Index: shared/scripts/configuration/strings.py =================================================================== diff -u -r38478ebb89d72fe302106d78dbcf3714bf9dc418 -r79eabb321c51bf5981fd6354cbeeb55cfb1ebf1b --- shared/scripts/configuration/strings.py (.../strings.py) (revision 38478ebb89d72fe302106d78dbcf3714bf9dc418) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision 79eabb321c51bf5981fd6354cbeeb55cfb1ebf1b) @@ -146,18 +146,15 @@ 16: "REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS", # A saline bolus is in progress 17: "REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE", # A treatment parameter is out of range 18: "REQUEST_REJECT_REASON_HEPARIN_PRESTOP_EXCEEDS_DURATION", # The Heparin pre-stop setting is greater than the treatment duration - 19: "REQUEST_REJECT_REASON_DG_FILTER_FLUSH_HAS_BEEN_EXPIRED", # available reason slot - #20: "REQUEST_REJECT_REASON_AVAILABLE_2", # available reason slot - 20: "REQUEST_REJECT_REASON_SALINE_BOLUS_NOT_ALLOWED", - #21: "REQUEST_REJECT_REASON_SALINE_MAX_VOLUME_REACHED", # Saline bolus volume maximum has been reached - no more saline allowed - 21: "REQUEST_REJECT_REASON_AVAILABLE_3", + 19: "REQUEST_REJECT_REASON_DG_FILTER_FLUSH_HAS_BEEN_EXPIRED", # available reason slot + 20: "REQUEST_REJECT_REASON_SALINE_BOLUS_NOT_ALLOWED", # No more Saline allowed + 21: "REQUEST_REJECT_REASON_AVAILABLE_3", # available reason slot 22: "REQUEST_REJECT_REASON_SALINE_BOLUS_NOT_IN_PROGRESS", # A saline bolus is not in progress 23: "REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE", # Requested user action is disabled in current state 24: "REQUEST_REJECT_REASON_ALARM_IS_ACTIVE", # Requested user action not allowed while alarm is active 25: "REQUEST_REJECT_REASON_INVALID_COMMAND", # Requested user action invalid 26: "REQUEST_REJECT_REASON_TREATMENT_IS_COMPLETED", # The treatment has been completed - #27: "REQUEST_REJECT_REASON_ADDL_RINSEBACK_MAX_VOLUME_REACHED", # Rinseback additional volume maximum has been reached - no more additional rinsebacks allowed - 27: "REQUEST_REJECT_REASON_AVAILABLE_4", + 27: "REQUEST_REJECT_REASON_AVAILABLE_4", # available reason slot 28: "REQUEST_REJECT_REASON_DIALYZER_NOT_INVERTED", # Dialyzer not inverted yet 29: "REQUEST_REJECT_REASON_NO_PATIENT_CONNECTION_CONFIRM", # The user has not confirmed patient connection 30: "REQUEST_REJECT_REASON_HEPARIN_PAUSE_INVALID_IN_THIS_STATE", # Heparin cannot be paused if not currently deliverying Heparin Index: tst_treatment_saline_data/test.py =================================================================== diff -u -r6dea78f296538eaec9a3478608f5ba0be9e9c954 -r79eabb321c51bf5981fd6354cbeeb55cfb1ebf1b --- tst_treatment_saline_data/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) +++ tst_treatment_saline_data/test.py (.../test.py) (revision 79eabb321c51bf5981fd6354cbeeb55cfb1ebf1b) @@ -291,9 +291,8 @@ dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) - test.compare((waitForObjectExists(names.o_treatmentHome_startFluidButton_TouchRect).enabled), False, "START BOLUS button is not enable") - test.compare((waitForObjectExists(names.o_treatmentHome_START_BOLUS_Text).enabled), False, "Start Bolus text is not enable") - test.compare(str(waitForObjectExists(names.o_treatmentHome_Maximum_cumulative_saline_bolus_volume_delivered_Text).text), "Maximum cumulative saline bolus volume delivered", "Treatment Paused text is visible") + test.compare((waitForObjectExists(names.o_treatmentHome_startFluidButton_TouchRect).enabled), True, "START BOLUS button is enabled") + test.compare((waitForObjectExists(names.o_treatmentHome_START_BOLUS_Text).enabled), True, "Start Bolus text is enabled") test.endSection()