Index: suite_leahi/shared/scripts/configuration/config.py =================================================================== diff -u -rcb5bd455ccab1f25b69359aab8ec82e4d9577230 -r1791a25083272945f9aa9c32f57c7f203d66aba6 --- suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision cb5bd455ccab1f25b69359aab8ec82e4d9577230) +++ suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision 1791a25083272945f9aa9c32f57c7f203d66aba6) @@ -177,12 +177,17 @@ INSTITUTIONAL_CONFIGURATIONS = "Institutional Configurations" DATE_AND_TIME = "Date and Time" LANGUAGE = "Language" + +#Menu Bar +PRESCRIPTIONS = "Prescriptions" +TREATMENT = "Treatment" +SETTINGS = "Settings" + # Blood Prime TOTAL_FLUID_DELIVERED = "Total Fluid Delivered" DELIVERING_FLUID = "Delivering Fluid" BLOOD_PRIME_PAUSED_NOTIFICATION = "Blood Prime Paused" - # Pre-Treatment Foundation SELF_TESTS_PAGE_CONTENTS = [ "Auto-Load Blood Tube Set", @@ -197,11 +202,17 @@ RECIRCULATION_COUNTDOWN_DESCRIPTION_TEXT = "Recirculation Time Elapsed:" RECONNECT_TO_PATIENT = "Reconnect To Patient" END_TREATMENT = "End Treatment" +HDF = "HDF" +#Post-Treatment Foundation +END_TREATMENT = "End Treatment" +CONTINUE = "Continue" +CONFIGURATIONS_PATH = "Public/luis/config/configurations/" +SKIP = "Skip" #General Aesthetics SD_CARD_SECTION_CONTENTS = ["SD-Card", "0.000 MB Used", "0.000 Free MB of 0.000 MB"] -OPMODE_TITLE = " Opmode " +OPMODE_TITLE = '[0x12] Opmode ' OPMODE = 'opMode ' SUBMODE = 'subMode ' TX_STATES = ' TXStates ' @@ -216,6 +227,7 @@ NEW_UF_RATE = "New UF Rate" + MAX_NEW_UF_VOLUME = 8.0 MAX_NEW_UF_RATE = 2.0 @@ -225,4 +237,5 @@ BLOOD_RETURN_COUNTDOWN_DESCRIPTION_TEXT = "Blood return will NOT be allowed in:" BLOOD_RETURN_COMPLETE = "Blood Return Complete!" - +#Trends and Screensaver +TRENDS = "Trends" Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -r56599f7ae0abe203a89be48e5694396d274969c8 -r1791a25083272945f9aa9c32f57c7f203d66aba6 --- suite_leahi/shared/scripts/names.py (.../names.py) (revision 56599f7ae0abe203a89be48e5694396d274969c8) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision 1791a25083272945f9aa9c32f57c7f203d66aba6) @@ -199,6 +199,10 @@ o_PreTreatmentCreate_bicarbonateConcentrateComboBox_BaseComboBox= {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bicarbonateConcentrateComboBox", "type": "BaseComboBox", "unnamed": 1 } o_PreTreatment_vitalsCombobox_BaseCombobox = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bpMeasurementIntervalControl", "type": "BaseComboBox", "unnamed": 1 } o_PreTreatmentCreate_Text = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "type": "Text", "unnamed": 1 } +o_PreTreatmentCreate_patientID_LabelUnitContainer = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_patientID", "type": "LabelUnitContainer", "unnamed": 1 } +o_secondaryPatientID_LabelUnitContainer = {"container": o_Overlay, "id": "_secondaryPatientID", "type": "LabelUnitContainer", "unnamed": 1 } + + #prescription header bar o_prescriptionButton_IconButton = {"container": o_Gui_MainView, "id": "_prescriptionButton", "type": "IconButton", "unnamed": 1 } @@ -248,20 +252,32 @@ 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 } -#Helpers +# 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_userConfirmation_ConfirmButton = {"container": o_UserConfirmation_SettingsServicePassword, "objectName": "_confirmButton", "type": "ConfirmButton", } -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_PostTreatmentStack_PostTreatmentStack = {"container": o_Gui_MainView, "objectName": "_PostTreatmentStack", "type": "PostTreatmentStack", } +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_PostTreatmentStack_PostTreatmentStack = {"container": o_Gui_MainView, "objectName": "_PostTreatmentStack", "type": "PostTreatmentStack", } o_preTreatmentStack_pretreatmentInstallation_PreTreatmentInstallStack= {"container": o_preTreatmentStack_PreTreatmentStack, "id": "_pretreatmentInstallation", "type": "PreTreatmentInstallStack", "unnamed": 1 } o_pretreatmentInstallation_PreTreatmentBase_PreTreatmentBase = {"container": o_preTreatmentStack_pretreatmentInstallation_PreTreatmentInstallStack, "objectName": "_PreTreatmentBase", "type": "PreTreatmentBase", } o_pretreatmentInstallation_instructionView_InstructionView = {"container": o_pretreatmentInstallation_PreTreatmentBase_PreTreatmentBase, "id": "_instructionView", "type": "InstructionView", "unnamed": 1 } @@ -358,6 +374,20 @@ o_HeaderBar_Diagnostics_Popup_TDOpmode_Submode_Value = {"container": o_view_SwipeView, "objectName": "_TDOpmodeData1", "type": "Text", } o_HeaderBar_Diagnostics_Popup_TDOpmode_Submode_Text = {"container": o_view_SwipeView, "objectName": "_TDOpmodeDataL1", "type": "Text", } o_HeaderBar_Diagnostics_Popup_TDTXStatesColumn = {"container": o_view_SwipeView, "id": "_TDTXStatesColumn", "type": "DebugDataColumn", "unnamed": 1 } +#HDF +o_treatmentHDF_TreatmentHDF = {"container": treatmentStack, "id": "_treatmentHDF", "type": "TreatmentHDF", "unnamed": 1 } +o_treatmentHDF_treatmentPressures_TreatmentPressures = {"container": o_treatmentHDF_TreatmentHDF, "objectName": "_treatmentPressures", "type": "TreatmentPressures" } +o_treatmentHDF_currentDataRow_Row = {"container": o_treatmentHDF_TreatmentHDF, "id": "_currentDataRow", "type": "Row", "unnamed": 1 } +o_treatmentHDF_treatmentHdfComponent_TreatmentHDFComponent = {"container": o_treatmentHDF_TreatmentHDF, "objectName": "_treatmentHdfComponent", "type": "TreatmentHDFComponent" } +o_valueAdjuster_ValueAdjuster = {"container": o_Overlay, "objectName": "_valueAdjuster", "type": "ValueAdjuster" } +o_treatmentHDF_prescribedFluidVolume_LabelUnitValueAdjuster = {"container": o_treatmentHDF_TreatmentHDF, "objectName": "_prescribedFluidVolume", "type": "LabelUnitValueAdjuster" } +o_vitals_close_btn = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iClose", "type": "Image", "unnamed": 1 } +o_TreatmentBloodPrime_TreatmentBloodPrime = {"container": treatmentStack, "objectName": "_TreatmentBloodPrime", "type": "TreatmentBloodPrime", } +o_TreatmentBloodPrime_flowRateValue_Text = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_flowRateValue", "type": "Text", } +o_createHDFTreatment_TouchRect = {"container": o_standByScreen_MainHome, "id": "_createHDFTreatment", "type": "TouchRect", "unnamed": 1 } +#Added occurences and visible property to click on HDF tab +o_listView_ListView_2 = {"container": o_Gui_MainView, "id": "_listView", "occurrence": 2, "type": "ListView", "unnamed": 1, "visible": True} +o_listView_delegateControl_Item_2 = {"container": o_listView_ListView_2, "index": 3, "objectName": "delegateControl", "type": "Item" } #Pre Treatment Foundation o_pretreatmentInstallation_PreTreatmentBase_PreTreatmentBase_2 = {"container": o_preTreatmentStack_pretreatmentInstallation_PreTreatmentInstallStack, "objectName": "_PreTreatmentBase", "type": "PreTreatmentBase", "visible": True } @@ -507,3 +537,7 @@ o_Blood_Return_Complete_Recirculate_TouchRect = {"container": o_Overlay, "id": "_additionalTouch", "type": "TouchRect", "unnamed": 1 } o_Blood_Return_Complete_End_Treatment_TouchRect = {"container": o_Overlay, "id": "_cancelTouch", "type": "TouchRect", "unnamed": 1 } o_Blood_Return_Complete_Fluid_Bolus_TouchRect = {"container": o_Overlay, "id": "_confirmTouch", "type": "ConfirmButton", "unnamed": 1 } + +#Trends and Screensaver +o_TreatmentTrends_TreatmentTrends = {"container": treatmentStack, "objectName": "_TreatmentTrends", "type": "TreatmentTrends", } +o_TreatmentTrends_paramListDelegate_Column = {"container": o_TreatmentTrends_TreatmentTrends, "id": "_paramListDelegate", "index": 0, "type": "Column", "unnamed": 1 } Index: suite_leahi/tst_pre_treatment_foundation/test.py =================================================================== diff -u -rd4c6bf838a87529d60797460eb7242948f46f65b -r1791a25083272945f9aa9c32f57c7f203d66aba6 --- suite_leahi/tst_pre_treatment_foundation/test.py (.../test.py) (revision d4c6bf838a87529d60797460eb7242948f46f65b) +++ suite_leahi/tst_pre_treatment_foundation/test.py (.../test.py) (revision 1791a25083272945f9aa9c32f57c7f203d66aba6) @@ -1,5 +1,6 @@ # Subject/Title: Pre-Treatment - SW - 02 - Foundation - Q&R -# +# LDT -3816 SW Misc & Enhc - SW - 02 - Usability Requests - Q&R - 15: SIT - Software Integration Tests - Squish Qt +# # Functionalities: Testing of Pre-Treatment Foundation # # Steps: @@ -10,6 +11,9 @@ # simulate TD Treatment mode and simulate TD Post Treatment mode # Navigate to Device settings using service password and Toggle Advanced Mode Switch # Navigate to Through Pre-Treatment Pages Comparing Page Title and Page Contents +# Pre-Treatment test cycle steps timer. +# Press the play button on one of the pre treatment instruction pages. Wait 5 seconds +# confirm the index of the test step changes import names import re