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 abfed6a9930403688fc930dd99282cc7616baf39..0ae76c8027d2dd7a964a2bab9911c58eed773649 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
@@ -44,12 +44,12 @@ class SchedulingUnitList extends Component{
SU_BLUEPRINT_FIELDS = ['id', 'status', 'draft_id', 'draft.id', 'draft.scheduling_set.name', 'draft.scheduling_set.project.name', 'scheduling_set.id', 'draft.name',
'name', 'description', 'priority', 'priority_queue_value', 'rank', 'unschedulable_reason', 'draft.observation_strategy_template.id', 'draft.scheduling_constraints_doc',
'draft.observation_strategy_template.name', 'draft.observation_strategy_template.description', 'on_sky_start_time', 'draft.observation_strategy_template.scheduling_unit_template',
- 'on_sky_stop_time', 'scheduled_central_lst', 'process_start_time', 'process_stop_time', 'duration', 'do_cancel', 'output_pinned', 'created_at',
+ 'on_sky_stop_time', 'scheduled_central_lst', 'process_start_time', 'process_stop_time', 'duration', 'do_cancel', 'results_accepted', 'output_pinned', 'created_at',
'updated_at', 'task_blueprints.id', 'task_blueprints.name', 'task_blueprints.specifications_doc', 'task_blueprints.specifications_template.id', 'draft.scheduling_unit_blueprints',
'task_blueprints.specifications_template.name', 'task_blueprints.specifications_template.type_value','task_blueprints.subtasks.specifications_doc', 'scheduling_constraints_template', 'scheduling_constraints_doc', 'observation_strategy_template.specifications_template'
];
SU_BPCONSTRAINTS_EXPAND = 'draft,draft.scheduling_set,draft.scheduling_set.project,draft.observation_strategy_template,task_blueprints,task_blueprints.specifications_template,task_blueprints.subtasks'
- SU_BPCONSTRAINTS_FIELDS = ['id', 'status', 'draft_id', 'draft.scheduling_set.name', 'draft.scheduling_set.project.name', 'name', 'description', 'priority', 'unschedulable_reason', 'scheduling_constraints_doc','task_blueprints.id', 'task_blueprints.name', 'task_blueprints.specifications_doc', 'task_blueprints.specifications_template.id',
+ SU_BPCONSTRAINTS_FIELDS = ['id', 'status', 'draft_id', 'draft.scheduling_set.name', 'draft.scheduling_set.project.name', 'name', 'description', 'priority', 'results_accepted', 'unschedulable_reason', 'scheduling_constraints_doc','task_blueprints.id', 'task_blueprints.name', 'task_blueprints.specifications_doc', 'task_blueprints.specifications_template.id',
'task_blueprints.specifications_template.name', 'task_blueprints.specifications_template.type_value','task_blueprints.subtasks', 'draft.scheduling_set.id'];
COMMA_SEPARATE_TOOLTIP ='Enter Id and press ‘Enter’ key to search. For multiple values enter comma separated values. For range, provide input like 1..6';
@@ -67,7 +67,7 @@ class SchedulingUnitList extends Component{
name:"Unschedulable Reason",
},
workflowStatus: {name: "Workflow Status",filter: "select"},
- dataAccepted: {name: "Data Accepted", filter: 'none'},
+ results_accepted: {name: "Data Accepted", filter: 'none'},
suid: {name: "Scheduling Unit ID", tooltip: this.COMMA_SEPARATE_TOOLTIP},
priority:{name:"Priority"},
project:{name:"Project"},
@@ -213,7 +213,7 @@ class SchedulingUnitList extends Component{
"Type": "filter-input-75",
"Status":"filter-input-125",
"workflowStatus":"filter-input-100",
- "dataAccepted":"filter-input-50",
+ "Data Accepted":"filter-input-50",
"Stations (CS/RS/IS)":"filter-input-50",
"Tasks content (O/P/I)":"filter-input-50",
"Number of SAPs in the target observation":"filter-input-50",
@@ -594,7 +594,7 @@ class SchedulingUnitList extends Component{
*/
async getFilterColumns(type) {
//const columnOrderToBeRemove = ['Status', 'Workflow Status', 'Observation Start Time', 'Observation End Time', 'Process Start Time', 'Process End Time' ];
- const columnDefinitionToBeRemove = ['status', 'unschedulable_reason', 'workflowStatus', 'dataAccepted', 'on_sky_start_time', 'on_sky_stop_time', 'process_start_time', 'process_stop_time'];
+ const columnDefinitionToBeRemove = ['status', 'unschedulable_reason', 'workflowStatus', 'results_accepted', 'on_sky_start_time', 'on_sky_stop_time', 'process_start_time', 'process_stop_time'];
//For Constraint
const constColDefToBeRemove = ['observation_strategy_template_name', 'duration', 'observation_strategy_template_id', 'observation_strategy_template_description', 'on_sky_start_time', 'on_sky_stop_time', 'process_start_time', 'process_stop_time', 'task_content',
'target_observation_sap', 'do_cancel', 'created_at', 'updated_at', 'rank', 'priority_queue', 'output_pinned', 'draft', 'targetName','targetAngle1','targetAngle2','targetRef'];
@@ -2546,7 +2546,7 @@ class SchedulingUnitList extends Component{
scheduleunit['scheduling_set'] = scheduleunit.draft.scheduling_set.name;
const workflowDetails = this.timelineCommonUtils.getWorkflowDetails(workflows, scheduleunit.id);
scheduleunit['workflowStatus'] = workflowDetails.status;
- scheduleunit['dataAccepted'] = workflowDetails.dataAccepted;
+ //scheduleunit['dataAccepted'] = workflowDetails.dataAccepted;
// TODO: When time taken to load all workflow data increases, change to load individual workflow data
//scheduleunit['workflowStatus'] = this.timelineCommonUtils.getWorkflowStatus(scheduleunit);
scheduleunit.duration = moment.utc((scheduleunit.duration || 0)*1000).format('HH:mm:ss');
@@ -2566,7 +2566,7 @@ class SchedulingUnitList extends Component{
async updateSchedulingUnitDraft(scheduleunit) {
scheduleunit['status'] = null;
scheduleunit['workflowStatus'] = null;
- scheduleunit['dataAccepted'] = null;
+ scheduleunit['results_accepted'] = null;
scheduleunit['observation_strategy_template_name'] = scheduleunit.observation_strategy_template?scheduleunit.observation_strategy_template.name:null;
scheduleunit['observation_strategy_template_description'] = scheduleunit.observation_strategy_template?scheduleunit.observation_strategy_template.description:null;
scheduleunit['draft'] = this.getLinksList(scheduleunit.scheduling_unit_blueprints_ids, 'blueprint');
@@ -2638,7 +2638,7 @@ class SchedulingUnitList extends Component{
scheduleunit['scheduling_set'] = scheduleunit.draft.scheduling_set.name;
const workflowDetails = this.timelineCommonUtils.getWorkflowDetails(workflows, scheduleunit.id);
scheduleunit['workflowStatus'] = workflowDetails.status;
- scheduleunit['dataAccepted'] = workflowDetails.dataAccepted;
+ //scheduleunit['dataAccepted'] = workflowDetails.dataAccepted;
scheduleunit.duration = moment.utc((scheduleunit.duration || 0)*1000).format('HH:mm:ss');
scheduleunit['type'] = "Blueprint";
scheduleunit['priority'] = scheduleunit.priority || "";
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js
index 728da9e285ad3593d30b14d362cc5ef907b14245..15b0bf7311f456ee33d9004ffb0ce91d1f3295f3 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js
@@ -611,7 +611,6 @@ export class TimelineView extends Component {
suBlueprint.duration = UnitConverter.getSecsToHHmmss(suBlueprint.duration);
const workflowDetails = this.timelineCommonUtils.getWorkflowDetails(workflows, suBlueprint.id);
suBlueprint.workflowStatus = workflowDetails.status;
- suBlueprint.dataAccepted = workflowDetails.dataAccepted;
suBlueprint.task_content = "";
suBlueprint.observ_template_name = suBlueprint.draft.observation_strategy_template?suBlueprint.draft.observation_strategy_template.name:null;
suBlueprint.tasks = suBlueprint.task_blueprints;
@@ -1602,7 +1601,6 @@ export class TimelineView extends Component {
suBlueprint.duration = UnitConverter.getSecsToHHmmss(suBlueprint.duration);
const workflowDetails = this.timelineCommonUtils.getWorkflowDetails(workflows, suBlueprint.id);
suBlueprint.workflowStatus = workflowDetails.status;
- suBlueprint.dataAccepted = workflowDetails.dataAccepted;
suBlueprint.task_content = "";
suBlueprint.observ_template_name = suBlueprint.draft.observation_strategy_template?suBlueprint.draft.observation_strategy_template.name:null;
suBlueprint.tasks = suBlueprint.task_blueprints;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/week.view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/week.view.js
index 293a4ed11651833f54d951dd9401e585eb9d80ba..04c48e9a982e7aa323cb1226b0abda0cdc64b002 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/week.view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/week.view.js
@@ -510,7 +510,6 @@ export class WeekTimelineView extends Component {
suBlueprint.duration = UnitConverter.getSecsToHHmmss(suBlueprint.duration);
const workflowDetails = this.timelineCommonUtils.getWorkflowDetails(workflows, suBlueprint.id);
suBlueprint.workflowStatus = workflowDetails.status;
- suBlueprint.dataAccepted = workflowDetails.dataAccepted;
suBlueprint.task_content = "";
suBlueprint.observ_template_name = suBlueprint.draft.observation_strategy_template?suBlueprint.draft.observation_strategy_template.name:null;
suBlueprint.tasks = suBlueprint.task_blueprints;
@@ -1097,7 +1096,6 @@ export class WeekTimelineView extends Component {
suBlueprint.duration = UnitConverter.getSecsToHHmmss(suBlueprint.duration);
const workflowDetails = this.timelineCommonUtils.getWorkflowDetails(workflows, suBlueprint.id);
suBlueprint.workflowStatus = workflowDetails.status;
- suBlueprint.dataAccepted = workflowDetails.dataAccepted;
suBlueprint.task_content = "";
suBlueprint.observ_template_name = suBlueprint.draft.observation_strategy_template?suBlueprint.draft.observation_strategy_template.name:null;
suBlueprint.tasks = suBlueprint.task_blueprints;
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 c918135d41a952072661c647127846337de6c3f9..949798ad8859448fad6e69bb1f187dacaf6d02b1 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js
@@ -18,6 +18,7 @@ const SU_FETCH_FIELDS = [ "id",
"short_description",
"status",
"output_pinned",
+ "results_accepted",
"unschedulable_reason",
"scheduling_constraints_doc",
"scheduling_constraints_template_id",
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 1674b81e1a134e8caf980bfbba930ff327ef0234..a05753d9c68b8190ae015855b6713ef8e8b3ff69 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/shared/timeline.constants.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/shared/timeline.constants.js
@@ -32,7 +32,7 @@ const TimelineConstants = {
workflowStatus: {
name: "Workflow Status"
},
- dataAccepted: {
+ results_accepted: {
name: "Data Accepted"
},
rank: {