Index: suite_leahi/shared/scripts/configuration/config.py =================================================================== diff -u -re8cd90cce86be92ea2dd2bf9390366cf42c755ee -r36f9a57876839463c912185195ef380e6704b577 --- suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision e8cd90cce86be92ea2dd2bf9390366cf42c755ee) +++ suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision 36f9a57876839463c912185195ef380e6704b577) @@ -201,8 +201,16 @@ #Post treatemnt CONTINUE = "Continue" -blood_flow_prescribed = 60 -blood_flow_actual = 75 +blood_flow_prescribed = 60 +blood_flow_actual = 75 +dialysis_flow_prescribed = 80 +dialysis_flow_actual = 90 +dialyzer_type = "Dialyzer Type" +dialysate_temperature = 10.0 +dialysate_temperature_actual= 11.0 +dialysate_volume = 12.00 +acid_concentrate = 20 +acid_concentrate_actual = 30 @@ -213,9 +221,3 @@ - - - - - - Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -re8cd90cce86be92ea2dd2bf9390366cf42c755ee -r36f9a57876839463c912185195ef380e6704b577 --- suite_leahi/shared/scripts/names.py (.../names.py) (revision e8cd90cce86be92ea2dd2bf9390366cf42c755ee) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision 36f9a57876839463c912185195ef380e6704b577) @@ -407,7 +407,7 @@ #post treatement o_PostTreatmentStack_PostTreatmentStack = {"container": o_Gui_MainView, "objectName": "_PostTreatmentStack", "type": "PostTreatmentStack", } -o_PostTreatmentStack_PostTreatmentBase_PostTreatmentReview = {"container": o_PostTreatmentStack_PostTreatmentStack, "objectName": "_PostTreatmentBase", "type": "PostTreatmentReview", "visible": True} -o_PostTreatmentBase_bloodFlowDiaysate_ReviewContainer = {"container": o_PostTreatmentStack_PostTreatmentBase_PostTreatmentReview, "id": "_bloodFlowDiaysate", "type": "ReviewContainer", "unnamed": 1, "visible": True} -o_PostTreatmentBase_delegate_LabelUnitContainer = {"container": o_PostTreatmentStack_PostTreatmentBase_PostTreatmentReview, "id": "_delegate", "type": "LabelUnitContainer", "unnamed": 1, "visible": True} - +o_PostTreatmentStack_PostTreatmentBase_PostTreatmentReview = {"container": o_PostTreatmentStack_PostTreatmentStack, "objectName": "_PostTreatmentBase", "type": "PostTreatmentReview"} +o_PostTreatmentBase_bloodFlowDiaysate_ReviewContainer = {"container": o_PostTreatmentStack_PostTreatmentBase_PostTreatmentReview, "id": "_bloodFlowDiaysate", "type": "ReviewContainer", "unnamed": 1} +o_PostTreatmentBase_concentrateSettings_ReviewContainer = {"container": o_PostTreatmentStack_PostTreatmentBase_PostTreatmentReview, "id": "_concentrateSettings", "type": "ReviewContainer", "unnamed": 1} +o_PostTreatmentBase_ScrollBar = {"container": o_PostTreatmentStack_PostTreatmentBase_PostTreatmentReview, "type": "ScrollBar", "unnamed": 1} Index: suite_leahi/tst_post_treatement_tx_review/test.py =================================================================== diff -u -re8cd90cce86be92ea2dd2bf9390366cf42c755ee -r36f9a57876839463c912185195ef380e6704b577 --- suite_leahi/tst_post_treatement_tx_review/test.py (.../test.py) (revision e8cd90cce86be92ea2dd2bf9390366cf42c755ee) +++ suite_leahi/tst_post_treatement_tx_review/test.py (.../test.py) (revision 36f9a57876839463c912185195ef380e6704b577) @@ -41,11 +41,31 @@ test.compare(str(blood_flow_prescribed_initial_value.text),str(config.blood_flow_prescribed), "Blood flow prescribed value should be"+str(config.blood_flow_prescribed)) blood_flow_prescribed_actual_value = utility.findObjectById(blood_flow_prescribed_value_obj,"_actual") test.compare(str(blood_flow_prescribed_actual_value.text),str(config.blood_flow_actual), "Blood flow actual value should be"+ str(config.blood_flow_actual)) + dialysis_flow_value_obj = utility.findChildByText(blood_flow_prescribed_obj, "Dialysis Flow Rate") + dialysis_flow_value_initial_value = utility.findObjectById(dialysis_flow_value_obj, "_initial") + test.compare(str(dialysis_flow_value_initial_value.text),str(config.dialysis_flow_prescribed), "Dialysis flow prescribed value should be"+str(config.dialysis_flow_prescribed)) + dialysis_flow_value_actual_value = utility.findObjectById(dialysis_flow_value_obj,"_actual") + test.compare(str(dialysis_flow_value_actual_value.text),str(config.dialysis_flow_actual), "Dialysis flow actual value should be"+ str(config.dialysis_flow_actual)) + dialyzer_type = utility.findChildByText(blood_flow_prescribed_obj,"Dialyzer Type") + test.compare(str(dialyzer_type.text),str(config.dialyzer_type), "Dialyzer type value should be"+ str(config.dialyzer_type)) + dialysate_temp_value_obj = utility.findChildByText(blood_flow_prescribed_obj, "Dialysate Temperature") + dialysate_temp_initial_value = utility.findObjectById(dialysate_temp_value_obj, "_initial") + test.compare(str(dialysate_temp_initial_value.text),str(config.dialysate_temperature), "Dialysate temperature value should be"+str(config.dialysate_temperature)) + dialysate_temp_actual_value = utility.findObjectById(dialysate_temp_value_obj,"_actual") + test.compare(str(dialysate_temp_actual_value.text),str(config.dialysate_temperature_actual), "Dialysate temperature actual value should be"+ str(config.dialysate_temperature_actual)) + dialysate_volume_value_obj = utility.findChildByText(blood_flow_prescribed_obj, "Dialysate Volume Used") + dialysate_volume_initial_value = utility.findObjectById(dialysate_volume_value_obj, "_initial") + test.compare(f"{float(str(dialysate_volume_initial_value.text).strip()):.1f}",f"{float(str(config.dialysate_volume)):.1f}","Dialysate volume value should be " + str(config.dialysate_volume)) + mouseWheel(waitForObject(names.o_PostTreatmentBase_ScrollBar), 387, 510, 0, -45, Qt.NoModifier) + potassium_concentrate_obj = waitForObject(names.o_PostTreatmentBase_concentrateSettings_ReviewContainer) + potassium_concentrate_value_obj = utility.findChildByText(blood_flow_prescribed_obj, "Blood Flow Rate") + blood_flow_prescribed_initial_value = utility.findObjectById(blood_flow_prescribed_value_obj, "_initial") + test.compare(str(blood_flow_prescribed_initial_value.text),str(config.blood_flow_prescribed), "Blood flow prescribed value should be"+str(config.blood_flow_prescribed)) + blood_flow_prescribed_actual_value = utility.findObjectById(blood_flow_prescribed_value_obj,"_actual") + test.compare(str(blood_flow_prescribed_actual_value.text),str(config.blood_flow_actual), "Blood flow actual value should be"+ str(config.blood_flow_actual)) + - - - def main(): utils.tstStart(__file__) test.startSection("Post-Treatment Foundation") @@ -79,13 +99,13 @@ vRejectionReason = 0, vBloodFlowRate = config.blood_flow_prescribed, vBloodFlowRateActual = config.blood_flow_actual, - vDialysateFlowRate = 80, - vDialysateFlowRateActual = 90, + vDialysateFlowRate = config.dialysis_flow_prescribed, + vDialysateFlowRateActual = config.dialysis_flow_actual, vTreatmentDuration = 0, vTreatmentDurationActual = 0, - vAcidConcentrateType = 0, - vAcidConcentrateTypeActual = 20, - vBicarbonateCartridgeSize = 30, + vAcidConcentrateType = config.acid_concentrate, + vAcidConcentrateTypeActual = config.acid_concentrate_actual, + vBicarbonateCartridgeSize = 0, vBicarbonateCartridgeSizeActual = 40, vPotassiumConcentration = 50, vPotassiumConcentrationActual = 10, @@ -110,9 +130,9 @@ vHDFOperatingMode = 0, vHDFOperatingModeActual = 0, vHepatitisStatus = 0, - vDialysateTemperature = 10.0, - vDialysateTemperatureActual = 11.0, - vDialysateVolumeUsed = 12.0, + vDialysateTemperature = config.dialysate_temperature, + vDialysateTemperatureActual = config.dialysate_temperature_actual, + vDialysateVolumeUsed = config.dialysate_volume, vHeparinBolusVolume = 13.0, vHeparinBolusVolumeActual = 14.0, vHeparinDispenseRate = 15.0,