Index: shared/scripts/configuration/config.py =================================================================== diff -u -r6b8f0f06784bac5f015688ba42a8929ed9321b44 -r0ff57e2fc0e614eab98b8e9ce9b73a48419fc34b --- shared/scripts/configuration/config.py (.../config.py) (revision 6b8f0f06784bac5f015688ba42a8929ed9321b44) +++ shared/scripts/configuration/config.py (.../config.py) (revision 0ff57e2fc0e614eab98b8e9ce9b73a48419fc34b) @@ -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 Index: shared/scripts/names.py =================================================================== diff -u -rd353049871cb6179cef23aba08f3af9d0a42511b -r0ff57e2fc0e614eab98b8e9ce9b73a48419fc34b --- shared/scripts/names.py (.../names.py) (revision d353049871cb6179cef23aba08f3af9d0a42511b) +++ shared/scripts/names.py (.../names.py) (revision 0ff57e2fc0e614eab98b8e9ce9b73a48419fc34b) @@ -287,13 +287,37 @@ o_PreTreatmentBase_nextStepsBullet_StepBullet = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_nextStepsBullet", "occurrence": 7, "type": "StepBullet", "unnamed": 1, "visible": True} o_PreTreatmentBase_BACK_Text = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "BACK", "type": "Text", "unnamed": 1, "visible": True} o_PreTreatmentBase_CONFIRM_Text_2 = {"container":o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} + +#vitals +#vitals title text on main-treatment screen +o_vitals_toucharea = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "id": "_mouseArea", "occurrence": 2, "type": "MouseArea", "unnamed": 1, "visible": True} +#unit of measurement for blood pressure and heart rate +o_bp_uom = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "mmHg", "type": "Text", "unnamed": 1, "visible": True} +o_hr_uom = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "BPM", "type": "Text", "unnamed": 1, "visible": True} +#reading of vitals +o_vitals_reading = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "type": "Text", "unnamed": 1, "visible": True} +#vitals pop up confirm and close button +o_treatmentStack_vitals_confirmButton_TouchRect = {"container": o_treatmentStack_TreatmentStack, "id": "_confirmButton", "type": "TouchRect", "unnamed": 1, "visible": True} +o_vitals_close_btn = {"container": o_treatmentStack_TreatmentStack, "id": "_image", "source": "qrc:/images/iClose", "type": "Image", "unnamed": 1, "visible": True} + +#vitals title text vitals pop up +o_vitals_pop_up_title = {"container": o_treatmentStack_TreatmentStack, "text": "VITALS", "type": "Text", "unnamed": 1, "visible": True} +o_pop_up_bp_title = {"container": o_treatmentStack_TreatmentStack, "text": "Blood Pressure", "type": "Text", "unnamed": 1, "visible": True} +o_pop_up_heart_rate_title = {"container": o_treatmentStack_TreatmentStack, "text": "Heart Rate", "type": "Text", "unnamed": 1, "visible": True} +#unit of measurement for blood pressure and heart rate on pop up +o_pop_up_bp_uom = {"container": o_treatmentStack_TreatmentStack, "text": "mmHg", "type": "Label", "unnamed": 1, "visible": True} +o_pop_up_heart_rate_uom = {"container": o_treatmentStack_TreatmentStack, "text": "BPM", "type": "Label", "unnamed": 1, "visible": True} +#systolic, diastolic and heart rate input field +o_pop_up_systolic_input_field = {"container": o_treatmentStack_TreatmentStack, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} +o_pop_up_diastolic_input_field = {"container": o_treatmentStack_TreatmentStack, "echoMode": 0, "id": "_input", "occurrence": 2, "type": "TextInput", "unnamed": 1, "visible": True} +o_pop_up_heart_rate_input_field = {"backgroundcolor": "#254670", "container": o_treatmentStack_TreatmentStack, "echoMode": 0, "id": "_input", "occurrence": 3, "type": "TextInput", "unnamed": 1, "visible": True} #virtal keypad input field o_keypad_input = {"container": o_Gui_MainView, "id": "_keyText","type": "Text", "unnamed": 1, "visible": True} #virtal keypad back space key o_back_space_key = {"container": o_Gui_MainView, "id": "_backspaceKeyIcon", "source": "qrc:/plugins/QtQuick/VirtualKeyboard/Styles/denali/images/iBackspace.svg", "type": "Image", "unnamed": 1, "visible": True} - #vital time interval o_time_interval = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "id": "_text", "type": "Text", "unnamed": 1, "visible": True} + #create_custom treatment testcase o_PreTreatmentBase_confirmButton_TouchRect = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} o_PreTreatmentCreate_bloodFlowRate_SliderCreateTreatment = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,"objectName": "_bloodFlowRate", "type": "SliderCreateTreatment", "visible": True} Index: tst_main_treatment_vitals/test.py =================================================================== diff -u -r65b2d48f2644addc4edfa1800282c4a6324cae23 -r0ff57e2fc0e614eab98b8e9ce9b73a48419fc34b --- tst_main_treatment_vitals/test.py (.../test.py) (revision 65b2d48f2644addc4edfa1800282c4a6324cae23) +++ tst_main_treatment_vitals/test.py (.../test.py) (revision 0ff57e2fc0e614eab98b8e9ce9b73a48419fc34b) @@ -116,7 +116,7 @@ and verify 'Vitals' pop is opened """ test.startSection("Opening 'Vitals' pop up") - vitals_touch_area = object.parent(waitForObject(names.o_vitals_title)) + vitals_touch_area = object.parent(waitForObject(names.o_vitals_toucharea)) start_time = time.time() mouseClick(vitals_touch_area) test.log("Verifying the 'Vitals' pop up is displayed") @@ -343,7 +343,7 @@ if save: test.log("Clicking confirm button") - confirm_button = waitForObjectExists(names.o_vitals_confrim_btn) + confirm_button = waitForObjectExists(names.o_treatmentStack_vitals_confirmButton_TouchRect) test.compare(confirm_button.enabled, True, "Valid Blood Pressure and Heart is entered therefore confirm button is enabled") saved_time = utility.get_current_date_and_time(date_format='%m/%d/%Y %H:%M:%S')