From 0692a845ea69d1124855e1924d5ba9b3c47f1637 Mon Sep 17 00:00:00 2001
From: Muthukrishnan <muthukrishnan.m@matriotsolutions.com>
Date: Tue, 5 Jan 2021 10:57:05 +0530
Subject: [PATCH] End Date issue resolved in filter
End Date issue resolved in filter
---
SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
index 03d2767515d..bcff162b508 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
@@ -365,6 +365,8 @@ function multiSelectFilterFn(rows, id, filterValue) {
* @param {String} filterValue
*/
function toDatetimeFilterFn(rows, id, filterValue) {
+ let end = moment.utc(moment(filterValue, 'YYYY-MMM-DDTHH:mm:SS').format("YYYY-MM-DDTHH:mm:SS"));
+ end = moment(end, "DD-MM-YYYY").add(1, 'days');
const filteredRows = _.filter(rows, function(row) {
// If cell value is null or empty
if (!row.values[id]) {
@@ -376,8 +378,6 @@ function toDatetimeFilterFn(rows, id, filterValue) {
// For cell data in format 'YYYY-MMM-DD'
rowValue = moment.utc(moment(row.values[id], 'YYYY-MMM-DDTHH:mm:SS').format("YYYY-MM-DDTHH:mm:SS"));
}
- const end = moment.utc(moment(filterValue, 'YYYY-MMM-DDTHH:mm:SS').format("YYYY-MM-DDTHH:mm:SS"));
-
return (end.isSameOrAfter(rowValue));
} );
return filteredRows;
--
GitLab