Skip to content
Snippets Groups Projects
Commit 162fcb99 authored by Ramesh Kumar's avatar Ramesh Kumar
Browse files

TMSS-378: Project Name missing in SU List- Fixed

parent 0270dc9b
No related branches found
No related tags found
1 merge request!271Sprint-15 Front End Merge
...@@ -79,7 +79,7 @@ export class TimelineView extends Component { ...@@ -79,7 +79,7 @@ export class TimelineView extends Component {
const suBlueprint = _.find(suBlueprints, {'id': suBlueprintId}); const suBlueprint = _.find(suBlueprints, {'id': suBlueprintId});
suBlueprint['actionpath'] = `/schedulingunit/view/blueprint/${suBlueprintId}`; suBlueprint['actionpath'] = `/schedulingunit/view/blueprint/${suBlueprintId}`;
suBlueprint.suDraft = suDraft; suBlueprint.suDraft = suDraft;
suBlueprint.project = project; suBlueprint.project = project.name;
suBlueprint.suSet = suSet; suBlueprint.suSet = suSet;
suBlueprint.durationInSec = suBlueprint.duration; suBlueprint.durationInSec = suBlueprint.duration;
suBlueprint.duration = UnitConverter.getSecsToHHmmss(suBlueprint.duration); suBlueprint.duration = UnitConverter.getSecsToHHmmss(suBlueprint.duration);
...@@ -122,8 +122,8 @@ export class TimelineView extends Component { ...@@ -122,8 +122,8 @@ export class TimelineView extends Component {
// suBlueprint.status = diffOfCurrAndStart>=0?"FINISHED":"DEFINED"; // suBlueprint.status = diffOfCurrAndStart>=0?"FINISHED":"DEFINED";
let item = { id: suBlueprint.id, let item = { id: suBlueprint.id,
group: suBlueprint.suDraft.id, group: suBlueprint.suDraft.id,
title: `${suBlueprint.project.name} - ${suBlueprint.suDraft.name} - ${(suBlueprint.durationInSec/3600).toFixed(2)}Hrs`, title: `${suBlueprint.project} - ${suBlueprint.suDraft.name} - ${(suBlueprint.durationInSec/3600).toFixed(2)}Hrs`,
project: suBlueprint.project.name, project: suBlueprint.project,
name: suBlueprint.suDraft.name, name: suBlueprint.suDraft.name,
duration: suBlueprint.durationInSec?`${(suBlueprint.durationInSec/3600).toFixed(2)}Hrs`:"", duration: suBlueprint.durationInSec?`${(suBlueprint.durationInSec/3600).toFixed(2)}Hrs`:"",
start_time: moment.utc(suBlueprint.start_time), start_time: moment.utc(suBlueprint.start_time),
...@@ -318,7 +318,7 @@ export class TimelineView extends Component { ...@@ -318,7 +318,7 @@ export class TimelineView extends Component {
data={this.state.suBlueprintList} data={this.state.suBlueprintList}
defaultcolumns={[{name: "Name", defaultcolumns={[{name: "Name",
start_time:"Start Time", stop_time:"End Time"}]} 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", columnclassname={[{"Start Time":"filter-input-50", "End Time":"filter-input-50",
"Duration (HH:mm:ss)" : "filter-input-50",}]} "Duration (HH:mm:ss)" : "filter-input-50",}]}
defaultSortColumn= {[{id: "Start Time", desc: false}]} defaultSortColumn= {[{id: "Start Time", desc: false}]}
......
...@@ -139,8 +139,8 @@ export class WeekTimelineView extends Component { ...@@ -139,8 +139,8 @@ export class WeekTimelineView extends Component {
let item = { id: `${suBlueprint.id}-${suBlueprint.start_time}`, let item = { id: `${suBlueprint.id}-${suBlueprint.start_time}`,
// group: suBlueprint.suDraft.id, // group: suBlueprint.suDraft.id,
group: moment.utc(suBlueprint.start_time).format("MMM DD ddd"), group: moment.utc(suBlueprint.start_time).format("MMM DD ddd"),
title: `${suBlueprint.project.name} - ${(suBlueprint.durationInSec/3600).toFixed(2)}Hrs - ${antennaSet}`, title: `${suBlueprint.project} - ${(suBlueprint.durationInSec/3600).toFixed(2)}Hrs - ${antennaSet}`,
project: suBlueprint.project.name, project: suBlueprint.project,
name: suBlueprint.suDraft.name, name: suBlueprint.suDraft.name,
band: antennaSet, band: antennaSet,
duration: suBlueprint.durationInSec?`${(suBlueprint.durationInSec/3600).toFixed(2)}Hrs`:"", duration: suBlueprint.durationInSec?`${(suBlueprint.durationInSec/3600).toFixed(2)}Hrs`:"",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment