Index: shared/scripts/configuration/config.py =================================================================== diff -u -rfaf8300935e61977120bcf6d6b938cc015b693ac -r734ec91ae79e5f2b8d3d7d8a027b3fa2fe7c424f --- shared/scripts/configuration/config.py (.../config.py) (revision faf8300935e61977120bcf6d6b938cc015b693ac) +++ shared/scripts/configuration/config.py (.../config.py) (revision 734ec91ae79e5f2b8d3d7d8a027b3fa2fe7c424f) @@ -95,5 +95,5 @@ "OPTION_12" : {"uf_maximum" : 1250, "uf_minimum" : 0}, } -NUM_OF_REQUEST_REJECT_REASONS = 39 +NUM_OF_REQUEST_REJECT_REASONS = 34 Index: shared/scripts/configuration/strings.py =================================================================== diff -u -r10c52818fe8270511b5240c543904b48da159478 -r734ec91ae79e5f2b8d3d7d8a027b3fa2fe7c424f --- shared/scripts/configuration/strings.py (.../strings.py) (revision 10c52818fe8270511b5240c543904b48da159478) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision 734ec91ae79e5f2b8d3d7d8a027b3fa2fe7c424f) @@ -82,17 +82,6 @@ 31: "REQUEST_REJECT_REASON_HEPARIN_NOT_PAUSED", # Heparin cannot be resumed if not paused 32: "REQUEST_REJECT_REASON_DG_COMM_LOST", # Treatment cannot initiate if DG comm is lost 33: "REQUEST_REJECT_REASON_DRAIN_NOT_COMPLETE", # Post-treatment reservoirs drain not complete - 34: "REQUEST_REJECT_REASON_DG_NOT_IN_STANDBY_IDLE_STATE", # Treatment cannot initiate if DG is not in standby idle state - 35: "REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT", # Request message not formatted properly - 36: "REQUEST_REJECT_REASON_INVALID_DATE_OR_TIME", # Given date/time is invalid - 37: "REQUEST_REJECT_REASON____AVAILABLE_1", # Not used - available for use - 38: "REQUEST_REJECT_REASON_BATTERY_IS_NOT_CHARGED", # Battery does not have enough charge to start treatment - 39: "REQUEST_REJECT_REASON_RINSEBACK_NOT_COMPLETED", # Cannot move on to recirculate without completing full rinseback. - 40: "REQUEST_REJECT_REASON_RESERVOIR_ONE_IS_NOT_READY", # Reservoir one fill is not complete - 41: "REQUEST_REJECT_REASON_PUMP_TRACK_NOT_CLOSED", # Pump track is not ready / closed - 42: "REQUEST_REJECT_REASON_DOOR_NOT_CLOSED", # Door is not closed - 43: "REQUEST_REJECT_REASON_SYRINGE_NOT_PRESENT", # Syringe is not present - } + } - Index: shared/scripts/names.py =================================================================== diff -u -r45781d590286e5810f0c6d7c5cfbd9732264aee4 -r734ec91ae79e5f2b8d3d7d8a027b3fa2fe7c424f --- shared/scripts/names.py (.../names.py) (revision 45781d590286e5810f0c6d7c5cfbd9732264aee4) +++ shared/scripts/names.py (.../names.py) (revision 734ec91ae79e5f2b8d3d7d8a027b3fa2fe7c424f) @@ -23,8 +23,8 @@ o_PreTreatmentCreate_dialysateFlowRate_SliderCreateTreatment = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "gradient": 0, "objectName": "_dialysateFlowRate", "type": "SliderCreateTreatment", "visible": True} o_PreTreatementCreateStack_PreTreatmentBase_TreatmentFlowBase = {"container":o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase,"objectName":"_PreTreatmentBase","type":"TreatmentFlowBase", "visible": True} o_treatmentStack_treatmentHome_TreatmentHome = {"container": o_treatmentStack_TreatmentStack, "id": "_treatmentHome", "type": "TreatmentHome", "unnamed": 1, "visible": True} -o_confirmButton_TouchRect = {"container": o_Gui_MainView, "gradient": 0, "objectName": "_confirmButton", "type": "TouchRect", "visible": False} -o_backButton_BackButton = {"container": o_Gui_MainView, "gradient": 0, "objectName": "_backButton", "type": "BackButton", "visible": False} +o_confirmButton_TouchRect = {"container": o_Gui_MainView, "objectName": "_confirmButton", "type": "TouchRect", "visible": False} +o_backButton_BackButton = {"container": o_Gui_MainView, "objectName": "_backButton", "type": "BackButton", "visible": False} o_NinePatchImage = {"container": o_Gui_MainView, "occurrence": 6, "type": "NinePatchImage", "unnamed": 1, "visible": False} o_PreTreatmentBase_backgroundRect_Rectangle = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "gradient": 0, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True} o_PreTreatmentBase_confirmButton_TouchRect = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "gradient": 0, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} @@ -93,7 +93,7 @@ o_PreTreatmentBase_BACK_Text = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "BACK", "type": "Text", "unnamed": 1, "visible": True} o_PreTreatmentBase_CONFIRM_Text_2 = {"container":o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} #virtal keypad input field -o_keypad_input = {"container": o_Gui_MainView, "id": "_keyText", "type": "Text", "unnamed": 1, "visible": True} +o_keypad_input = {"container": o_Gui_MainView, "id": "_keyText","type": "Text", "unnamed": 1, "visible": True} #virtal keypad back space key o_back_space_key = {"container": o_Gui_MainView, "id": "_backspaceKeyIcon", "source": "qrc:/plugins/QtQuick/VirtualKeyboard/Styles/denali/images/iBackspace.svg", "type": "Image", "unnamed": 1, "visible": True} o_PreTreatmentBase_Indicators = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "type": "StepBullet", "unnamed": 1, "visible": True}