TMSS-299

Updation on filters

SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js

@@ -40,6 +40,11 @@ function DefaultColumnFilter({
   column: { filterValue, preFilteredRows, setFilter },
 }) {
   const [value, setValue] = useState('');
+  React.useEffect(() => {
+    if (!filterValue && value) {
+      setValue('');
+    }
+  }, [filterValue]);
   return (
     <div className="table-filter" onClick={e => { e.stopPropagation() }}>
       <input
@@ -119,11 +124,16 @@ function SliderColumnFilter({
 // This is a custom filter UI that uses a
 // switch to set the value
 function BooleanColumnFilter({
-  column: { setFilter},
+  column: { setFilter, filterValue},
 }) {
   // Calculate the min and max
   // using the preFilteredRows
-  const [value, setValue] = useState(true);
+  const [value, setValue] = useState(null);
+  React.useEffect(() => {
+    if (!filterValue && value) {
+      setValue(null);
+    }
+  }, [filterValue]);
   return (
     <div onClick={e => { e.stopPropagation() }}>
       <TriStateCheckbox value={value} onChange={(e) => { setValue(e.value); setFilter(e.value === null ? undefined : e.value); }} />
@@ -134,11 +144,16 @@ function BooleanColumnFilter({
 // This is a custom filter UI that uses a
 // calendar to set the value
 function CalendarColumnFilter({
-  column: { setFilter},
+  column: { setFilter, filterValue},
 }) {
   // Calculate the min and max
   // using the preFilteredRows
   const [value, setValue] = useState('');
+  React.useEffect(() => {
+    if (!filterValue && value) {
+      setValue(null);
+    }
+  }, [filterValue]);
   return (
     
     <div className="table-filter" onClick={e => { e.stopPropagation() }}>
@@ -163,7 +178,7 @@ function RangeColumnFilter({
     
        <Slider className='table-slider' value={value} onChange={(e) => {
        setValue(value);
-         setFilter(value); }} range />
+         setFilter(value); }} />
     
   )
 }

SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js

@@ -25,7 +25,10 @@ class SchedulingUnitList extends Component{
                     name:'Created At',
                     filter: 'date'
                 },
-                "updated_at":"Updated Date",
+                "updated_at":{
+                    name:'Updated At',
+                    filter: 'date'
+                },
                 "requirements_template_id":{
                     name: "Template",
                     filter: 'slider'
@@ -54,6 +57,7 @@ class SchedulingUnitList extends Component{
                 blueprintdata.map(blueP => { 
                     blueP.duration = moment(blueP.duration).format('H:mm:ss'); 
                     blueP['created_at'] = moment(blueP['created_at'], moment.ISO_8601).format("YYYY-MMM-DD HH:mm:SS");
+                    blueP['updated_at'] = moment(blueP['updated_at'], moment.ISO_8601).format("YYYY-MMM-DD HH:mm:SS");
                     blueP.type="Blueprint"; 
                     return blueP; 
                 });
@@ -63,6 +67,7 @@ class SchedulingUnitList extends Component{
                 // scheduleunit['stop_time'] = blueprintdata.stop_time;
                 scheduleunit['duration'] = moment(scheduleunit.duration).format('H:mm:ss');
                 scheduleunit['created_at'] = moment(scheduleunit['created_at'], moment.ISO_8601).format("YYYY-MMM-DD HH:mm:SS");
+                scheduleunit['updated_at'] = moment(scheduleunit['updated_at'], moment.ISO_8601).format("YYYY-MMM-DD HH:mm:SS");
                 output.push(scheduleunit);
             }
             this.setState({

SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js

 import axios from 'axios'
 import _ from 'lodash';
+import moment from 'moment';
 
 axios.defaults.headers.common['Authorization'] = 'Basic dGVzdDp0ZXN0';
 
@@ -39,6 +40,8 @@ const ScheduleService = {
                 scheduletask['tasktype'] = 'Task Draft';
                 scheduletask['actionpath'] = '/task/view/draft/'+task['id'];
                 scheduletask['blueprint_draft'] = task['task_blueprints'];
+                scheduletask['created_at'] = moment(task['created_at'], moment.ISO_8601).format("YYYY-MMM-DD HH:mm:SS");
+                scheduletask['updated_at'] = moment(task['updated_at'], moment.ISO_8601).format("YYYY-MMM-DD HH:mm:SS");
 
                 //fetch task draft details
                 for(const key of commonkeys){
@@ -58,6 +61,8 @@ const ScheduleService = {
                     for(const key of commonkeys){
                         taskblueprint[key] = blueprint[key];
                     }
+                    taskblueprint['created_at'] = moment(blueprint['created_at'], moment.ISO_8601).format("YYYY-MMM-DD HH:mm:SS");
+                    taskblueprint['updated_at'] = moment(blueprint['updated_at'], moment.ISO_8601).format("YYYY-MMM-DD HH:mm:SS");
                     //Add Blue print details to array
                     scheduletasklist.push(taskblueprint);
                 }