From 2d38e1217d064be122133fb61b7bc56e591bade6 Mon Sep 17 00:00:00 2001
From: Ramesh Kumar <ramesh.p@matriotsolutions.com>
Date: Thu, 27 May 2021 21:42:03 +0530
Subject: [PATCH] TMSS-680: Missing column added and style updated.
---
SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_timeline.scss | 2 +-
.../frontend/tmss_webapp/src/routes/Timeline/common.utils.js | 1 -
.../frontend/tmss_webapp/src/routes/Timeline/list.tabs.js | 2 +-
.../frontend/tmss_webapp/src/shared/timeline.constants.js | 5 ++++-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_timeline.scss b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_timeline.scss
index 2b0360d86c6..b1e7da33347 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_timeline.scss
+++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_timeline.scss
@@ -202,7 +202,7 @@
position: fixed !important;
// top: 50%;
// transition: all 0.2s ease-in 0s;//this is the key attribute
- z-index: 9999;
+ z-index: 1000;
//cursor: pointer;
font-size: 8px;
color: #ffffff;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/common.utils.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/common.utils.js
index cdf8d1044ea..2866186c61d 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/common.utils.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/common.utils.js
@@ -85,7 +85,6 @@ class TimelineCommonUtils {
* @returns Object - A JSON object with station groups and count as proerpty with formatted string to display
*/
getSUStationGroupCount(itemSU) {
- console.log("IN TIMELINE COMMON UTILS");
const itemStations = this.getSUStations(itemSU);
const itemStationGroups = this.groupSUStations(itemStations);
let suStationGroupCount = { groups: "", counts: "" };
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/list.tabs.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/list.tabs.js
index 9bab6fd7ba7..f6c561b938f 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/list.tabs.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/list.tabs.js
@@ -185,7 +185,7 @@ class TimelineListTabs extends Component {
</TabView>
{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' }}
+ visible={this.state.showStatusLogs} maximizable={false} maximized={false} position="left" style={{ width: '50vw' }}
onHide={() => { this.setState({ showStatusLogs: false }) }}>
<TaskStatusLogs taskId={this.state.task.id}></TaskStatusLogs>
</Dialog>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/shared/timeline.constants.js b/SAS/TMSS/frontend/tmss_webapp/src/shared/timeline.constants.js
index 3e9b02cbb5b..c588cbafccd 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/shared/timeline.constants.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/shared/timeline.constants.js
@@ -211,6 +211,9 @@ const TimelineConstants = {
fixedProject: {
name: "Fixed Project"
},
+ project_id: {
+ name: "Project"
+ },
effectsExpert: {
name: "Expert"
},
@@ -237,7 +240,7 @@ const TimelineConstants = {
"Stations": "filter-input-100", "Manual": "filter-input-50",
"Dynamic": "filter-input-50", "Fixed Project": "filter-input-50",
"Expert": "filter-input-50", "HBA-RFI": "filter-input-50",
- "LBA-RFI":"filter-input-50"
+ "LBA-RFI":"filter-input-50", "Project": "filter-input-100"
}]
};
--
GitLab