From bedf5c9e13a63f2700170359c8fa8dd8dba5bd1d Mon Sep 17 00:00:00 2001
From: Ramesh Kumar <ramesh.p@matriotsolutions.com>
Date: Thu, 7 Jan 2021 11:52:47 +0530
Subject: [PATCH] TMSS-542: Moved task details before Stations & Constraints in
SU VIew
---
.../routes/Scheduling/ViewSchedulingUnit.js | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
index afe92374a93..2f84cfb6c32 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
@@ -347,13 +347,6 @@ class ViewSchedulingUnit extends Component{
</>
}
- {<Stations
- stationGroup={this.state.stationGroup}
- targetObservation={this.state.targetObservation}
- view
- />}
-
- {this.state.scheduleunit && this.state.scheduleunit.scheduling_constraints_doc && <SchedulingConstraint disable constraintTemplate={this.state.constraintSchema} initValue={this.state.scheduleunit.scheduling_constraints_doc} />}
<div>
<h3>Tasks Details</h3>
</div>
@@ -380,8 +373,16 @@ class ViewSchedulingUnit extends Component{
unittest={this.state.unittest}
tablename="scheduleunit_task_list"
/>
- }
- {this.state.showStatusLogs &&
+ }
+
+ {<Stations
+ stationGroup={this.state.stationGroup}
+ targetObservation={this.state.targetObservation}
+ view
+ />}
+
+ {this.state.scheduleunit && this.state.scheduleunit.scheduling_constraints_doc && <SchedulingConstraint disable constraintTemplate={this.state.constraintSchema} initValue={this.state.scheduleunit.scheduling_constraints_doc} />}
+ {this.state.showStatusLogs &&
<Dialog header={`Status change logs - ${this.state.task?this.state.task.name:""}`}
visible={this.state.showStatusLogs} maximizable maximized={false} position="left" style={{ width: '50vw' }}
onHide={() => {this.setState({showStatusLogs: false})}}>
--
GitLab