diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js index 2a64e939ff8efe2e321075c2d3c4046075768eb9..96bc9ec03189676a75a8f56feaa6949424a6e5df 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js @@ -542,7 +542,7 @@ export class SchedulingSetCreate extends Component { purpose: [] } } - this.setState({observStrategies: this.observStrategies, observStrategyFilters: observStrategyFilter}) + this.setState({observStrategies: _.cloneDeep(this.observStrategies), observStrategyFilters: observStrategyFilter}) this.setObservStrateyFilters(); }); } @@ -569,7 +569,7 @@ export class SchedulingSetCreate extends Component { async changeStrategy(strategyId) { await this.setState({noOfSU: 10, isAGLoading: true, copyHeader: false, rowData: [], confirmDialogVisible: false, isDirty: false}); publish('edit-dirty', false); - const observStrategy = _.find(this.observStrategies, {'id': strategyId}); + const observStrategy = _.find(this.state.observStrategies, {'id': strategyId}); ParserUtility.addStationParameters(observStrategy); // this.setState({schedulingUnitList: null, observStrategy: observStrategy, noOfSU: 10, isAGLoading: true, copyHeader: false, rowData: [], agSUWithDefaultValue: {}, confirmDialogVisible: false, isDirty: false}); this.setState({observStrategy: observStrategy, noOfSU: 10, isAGLoading: true, copyHeader: false, rowData: [], agSUWithDefaultValue: {}, @@ -956,6 +956,7 @@ export class SchedulingSetCreate extends Component { } let tasksToUpdate = {}; const observStrategy = _.find(this.observStrategies, {'id': scheduleunit.observation_strategy_template_id}); + ParserUtility.addStationParameters(observStrategy); const tasks = observStrategy.template.tasks; let paramsOutput = []; //let schema = { type: 'object', additionalProperties: false, @@ -1446,7 +1447,7 @@ export class SchedulingSetCreate extends Component { for ( const stationKey of stationKeys) { let stationValue = ''; let cellProp = {}; - schema.definitions.station_groups.default.map(stationGroup =>{ + this.state.defaultStationGroups[stationKey].map(stationGroup =>{ let missingStation = (stationGroup.max_nr_missing)?stationGroup.max_nr_missing:0; stationValue += stationGroup.stations+':'+missingStation+"|"; }); @@ -3364,7 +3365,7 @@ export class SchedulingSetCreate extends Component { setObservStrateyFilters(selectedFilter, filterId) { let purposeFiltered = true; let stateFiltered = true; - let observStrategies = this.observStrategies; + let observStrategies = this.state.observStrategies; let observStrategyFilters = this.state.observStrategyFilters; if(filterId === 'purpose') { observStrategyFilters.purpose = selectedFilter diff --git a/SAS/TMSS/frontend/tmss_webapp/src/utils/parser.utility.js b/SAS/TMSS/frontend/tmss_webapp/src/utils/parser.utility.js index 78b9c32e3305c7323f670419f759f5859e845e31..c9c363f5f43510b32f94d4dbf29e03d4ee255c03 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/utils/parser.utility.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/utils/parser.utility.js @@ -92,7 +92,7 @@ const ParserUtility = { } }, /** - * Inject Station parameter if not definied in the strategy parameter + * Inject Station parameter if not defined in the strategy parameter * @param {*} observStrategy */ addStationParameters(observStrategy) {