diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js index ec2a9dcbd5b45f88cd268ea6e1c7ab96d97a66a0..5ab65e6a7b09886f107dc78943236999c1836156 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js @@ -79,7 +79,7 @@ export class TimelineView extends Component { const suBlueprint = _.find(suBlueprints, {'id': suBlueprintId}); suBlueprint['actionpath'] = `/schedulingunit/view/blueprint/${suBlueprintId}`; suBlueprint.suDraft = suDraft; - suBlueprint.project = project; + suBlueprint.project = project.name; suBlueprint.suSet = suSet; suBlueprint.durationInSec = suBlueprint.duration; suBlueprint.duration = UnitConverter.getSecsToHHmmss(suBlueprint.duration); @@ -122,8 +122,8 @@ export class TimelineView extends Component { // suBlueprint.status = diffOfCurrAndStart>=0?"FINISHED":"DEFINED"; let item = { id: suBlueprint.id, group: suBlueprint.suDraft.id, - title: `${suBlueprint.project.name} - ${suBlueprint.suDraft.name} - ${(suBlueprint.durationInSec/3600).toFixed(2)}Hrs`, - project: suBlueprint.project.name, + title: `${suBlueprint.project} - ${suBlueprint.suDraft.name} - ${(suBlueprint.durationInSec/3600).toFixed(2)}Hrs`, + project: suBlueprint.project, name: suBlueprint.suDraft.name, duration: suBlueprint.durationInSec?`${(suBlueprint.durationInSec/3600).toFixed(2)}Hrs`:"", start_time: moment.utc(suBlueprint.start_time), @@ -323,7 +323,7 @@ export class TimelineView extends Component { data={this.state.suBlueprintList} defaultcolumns={[{name: "Name", start_time:"Start Time", stop_time:"End Time"}]} - optionalcolumns={[{description: "Description", duration:"Duration (HH:mm:ss)", actionpath: "actionpath"}]} + optionalcolumns={[{project:"Project",description: "Description", duration:"Duration (HH:mm:ss)", actionpath: "actionpath"}]} columnclassname={[{"Start Time":"filter-input-50", "End Time":"filter-input-50", "Duration (HH:mm:ss)" : "filter-input-50",}]} defaultSortColumn= {[{id: "Start Time", desc: false}]} diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/week.view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/week.view.js index 407b2082cb913f462afaf660e0589e48f5adcc91..b4b3ae65ec5a753e2b52bff6c251f59c3d60f71e 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/week.view.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/week.view.js @@ -139,8 +139,8 @@ export class WeekTimelineView extends Component { let item = { id: `${suBlueprint.id}-${suBlueprint.start_time}`, // group: suBlueprint.suDraft.id, group: moment.utc(suBlueprint.start_time).format("MMM DD ddd"), - title: `${suBlueprint.project.name} - ${(suBlueprint.durationInSec/3600).toFixed(2)}Hrs - ${antennaSet}`, - project: suBlueprint.project.name, + title: `${suBlueprint.project} - ${(suBlueprint.durationInSec/3600).toFixed(2)}Hrs - ${antennaSet}`, + project: suBlueprint.project, name: suBlueprint.suDraft.name, band: antennaSet, duration: suBlueprint.durationInSec?`${(suBlueprint.durationInSec/3600).toFixed(2)}Hrs`:"",