Index: shared/scripts/configuration/config.py =================================================================== diff -u -r77357a9f5fffc498d21ad83caf2e6e2a94c05fc8 -r8a536497f2070b9552526301d74114bdf3d5fe90 --- shared/scripts/configuration/config.py (.../config.py) (revision 77357a9f5fffc498d21ad83caf2e6e2a94c05fc8) +++ shared/scripts/configuration/config.py (.../config.py) (revision 8a536497f2070b9552526301d74114bdf3d5fe90) @@ -469,7 +469,6 @@ BLOOD_PRIMING_RANGE = 300 BLOOD_PRIMING_TARGET_MAXIMUM = 300 - #tst_treatment_monitoring FLOWS_TEXT = "FLOWS" BLOOD_UNIT = "mL/min" @@ -503,25 +502,6 @@ KEYBOARD_SWITCH = ["ABC", "&123"] - -#main-treatment heparin -HEPARIN_UNIT = "mL" -HEPARIN_DELIVERY_TEXT = "HEPARIN DELIVERY" -HEPARIN_DELIVERY_OFF_TEXT = "OFF" -HEPARIN_STOP_TEXT = "Delivery Stopped" -HEPARIN_RESUME_DELIVERY_TEXT = "RESUME DELIVERY" -HEPARIN_BOLUS_ACTIVE_TEXT = "Bolus Active" -HEPARIN_BOLUS_DISPENSING_TEXT = "Dispensing Active" -HEPARIN_PAUSE_DELIVERY_TEXT = "PAUSE DELIVERY" -HEPARIN_MAXIMUM_VOLUME_DELIVERED_TEXT = "Maximum Cumulative Heparin Volume Delivered" -HEPARIN_SYRINGE_EMPTY_TEXT = "Syringe Empty" - -#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", - "Rinseback Flow Rate"] -TREATMENT_PAUSED_TEXT = "Treatment Paused" - #dictionary consist of custom treatment values CREATE_CUSTOM_TREATMENT = { "Blood Flow Rate": 250, @@ -627,23 +607,11 @@ ENABLED_COLOR = '#fcfcfc' INCOMPLETE_COLOR = '#607a91' -CONSUMABLE_SELF_TEST_TEXT = "Consumables Self Test" -BICARB_PUMP_CHECK_TEXT = "BiCarb Pump Check" -ACID_PUMP_CHECK_TEXT = "Acid Pump Check" -SELF_TEST_COMPLETE_TEXT = "Self Test Complete!" - - #pre-treatment_priming NOT_VISIBLE = False VISIBLE = True FOCUS = True NOT_IN_FOCUS = False -BUSY = "Busy" -CHECK = "Check" -BEGIN_PRIME_TITLE = "Begin Prime" -PRIMING_TITLE = "Priming" -SYSTEM_SELF_TEST_TITLE = "System Self Test" -FILTER_FLUSH_TITLE = "Filter Flush" TIME_OUT_DURATION_300 = 300 TIME_OUT_DURATION_200 = 200 TIME_OUT_DURATION_100 = 100 @@ -652,31 +620,15 @@ ENABLED = True DISABLED = False CONSUMABLE_SELF_TEST_BICARB_PUMP_CHECK_STATE = 3 -LOOD_PRIMING_TEXT = "Blood Priming" -SALINE_UNIT = "mL" -BLOOD_PRIMING_DEFAULT_VALUE = "0 mL" + #Pre-Treatment Disposables -NEXT_BUTTON_TEXT = "NEXT" -BACK_BUTTON_TEXT = "BACK" ENABLED = True DISABLED = False -CONFIRM_BUTTON_TEXT = "CONFIRM" - #Filter Flush ACCEPTED = True REJECTED = False -#Pre_treatment_water_sample -SAMPLE_TEXT = "Sample" -CREATE_TEXT = "Create" -NEXT_BUTTON_TEXT = "NEXT" -WATER_SAMPLE_BUTTON_TEXT = "WATER SAMPLE" -BACK_BUTTON_TEXT = "BACK" -PASS_TEXT = "PASS" -FAIL_TEXT = "FAIL" -OK_TEXT = "OK" - # pretreatment_patient_connection SYSTOLIC_PRESSSURE_120 = 120 SYSTOLIC_PRESSSURE_113 = 113 @@ -730,13 +682,3 @@ "OPTION_12" : {"uf_maximum" : 1250, "uf_minimum" : 0}, } -ACCEPTED = True -REJECTED = False - -#pretreatment_screen_bullets -PRE_TREATMENT_SCREENS = ["Create" , "Sample" , "Consumables" , "Disposables" , "Prime" , "Ultrafiltration" , "BP/HR" , "Connection" , "Start"] - -CURRENT_COLOR = '#000000' -COMPLETE_COLOR= '#4290ec' -ENABLED_COLOR = '#fcfcfc' -INCOMPLETE_COLOR = '#607a91' Index: shared/scripts/configuration/strings.py =================================================================== diff -u -ra4f1e264727015d92baa065dde52c33c0bc33ef3 -r8a536497f2070b9552526301d74114bdf3d5fe90 --- shared/scripts/configuration/strings.py (.../strings.py) (revision a4f1e264727015d92baa065dde52c33c0bc33ef3) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision 8a536497f2070b9552526301d74114bdf3d5fe90) @@ -153,4 +153,94 @@ OPERATIONAL_PARAMETERS = {"Heparin Type": HEPARIN_TYPE, "Acid Concentrate": "Fres. Naturalyte", "Bicarbonate Concentrate": BICARBONATE_CONCENTRATE, "Dialyzer Type": "BB Diacap Pro 16H"} - \ No newline at end of file + + +#tst_treatment_monitoring +FLOWS_TEXT = "FLOWS" +BLOOD_UNIT = "mL/min" +DIALYSATE_TEXT = "Dialysate" +BLOOD_TEXT = "Blood" +VITALS_TEXT = "VITALS" +BLOOD_PRESSURE_TEXT = "mmHg" +HEARTRATE_UNIT = "BPM" +PRESSURE_TEXT = "PRESSURE (mmHg)" +ARTEREAL_TEXT = "Arterial" +VENOUS_TEXT = "Venous" +TIME_DURATION_TEXT = "Time Remaining" +ULTRAFILTERATION_TEXT = "ULTRAFILTRATION VOLUME (L)" +SALINE_BOLUS = "SALINE BOLUS" +VOLUME_DELIVERED = "Volume Delivered" +CUMULATIVE_DELIVERED = "Cumulative Delivered" +HEPARIN_TEXT = "HEPARIN" +VOLUME_DELIVERED = "Volume Delivered" + +#patient id +PATIENT_ID = { + "qwerty" : "qwerty", + "sampleid" : "sampleid", + "abcdefghijklmnop" : "abcdefghijklmnop", + "patientid" : "patientid", + "username" : "username", + "sA@MpLE#123" : "sAMpLE123", + "A@BH&321" : "ABH321", + "5432@qwerty" : "5432qwerty" +} + +KEYBOARD_SWITCH = ["ABC", "&123"] + + +#main-treatment heparin +HEPARIN_UNIT = "mL" +HEPARIN_DELIVERY_TEXT = "HEPARIN DELIVERY" +HEPARIN_DELIVERY_OFF_TEXT = "OFF" +HEPARIN_STOP_TEXT = "Delivery Stopped" +HEPARIN_RESUME_DELIVERY_TEXT = "RESUME DELIVERY" +HEPARIN_BOLUS_ACTIVE_TEXT = "Bolus Active" +HEPARIN_BOLUS_DISPENSING_TEXT = "Dispensing Active" +HEPARIN_PAUSE_DELIVERY_TEXT = "PAUSE DELIVERY" +HEPARIN_MAXIMUM_VOLUME_DELIVERED_TEXT = "Maximum Cumulative Heparin Volume Delivered" +HEPARIN_SYRINGE_EMPTY_TEXT = "Syringe Empty" + +#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", + "Rinseback Flow Rate"] +TREATMENT_PAUSED_TEXT = "Treatment Paused" + + +#pre-treatment +CONSUMABLE_SELF_TEST_TEXT = "Consumables Self Test" +BICARB_PUMP_CHECK_TEXT = "BiCarb Pump Check" +ACID_PUMP_CHECK_TEXT = "Acid Pump Check" +SELF_TEST_COMPLETE_TEXT = "Self Test Complete!" +BUSY = "Busy" +CHECK = "Check" +BEGIN_PRIME_TITLE = "Begin Prime" +PRIMING_TITLE = "Priming" +SYSTEM_SELF_TEST_TITLE = "System Self Test" +FILTER_FLUSH_TITLE = "Filter Flush" +SALINE_UNIT = "mL" +BLOOD_PRIMING_DEFAULT_VALUE = "0 mL" +BLOOD_PRIMING_TEXT = "Blood Priming" +#Pre-Treatment Disposables +NEXT_BUTTON_TEXT = "NEXT" +BACK_BUTTON_TEXT = "BACK" +CONFIRM_BUTTON_TEXT = "CONFIRM" + +#Pre_treatment_water_sample +SAMPLE_TEXT = "Sample" +CREATE_TEXT = "Create" +NEXT_BUTTON_TEXT = "NEXT" +WATER_SAMPLE_BUTTON_TEXT = "WATER SAMPLE" +BACK_BUTTON_TEXT = "BACK" +PASS_TEXT = "PASS" +FAIL_TEXT = "FAIL" +OK_TEXT = "OK" + +#priming +TEST_DRY_STEPS = ["Used Cartridge Check", "Occlusion Sensors Check", "Pressure Sensors Check", "Syringe Pump Check"] +PRIMING_STEPS = ["Blood Circuit Priming", "Dialysate Circuit Priming", "Wet Self Tests"] +SELF_TEST_COMPLETION_MSG = "Self Test Complete!" +PRIMING_COMPLETE_MSG = "Priming Complete!" + + Index: shared/scripts/configuration/utility.py =================================================================== diff -u -re9d97fc0bfd110d3f15396cb78108b2b3d590f5a -r8a536497f2070b9552526301d74114bdf3d5fe90 --- shared/scripts/configuration/utility.py (.../utility.py) (revision e9d97fc0bfd110d3f15396cb78108b2b3d590f5a) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 8a536497f2070b9552526301d74114bdf3d5fe90) @@ -41,7 +41,7 @@ handle the application for log """ test.compare(config.COLOR_CODES[color_name],(act_val.color[name])) - + def check_if_object_is_within_the_container(obj=None, container=None): """ check if an object is inside a container @@ -888,12 +888,14 @@ time_text = progress_circle_children[1] return time_text.time -def verify_countdown(screen_title, time_out): +def verify_countdown(screen_title, time_out, hd_simulator, dg_simulator): """ Method to verify the count down time in application @param screen_title - (str) current title of the screen @param time_out - (int) time out duration in secs + @Param hd_simulator - Instance of class HDSimulator + @Param dg_simulator - Instance of class DGSimulator """ test.startSection("Verify the count down time in application") for count_down in range(config.COUNT_DOWN_TIME_100, config.MINIMUM_COUNTDOWN_TIME-1, -1):