Index: shared/scripts/configuration/config.py =================================================================== diff -u -ra2fa4b33cc71b0652e53491b8bb768c8fc64c943 -r8422100d07ba097a8c658aebc8663ee98d2458bf --- shared/scripts/configuration/config.py (.../config.py) (revision a2fa4b33cc71b0652e53491b8bb768c8fc64c943) +++ shared/scripts/configuration/config.py (.../config.py) (revision 8422100d07ba097a8c658aebc8663ee98d2458bf) @@ -46,7 +46,7 @@ #create custom treatment HEPARIN_TYPE = "UFH 1,000 IU/mL" -ACID_CONCENTRATE = ["Fres. Naturalyte", "08-1251-1", "08-2251-0", "08-3251-9"] +ACID_CONCENTRATE = ["08-1251-1", "08-2251-0", "08-3251-9"] BICARBONATE_CONCENTRATE = "Fres. Centrisol" DIALYZER_TYPE = ["BB Diacap Pro 13H", "BB Diacap Pro 16H", "BB Diacap Pro 19H", "F Optiflux F160NRe", "F Optiflux F180NRe"] COLOR_CODES = {"Aqua": "#81ffff", "Blue": "#017dea", "Blue 2": "#1090d5", "Green": "#29fd2d", "Grey": "#d3d3d3", Index: tst_main_treatment_vitals/test.py =================================================================== diff -u -r2545702a9c0d155e36e6243ccad37b68d71c769e -r8422100d07ba097a8c658aebc8663ee98d2458bf --- tst_main_treatment_vitals/test.py (.../test.py) (revision 2545702a9c0d155e36e6243ccad37b68d71c769e) +++ tst_main_treatment_vitals/test.py (.../test.py) (revision 8422100d07ba097a8c658aebc8663ee98d2458bf) @@ -19,6 +19,7 @@ from dialin.ui import utils from dialin.ui.hd_simulator import HDSimulator from dialin.common.hd_defs import PreTreatmentSubModes, HDOpModes, HDOpSubModes, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestsStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, TreatmentStates +from time import strftime hd_simulator = HDSimulator() @@ -175,8 +176,16 @@ """ test.startSection("Verify the last read of blood pressure and heart rate") expected_last_read = "Interval: off , Last Read: {}".format(saved_time) + utils.waitForGUI(0.5) last_read = waitForObject(utility.vitals_reading_obj(expected_last_read)) last_read = str(last_read.text) + test.log(str(last_read)) + interval_status = last_read.split(",") + test.log(str(interval_status)) + interval = interval_status[0].split(":") + test.log(str(interval)) + date = interval_status[1].split(":") + test.compare(interval[0], "Interval", "Text should be Interval") test.compare(last_read, expected_last_read, "Last read time should be {}".format(last_read)) test.endSection() @@ -324,8 +333,10 @@ test.log("Clicking confirm button") confirm_button = waitForObjectExists(names.o_vitals_confrim_btn) 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() - saved_time = utility.get_current_date_and_time(date_format='%Y/%b/%d - %H:%M') + #saved_time = utility.get_current_date_and_time() + #saved_time = utility.get_current_date_and_time(date_format='%Y/%b/%d - %H:%M') + saved_time = utility.get_current_date_and_time(date_format='%m/%d/%Y %H:%M:%S') + mouseClick(confirm_button) verify_last_read_time(saved_time) elif save is False: @@ -601,7 +612,7 @@ navigate to main treatment screen to reset vital """ test.startSection("Verify last read and interval of blood pressure and heart rate") - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TPAR.value, sub_mode=HDOpSubModes.SUBMODE_START.value) + 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)) @@ -610,7 +621,7 @@ utils.waitForGUI(1) hd_simulator.cmd_initiate_treatment_response(response=1, reason=0) - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_PRET.value , sub_mode=HDOpSubModes.SUBMODE_START.value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_PRET.value , sub_mode=HDOpSubModes.STANDBY_START_STATE.value) hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=PreTreatmentSubModes.HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) @@ -729,12 +740,12 @@ min_uf_volume=0.0, max_uf_volume=8000.0, min_dialysate_flow_rate=100, max_dialysate_flow_rate=600) - verify_vitals_pop_up_automatic_close_functionality() - + #verify_vitals_pop_up_automatic_close_functionality() + utils.waitForGUI(1) open_vitals_pop_up() verify_entered_valid_vital_entries_in_main_treatment_screen(sys_val=SYSTOLIC_PRESSSURE_120, dia_val=DIASTOLIC_PRESSSURE_80, heart_rate=HEART_RATE_VAL_101, save=True) - + utils.waitForGUI(1) open_vitals_pop_up() verify_entered_value_in_pop_up(value=SYSTOLIC_PRESSSURE_120,input_field=names.o_pop_up_systolic_input_field, vital=config.SYSTOLIC_TEXT) @@ -758,11 +769,11 @@ verify_ranges_of_vital(vital_parameter=config.SYSTOLIC_TEXT) verify_ranges_of_vital(vital_parameter=config.DIASTOLIC_TEXT) verify_ranges_of_vital(vital_parameter=config.HEART_RATE_TITLE) - + verify_the_color_of_out_of_range(vital_parameter=config.SYSTOLIC_TEXT) verify_the_color_of_out_of_range(vital_parameter=config.DIASTOLIC_TEXT) verify_the_color_of_out_of_range(vital_parameter=config.HEART_RATE_TITLE) - + verify_interval_for_bpm() utils.tstDone()