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 0ae76c8027d2dd7a964a2bab9911c58eed773649..697ed4121251fa3425bfbd14431a532603f3be41 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
@@ -34,14 +34,14 @@ class SchedulingUnitList extends Component{
//Expand details for API Query
SU_DRAFT_EXPAND = 'scheduling_set,scheduling_set.project,observation_strategy_template,task_drafts,task_drafts.specifications_template,scheduling_unit_blueprints';
SU_DRAFT_FIELDS = ['id', 'scheduling_unit_blueprints.name', 'scheduling_unit_blueprints.url', 'scheduling_unit_blueprints.name','scheduling_unit_blueprints_ids', 'scheduling_set.name',
- 'scheduling_set.project.name', 'name', 'description', 'priority', 'priority_queue_value', 'rank', 'scheduling_unit_blueprints.id',
+ 'scheduling_set.project.name','scheduling_set.project.rank', 'name', 'description', 'priority', 'priority_queue_value', 'rank', 'scheduling_unit_blueprints.id',
'observation_strategy_template.id', 'observation_strategy_template.name', 'observation_strategy_template.description',
'duration', 'do_cancel', 'output_pinned', 'created_at', 'updated_at', 'task_drafts.id', 'task_drafts.name', 'task_drafts.output_pinned', 'task_drafts.url',
'task_drafts.specifications_doc', 'task_drafts.specifications_template.id', 'task_drafts.specifications_template.name',
'task_drafts.specifications_template.type_value', 'scheduling_constraints_template', 'observation_strategy_template.scheduling_unit_template', 'scheduling_constraints_doc'
];
SU_BLUEPRINT_EXPAND = 'draft,draft.scheduling_set,draft.scheduling_set.project,draft.observation_strategy_template,task_blueprints,task_blueprints.specifications_template,task_blueprints.subtasks';
- SU_BLUEPRINT_FIELDS = ['id', 'status', 'draft_id', 'draft.id', 'draft.scheduling_set.name', 'draft.scheduling_set.project.name', 'scheduling_set.id', 'draft.name',
+ SU_BLUEPRINT_FIELDS = ['id', 'status', 'draft_id', 'draft.id', 'draft.scheduling_set.name', 'draft.scheduling_set.project.name','draft.scheduling_set.project.rank', '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', 'results_accepted', 'output_pinned', 'created_at',
@@ -49,7 +49,7 @@ class SchedulingUnitList extends Component{
'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', 'results_accepted', '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','draft.scheduling_set.project.rank', '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';
@@ -69,10 +69,10 @@ class SchedulingUnitList extends Component{
workflowStatus: {name: "Workflow Status",filter: "select"},
results_accepted: {name: "Data Accepted", filter: 'none'},
suid: {name: "Scheduling Unit ID", tooltip: this.COMMA_SEPARATE_TOOLTIP},
- priority:{name:"Priority"},
project:{name:"Project"},
name:{name:"Name"},
description: {name: "Description"},
+ project_rank: {name: "Project Rank", filter: 'rankMinMax'},
priority_queue: {name: "Priority Queue", filter: "numberRangeMinMax"},
scheduling_set: {name: "Scheduling Set",},
observation_strategy_template_name: {name: "Template Name"},
@@ -140,7 +140,7 @@ class SchedulingUnitList extends Component{
"Project",
"Name",
"Description",
- "Priority",
+ "Project Rank",
"Priority Queue",
"Rank",
"Scheduling Set",
@@ -169,8 +169,8 @@ class SchedulingUnitList extends Component{
"Type",
"Workflow Status",
"Scheduling Unit ID",
- "Priority",
"Project",
+ "Project Rank",
"Scheduling Set",
"Name",
"Description",
@@ -206,6 +206,7 @@ class SchedulingUnitList extends Component{
"Template Description": "filter-input-200",
"Scheduling Set": "filter-input-150",
"Project":"filter-input-100",
+ "Project Rank":"filter-input-75",
"Rank":"filter-input-75",
"Duration (HH:mm:ss)":"filter-input-100",
"Linked Draft ID":"filter-input-100",
@@ -2538,6 +2539,7 @@ class SchedulingUnitList extends Component{
workflows = await this.timelineCommonUtils.getWorkflowsAndTasks([scheduleunit.id])
}
scheduleunit['project'] = scheduleunit.draft.scheduling_set.project.name;
+ scheduleunit['project_rank'] = scheduleunit.draft.scheduling_set.project.rank;
scheduleunit['links'] = ['Project', 'id'];
scheduleunit['linksURL'] = {
'Project': `/project/view/${scheduleunit.draft.scheduling_set.project.name}`,
@@ -2577,6 +2579,7 @@ class SchedulingUnitList extends Component{
scheduleunit['duration'] = moment.utc((scheduleunit.duration || 0)*1000).format('HH:mm:ss');
scheduleunit['observation_strategy_template_id'] = scheduleunit.observation_strategy_template? scheduleunit.observation_strategy_template.id : '';
scheduleunit.project = scheduleunit.scheduling_set?scheduleunit.scheduling_set.project.name:'';
+ scheduleunit.project_rank = scheduleunit.scheduling_set?scheduleunit.scheduling_set.project.rank:'';
scheduleunit.canSelect = true;
scheduleunit.links = ['Project', 'id'];
scheduleunit.linksURL = {
@@ -2630,6 +2633,7 @@ class SchedulingUnitList extends Component{
workflows = await this.timelineCommonUtils.getWorkflowsAndTasks([scheduleunit.id])
}
scheduleunit['project'] = scheduleunit.draft.scheduling_set.project.name;
+ scheduleunit['project_rank'] = scheduleunit.draft.scheduling_set.project.rank;
scheduleunit['links'] = ['Project', 'id'];
scheduleunit['linksURL'] = {
'Project': `/project/view/${scheduleunit.draft.scheduling_set.project.name}`,
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/common.utils.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/common.utils.js
index 6e293b045789ea84eec8745606a889505568efa2..920f9b1061c1a9a4cea001af113f632e43aa8529 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/common.utils.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/common.utils.js
@@ -201,6 +201,7 @@ class TimelineCommonUtils {
unschedulableBlueprint['actionpath'] = `/schedulingunit/view/blueprint/${unschedulableBlueprint.id}`;
unschedulableBlueprint.suDraft = unschedulableBlueprint.draft;
unschedulableBlueprint.project = unschedulableBlueprint.draft.scheduling_set.project.name;
+ unschedulableBlueprint.project_rank = unschedulableBlueprint.draft.scheduling_set.project.rank;
unschedulableBlueprint.suSet = unschedulableBlueprint.draft.scheduling_set;
unschedulableBlueprint.durationInSec = unschedulableBlueprint.duration;
unschedulableBlueprint.duration = UnitConverter.getSecsToHHmmss(unschedulableBlueprint.duration);
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 12a32deb528fd0fa9ba03f3a416e3a5283e1ad58..16b91c3d9fd2669cecacd3a32a7945e3a4804644 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js
@@ -606,6 +606,7 @@ export class TimelineView extends Component {
suBlueprint['actionpath'] = `/schedulingunit/view/blueprint/${suBlueprint.id}`;
suBlueprint.suDraft = suBlueprint.draft;
suBlueprint.project = suBlueprint.draft.scheduling_set.project.name;
+ suBlueprint.project_rank = suBlueprint.draft.scheduling_set.project.rank;
suBlueprint.suSet = suBlueprint.draft.scheduling_set;
suBlueprint.durationInSec = suBlueprint.duration;
suBlueprint.duration = UnitConverter.getSecsToHHmmss(suBlueprint.duration);
@@ -1601,6 +1602,7 @@ export class TimelineView extends Component {
suBlueprint['actionpath'] = `/schedulingunit/view/blueprint/${id}`;
suBlueprint.suDraft = suBlueprint.draft;
suBlueprint.project = suBlueprint.draft.scheduling_set.project.name;
+ suBlueprint.project_rank = suBlueprint.draft.scheduling_set.project.rank;
suBlueprint.suSet = suBlueprint.draft.scheduling_set;
suBlueprint.durationInSec = suBlueprint.duration;
suBlueprint.duration = UnitConverter.getSecsToHHmmss(suBlueprint.duration);
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 c70b03e42e26ab6fcd41f118ad99d4057fc5d7c5..42575534e21c392f674b7fd30e31c9817344ac1f 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
@@ -505,6 +505,7 @@ export class WeekTimelineView extends Component {
suBlueprint['actionpath'] = `/schedulingunit/view/blueprint/${suBlueprint.id}`;
suBlueprint.suDraft = suBlueprint.draft;
suBlueprint.project = suBlueprint.draft.scheduling_set.project.name;
+ suBlueprint.project_rank = suBlueprint.draft.scheduling_set.project.rank;
suBlueprint.suSet = suBlueprint.draft.scheduling_set;
suBlueprint.durationInSec = suBlueprint.duration;
suBlueprint.duration = UnitConverter.getSecsToHHmmss(suBlueprint.duration);
@@ -1096,6 +1097,7 @@ export class WeekTimelineView extends Component {
suBlueprint['actionpath'] = `/schedulingunit/view/blueprint/${id}`;
suBlueprint.suDraft = suBlueprint.draft;
suBlueprint.project = suBlueprint.draft.scheduling_set.project.name;
+ suBlueprint.project_rank = suBlueprint.draft.scheduling_set.project.rank;
suBlueprint.suSet = suBlueprint.draft.scheduling_set;
suBlueprint.durationInSec = suBlueprint.duration;
suBlueprint.duration = UnitConverter.getSecsToHHmmss(suBlueprint.duration);
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 d3ec1132acbdbdc119ae0fb8f1243e5ee6203ec7..a2977929c99ddb453704b47d203219c32bfe6001 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js
@@ -25,6 +25,7 @@ const SU_FETCH_FIELDS = [ "id",
"do_cancel",
"start_time",
"stop_time",
+ "priority_queue_value",
"process_start_time", "process_stop_time",
"on_sky_start_time", "on_sky_stop_time",
"scheduled_start_time", "scheduled_stop_time",
@@ -35,6 +36,7 @@ const SU_FETCH_FIELDS = [ "id",
"draft.name",
"draft.observation_strategy_template.name",
"draft.scheduling_set.project.name",
+ "draft.scheduling_set.project.rank",
"draft.scheduling_constraints_template_id",
"draft.scheduling_constraints_doc",
"task_blueprints.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 a05753d9c68b8190ae015855b6713ef8e8b3ff69..04849168f41e9cf01f706e05f761ba301e269eb6 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/shared/timeline.constants.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/shared/timeline.constants.js
@@ -36,11 +36,17 @@ const TimelineConstants = {
name: "Data Accepted"
},
rank: {
- name: "Priority"
+ name: "Rank"
},
project: {
name: "Project"
},
+ project_rank: {
+ name: "Project Rank"
+ },
+ priority_queue_value: {
+ name: "Priority Queue"
+ },
stationGroupCount: {
name: "Stations (CS/RS/IS)"
}
@@ -84,11 +90,17 @@ const TimelineConstants = {
name: "Workflow Status"
},
rank: {
- name: "Priority"
+ name: "Rank"
},
project: {
name: "Project"
},
+ project_rank: {
+ name: "Project Rank"
+ },
+ priority_queue_value: {
+ name: "Priority Queue"
+ },
stationGroupCount: {
name: "Stations (CS/RS/IS)"
}
@@ -121,8 +133,10 @@ const TimelineConstants = {
"Description",
"Workflow Status",
"Data Accepted",
- "Priority",
- "Project",
+ "Project Rank",
+ "Rank",
+ "Project",
+ "Priority Queue",
"Stations (CS/RS/IS)",
"Task content",
"Template name"
@@ -132,7 +146,7 @@ const TimelineConstants = {
"Start Time": "filter-input-75", "End Time": "filter-input-75",
"Id": "filter-input-50", "Name": "filter-input-150", "View Summary": "filter-input-0",
"Workflow Status": "filter-input-75", "description": "filter-input-125",
- "Priority": "filter-input-50", "Project": "filter-input-75",
+ "Project Rank": "filter-input-50", "Project": "filter-input-75",
"Stations (CS/RS/IS)":"filter-input-75", "Task content": "filter-input-75",
"Duration (HH:mm:ss)": "filter-input-50", "Template Name": "filter-input-75"
}],