diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/create.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/create.js
index 7e0807e9599ad356dedf62f4c77923b62ba2f3b0..d4f12a28dffafaecdf586fc1076fbd3154130392 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/create.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/create.js
@@ -195,14 +195,15 @@ export class CycleCreate extends Component {
setCycleQuotaParams(key, event) {
let cycleQuota = _.cloneDeep(this.state.cycleQuota);
const previousValue = cycleQuota[key];
- if (event.target.value) {
+ const eventValue = event.target?.value || event.value
+ if (eventValue) {
let resource = _.find(this.state.resources, {'name': key});
let newValue = 0;
if (this.resourceUnitMap[resource.quantity_value] &&
- event.target.value.toString().indexOf(this.resourceUnitMap[resource.quantity_value].display)>=0) {
- newValue = _.trim(event.target.value.replace(this.resourceUnitMap[resource.quantity_value].display,''));
+ eventValue.toString().indexOf(this.resourceUnitMap[resource.quantity_value].display)>=0) {
+ newValue = _.trim(eventValue.replace(this.resourceUnitMap[resource.quantity_value].display,''));
} else {
- newValue = _.trim(event.target.value);
+ newValue = _.trim(eventValue);
}
//If value entered is not one decimal number then don't change the value and keep previous value.
cycleQuota[key] = (newValue==="NaN" || !/^[0-9]*(\.[0-9]{0,1})?$/.exec(newValue))?previousValue:(newValue);
@@ -511,7 +512,7 @@ export class CycleCreate extends Component {
</div>
<div className="p-col-1.5" style={{marginTop: '1em', marginLeft: '0.75em'}}>
<Checkbox inputId="trigger" role="trigger"
- tooltip="Select checkbox to create another Cycle"
+ tooltip="Select checkbox to create another Cycle after saving this cycle"
tooltipOptions={this.tooltipOptions}
checked={this.state.createAnother}
onChange={e => this.setState({'createAnother': e.target.checked})}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js
index 659b8370f9a289ad8346d2d6612fa40f42dce1cb..2ee83ace3b38ce85ee40d29d2d9cafdaf10fff89 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js
@@ -235,14 +235,15 @@ export class CycleEdit extends Component {
setCycleQuotaParams(key, event) {
let cycleQuota = _.cloneDeep(this.state.cycleQuota);
const previousValue = cycleQuota[key];
- if (event.target.value) {
+ const eventValue = event.target?.value || event.value;
+ if (eventValue) {
let resource = _.find(this.state.resources, {'name': key});
let newValue = 0;
if (this.resourceUnitMap[resource.quantity_value] &&
- event.target.value.toString().indexOf(this.resourceUnitMap[resource.quantity_value].display)>=0) {
- newValue = _.trim(event.target.value.replace(this.resourceUnitMap[resource.quantity_value].display,''));
+ eventValue.toString().indexOf(this.resourceUnitMap[resource.quantity_value].display)>=0) {
+ newValue = _.trim(eventValue.replace(this.resourceUnitMap[resource.quantity_value].display,''));
} else {
- newValue = _.trim(event.target.value);
+ newValue = _.trim(eventValue);
}
//If value entered is not one decimal number then don't change the value and keep previous value.
cycleQuota[key] = (newValue==="NaN" || !/^[0-9]*(\.[0-9]{0,1})?$/.exec(newValue))?previousValue:(newValue);
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js
index 7dd15456d87fc3b4ea4e674b228e4ad1452bdb01..b5d5dc8524031cd7c8435e7adff1b5c15ebe7e01 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js
@@ -257,14 +257,15 @@ export class ProjectCreate extends Component {
setProjectQuotaParams(key, event) {
let projectQuota = this.state.projectQuota;
const previousValue = projectQuota[key];
- if (event.target.value) {
+ const eventValue = event.target?.value || event.value
+ if (eventValue) {
let resource = _.find(this.state.resources, {'name': key});
let newValue = 0;
if (this.resourceUnitMap[resource.quantity_value] &&
- event.target.value.toString().indexOf(this.resourceUnitMap[resource.quantity_value].display)>=0) {
- newValue = _.trim(event.target.value.replace(this.resourceUnitMap[resource.quantity_value].display,''));
+ eventValue.toString().indexOf(this.resourceUnitMap[resource.quantity_value].display)>=0) {
+ newValue = _.trim(eventValue.replace(this.resourceUnitMap[resource.quantity_value].display,''));
} else {
- newValue = _.trim(event.target.value);
+ newValue = _.trim(eventValue);
}
//If value entered is not one decimal number then don't change the value and keep previous value.
projectQuota[key] = (newValue==="NaN" || !/^[0-9]*(\.[0-9]{0,1})?$/.exec(newValue))?previousValue:(newValue);
@@ -635,7 +636,7 @@ export class ProjectCreate extends Component {
</div>
<div className="p-col-1.5" style={{marginTop: '1em', marginLeft: '0.75em'}}>
<Checkbox inputId="trigger" role="trigger"
- tooltip="Select checkbox to create another Cycle"
+ tooltip="Select checkbox to create another Project after saving this project"
tooltipOptions={this.tooltipOptions}
checked={this.state.createAnother}
onChange={e => this.setState({'createAnother': e.target.checked})}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js
index 69388b1307c933ababc4f4b2aa8d0d4a4a52261d..2664000dcf7f7777f92e563e9e786c17862a0f0a 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js
@@ -299,15 +299,16 @@ export class ProjectEdit extends Component {
setProjectQuotaParams(key, event) {
let projectQuota = this.state.projectQuota;
const previousValue = projectQuota[key] || "";
- if (event.target.value) {
+ const eventValue = event.target?.value || event.value;
+ if (eventValue) {
let resource = _.find(this.state.resources, {'name': key});
let newValue = 0;
if (this.resourceUnitMap[resource.quantity_value] &&
- event.target.value.toString().indexOf(this.resourceUnitMap[resource.quantity_value].display)>=0) {
- newValue = _.trim(event.target.value.replace(this.resourceUnitMap[resource.quantity_value].display,''));
+ eventValue.toString().indexOf(this.resourceUnitMap[resource.quantity_value].display)>=0) {
+ newValue = _.trim(eventValue.replace(this.resourceUnitMap[resource.quantity_value].display,''));
} else {
- newValue = _.trim(event.target.value);
+ newValue = _.trim(eventValue);
}
//If value entered is not one decimal number then don't change the value and keep previous value.
projectQuota[key] = (newValue==="NaN" || !/^[0-9]*(\.[0-9]{0,1})?$/.exec(newValue))?previousValue:(newValue);
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.create.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.create.js
index 04ec2514e5e8274cb585c7be2e2708b1fb889d53..8af61a5564216ef6716b43f677cd825a1b9bd70e 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.create.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.create.js
@@ -652,7 +652,7 @@ export class ReservationCreate extends Component {
</div>
<div className="p-col-1.5" style={{marginTop: '1em', marginLeft: '0.75em'}}>
<Checkbox inputId="trigger" role="trigger"
- tooltip="Select checkbox to create another Cycle"
+ tooltip="Select checkbox to create another reservation after saving this reservation"
tooltipOptions={this.tooltipOptions}
checked={this.state.createAnother}
onChange={e => this.setState({'createAnother': e.target.checked})}
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 438b3880b47750c4d2494c06728b72395ca40bf7..dd93d132f6d1b3d033746ad0e9c82d537f992d3d 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
@@ -39,7 +39,7 @@ class ViewSchedulingUnit extends Component {
defaultSortColumn = [];
ignoreSorting = ['status logs'];
SU_NOT_STARTED_STATUSES = ['defined', 'schedulable', 'scheduled', 'unschedulable'];
- SU_ACTIVE_STATUSES = ['started', 'observing', 'observed', 'processing', 'processed', 'ingesting'];
+ SU_ACTIVE_STATUSES = ['started', 'observing', 'observed', 'processing', 'processed', 'ingesting', 'ingested'];
SU_END_STATUSES = ['finished', 'error', 'cancelled'];
TASK_END_STATUSES = ['finished', 'error', 'cancelled'];
SU_BLUEPRINT_EXPAND= 'draft.scheduling_constraints_template,draft,draft.scheduling_set,task_blueprints.specifications_template,task_blueprints,task_blueprints.subtasks,draft.observation_strategy_template,task_blueprints.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 948ca5ce9d42aa4c07f290dd498275b7940a5a3e..9cf50061b9ba69540b0a8e6cc43d28e45f15ac22 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js
@@ -743,6 +743,7 @@ export class SchedulingUnitCreate extends Component {
},
projectDisabled: (this.props.match?.params?.project? true:false),
observStrategy: {},
+ paramsSchema: null,
paramsOutput: null,
validEditor: false,
validFields: {},
@@ -1091,7 +1092,7 @@ export class SchedulingUnitCreate extends Component {
}
<div className="p-col-1.5" style={{marginTop: '1em', marginLeft: '0.9em'}}>
<Checkbox inputId="trigger" role="trigger"
- tooltip="Select checkbox to create another Cycle"
+ tooltip="Select checkbox to create another Scheduling Unit after saving this Scheduling Unit"
tooltipOptions={this.tooltipOptions}
checked={this.state.createAnother}
onChange={e => this.setState({'createAnother': e.target.checked})}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/SystemEvent/system.event.create.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/SystemEvent/system.event.create.js
index 8e1c02a12ff111b300895366688a5215af0f7ae3..934cf1038585d91d7e122ddaacd0da364d49975a 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/SystemEvent/system.event.create.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/SystemEvent/system.event.create.js
@@ -463,7 +463,7 @@ export class SystemEventCreate extends Component {
async saveSystemEvent() {
let systemevent = this.state.systemevent;
systemevent['start'] = moment(systemevent['start']).format(UIConstants.CALENDAR_DATETIME_FORMAT);
- systemevent['stop'] = systemevent['stop'] ? moment(systemevent['stop_time']).format(UIConstants.CALENDAR_DATETIME_FORMAT) : null;
+ systemevent['stop'] = systemevent['stop'] ? moment(systemevent['stop']).format(UIConstants.CALENDAR_DATETIME_FORMAT) : null;
systemevent['affected_hardware_template'] = this.state.seAffectedHardwareTemplate.url;
systemevent['affected_hardware_doc'] = this.paramsOutput;
let affected_tasks = [];
@@ -917,7 +917,7 @@ export class SystemEventCreate extends Component {
<>
<div className="p-col-1.5" style={{marginTop: '1em', marginLeft: '0.9em'}}>
<Checkbox inputId="trigger" role="trigger"
- tooltip="Select checkbox to create another Cycle"
+ tooltip="Select checkbox to create another system event after saving this system event"
tooltipOptions={this.tooltipOptions}
checked={this.state.createAnother}
onChange={e => this.setState({'createAnother': e.target.checked})}