Index: suite_leahi/shared/scripts/configuration/config.py =================================================================== diff -u -r5a31e21e36f2652df87477d61a8b9f43f2bc89d2 -r7c915408c5ea9f671cf72d1e97d2ac1c8b2c3901 --- suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision 5a31e21e36f2652df87477d61a8b9f43f2bc89d2) +++ suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision 7c915408c5ea9f671cf72d1e97d2ac1c8b2c3901) @@ -50,7 +50,10 @@ "ALARM_PRIORITY_MEDIUM" : "#db8f00", "ALARM_PRIORITY_HIGH" : "#c53b33" } + +BLUE_COLOR = "#18559e" ALARM_REJECT_NOTIFICATION_TEMPLATE = "No Active Alarm List [{}]" +ALARM_TREATMENT_BLOOD_STOP_COUNTDOWN_DESCRIPTION = "Rinseback will not be allowed in:" #HeaderBar WiFi WIFI_POPUP_TEXT = "WiFi Connection Error" @@ -63,10 +66,10 @@ DISABLED = False #Create Rx -ACID_CONCENTRATE = ["1.0 K, 2.50 Ca, 1 Mg","2.0 K, 2.50 Ca, 1 Mg","3.0 K, 2.50 Ca, 1 Mg"] +ACID_CONCENTRATE = ["1.0 K, 2.50 Ca","2.0 K, 2.50 Ca","3.0 K, 2.50 Ca"] DIALYZER_TYPE = ["Diacap Pro 13H","Diacap Pro 16H", "Diacap Pro 19H", "Optiflux F160NRe", "Optiflux F180NRe", "Optiflux F200NRe","Optiflux F250NRe"] VITALS = ["OFF","5","10","15","20","30","60"] -BICARBONATE = ["Sodium Bicarbonate"] +BICARBONATE = ["650 g","720 g","760 g", "900 g", "1100 g","1250 g"] #Heparin heparin_off = { "Heparin Type" :"OFF", @@ -94,6 +97,7 @@ AUTO_EJECT = 'Auto Eject' # Settings Service +CONFIGURATIONS_PATH = "Public/luis/config/configurations/" DEFAULT_SERVICE_PASSWORD_RAW = "Atal.Matal.22leh" # TODO need to update if we ever change the default NEW_PASSWORD_RAW = "Test4.Ksah.sk43sa" MANUFACTURING_SCREEN_TITLE_TEXT = "Manufacturing Setup" @@ -109,8 +113,7 @@ SET_PASSWORD = "Set Password" #Blood Set Auto Load -BLOOD_SET_AUTO_LOAD_REJECTION = "[1] Request is not allowed in the current operating mode" -BLOOD_SET_AUTO_EJECT_REJECTION = "[1] Request is not allowed in the current operating mode" +CONTINUE = "Continue" #Feature Options FEATURE_CONFIGURATIONS_SCREEN_TITLE_TEXT = "Feature Configurations" @@ -150,66 +153,12 @@ SETTINGS = "Settings" # Pre-Treatment Foundation -CONCENTRATES_PAGE_TITLE = "Connect Acid and Bicarbonate Concentrates" -CONCENTRATES_PAGE_CONTENTS = [ - "Remove acid connector and connect to acid concentrate.", - "Connect dry bicarbonate.", -] -INSTALLATION_STEPPER_1_PAGE_TITLE = "Install Blood Tubing Set" -INSTALL_BLOOD_TUBING_SET_CONTENTS = [ - "Open the blood pump door.", - "Insert blood tubing set and ensure it is secure.", - "Push the blood tube into the blood pump.", - "Close the blood pump door.", -] -INSTALLATION_STEPPER_2_PAGE_TITLE = "Install Bloodlines" -INSTALL_BLOODLINES_CONTENTS = [ - "Insert saline line into the first slot.", - "Insert arterial line into the second slot.", - "Ensure the venous line is placed in the bubble detector.", - "Insert the venous line into the third slot.", - "Connect the arterial and venous bloodlines using the recirculation connector.", -] -INSTALLATION_STEPPER_3_PAGE_TITLE = "Install Pressure Lines and Dialyzer" -INSTALL_PRESSURE_LINES_CONTENTS = [ - "Connect the arterial pressure line to the arterial pressure transducer port.", - "Connect the venous pressure line to the venous pressure transducer port.", - "Insert dialyzer into the holder and connect the dialysate lines.", - "Connect the bloodlines to the dialyzer.", - "Clamp the venous chamber line.", - "Clamp the heparin line.", -] SELF_TESTS_PAGE_CONTENTS = [ - "Auto-Load Blood Tubing", - "Cartridge Install Checks", + "Auto-Load Blood Tube Set", + "Blood Tube Set Verification", "Pressure Leak Check", ] -SALINE_PAGE_TITLE = "Connect Saline Bag" -SALINE_PAGE_CONTENTS = [ - "Hang saline bag on the hook.", - "Clamp saline line.", - "Use the saline line to spike saline bag.", - "Unclamp saline line.", -] PRIME_PAGE_CONTENTS = ["Blood Tubing Circuit Priming", "Dialysate Circuit Priming"] -CONNECT_PAGE_TITLE = "Connect Bloodlines to the Patient" -CONNECT_PAGE_CONTENTS = [ - "Clamp arterial and venous bloodlines (2 clamps).", - "Remove recirculation connector from the bloodlines.", - "Connect bloodlines to patient access lines.", - "Unclamp arterial and venous bloodlines (2 clamps).", -] -DISCONNECT_PAGE_TITLE = "Remove Concentrates and Blood Tubing Set" -DISCONNECT_PAGE_CONTENTS = [ - "Remove blood tubing set and dialyzer.", - "Remove acid and bicarbonate concentrates.", -] -INSTALLATION_PAGE_TITLE = "Install Concentrates and Blood Tubing Set" -INSTALLATION_PAGE_CONTENTS = [ - "Install acid and bicarbonate concentrates.", - "Install blood tubing set and dialyzer.", -] -START_TREATMENT_REJECTION_NOTIFICATION = "[1] Request is not allowed in the current operating mode" #Recirculate RECIRCULATE_SET_UP = "Recirculate Set Up" Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -r834a1140f64954a507508ac12ab2b77f9c1c4880 -r7c915408c5ea9f671cf72d1e97d2ac1c8b2c3901 --- suite_leahi/shared/scripts/names.py (.../names.py) (revision 834a1140f64954a507508ac12ab2b77f9c1c4880) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision 7c915408c5ea9f671cf72d1e97d2ac1c8b2c3901) @@ -64,26 +64,30 @@ o_InformationParameters = {"container": o_Overlay, "type": "Text", "unnamed": 1 } o_VersionColumn = {"container": o_Overlay, "id": "_versionColumn", "type": "Column", "unnamed": 1 } -# General Alarm Requirements Instruction -o_AlarmButton_Mute = {"container": o_Overlay, "id": "_muteButton", "type": "MuteButton" } -o_AlarmButton_Mute_Min = {"container": o_AlarmButton_Mute, "id": "_hourText", "type": "Text" } -o_AlarmButton_Mute_Sec = {"container": o_AlarmButton_Mute, "id": "_minuteText", "type": "Text" } -o_AlarmButton_Mute_Img = {"container": o_AlarmButton_Mute, "id": "_image", "type": "Image", "unnamed": 1 } -o_Alarm_Bar = {"container": o_QQuickView, "id": "_alarmBar", "type": "NotificationBar" } -o_Alarm_Bar_Mute_Img = {"container": o_Alarm_Bar, "id": "_image", "type": "Image" } -o_Alarm_Bar_Mute_Min = {"container": o_Alarm_Bar, "id": "_hourText", "type": "Text" } -o_Alarm_Bar_Mute_Sec = {"container": o_Alarm_Bar, "id": "_minuteText", "type": "Text" } -o_AlarmsList_IconButton = {"container": o_Overlay, "id": "_alarmsList", "type": "IconButton", "unnamed": 1 } -o_AlarmButton_Minimize = {"container": o_Overlay, "id": "_minMaxButton", "type": "ArrowButton", "unnamed": 1 } -o_AlarmButton_Maximize = {"container": o_Gui_MainView, "id": "_minMaxButton", "type": "ArrowButton", "unnamed": 1 } -o_Alarm_Dialog_TitleBar = {"container": o_Overlay , "id": "_titleBar", "type": "Rectangle" } -o_Alarm_List = {"container": o_Overlay, "id": "_grid", "type": "Grid" } -o_AlarmReject_Notification_Description_Text = {"container": o_Overlay, "objectName": "_NotificationDialog_Description", "type": "Text" } -o_Alarm_Ok_Button = {"container": o_Overlay, "id": "_okTouchRect", "type": "TouchRect", "unnamed": 1 } -o_Alarm_Resume_Button = {"container": o_Overlay, "id": "_resumeTouchRect", "type": "TouchRect", "unnamed": 1 } -o_Alarm_Rinseback_Button = {"container": o_Overlay, "id": "_rinsebackTouchRect", "type": "TouchRect", "unnamed": 1 } -o_Alarm_End_Treatment_Button = {"container": o_Overlay, "id": "_endTouchRect", "type": "TouchRect", "unnamed": 1 } - +# General Alarm Requirements Instruction +o_AlarmButton_Mute = {"container": o_Overlay, "id": "_muteButton", "type": "MuteButton", } +o_AlarmButton_Mute_Min = {"container": o_AlarmButton_Mute, "id": "_hourText", "type": "Text", } +o_AlarmButton_Mute_Sec = {"container": o_AlarmButton_Mute, "id": "_minuteText", "type": "Text", } +o_AlarmButton_Mute_Img = {"container": o_AlarmButton_Mute, "id": "_image", "type": "Image", "unnamed": 1 } +o_Alarm_Minimized_hour_Text = {"container": o_Gui_MainView, "objectName": "_TimeText_hour", "type": "Text", "visible": True } +o_Alarm_Minimized_minute_Text = {"container": o_Gui_MainView, "objectName": "_TimeText_minute", "type": "Text", "visible": True } +#The 'visible' property is required here and This allows Squish to correctly find the object and get its text +o_Alarm_Minimized_Mute_Img = {"container": o_Gui_MainView, "id": "_image", "source": "qrc:/images/iBellOff", "type": "Image", "unnamed": 1 } +o_Alarm_Minimized_Unmute_Img = {"container": o_Gui_MainView, "id": "_image", "source": "qrc:/images/iBellOn", "type": "Image", "unnamed": 1 } +o_Alarm_titleBar_Rectangle = {"container": o_Overlay, "id": "_titleBar", "type": "Rectangle", "unnamed": 1 } +o_AlarmsList_IconButton = {"container": o_Overlay, "id": "_alarmsList", "type": "IconButton", "unnamed": 1 } +o_AlarmButton_Minimize = {"container": o_Overlay, "id": "_minMaxButton", "type": "ArrowButton", "unnamed": 1 } +o_AlarmButton_Maximize = {"container": o_Gui_MainView, "id": "_minMaxButton", "type": "ArrowButton", "unnamed": 1 } +o_Alarm_Dialog_TitleBar = {"container": o_Overlay, "id": "_titleBar", "type": "Rectangle", } +o_Alarm_List = {"container": o_Overlay, "id": "_grid", "type": "Grid", } +o_AlarmReject_Notification_Description_Text = {"container": o_Overlay, "objectName": "_NotificationDialog_Description", "type": "Text", } +o_Alarm_Ok_Button = {"container": o_Overlay, "id": "_okTouchRect", "type": "TouchRect", "unnamed": 1 } +o_Alarm_Resume_Button = {"container": o_Overlay, "id": "_resumeTouchRect", "type": "TouchRect", "unnamed": 1 } +o_Alarm_Rinseback_Button = {"container": o_Overlay, "id": "_rinsebackTouchRect", "type": "TouchRect", "unnamed": 1 } +o_Alarm_End_Treatment_Button = {"container": o_Overlay, "id": "_endTouchRect", "type": "TouchRect", "unnamed": 1 } +o_Alarm_timerRect_Rectangle = {"container": o_Overlay, "id": "_timerRect", "type": "Rectangle", "unnamed": 1 } +o_Alarm_temporaryBreak_Button = {"container": o_Overlay, "type": "Text", "unnamed": 1 } + #ultrafiltration o_treatmentUltrafiltration = {"container": mainTreatmentScreen, "objectName": "treatmentUltrafiltration", "type": "TreatmentUltrafiltration" } o_editButton_ultrafiltration_IconButton = {"container": o_treatmentUltrafiltration, "id": "_editButton", "type": "IconButton", "unnamed": 1 } @@ -223,6 +227,39 @@ o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_pretreatmentPatientIDEntry", "type": "TextEntry", "unnamed": 1 } o_preTreatmentStack_Text = {"container": o_preTreatmentStack_PreTreatmentStack, "type": "Text", "unnamed": 1 } o_preTreatmentStack_stepIndicator_StepIndicator = {"container": o_preTreatmentStack_PreTreatmentStack, "id": "_stepIndicator", "type": "StepIndicator", "unnamed": 1 } + +# Settings Service +o_SettingsStack_SettingsStack = {"container": o_Gui_MainView, "objectName": "_SettingsStack", "type": "SettingsStack", } +o_UserConfirmation_SettingsServicePassword = {"container": o_SettingsStack_SettingsStack, "objectName": "UserConfirmation", "type": "SettingsServicePassword", } +o_loginPage_Titletext = {"container": o_UserConfirmation_SettingsServicePassword, "id":"_titleText", "type": "Text", "unnamed": 1 } +o_userConfirmation_TextInput = {"container": o_UserConfirmation_SettingsServicePassword, "id": "_input", "type": "TextInput", "unnamed": 1 } +o_headerBar_HeaderBar = {"container": o_Gui_MainView, "id": "_headerBar", "type": "HeaderBar", "unnamed": 1 } +o_userConfirmation_ConfirmButton = {"container": o_UserConfirmation_SettingsServicePassword, "objectName": "_confirmButton", "type": "ConfirmButton", } +o_SettingsHome_confirmButton = {"container": o_SettingsHome, "objectName": "_confirmButton", "type": "ConfirmButton", } +o_SettingsBase_SettingsAdvancedMode = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsAdvancedMode", } +o_settingsAdvancedMode_BaseSwitch = {"container": o_SettingsBase_SettingsAdvancedMode, "id": "_settingsAdvancedMode", "type": "BaseSwitch", "unnamed": 1 } +o_SettingsBase_backButton_AdvancedMode = {"container": o_SettingsBase_SettingsAdvancedMode, "objectName": "_backButton", "type": "BackButton", } +o_SettingsBase_SettingsDateTime = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsDateTime", } +o_SettingsBase_ntpSwitch_BaseSwitch = {"container": o_SettingsBase_SettingsDateTime, "id": "_ntpSwitch", "type": "BaseSwitch", "unnamed": 1 } +o_SettingsBase_backButton_NTP_Switch = {"container": o_SettingsBase_SettingsDateTime, "objectName": "_backButton", "type": "BackButton", } +o_timeContainer_LabelUnitContainer = {"container": o_SettingsBase_SettingsDateTime, "id": "_timeContainer", "type": "LabelUnitContainer", "unnamed": 1 } +o_SettingsBase_SettingsRootSSHAccess = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsRootSSHAccess", } +o_SettingsBase_SSH_LoginSwitch = {"container": o_SettingsBase_SettingsRootSSHAccess, "id": "_settingsRootSSHAccess_SSHDSwitch", "type": "BaseSwitch", "unnamed": 1 } +o_SettingsBase_Root_LoginSwitch = {"container": o_SettingsBase_SettingsRootSSHAccess, "id": "_settingsRootSSHAccess_RootSwitch", "type": "BaseSwitch", "unnamed": 1 } +o_SettingsBase_backButton_RootSSH = {"container": o_SettingsBase_SettingsRootSSHAccess, "objectName": "_backButton", "type": "BackButton", } +o_userConfirmation_SettingsFactoryReset = {"container": o_Gui_MainView, "objectName": "UserConfirmation", "type": "SettingsFactoryReset", } +o_userConfirmation_backButton_FactoryReset = {"container": o_userConfirmation_SettingsFactoryReset, "objectName": "_backButton", "type": "BackButton", } +o_factoryReset_ConfirmButton = {"container": o_userConfirmation_SettingsFactoryReset, "objectName": "_confirmButton", "type": "ConfirmButton", } +o_cancelTouch_TouchRect = {"container": o_Overlay, "id": "_cancelTouch", "type": "TouchRect", "unnamed": 1 } +o_confirmTouch_ConfirmButton = {"container": o_Overlay, "id": "_confirmTouch", "type": "ConfirmButton", "unnamed": 1 } + +#Helpers +o_PreTreatmentSampleStack_PreTreatmentWaterSample = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentSampleStack", "type": "PreTreatmentWaterSample", } +o_PreTreatmentSampleStack_button_TouchRect = {"container": o_PreTreatmentSampleStack_PreTreatmentWaterSample, "id": "_button", "type": "TouchRect", "unnamed": 1 } +o_preTreatmentStack_repeater_Repeater = {"container": o_preTreatmentStack_PreTreatmentStack, "id": "repeater", "type": "Repeater", "unnamed": 1 } +o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom= {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bpMeasurementIntervalControl", "type": "ValueAdjusterCustom", "unnamed": 1 } +o_preTreatmentStack_confirmButton_ConfirmButton = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_confirmButton", "type": "ConfirmButton", "visible": True } +o_PostTreatmentStack_PostTreatmentStack = {"container": o_Gui_MainView, "objectName": "_PostTreatmentStack", "type": "PostTreatmentStack", } # Settings Service o_SettingsStack_SettingsStack = {"container": o_Gui_MainView, "objectName": "_SettingsStack", "type": "SettingsStack", } @@ -346,4 +383,29 @@ o_EndTreatmentBase_ButtonEndTreatment_2 = {"container": o_recirculateRecirculateStack_EndTreatmentBase_EndTreatmentBase_2, "type": "ButtonEndTreatment", "unnamed": 1 } o_EndTreatmentBase_NotificationBar_NotificationBarSmall_2 = {"container": o_recirculateRecirculateStack_EndTreatmentBase_EndTreatmentBase_2, "objectName": "NotificationBar", "type": "NotificationBarSmall", } o_EndTreatmentBase_ButtonResume_2 = {"container": o_recirculateRecirculateStack_EndTreatmentBase_EndTreatmentBase_2, "type": "ButtonResume", "unnamed": 1 } +#New design create Rx +o_createHDTreatment_TouchRect = {"container": o_standByScreen_MainHome, "id": "_createHDTreatment", "type": "TouchRect", "unnamed": 1 } +o_PreTreatmentCreate_leftColumn_Column = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_leftColumn", "type": "Column", "unnamed": 1 } +o_PreTreatmentCreate_rightColumn_Column = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_rightColumn", "type": "Column", "unnamed": 1 } +o_LabelUnitValueAdjuster_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_LabelUnitValueAdjuster", "type": "LabelUnitValueAdjuster" } +o_heparinDispensingRate_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_LabelUnitValueAdjuster", "id": "_heparinDispensingRate", "type": "LabelUnitValueAdjuster" } +o_heparinDeliveryDuration_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_LabelUnitValueAdjuster", "id": "_heparinDeliveryDuration", "type": "LabelUnitValueAdjuster" } +o_PreTreatmentCreate_leftColumn_Column_2 = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_leftColumn", "type": "Column", "unnamed": 1 } +o_PreTreatmentCreate_rightColumn_Column_2 = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_rightColumn", "type": "Column", "unnamed": 1 } +o_PreTreatmentCreate_sodium_LabelUnitValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_sodium", "objectName": "_LabelUnitValueAdjuster", "type": "LabelUnitValueAdjuster" } +o_PreTreatmentCreate_bicarbonate_LabelUnitValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bicarbonate", "objectName": "_LabelUnitValueAdjuster", "type": "LabelUnitValueAdjuster" } +o_PreTreatmentCreate_fluidBolusVolume_LabelUnitValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_fluidBolusVolume", "objectName": "_LabelUnitValueAdjuster", "type": "LabelUnitValueAdjuster" } +o_PreTreatmentCreate_primeRinsebackVolume_LabelUnitValueAdjuster= {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_primeRinsebackVolume", "objectName": "_LabelUnitValueAdjuster", "type": "LabelUnitValueAdjuster" } +o_PreTreatmentCreate_listView_ListView = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_listView", "type": "ListView", "unnamed": 1 } +o_createHDFTreatment_TouchRect = {"container": o_standByScreen_MainHome, "id": "_createHDFTreatment", "type": "TouchRect", "unnamed": 1 } +o_PreTreatmentCreate_hdfTreatmentMode_LabelUnitContainer = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_hdfTreatmentMode", "type": "LabelUnitContainer", "unnamed": 1 } +o_PreTreatmentCreate_treatmentModalityComboBox_BaseComboBox = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_treatmentModalityComboBox", "type": "BaseComboBox", "unnamed": 1 } +#Pre Treatment Foundation +o_pretreatmentInstallation_PreTreatmentBase_PreTreatmentBase_2 = {"container": o_preTreatmentStack_pretreatmentInstallation_PreTreatmentInstallStack, "objectName": "_PreTreatmentBase", "type": "PreTreatmentBase", "visible": True } +#The 'visible' property is required here and This allows Squish to correctly find the object for performing mouseClick() +o_PreTreatmentBase_contentColumn_Column = {"container": o_pretreatmentInstallation_PreTreatmentBase_PreTreatmentBase_2, "id": "_contentColumn", "type": "Column", "unnamed": 1 } +o_preTreatmentStack_PreTreatmentBase_PreTreatmentBase_2 = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentBase", "type": "PreTreatmentBase", "visible": True } +#The 'visible' property is required here and This allows Squish to correctly find the object for performing mouseClick() +o_PreTreatmentBase_contentColumn_Column_2 = {"container": o_preTreatmentStack_PreTreatmentBase_PreTreatmentBase_2, "id": "_contentColumn", "type": "Column", "unnamed": 1 } +o_PreTreatmentBase_autoStepController_AutoStepController = {"container": o_preTreatmentStack_PreTreatmentBase_PreTreatmentBase, "id": "_autoStepController", "type": "AutoStepController", "unnamed": 1 }