diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js index d621f328343a065c1efd65f3c88dd7a8548d7fa6..d2dfd4708c542b56153824199dc5a9ebc02e9f17 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js @@ -187,7 +187,7 @@ export class ProjectView extends Component { </div> </div> </div> - <SchedulingUnitList project={this.state.project.name}/> + <SchedulingUnitList project={this.state.project.name} hideProjectColumn/> </div> </React.Fragment> } diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js index 718eeae2670b998620f879845f965508cc928cc0..570ca6388bd7f10954ccb6fe2731e0b424f92435 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js @@ -10,37 +10,41 @@ class SchedulingUnitList extends Component{ constructor(props){ super(props) + const defaultcolumns = { + type:{ + name:"Type", + filter:"select" + }, + name:"Name", + description:"Description", + project:"Project", + created_at:{ + name:"Created At", + filter: "date" + }, + updated_at:{ + name:"Updated At", + filter: "date" + }, + requirements_template_id:{ + name: "Template", + filter: "select" + }, + start_time:"Start Time", + stop_time:"End time", + duration:"Duration (HH:mm:ss)", + status:"Status" + }; + if (props.hideProjectColumn) { + delete defaultcolumns['project']; + } this.state = { scheduleunit: [], paths: [{ "View": "/schedulingunit/view", }], isLoading: true, - defaultcolumns: [ { - type:{ - name:"Type", - filter:"select" - }, - name:"Name", - description:"Description", - project:"Project", - created_at:{ - name:"Created At", - filter: "date" - }, - updated_at:{ - name:"Updated At", - filter: "date" - }, - requirements_template_id:{ - name: "Template", - filter: "select" - }, - start_time:"Start Time", - stop_time:"End time", - duration:"Duration (HH:mm:ss)", - status:"Status" - }], + defaultcolumns: [defaultcolumns], optionalcolumns: [{ actionpath:"actionpath", }],