From c7490ccf7855fc46ec0fb3de0b6f6155fadf45d5 Mon Sep 17 00:00:00 2001
From: Ramesh Kumar <ramesh.p@matriotsolutions.com>
Date: Fri, 22 Oct 2021 22:31:10 +0530
Subject: [PATCH] TMSS-1119: Minor fixes and update
---
SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js | 4 +++-
.../tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js | 1 -
SAS/TMSS/frontend/tmss_webapp/src/routes/Task/list.js | 2 +-
SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js | 4 ++--
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
index f097978c05f..1544f03d307 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
@@ -1157,7 +1157,9 @@ function dateFilterFn(rows, id, filterValue) {
function dateRangeFilterFn(rows, id, filterValue) {
const filteredRows = _.filter(rows, function (row) {
// If cell value is null or empty
- if (!row.values[id]) {
+ if (filterValue.length>0 && !row.values[id]) {
+ return false;
+ } else if (!row.values[id]) {
return true;
}
//Remove microsecond if value passed is UTC string in format "YYYY-MM-DDTHH:mm:ss.sssss"
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 6d0b5b18ec1..92760509bd8 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
@@ -1446,7 +1446,6 @@ class ViewSchedulingUnit extends Component {
</span>
</div>
</div>
- {console.log(this.state.schedulingUnitTasks)}
{this.state.isLoading ? <AppLoader /> : (this.state.schedulingUnitTasks.length > 0) ?
<ViewTable
data={this.state.schedulingUnitTasks}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/list.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/list.js
index bbd138a3be6..1e3ddf44003 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/list.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/list.js
@@ -806,7 +806,7 @@ export class TaskList extends Component {
if (values[1]) {
this.filterQry += 'on_sky_start_time_before='+moment(new Date(values[1])).format("YYYY-MM-DDTHH:mm:ss")+".000Z&";
}
- } else if (filter.id === 'End Time') {
+ } else if (filter.id === 'Observation End Time') {
const values = filter.value;
if (values[0]) {
this.filterQry += 'on_sky_stop_time_after='+ moment(new Date(values[0])).format("YYYY-MM-DDTHH:mm:ss")+".000Z&";
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
index 9ea825cd069..47a04d5e691 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
@@ -495,9 +495,9 @@ export class TaskView extends Component {
{this.state.taskType === 'blueprint' &&
<div className="p-grid">
<label className="col-lg-2 col-md-2 col-sm-12">Process Start Time</label>
- <span className="col-lg-4 col-md-4 col-sm-12">{this.state.task.process_start_time?moment(this.state.task.on_sky_start_time,moment.ISO_8601).format(UIConstants.CALENDAR_DATETIME_FORMAT):""}</span>
+ <span className="col-lg-4 col-md-4 col-sm-12">{this.state.task.process_start_time?moment(this.state.task.process_start_time,moment.ISO_8601).format(UIConstants.CALENDAR_DATETIME_FORMAT):""}</span>
<label className="col-lg-2 col-md-2 col-sm-12">Process End Time</label>
- <span className="col-lg-4 col-md-4 col-sm-12">{this.state.task.process_stop_time?moment(this.state.task.on_sky_stop_time,moment.ISO_8601).format(UIConstants.CALENDAR_DATETIME_FORMAT):""}</span>
+ <span className="col-lg-4 col-md-4 col-sm-12">{this.state.task.process_stop_time?moment(this.state.task.process_stop_time,moment.ISO_8601).format(UIConstants.CALENDAR_DATETIME_FORMAT):""}</span>
</div>}
<div className="p-grid">
{/* <label className="col-lg-2 col-md-2 col-sm-12">Tags</label>
--
GitLab