From d4efefd92042e9a64d4ef5876facacbe583db537 Mon Sep 17 00:00:00 2001
From: unknown <n.santhanam@redkarma.eu>
Date: Fri, 30 Oct 2020 10:30:42 +0530
Subject: [PATCH] TMSS-309
Project column removed from the SU List in the project view.
---
.../tmss_webapp/src/routes/Project/view.js | 2 +-
.../routes/Scheduling/SchedulingUnitList.js | 54 ++++++++++---------
2 files changed, 30 insertions(+), 26 deletions(-)
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 d621f328343..d2dfd4708c5 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 718eeae2670..570ca6388bd 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",
}],
--
GitLab