diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Stations.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Stations.js
index 841672888ac6cdbc75d850b1a39442f2752e1f59..7a7a354a7fd5872a6ee6256abba1b92749a22538 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Stations.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Stations.js
@@ -122,7 +122,7 @@ export default (props) => {
custom_stations_options = custom_stations_options.map(i => ({ value: i }));
setCustomStationsOptions(custom_stations_options);
if (props.onUpdateStations) {
- updateSchedulingComp(stationState, [...selected_Stations], missing_StationFieldsErrors, customStations);
+ updateSchedulingComp(stationState, [...selected_Stations], missing_StationFieldsErrors, custom_stations);
}
};
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 22914ed8871b0fe0ed58a456c2aa4baa4021b5bd..a76501c5c154cadef3782037eb877ff3db06c865 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
@@ -9,6 +9,7 @@ import PageHeader from '../../layout/components/PageHeader';
import ViewTable from './../../components/ViewTable';
import ScheduleService from '../../services/schedule.service';
import moment from 'moment';
+import _ from 'lodash';
import SchedulingConstraint from './Scheduling.Constraints';
import { Dialog } from 'primereact/dialog';
import TaskStatusLogs from '../Task/state_logs';
@@ -120,12 +121,12 @@ class ViewSchedulingUnit extends Component{
task.status_logs = task.tasktype === "Blueprint"?subtaskComponent(task):"";
return task;
});
- const targetObservation = tasks.find(task => task.name === 'Target Observation');
+ const targetObservation = _.find(tasks, (task)=> {return task.template.type_value==='observation' && task.tasktype.toLowerCase()===schedule_type && task.specifications_doc.station_groups});
this.setState({
scheduleunit : schedulingUnit,
schedule_unit_task : tasks,
isLoading: false,
- stationGroup: targetObservation.specifications_doc.station_groups
+ stationGroup: targetObservation?targetObservation.specifications_doc.station_groups:[]
}, this.getAllStations);
});
} else {
@@ -139,9 +140,9 @@ class ViewSchedulingUnit extends Component{
getScheduleUnitTasks(type, scheduleunit){
if(type === 'draft')
- return ScheduleService.getTasksBySchedulingUnit(scheduleunit.id);
+ return ScheduleService.getTasksBySchedulingUnit(scheduleunit.id, true);
else
- return ScheduleService.getTaskBlueprintsBySchedulingUnit(scheduleunit);
+ return ScheduleService.getTaskBlueprintsBySchedulingUnit(scheduleunit, true);
}
getScheduleUnit(type, id){
if(type === 'draft')
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js
index 805787316649f94e265385af3e200bd9a8c73d20..f70b3eb5b38d6797bc9b578dd2e660c9a8379b54 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js
@@ -121,8 +121,7 @@ export class SchedulingUnitCreate extends Component {
*/
async changeStrategy (strategyId) {
const observStrategy = _.find(this.observStrategies, {'id': strategyId});
- const station_group = observStrategy.template.tasks['Target Observation'].specifications_doc.station_groups;
- this.setState({ stationGroup: station_group });
+ let station_group = [];
const tasks = observStrategy.template.tasks;
let paramsOutput = {};
let schema = { type: 'object', additionalProperties: false,
@@ -138,6 +137,9 @@ export class SchedulingUnitCreate extends Component {
const taskTemplate = _.find(this.taskTemplates, {'name': task['specifications_template']});
schema['$id'] = taskTemplate.schema['$id'];
schema['$schema'] = taskTemplate.schema['$schema'];
+ if (taskTemplate.type_value==='observation' && task.specifications_doc.station_groups) {
+ station_group = task.specifications_doc.station_groups;
+ }
let index = 0;
for (const param of observStrategy.template.parameters) {
if (param.refs[0].indexOf(`/tasks/${taskName}`) > 0) {
@@ -174,7 +176,7 @@ export class SchedulingUnitCreate extends Component {
}
}
- this.setState({observStrategy: observStrategy, paramsSchema: schema, paramsOutput: paramsOutput});
+ this.setState({observStrategy: observStrategy, paramsSchema: schema, paramsOutput: paramsOutput, stationGroup: station_group});
// Function called to clear the JSON Editor fields and reload with new schema
if (this.state.editorFunction) {
@@ -345,6 +347,12 @@ export class SchedulingUnitCreate extends Component {
observStrategy.template.parameters.forEach(async(param, index) => {
$refs.set(observStrategy.template.parameters[index]['refs'][0], this.state.paramsOutput['param_' + index]);
});
+ for (const taskName in observStrategy.template.tasks) {
+ let task = observStrategy.template.tasks[taskName];
+ if (task.specifications_doc.station_groups) {
+ task.specifications_doc.station_groups = station_groups;
+ }
+ }
const const_strategy = {scheduling_constraints_doc: constStrategy, id: this.constraintTemplates[0].id, constraint: this.constraintTemplates[0]};
const schedulingUnit = await ScheduleService.saveSUDraftFromObservStrategy(observStrategy, this.state.schedulingUnit, const_strategy, station_groups);
if (schedulingUnit) {
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/edit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/edit.js
index d3060f0f30d53126e4b4d95596323c40e99a879f..f2f56627824593d0f270148148f2e718fb2d41ff 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/edit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/edit.js
@@ -130,6 +130,9 @@ export class EditSchedulingUnit extends Component {
}
index++;
}
+ if (taskTemplate.type_value==='observation' && task.specifications_doc.station_groups) {
+ tasksToUpdate[taskName] = taskName;
+ }
}
this.setState({observStrategy: observStrategy, paramsSchema: schema, paramsOutput: paramsOutput, tasksToUpdate: tasksToUpdate});
@@ -161,9 +164,9 @@ export class EditSchedulingUnit extends Component {
observStrategyVisible: responses[4].observation_strategy_template_id?true:false });
if (responses[4].observation_strategy_template_id) {
this.changeStrategy(responses[4].observation_strategy_template_id);
- const targetObservation = responses[5].data.results.find(task => task.name === 'Target Observation');
+ const targetObservation = responses[5].data.results.find(task => {return task.specifications_doc.station_groups?true:false});
this.setState({
- stationGroup: targetObservation.specifications_doc.station_groups
+ stationGroup: targetObservation?targetObservation.specifications_doc.station_groups:[]
});
}
if (this.state.schedulingUnit.project) {
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 6c7570bb5988cac32bb82e12a79eb8a48940ca3f..1ace4022edceedeffc7a6916b1749edaf81cc4fa 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js
@@ -91,7 +91,7 @@ const ScheduleService = {
}
return taskblueprintsList;
},
- getTasksBySchedulingUnit: async function(id){
+ getTasksBySchedulingUnit: async function(id, loadTemplate){
let scheduletasklist=[];
// let taskblueprints = [];
// Common keys for Task and Blueprint
@@ -119,6 +119,9 @@ const ScheduleService = {
scheduletask.duration = moment.utc((scheduletask.duration || 0)*1000).format('HH:mm:ss');
scheduletask.relative_start_time = moment.utc(scheduletask.relative_start_time*1000).format('HH:mm:ss');
scheduletask.relative_stop_time = moment.utc(scheduletask.relative_stop_time*1000).format('HH:mm:ss');
+ if (loadTemplate) {
+ scheduletask.template = await TaskService.getTaskTemplate(task.specifications_template_id);
+ }
//Fetch blueprint details for Task Draft
const draftBlueprints = await TaskService.getDraftsTaskBlueprints(task.id);
// let filteredblueprints = _.filter(taskblueprints, function(o) {
@@ -140,7 +143,9 @@ const ScheduleService = {
taskblueprint.duration = moment.utc((taskblueprint.duration || 0)*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');
-
+ if (loadTemplate) {
+ taskblueprint.template = scheduletask.template;
+ }
//Add Blue print details to array
scheduletasklist.push(taskblueprint);
}
@@ -237,7 +242,6 @@ const ScheduleService = {
if (schedulingUnit && schedulingUnit.id) {
// Update the newly created SU draft requirement_doc with captured parameter values
schedulingUnit.requirements_doc = observStrategy.template;
- schedulingUnit.requirements_doc.tasks['Target Observation'].specifications_doc.station_groups = station_groups;
schedulingUnit.scheduling_constraints_doc = constraint.scheduling_constraints_doc;
schedulingUnit.scheduling_constraints_template_id = constraint.id;
schedulingUnit.scheduling_constraints_template = constraint.constraint.url;
@@ -267,7 +271,7 @@ const ScheduleService = {
for (const taskToUpdate in tasksToUpdate) {
let task = tasks.find(task => { return task.name === taskToUpdate});
task.specifications_doc = observStrategy.template.tasks[taskToUpdate].specifications_doc;
- if (task.name === 'Target Observation') {
+ if (task.specifications_doc.station_groups) {
task.specifications_doc.station_groups = station_groups;
}
delete task['duration'];