Index: shared/scripts/configuration/strings.py =================================================================== diff -u -r6bb43117bca2673c5de877f5b70b094da344418a -r2650a9f3f8ca6571294f6ce322327b62fc832ab9 --- shared/scripts/configuration/strings.py (.../strings.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision 2650a9f3f8ca6571294f6ce322327b62fc832ab9) @@ -32,23 +32,22 @@ CREATE_TREATMENT_PARAMETERS = ["Blood Flow Rate", "Dialysate Flow Rate", "Duration","Heparin Dispensing Rate", "Heparin Bolus Volume","Heparin Stop Time", "Saline Bolus", "Dialysate Temperature", - "Blood Pressure Measurement Interval", "Rinseback Flow Rate"] + "Blood Pressure Measurement Interval"] #pretreatment_screen_bullets -PRE_TREATMENT_SCREENS = ["Create" , "Sample" , "Consumables" , "Disposables" , "Prime" , "Ultrafiltration" , "BP/HR" , "Connection" , "Start"] +PRE_TREATMENT_SCREENS = ["Create" , "Sample" , "Consumables" , "Disposables" , "Prime" , "BP/HR" , "Ultrafiltration" , "Connection" , "Start"] POST_TREATMENT_SCREENS = ["Disconnection", "Review", "Disposables", "Disinfection"] #main_treatment_ultrafilteration ULTRAFILTRATION_PAUSED_TEXT = "Ultrafiltration Paused" INCREASE_UF_RATE_TEXT = "Increase UF Rate" -INCREASE_TREATMENT_DURATION_TEXT = "Increase Treatment Duration" RESUME_TEXT = "RESUME ULTRAFILTRATION" EDIT_TEXT = "EDIT ULTRAFILTRATION VOLUME" TITLE_TEXT = "ULTRAFILTRATION VOLUME (L)" #recirculate screens RECIRCULATE_TEXT = "Recirculate" -RECONNECT_BUTTON_TEXT = "RECONNECT" +RECONNECT_BUTTON_TEXT = "RESUME TREATMENT" # pretreatment_patient_connection DIASTOLIC_TEXT = "diastolic" @@ -83,12 +82,13 @@ RINSEBACK_COMPLETE_TEXT = "Rinseback Complete" END_TREATMENT_BUTTON_TEXT = "END TREATMENT" BACK_TO_RECIRCULATE_TEXT = "BACK TO RECIRCULATE" -RECONNECT_TEXT = "Reconnect" +RECONNECT_TEXT = "RESUME_TREATMENT" +RETURN_TO_RECIRCULATE = "BACK TO RECIRCULATE" #main treatment pressure PRESSURE_TITLE = "PRESSURES" -ARTERIAL_TITLE = "Arterial" -VENOUS_TITLE = "Venous" +ARTERIAL_TITLE = "Arterial Window" +VENOUS_TITLE = "Venous Window" VENOUS_UOM = "mmHg" ARTERIAL_UOM = "mmHg" LOW_TEXT = "LOW" @@ -103,7 +103,7 @@ HEPARIN_RESUME_DELIVERY_TEXT = "RESUME DELIVERY" HEPARIN_BOLUS_ACTIVE_TEXT = "Bolus Active" HEPARIN_BOLUS_DISPENSING_TEXT = "Dispensing Active" -HEPARIN_PAUSE_DELIVERY_TEXT = "PAUSE DELIVERY" +HEPARIN_PAUSE_DELIVERY_TEXT = "PAUSE HEPARIN" HEPARIN_MAXIMUM_VOLUME_DELIVERED_TEXT = "Maximum Cumulative Heparin Volume Delivered" HEPARIN_SYRINGE_EMPTY_TEXT = "Syringe Empty" HEPARIN_DISPENSING_RATE = "Heparin Dispensing Rate" @@ -146,16 +146,16 @@ 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_ARTERIAL_PRESSURE_LOW_VS_HIGH", # Arterial pressure low and high alarm limits are not inconsistent - 20: "REQUEST_REJECT_REASON_VENOUS_PRESSURE_LOW_VS_HIGH", # Venous pressure low and high alarm limits are inconsistent + 19: "REQUEST_REJECT_REASON_DG_FILTER_FLUSH_HAS_BEEN_EXPIRED", # available reason slot + 20: "REQUEST_REJECT_REASON_AVAILABLE_2", # available reason slot 21: "REQUEST_REJECT_REASON_SALINE_MAX_VOLUME_REACHED", # Saline bolus volume maximum has been reached - no more saline allowed 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 - 28: "REQUEST_REJECT_REASON_UF_VOLUME_NOT_SET", # Ultrafiltration volume is not set yet + 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 31: "REQUEST_REJECT_REASON_HEPARIN_NOT_PAUSED", # Heparin cannot be resumed if not paused @@ -205,7 +205,7 @@ EXPORT_LOG_TEXT ="Export Logs" SHUTDOWN_BUTTON_TEXT = "SHUTDOWN" BACK_BUTTON_TEXT = "BACK" -EXPORT_LOGS_OPTIONS = ["Application", "Treatment", "Service"] +EXPORT_LOGS_OPTIONS = ["Application", "Service", "Treatment"] SD_CARD_DETAILS =["SD-Card (MB)", "Free : 0.000","Total: 0.000"] USB_DRIVE_DETAILS = ["USB Drive (MB)","Free : 0.000","Total: 0.000"] EXPORT_BUTTON_TEXT = "Export" @@ -214,7 +214,20 @@ SettingsHome_Manager_Text = "Manager" SettingsHome_Settings_Text = "Settings" SERVICE_SCREEN_TITLE_TEXT = "Service" +SERVICES_TITLE_TEXT = "Service Password" +SERVICES_ENABLE_ROOT_SSH_TITLE="Enable Root SSH" +SERVICES_FACTORY_RESET_TITLE="Factory Reset" +SERVICES_FACTORY_RESET_CONFIRM_MSG = "Are you sure?" +SERVICES_FACTORY_RESET_MSGS = ["Do you want to perform the factory reset?", "Please wait..."] + +SERVICES_DECOMMISSION_TITLE="Decommissioning" +SERVICES_DECOMMISSION_CONFIRM_MSG = "Are you sure?" +SERVICES_DECOMMISSION_MSGS = ["Do you want to perform the decommissioning?", "Please wait..."] + +SERVICES_SHUTDOWN_CONFIRM_TITLE = "Shutdown" +SERVICES_SHUTDOWN_CONFIRM_MSG = "Are you sure you want to Shutdown?" + #main treatment screen VITALS_TITLE = "VITALS" PATIENT_ID = "demopatientid" @@ -237,7 +250,7 @@ SELF_TEST_COMPLETE_TEXT = "Self Test Complete!" BUSY = "Busy" CHECK = "Check" -BEGIN_PRIME_TITLE = "Begin Prime" +BEGIN_PRIME_TITLE = "Prime" PRIMING_TITLE = "Priming" SYSTEM_SELF_TEST_TITLE = "System Self Test" FILTER_FLUSH_TITLE = "Filter Flush" @@ -302,21 +315,22 @@ #post treatment review TREATMENT_REVIEW_TITLE_TEXT = "Treatment Review" HEPARIN_TYPE = "UFH 1,000 IU/mL" -ACID_CONCENTRATE = ["08-1251-1", "08-2251-0", "08-3251-9"] +#ACID_CONCENTRATE = ["08-1251-1", "08-2251-0", "08-3251-9"] +ACID_CONCENTRATE = ["1.0 K 2.5 Ca", "2.0 K 2.5 Ca", "3.0 K 2.5 Ca"] BICARBONATE_CONCENTRATE = "Fres. Centrisol" DIALYZER_TYPE = ["BB Diacap Pro 13H", "BB Diacap Pro 16H", "BB Diacap Pro 19H", "F Optiflux F160NRe", "F Optiflux F180NRe", "F Optiflux F200NRe"] CODE_TEXT = "Code: " CODE_TEXT_AFTER_LOGGING = "Code: ..." PRESCRIPTION_DETAILS = { - "Blood Flow Rate": "mL/min", "Dialysate Flow Rate": "mL/min", - "Duration": "min", "Heparin Dispensing Rate": "mL/hr", - "Heparin Bolus Volume": "mL", "Heparin Stop Time": "min", + "Blood Flow Rate": "mL/min", + "Dialysate Flow Rate": "mL/min", + "Duration": "min", + "Heparin Dispensing Rate": "mL/hr", + "Heparin Bolus Volume": "mL", + "Heparin Stop Time": "min", "Saline Bolus Volume": "mL", - "Dialysate Temperature": "°C", "Arterial Pressure Limit Low": "mmHg", - "Arterial Pressure Limit High": "mmHg","Blood Pressure Measure Interval":"min", - "Rinseback Rate" : "mL/min", "Venous Pressure Limit High": "mmHg", - "Venous Pressure Limit Low": "mmHg" + "Dialysate Temperature": "°C" } POST_TREATMENT_REVIEW_SCREEN_UNITS = { @@ -338,13 +352,13 @@ "Prescribed UF Volume" : "L", "Bicarbonate Concentrate Type" : "", "Target UF Volume" : "L", - "Potassium Concentration" : "mEg/L", + "Potassium Concentration" : "mEq/L", "Actual UF Volume" : "L", - "Calcium Concentration" :"mEg/L", + "Calcium Concentration" :"mEq/L", "Prescribed UF Rate" : "mL/min", - "Bicarbonate Concentration" : "mEg/L", + "Bicarbonate Concentration" : "mEq/L", "Target UF Rate": "mL/min", - "Sodium Concentration" : "mEg/L", + "Sodium Concentration" : "mEq/L", "Actual UF Rate": "mL/min", "Dialysate Temperature" :"C", "Saline Bolus Volume" : "mL", @@ -372,14 +386,14 @@ UNIT_OF_VOLUME_AND_BRIGHTNESS = "%" #service wifi -WIFI_PARAMETERS_TEXTS = ["Wi-Fi", "IP Address", "Gateway", "Subnet Mask", "DNS", "SSID", "SCAN", "Scan Finished", "BACK"] +WIFI_PARAMETERS_TEXTS = ["Wi-Fi", "IP Address", "Gateway", "Subnet Mask", "DNS", "SSID", "SCAN", "BACK"] # , "Scan Finished" is not available in the when not running on the device due to disabled administrative scripts. #service Bluetooth cuff BLUETOOTH_CUFF_PARAMETERS = ["Bluetooth Cuff", "Devices"] BLUETOOTH_CUFF_NOTIFICATION_MESSAGE_TEXT = "The Bluetooth cuff pair clear error. [1001]" #service DG Cleaning -DG_CLEANING_PARAMETERS = ["DG Cleaning", "Water Flush", "Time (HH:MM)", "Cycle (Days)", "Heat Disinfection", "Time (HH:MM)", "Cycle (Days)"] +DG_CLEANING_PARAMETERS = ["Last Basic Flush Complete", "Last Chemical Disinfect Start", "Last Chemical Disinfect Complete", "Last Chemical Disinfect Flush Complete", "Last Heat Disinfect Complete"]#"DG Cleaning", "Water Flush", "Time (HH:MM)", "Cycle (Days)", "Heat Disinfection", "Time (HH:MM)", "Cycle (Days)"] #services SHUTDOWN_TEXT = "SHUTDOWN" @@ -394,6 +408,7 @@ #rinseback-setup ADDITIONAL_BUTTON_TEXT = "ADDITIONAL" +SALINE_BOLUS_BUTTON = "SALINE BOLUS" ADDITIONAL_RINSEBACK_TEXT = "Additional Rinseback" RINSEBACK_UNIT = " mL" RINSEBACK_UNIT_MIN = " mL/min" @@ -1025,11 +1040,32 @@ DEVICES_TEXT = "Devices" #DG Cleaning -DG_CLEANING_TITLE_TEXT = "DG Cleaning" -WATER_FLUSH_TEXT = "Water Flush" -HEAT_DISINFECTION_TEXT = "Heat Disinfection" -WATER_FLUSH_TIME_TEXT = "Time (HH:MM)" -WATER_FLUSH_CYCLE_TEXT = "Cycle (Days)" -HEAT_DISINFECTION_TIME_TEXT = "Time (HH:MM)" -HEAT_DISINFECTION_CYCLE_TEXT = "Cycle (Days)" +DG_CLEANING_TITLE_TEXT = "Information" +DG_CLEANING_FIELDS = [ + #TODO need to update with expected values when staging code fixed to use correct macro to process the request from DG + { + "title" : "Cleaning Last Status", + "mock_value" : "None" + }, + { + "title" : "Last Basic Flush Complete", + "mock_value" : "None" + }, + { + "title" : "Last Chemical Disinfect Start", + "mock_value" : "None" + }, + { + "title" : "Last Chemical Disinfect Complete", + "mock_value" : "None" + }, + { + "title" : "Last Chemical Disinfect Flush Complete", + "mock_value" : "None" + }, + { + "title" : "Last Heat Disinfect Complete", + "mock_value" : "None" + } + ]