Index: shared/scripts/configuration/config.py =================================================================== diff -u -rb8e590e924c8ea6bb4c53ec05c9f795bebc6b5b8 -r602a0fa53978e3d7a44180fd13a83db2b480b83c --- shared/scripts/configuration/config.py (.../config.py) (revision b8e590e924c8ea6bb4c53ec05c9f795bebc6b5b8) +++ shared/scripts/configuration/config.py (.../config.py) (revision 602a0fa53978e3d7a44180fd13a83db2b480b83c) @@ -16,7 +16,6 @@ from pathlib import Path from configuration.strings import * - # -S, --disable-sd-card-fail-log-stop disable-sd-card-fail-log-stop # -k, --enable-check-in-log Enables Check-In Log # -K, --enable-acknow-log Enables Acknowledgment Log @@ -386,8 +385,10 @@ VOLUME_MIN_VAL = 20 VOLUME_MAX_VAL = 100 +#service screen PASSWORD = 123 +#wifi screen IP_ADDRESS = {"valid" : "192.168.1.1","invalid" : "192.168.1"} GATEWAY = {"valid" : "255.255.255.0", "invalid" : "255.255.255"} SUBNET_MASK = {"valid" : "255.255.255.0", "invalid" : "255.255.255"} @@ -480,4 +481,12 @@ UF_MAXIMUM_SLIDER_WIDTH = 638.00 +#dg cleaning +WATER_FLUSH_TIME_HOUR = {"valid" : "23","invalid" : "24"} +WATER_FLUSH_TIME_MINUTE = {"valid" : "59","invalid" : "60"} +WATER_FLUSH_CYCLE = {"valid" : "1", "invalid" : "8"} +HEAT_DISINFECTION_TIME_HOUR = {"valid" : "23","invalid" : "24"} +HEAT_DISINFECTION_TIME_MINUTE = {"valid" : "59","invalid" : "60"} +HEAT_DISINFECTION_CYCLE = {"valid" : "7", "invalid" : "61"} + Index: shared/scripts/configuration/strings.py =================================================================== diff -u -re669901857ed8bd5749874568939745d91ce5a0f -r602a0fa53978e3d7a44180fd13a83db2b480b83c --- shared/scripts/configuration/strings.py (.../strings.py) (revision e669901857ed8bd5749874568939745d91ce5a0f) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision 602a0fa53978e3d7a44180fd13a83db2b480b83c) @@ -354,6 +354,7 @@ VOLUME_AND_BRIGHTNESS_TEXT = "Volume And Brightness" BRIGHTNESS_TEXT = "Brightness" ALARM_VOLUME_TEXT = "Alarm Volume" +NOTIFICATION_MESSAGE_TEXT = "The response value is incorrect. [1007]" CONFIRM_TEXT = "CONFIRM" SERVICE_BACK_BTN = "BACK" BACK_TEXT = "BACK" @@ -1070,6 +1071,7 @@ DNS_TEXT = "DNS" SSID_TEXT = "SSID" SCAN_TEXT = "SCAN" +SCAN_FINISHED_TEXT = "Scan Finished" BACK_BUTTON_TEXT = "BACK" #Bluetooth cuff @@ -1080,7 +1082,10 @@ DG_CLEANING_TITLE_TEXT = "DG Cleaning" WATER_FLUSH_TEXT = "Water Flush" HEAT_DISINFECTION_TEXT = "Heat Disinfection" -CHEMICAL_DISINFECTION_TEXT = "Chemical 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)" BACK_TEXT = "BACK" CONTINUE_TEXT = "CONTINUE" Index: shared/scripts/names.py =================================================================== diff -u -r9f0f4e94476117233b651fb5dfc094221b7dd47a -r602a0fa53978e3d7a44180fd13a83db2b480b83c --- shared/scripts/names.py (.../names.py) (revision 9f0f4e94476117233b651fb5dfc094221b7dd47a) +++ shared/scripts/names.py (.../names.py) (revision 602a0fa53978e3d7a44180fd13a83db2b480b83c) @@ -855,6 +855,7 @@ o_patient_disconnection_text = {"container": o_PostTreatmentStack_patientDisconnectionConfirm_TreatmentFlowBase, "text": "Patient Disconnection", "type": "Text", "unnamed": 1, "visible": True} o_patient_Disconnection_right_arrow = {"container": o_PostTreatmentStack_patientDisconnectionConfirm_TreatmentFlowBase, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True} o_patient_disconnection_confirm_button = {"container": o_PostTreatmentStack_patientDisconnectionConfirm_TreatmentFlowBase, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} +o_patientDisconnectionConfirm_confirmButton_TouchRect = {"container": o_PostTreatmentStack_patientDisconnectionConfirm_TreatmentFlowBase, "gradient": 0, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} o_treatment_review_next_text = {"container": o_PostTreatmentStack_treatmentReviewConfirm_PostTreatmentReview, "text": "NEXT", "type": "Text", "unnamed": 1, "visible": True} o_disposables_removal_backButton = {"container": o_PostTreatmentStack_disposablesRemovalConfirm_TreatmentFlowBase, "objectName": "_backButton", "type": "BackButton", "visible": True} o_treatment_review_next_button = {"container": o_PostTreatmentStack_treatmentReviewConfirm_PostTreatmentReview, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} @@ -1010,24 +1011,34 @@ o_SettingsBase_SSID_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "SSID", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_SCAN_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "SCAN", "type": "Text", "unnamed": 1, "visible": True} o_SettingsHome_Bluetooth_Cuff_Text = {"container": o_SettingsHome_SettingsHome_2, "text": "Bluetooth Cuff", "type": "Text", "visible": True} +o_SettingsBase_mouseArea_MouseArea_2 = {"container": o_SettingsBase_SettingsBase, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True} o_SettingsBase_Devices_Label = {"container": o_SettingsBase_SettingsBase, "text": "Devices", "type": "Label", "unnamed": 1, "visible": True} o_SettingsBase_Bluetooth_Cuff_Text = {"container": o_SettingsBase_SettingsBase, "text": "Bluetooth Cuff", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_SettingsDG = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsDG", "visible": True} o_SettingsBase_DG_Cleaning_Text = {"container": o_SettingsBase_SettingsDG, "text": "DG Cleaning", "type": "Text", "unnamed": 1, "visible": True} -o_SettingsHome_DG_Cleaning_Text = {"container": o_SettingsHome_SettingsHome_2, "text": "DG Cleaning", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_Water_Flush_Text = {"container": o_SettingsBase_SettingsDG, "text": "Water Flush", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_Heat_Disinfection_Text = {"container": o_SettingsBase_SettingsDG, "text": "Heat Disinfection", "type": "Text", "unnamed": 1, "visible": True} -o_SettingsBase_Chemical_Disinfection_Text = {"container": o_SettingsBase_SettingsDG, "text": "Chemical Disinfection", "type": "Text", "unnamed": 1, "visible": True} +o_SettingsHome_DG_Cleaning_Text = {"container": o_SettingsHome_SettingsHome_2, "text": "DG Cleaning", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_backButton_BackButton = {"container": o_SettingsBase_SettingsWiFi, "gradient": 0, "objectName": "_backButton", "type": "BackButton", "visible": True} +o_SettingsBase_The_response_value_is_incorrect_1007_Text = {"container": o_SettingsBase_SettingsVolumeBrightness, "text": "The response value is incorrect. [1007]", "type": "Text", "unnamed": 1, "visible": True} +o_SettingsBase_Time_HH_MM_Label = {"container": o_SettingsBase_SettingsDG, "text": "Time (HH:MM)", "type": "Label", "unnamed": 1, "visible": True} +o_SettingsBase_input_TextInput_5 = {"container": o_SettingsBase_SettingsDG, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} +o_SettingsBase_input_TextInput_6 = {"container": o_SettingsBase_SettingsDG, "echoMode": 0, "id": "_input", "occurrence": 2, "type": "TextInput", "unnamed": 1, "visible": True} +o_SettingsBase_Time_HH_MM_Label_2 = {"container": o_SettingsBase_SettingsDG, "occurrence": 2, "text": "Time (HH:MM)", "type": "Label", "unnamed": 1, "visible": True} +o_SettingsBase_input_TextInput_7 = {"container": o_SettingsBase_SettingsDG, "echoMode": 0, "id": "_input", "occurrence": 4, "type": "TextInput", "unnamed": 1, "visible": True} +o_SettingsBase_input_TextInput_8 = {"container": o_SettingsBase_SettingsDG, "echoMode": 0, "id": "_input", "occurrence": 5, "type": "TextInput", "unnamed": 1, "visible": True} +o_SettingsBase_Cycle_Days_Text = {"container": o_SettingsBase_SettingsDG, "text": "Cycle (Days)", "type": "Text", "unnamed": 1, "visible": True} +o_SettingsBase_input_TextInput_9 = {"container": o_SettingsBase_SettingsDG, "echoMode": 0, "id": "_input", "occurrence": 3, "type": "TextInput", "unnamed": 1, "visible": True} +o_SettingsBase_Cycle_Days_Text_2 = {"container": o_SettingsBase_SettingsDG, "occurrence": 2, "text": "Cycle (Days)", "type": "Text", "unnamed": 1, "visible": True} +o_SettingsBase_input_TextInput_10 = {"container": o_SettingsBase_SettingsDG, "echoMode": 0, "id": "_input", "occurrence": 6, "type": "TextInput", "unnamed": 1, "visible": True} o_back_button = {"container": o_Gui_MainView, "text": "BACK", "type": "Text", "unnamed": 1, "visible": False} +o_dg_cleaning_back_button = {"container": o_SettingsBase_SettingsDG, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True} o_SettingsBase_SCAN_Text_2 = {"container": o_SettingsBase_SettingsBase, "text": "SCAN", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_ssidText_Text = {"container": o_SettingsBase_SettingsWiFi, "id": "_ssidText", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_input_TextInput = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} o_SettingsBase_input_TextInput_2 = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} o_SettingsBase_input_TextInput_3 = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} o_SettingsBase_input_TextInput_4 = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} - - o_services_screen_text_obj = {"container": o_SettingsBase_SettingsBase, "type": "Text", "unnamed": 1, "visible": True} o_settings_text = {"container":o_Gui_MainView , "text": "Settings", "type": "Text", "unnamed": 1, "visible": True} o_service_text = {"container": o_Gui_MainView , "text": "Service", "type": "Text", "unnamed": 1, "visible": True} @@ -1062,12 +1073,11 @@ progress_bar = {"container": o_initialModeScreen_ScreenItem, "id": "_textMaximum", "type": "Text", "unnamed": 1, "visible": False} o_alarm_text = {"container": o_Overlay, "id": "_desc", "objectName": "_NotificationDialog_Description", "type": "Text", "visible": True} o_SettingsBase_mouseArea_MouseArea = {"container": o_SettingsBase_SettingsWiFi, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True} - o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeInstallation_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesCartridgeInstallation", "type": "TreatmentFlowBase", "visible": True} o_next_button_text = {"container": o_Gui_MainView, "text":"NEXT", "type": "Text", "unnamed": 1, "visible": True} o_back_button_text = {"container": o_Gui_MainView, "text":"BACK", "type": "Text", "unnamed": 1, "visible": True} o_preTreatmentDisposablesStack_preTreatmentDisposablesSalineBag_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesSalineBag", "type": "TreatmentFlowBase", "visible": True} o_confirm_button_text = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesSalineBag_TreatmentFlowBase, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} -o_patientDisconnectionConfirm_confirmButton_TouchRect = {"container": o_PostTreatmentStack_patientDisconnectionConfirm_TreatmentFlowBase, "gradient": 0, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} +o_SettingsBase_Scan_Finished_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "Scan Finished", "type": "Text", "unnamed": 1, "visible": True}