Index: shared/scripts/configuration/config.py =================================================================== diff -u -r62ee1e1804a02e62964febd3618a660d080bb437 -r3002a441527d3a164aa29ee0546201bd1c8c3198 --- shared/scripts/configuration/config.py (.../config.py) (revision 62ee1e1804a02e62964febd3618a660d080bb437) +++ shared/scripts/configuration/config.py (.../config.py) (revision 3002a441527d3a164aa29ee0546201bd1c8c3198) @@ -138,5 +138,5 @@ ACCEPTED = True REJECTED = False - + Index: shared/scripts/configuration/strings.py =================================================================== diff -u -r62ee1e1804a02e62964febd3618a660d080bb437 -r3002a441527d3a164aa29ee0546201bd1c8c3198 --- shared/scripts/configuration/strings.py (.../strings.py) (revision 62ee1e1804a02e62964febd3618a660d080bb437) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision 3002a441527d3a164aa29ee0546201bd1c8c3198) @@ -79,8 +79,8 @@ "Bicarbonate Concentrate": BICARBONATE_CONCENTRATE, "Dialyzer Type": "BB Diacap Pro 16H"} LIQUID_UNIT = "mL" +OFF_TEXT = "OFF" - #Time_Duration 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", Index: shared/scripts/names.py =================================================================== diff -u -r62ee1e1804a02e62964febd3618a660d080bb437 -r3002a441527d3a164aa29ee0546201bd1c8c3198 --- shared/scripts/names.py (.../names.py) (revision 62ee1e1804a02e62964febd3618a660d080bb437) +++ shared/scripts/names.py (.../names.py) (revision 3002a441527d3a164aa29ee0546201bd1c8c3198) @@ -164,10 +164,8 @@ #right and left button o_disposable_rightImage_Image = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True} o_disposable_leftImage_Image = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "id": "_leftImage", "source": "qrc:/images/iArrowLeft", "type": "Image", "unnamed": 1, "visible": True} -o_next_button_text = {"container": o_Gui_MainView, "text":"NEXT", "type": "Text", "unnamed": 1, "visible": True} o_right_side_arrow = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True} -o_back_button_text = {"container": o_Gui_MainView, "text":"BACK", "type": "Text", "unnamed": 1, "visible": True} -o_confirm_button_text = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} +o_continue_button = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "text": "CONTINUE", "type": "Text", "unnamed": 1, "visible": True} o_PreTreatmentBase_swipeview_SwipeView = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} o_cartridge_installation_screen1_text = {"container": o_PreTreatmentBase_swipeview_SwipeView, "text": "Open the front panel door.", "type": "Text", "unnamed": 1, "visible": True} o_heparin_syringe_screen1_text = {"container": o_PreTreatmentBase_swipeview_SwipeView, "text": "Fill a syringe with heparin and connect the cartridge heparin tubing line. \nInsert syringe into infusion pump housing.", "type": "Text", "unnamed": 1, "visible": True} @@ -188,3 +186,13 @@ o_PreTreatmentBase_gridStepsRest_Grid_2 = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_gridStepsRest", "occurrence": 10, "type": "Grid", "unnamed": 1, "visible": True} +o_PreTreatmentCreate_Rectangle = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "type": "Rectangle", "unnamed": 1, "visible": True} +o_PreTreatmentCreate_heparinDispensingRateSwitch_Switch = {"checkable": True, "container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinDispensingRateSwitch", "type": "Switch", "unnamed": 1, "visible": True} +o_PreTreatmentCreate_heparinBolusVolumeSwitch_Switch = {"checkable": True, "container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinBolusVolumeSwitch", "type": "Switch", "unnamed": 1, "visible": True} +o_PreTreatmentCreate_OFF_Text = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "text": "OFF", "type": "Text", "unnamed": 1, "visible": True} +o_PreTreatmentCreate_OFF_Text_2 = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "occurrence": 2, "text": "OFF", "type": "Text", "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} Index: tst_pre_treatment_disposables/test.py =================================================================== diff -u -rbf9e892d9c9505efbebcf7eceb714a1a9143d2f3 -r3002a441527d3a164aa29ee0546201bd1c8c3198 --- tst_pre_treatment_disposables/test.py (.../test.py) (revision bf9e892d9c9505efbebcf7eceb714a1a9143d2f3) +++ tst_pre_treatment_disposables/test.py (.../test.py) (revision 3002a441527d3a164aa29ee0546201bd1c8c3198) @@ -31,10 +31,10 @@ CARTRIDGE_CONNECTION = 2 HEPARIN_SYRINGE = 3 SALINE_BAG = 4 -NUM_OF_CARTRIDGE_INSTALLATION_SCREENS = 4 -NUM_OF_CARTRIDGE_CONNECTION_SCREENS = 5 -NUM_OF_HEPARIN_SYRINGE_SCREENS = 1 -NUM_OF_SALINE_BAG_SCREENS = 2 +NUM_OF_CARTRIDGE_INSTALLATION_SCREENS = 5 +NUM_OF_CARTRIDGE_CONNECTION_SCREENS = 6 +NUM_OF_HEPARIN_SYRINGE_SCREENS = 2 +NUM_OF_SALINE_BAG_SCREENS = 3 CARTRIDGE_INSTALLATION_TEXT = "Open the front panel door." CARTRIDGE_CONNECTION_TEXT = "Connect the cartridge blood lines to the dialyzer." HEPARIN_SYRINGE_TEXT = "Fill a syringe with heparin and connect the cartridge heparin tubing line. \nInsert syringe into infusion pump housing." @@ -232,7 +232,7 @@ @param condition - (bool) True/False """ test.startSection("Verifying the availability 'CONFIRM' button verify the status of the same") - if object.exists(names.o_confirm_button_text): + if object.exists(names.o_next_button_text): test.compare(str(waitForObjectExists(names.o_confirm_button_text).text), config.CONFIRM_BUTTON_TEXT,"'CONFIRM' button text should be {}".format(config.CONFIRM_BUTTON_TEXT)) if condition: test.compare(waitForObjectExists(names.o_confirm_button_text).enabled , condition, "'CONFIRM' button should be enabled") @@ -370,13 +370,21 @@ test.startSection("verification of heparin dispensing rate values") test.compare(waitForObject(names.o_PreTreatmentCreate_heparinDispensingRate_SliderCreateTreatment).label, config.HEPARIN_DISPENSING_RATE, "Parameter should be -> "+str(config.HEPARIN_DISPENSING_RATE)) + utils.waitForGUI(1) + test.compare(waitForObject(names.o_PreTreatmentCreate_OFF_Text).text,"OFF", "Text should be -> "+"OFF") + mouseClick(names.o_PreTreatmentCreate_heparinDispensingRateSwitch_Switch) + mouseClick(names.o_PreTreatmentCreate_heparinDispensingRateSwitch_Switch) + utils.waitForGUI(1) test_custom_treatment_slider(names.o_PreTreatmentCreate_heparinDispensingRateSlider_Slider, 0.8, config.CREATE_TREATMENT_SLIDER_VALUES["heparin_dispensing_rate"], config.HEPARIN_DISPENSING_RATE) - + test.endSection() test.startSection("verification of heparin bolus volume values") test.compare(waitForObject(names.o_PreTreatmentCreate_heparinBolusVolume_SliderCreateTreatment).label, config.HEPARIN_BOLUS_VOLUME, "Parameter should be -> "+str(config.HEPARIN_BOLUS_VOLUME)) - test_custom_treatment_slider(names.o_PreTreatmentCreate_heparinBolusVolumeSlider_Slider, 1.3, config.CREATE_TREATMENT_SLIDER_VALUES["heparin_bolus_volume"], config.HEPARIN_BOLUS_VOLUME) + mouseClick(names.o_PreTreatmentCreate_heparinBolusVolumeSwitch_Switch) + mouseClick(names.o_PreTreatmentCreate_heparinBolusVolumeSwitch_Switch) + utils.waitForGUI(1) + test_custom_treatment_slider(names.o_PreTreatmentCreate_heparinBolusVolumeSlider_Slider, 1.4, config.CREATE_TREATMENT_SLIDER_VALUES["heparin_bolus_volume"], config.HEPARIN_BOLUS_VOLUME) test.endSection() @@ -387,7 +395,7 @@ test.startSection("verification of heparin stop time values") test.compare(waitForObject(names.o_PreTreatmentCreate_heparinStopTime_SliderCreateTreatment).label, config.HEPARIN_STOP_TIME, "Parameter should be -> "+str(config.HEPARIN_STOP_TIME)) test_custom_treatment_slider(names.o_PreTreatmentCreate_heparinStopTimeSlider_Slider, 230, config.CREATE_TREATMENT_SLIDER_VALUES["heparin_stop_time"], config.HEPARIN_STOP_TIME) - + test.endSection() test.startSection("verification of saline bolus values") @@ -514,7 +522,7 @@ slider_buffer = slider_parameter[1] width_buffer = slider_parameter[2] slider_width = ((value - minimum_slider_value)/slider_buffer) * width_buffer - utils.waitForGUI(0.3) + utils.waitForGUI(0.2) mouseClick(findObject(slider_object), float(slider_width) , 3, Qt.LeftButton) test.compare(waitForObjectExists(slider_object).value, value, str(parameter)+" slider value should set to"+str(value)) @@ -528,7 +536,7 @@ hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TPAR.value, sub_mode=HDOpSubModes.STANDBY_START_STATE.value) mouseClick(waitForObject(names.o_input_patient_id)) type(waitForObject(names.o_input_patient_id), "abcd") - mouseClick(waitForObject(names.o_confirm_button)) + mouseClick(waitForObject(names.o_continue_button)) verify_create_custom_treatment_parameter() verify_request_continue_mode() # navigation for pre-treatment screens