Index: shared/scripts/configuration/config.py =================================================================== diff -u -re5ab0ad79b3678b7827152eee916aefa73493786 -r122e2381f21a1534424c61059dc720c756710cd8 --- shared/scripts/configuration/config.py (.../config.py) (revision e5ab0ad79b3678b7827152eee916aefa73493786) +++ shared/scripts/configuration/config.py (.../config.py) (revision 122e2381f21a1534424c61059dc720c756710cd8) @@ -72,11 +72,6 @@ KEYBOARD_SWITCH = ["ABC", "&123"] -HEPARIN_TYPE = "UFH 1,000 IU/mL" -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"] - TREATMENT_UNHIGHLIGHTED_COLOR = "#000000" TREATMENT_HIGHLIGHTED_COLOR = "#135088" @@ -95,7 +90,6 @@ VENOUS_VALUE_570 = 570 POSITIVE_BUFFER = 10 NEGATIVE_BUFFER = -10 - NUM_OF_ALARM_PRIORITIES = 4 # Total number of alarm priorities @@ -240,9 +234,9 @@ "Blood Flow Rate": [100, 125, 150, 175, 200, 225, 250, 275, 300, 325, 350, 375, 400, 425, 450, 475, 500], "Dialysate Flow Rate": [100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 600], "Duration": [60, 75, 90, 105, 120, 135, 150, 165, 180, 195, 240, 255, 270, 285, 300, 315, 330, 345, 360, 375, 390, 405, 420, 435, 450, 465, 480], - "Heparin Dispensing Rate": [0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1, 0], - "Heparin Bolus Volume": [0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2, 0], - "Heparin Stop Time": [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 210, 220, 230, 240, 250, 260, 270, 280, 290, 300, 310, 320, 330, 340, 350, 360, 370, 380, 390, 400, 410, 420, 430, 440, 450, 460, 470, 0], + "Heparin Dispensing Rate": [0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1], + "Heparin Bolus Volume": [0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2], + "Heparin Stop Time": [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 210, 220, 230, 240, 250, 260, 270, 280, 290, 300, 310, 320, 330, 340, 350, 360, 370, 380, 390, 400, 410, 420, 430, 440, 450, 460, 470, 480], "Saline Bolus Volume": [100, 200, 300], "Dialysate Temperature": [35.0, 35.5, 36.0, 36.5, 37.0], "Blood Pressure Measurement Interval": [0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 0], @@ -255,9 +249,9 @@ "blood_flow_rate" : [100, 25, 46], "dialysate_flow_rate" : [100, 50, 75], "duration" : [60, 15, 26.6], - "heparin_dispensing_rate" : [0.2, 0.4, 0.6], - "heparin_bolus_volume" : [0.2, 0.4, 0.6], - "heparin_stop_time" : [0, 10, 15.9], + "heparin_dispensing_rate" : [0.2, 0.1, 93], + "heparin_bolus_volume" : [0.2, 0.1, 41], + "heparin_stop_time" : [0, 10, 15.5], "saline_bolus" : [100, 100, 375], "dialysate_temperature" : [35, 0.5, 187.5], "arterial_pressure_limit_high" : [20, 10, 11.931], @@ -479,4 +473,3 @@ } - Index: shared/scripts/configuration/strings.py =================================================================== diff -u -ra12a47b9685a630565ff5764d3597eb766c4c4c1 -r122e2381f21a1534424c61059dc720c756710cd8 --- shared/scripts/configuration/strings.py (.../strings.py) (revision a12a47b9685a630565ff5764d3597eb766c4c4c1) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision 122e2381f21a1534424c61059dc720c756710cd8) @@ -298,7 +298,7 @@ HEPARIN_TYPE = "UFH 1,000 IU/mL" 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"] +DIALYZER_TYPE = ["BB Diacap Pro 13H", "BB Diacap Pro 16H", "BB Diacap Pro 19H", "F Optiflux F160NRe", "F Optiflux F180NRe", "F Optiflux F200NRe"] TREATMENT_REVIEW_TITLE_TEXT = "Treatment Review" EXPORT_TEXT = "Export" CODE_TEXT = "Code: " @@ -747,7 +747,7 @@ HEPARIN_TYPE = "UFH 1,000 IU/mL" 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"] +DIALYZER_TYPE = ["BB Diacap Pro 13H", "BB Diacap Pro 16H", "BB Diacap Pro 19H", "F Optiflux F160NRe", "F Optiflux F180NRe", "F Optiflux F200NRe"] CONFIRM_TREATMENT_TITLE = "Confirm Treatment" PRESCRIPTION_TITLE = "PRESCRIPTION" OPERATING_PARAMETERS_TITLE = "OPERATING PARAMETERS" @@ -801,11 +801,12 @@ 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_UNHIGHLIGHTED_COLOR = "#000000" -TREATMENT_HIGHLIGHTED_COLOR = "#135088" -OFF_TEXT = "OFF" + BACK_TEXT = "BACK" CONTINUE_TEXT = "CONTINUE" +SKIP_TEXT = "SKIP" +OFF_TEXT = "OFF" +ON_TEXT = "ON" PRESCRIPTION_DETAILS = { "Blood Flow Rate": "mL/min", "Dialysate Flow Rate": "mL/min", Index: shared/scripts/names.py =================================================================== diff -u -r1736438294d7726ab9e020b057c05287a4e9e324 -r122e2381f21a1534424c61059dc720c756710cd8 --- shared/scripts/names.py (.../names.py) (revision 1736438294d7726ab9e020b057c05287a4e9e324) +++ shared/scripts/names.py (.../names.py) (revision 122e2381f21a1534424c61059dc720c756710cd8) @@ -436,15 +436,13 @@ o_prescription_title_text = {"container": o_PreTreatmentCreateStack_PreTreatmentConfirm_TreatmentFlowBase, "objectName": "ConfirmTreatmentTable_prescription", "type": "Text", "visible": True} o_input_patient_id = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} o_confirm_button = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "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_create_treatment_skip_button = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "text": "SKIP", "type": "Text", "unnamed": 1, "visible": True} +o_create_treatment_continue_button = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "text": "CONTINUE", "type": "Text", "unnamed": 1, "visible": True} o_back_button_confirm_treatment = {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True} - o_headerRect_Rectangle = {"container": o_Overlay, "id": "_headerRect", "type": "Rectangle", "unnamed": 1, "visible": True} o_resumeButton_TouchRect = {"container": o_Overlay, "id": "_resumeButton", "type": "TouchRect", "unnamed": 1, "visible": True} o_editButton_TouchRect = {"container": o_Overlay, "id": "_editButton", "type": "TouchRect", "unnamed": 1, "visible": True} - o_PreTreatmentCreate_progressRect_ProgressRect = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_progressRect", "type": "ProgressRect", "unnamed": 1, "visible": True} #page step indicator verification o_PreTreatmentCreate_gridSteps_Grid = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_gridSteps", "type": "Grid", "unnamed": 1, "visible": True} @@ -489,7 +487,12 @@ o_PreTreatmentCreate_dialyzerTypeRect2_TouchRect = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_dialyzerTypeRect2", "type": "TouchRect", "visible": True} o_PreTreatmentCreate_dialyzerTypeRect3_TouchRect = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_dialyzerTypeRect3", "type": "TouchRect", "visible": True} o_PreTreatmentCreate_dialyzerTypeRect4_TouchRect = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_dialyzerTypeRect4", "type": "TouchRect", "visible": True} +o_PreTreatmentCreate_dialyzerTypeRect5_TouchRect = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_dialyzerTypeRect5", "type": "TouchRect", "visible": True} +o_PreTreatmentCreate_heparinDispensingRateValue_switch = {"checkable": True, "container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinDispensingRateSwitch", "type": "Switch", "unnamed": 1, "visible": True} +o_PreTreatmentCreate_heparinDispensingRateValue_On_Text = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "text": "ON", "type": "Text", "unnamed": 1, "visible": True} o_PreTreatmentCreate_heparinDispensingRateValue_Text = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_heparinDispensingRateValue", "type": "Text", "visible": True} +o_PreTreatmentCreate_heparinBolusVolumeValue_switch = {"checkable": True, "container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinBolusVolumeSwitch", "type": "Switch", "unnamed": 1, "visible": True} +o_PreTreatmentCreate_heparinBolusVolumeValue_On_Text = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "text": "ON", "type": "Text", "unnamed": 1, "visible": True} o_PreTreatmentCreate_heparinBolusVolumeValue_Text = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_heparinBolusVolumeValue", "type": "Text", "visible": True} o_PreTreatmentCreate_heparinStopTimeValue_Text = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_heparinStopTimeValue", "type": "Text", "visible": True} o_PreTreatmentCreate_bloodPressureMeasurementIntervalValue_Text = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_bloodPressureMeasurementIntervalValue", "type": "Text", "visible": True}