diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
index ad78ec5dcd5bac89443ea5fe4fc75184b26b90c3..d1c5da28fd14540b005efdcc06283b66e3c93937 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
@@ -49,7 +49,7 @@ function DefaultColumnFilter({
if (!filterValue && value) {
setValue('');
}
- }, [filterValue]);
+ }, [filterValue, value]);
return (
<div className="table-filter" onClick={e => { e.stopPropagation() }}>
<input
@@ -75,7 +75,7 @@ function SelectColumnFilter({
if (!filterValue && value) {
setValue('');
}
- }, [filterValue]);
+ }, [filterValue, value]);
const options = React.useMemo(() => {
const options = new Set()
preFilteredRows.forEach(row => {
@@ -117,7 +117,7 @@ function SliderColumnFilter({
// Calculate the min and max
// using the preFilteredRows
const [value, setValue] = useState(0);
- const [min, max] = React.useMemo(() => {
+ /*const [min, max] = React.useMemo(() => {
let min = preFilteredRows.length ? preFilteredRows[0].values[id] : 0
let max = preFilteredRows.length ? preFilteredRows[0].values[id] : 0
preFilteredRows.forEach(row => {
@@ -125,7 +125,7 @@ function SliderColumnFilter({
max = Math.max(row.values[id], max)
})
return [min, max]
- }, [id, preFilteredRows])
+ }, [id, preFilteredRows])*/
return (
<div onClick={e => { e.stopPropagation() }} className="table-slider">
@@ -146,7 +146,7 @@ function BooleanColumnFilter({
if (!filterValue && value) {
setValue(null);
}
- }, [filterValue]);
+ }, [filterValue, value]);
return (
<div onClick={e => { e.stopPropagation() }}>
<TriStateCheckbox value={value} style={{'width':'15px','height':'24.2014px'}} onChange={(e) => { setValue(e.value); setFilter(e.value === null ? undefined : e.value); }} />
@@ -166,7 +166,7 @@ function CalendarColumnFilter({
if (!filterValue && value) {
setValue(null);
}
- }, [filterValue]);
+ }, [filterValue, value]);
return (
<div className="table-filter" onClick={e => { e.stopPropagation() }}>
@@ -216,7 +216,6 @@ function RangeColumnFilter({
let max = 0;
if (preFilteredRows.length > 0 && preFilteredRows[0].values[id]) {
min = preFilteredRows[0].values[id];
- max = max;
}
preFilteredRows.forEach(row => {
min = Math.min(row.values[id]?row.values[id]:0, min);
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
index ece49855e6ceefbd630a74fa8c513aa92903c3eb..8b7a3f54381ca0d1bc2c0a741a194b16b685a564 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
@@ -72,16 +72,16 @@ class SchedulingUnitList extends Component{
blueP.duration = moment.utc(blueP.duration*1000).format('HH:mm:ss');
blueP.type="Blueprint";
blueP['actionpath'] ='/schedulingunit/view/blueprint/'+blueP.id;
- blueP['created_at'] = moment(blueP['created_at'], moment.ISO_8601).format("YYYY-MMM-DD");
- blueP['updated_at'] = moment(blueP['updated_at'], moment.ISO_8601).format("YYYY-MMM-DD");
+ 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");
return blueP;
});
output.push(...blueprintdata);
scheduleunit['actionpath']='/schedulingunit/view/draft/'+scheduleunit.id;
scheduleunit['type'] = 'Draft';
scheduleunit['duration'] = moment.utc(scheduleunit.duration*1000).format('HH:mm:ss');
- scheduleunit['created_at'] = moment(scheduleunit['created_at'], moment.ISO_8601).format("YYYY-MMM-DD");
- scheduleunit['updated_at'] = moment(scheduleunit['updated_at'], moment.ISO_8601).format("YYYY-MMM-DD");
+ 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({
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 2f140638247d002acbb5ac41b1a788f389039971..30cab3f14df153befbdfdc94c66762cb12eeb449 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
@@ -26,10 +26,7 @@ class ViewSchedulingUnit extends Component{
name:"Type",
filter:"select"
},
- id:{
- name: "ID",
- filter: "range"
- },
+ id: "ID",
name:"Name",
description:"Description",
created_at:{
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js
index 9b3daeebf56227d97304f459e363ee43e0662da9..f5c26c533265c2efc0bb5e9e15fec488f06ebd50 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js
@@ -103,8 +103,8 @@ const ScheduleService = {
for(const key of commonkeys){
scheduletask[key] = task[key];
}
- scheduletask['created_at'] = moment(task['created_at'], moment.ISO_8601).format("YYYY-MMM-DD");
- scheduletask['updated_at'] = moment(task['updated_at'], moment.ISO_8601).format("YYYY-MMM-DD");
+ 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");
scheduletask.duration = moment.utc(scheduletask.duration*1000).format('HH:mm:ss');
scheduletask.relative_start_time = moment.utc(scheduletask.relative_start_time*1000).format('HH:mm:ss');
@@ -125,8 +125,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");
- taskblueprint['updated_at'] = moment(blueprint['updated_at'], moment.ISO_8601).format("YYYY-MMM-DD");
+ 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");
taskblueprint.duration = moment.utc(taskblueprint.duration*1000).format('HH:mm:ss');
taskblueprint.relative_start_time = moment.utc(taskblueprint.relative_start_time*1000).format('HH:mm:ss');
taskblueprint.relative_stop_time = moment.utc(taskblueprint.relative_stop_time*1000).format('HH:mm:ss');
@@ -142,16 +142,6 @@ const ScheduleService = {
});
return scheduletasklist;
},
- getSchedulingUnitBlueprint: async function (){
- let res = [];
- await axios.get('/api/scheduling_unit_blueprint/?ordering=id')
- .then(response => {
- res= response;
- }).catch(function(error) {
- console.error('[schedule.services.getSchedulingUnitBlueprint]',error);
- });
- return res;
- },
getTaskBlueprints: async function (){
let res=[];
await axios.get('/api/task_blueprint/?ordering=id')