Index: shared/scripts/names.py
===================================================================
diff -u -r85ee02c219e997e7c159fd7f08e48a9248c9007a -r1736438294d7726ab9e020b057c05287a4e9e324
--- shared/scripts/names.py	(.../names.py)	(revision 85ee02c219e997e7c159fd7f08e48a9248c9007a)
+++ shared/scripts/names.py	(.../names.py)	(revision 1736438294d7726ab9e020b057c05287a4e9e324)
@@ -39,7 +39,7 @@
 o_PreTreatmentBase_CONFIRM_Text = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True}
 o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate = {"container": o_PreTreatmentCreateStack_PreTreatmentCreateStack, "objectName": "_PreTreatmentCreate", "type": "PreTreatmentCreate", "visible": True}
 o_PreTreatmentCreate_bloodFlowRate_SliderCreateTreatment = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,  "objectName": "_bloodFlowRate", "type": "SliderCreateTreatment", "visible": True}
-o_PreTreatmentCreate_bloodFlowRateSlider_Slider = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_bloodFlowRateSlider", "type": "Slider", "visible": True}
+# o_PreTreatmentCreate_bloodFlowRateSlider_Slider = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_bloodFlowRateSlider", "type": "Slider", "visible": True}
 o_PreTreatmentCreate_dialysateFlowRate_SliderCreateTreatment = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,  "objectName": "_dialysateFlowRate", "type": "SliderCreateTreatment", "visible": True}
 o_PreTreatementCreateStack_PreTreatmentBase_TreatmentFlowBase = {"container":o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase,"objectName":"_PreTreatmentBase","type":"TreatmentFlowBase", "visible": True}
 o_treatmentStack_treatmentHome_TreatmentHome = {"container": o_treatmentStack_TreatmentStack, "id": "_treatmentHome", "type": "TreatmentHome", "unnamed": 1, "visible": True}
@@ -300,7 +300,7 @@
 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}
+o_PreTreatmentCreate_bloodFlowRate_SliderCreateTreatment = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,"objectName": "_bloodFlowRate", "type": "SliderCreateTreatment", "visible": True}
 o_PreTreatmentBase_confirmButton_TouchRect_2 = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "objectName": "_confirmButton", "type": "TouchRect", "visible": True}
 o_PreTreatmentCreate_heparinDispensingRate_SliderCreateTreatment = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_heparinDispensingRate", "type": "SliderCreateTreatment", "visible": True}
 o_PreTreatmentBase_backgroundRect_Rectangle_2 = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True}
@@ -436,6 +436,9 @@
 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_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}
@@ -449,6 +452,10 @@
 
 
 #prescription object propert's
+
+# o_PreTreatmentCreate_bloodFlowRateSlider_Slider = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_bloodFlowRateSlider", "type": "Slider", "visible": True}
+o_PreTreatmentCreate_bloodFlowRateSlider_Slider = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_bloodFlowRateSlider", "type": "Slider", "visible": True}
+
 o_PreTreatmentCreate_dialysateFlowRateSlider_Slider = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,  "objectName": "_dialysateFlowRateSlider", "type": "Slider", "visible": True}
 o_PreTreatmentCreate_durationSlider_Slider = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_durationSlider", "type": "Slider", "visible": True}
 o_PreTreatmentCreate_heparinDispensingRateSlider_Slider = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,  "objectName": "_heparinDispensingRateSlider", "type": "Slider", "visible": True}
@@ -526,11 +533,7 @@
 o_keyboard_switch = {"container": o_Gui_MainView, "id": "_shiftKeyIcon", "source": "qrc:/plugins/QtQuick/VirtualKeyboard/Styles/denali/images/iShiftNormal.svg", "type": "Image", "unnamed": 1, "visible": True}
 o_keyboard_switch2 = {"container": o_Gui_MainView, "id": "_shiftKeyIcon", "source": "qrc:/plugins/QtQuick/VirtualKeyboard/Styles/denali/images/iShiftActive.svg", "type": "Image", "unnamed": 1, "visible": True}
 
-#text and bullet object
-o_text_object = {"type": "Text", "unnamed": 1, "visible": True}
-o_bullet_object = {"type": "StepBullet", "unnamed": 1, "visible": True}
 
-
 #disposable
 o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_preTreatmentDisposablesStack", "type": "PreTreatmentDisposablesStack", "visible": True}
 o_preTreatmentDisposablesStack_preTreatmentDisposablesSelfTest_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesSelfTest", "type": "TreatmentFlowBase", "visible": True}
@@ -806,6 +809,11 @@
 o_right_arrow = {"id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True}
 o_image_path = {"type": "Image", "unnamed": 1, "visible": True}
 o_interval_obj = {"container":o_treatmentStack_treatmentHome_TreatmentHome, "id": "_text", "type": "Text", "unnamed": 1, "visible": True}
+o_PreTreatmentCreate_Rectangle = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "type": "Rectangle", "unnamed": 1, "visible": True}
+o_PreTreatmentCreate_heparinDispensingRateSwitch_Switch = {"checkable": True, "container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinDispensingRateSwitch", "type": "Switch", "unnamed": 1, "visible": True}
+o_PreTreatmentCreate_heparinBolusVolumeSwitch_Switch = {"checkable": True, "container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinBolusVolumeSwitch", "type": "Switch", "unnamed": 1, "visible": True}
+o_PreTreatmentCreate_OFF_Text = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "text": "OFF", "type": "Text", "unnamed": 1, "visible": True}
+o_PreTreatmentCreate_OFF_Text_2 = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "occurrence": 2, "text": "OFF", "type": "Text", "unnamed": 1, "visible": True}
 
 
 # #settings_Home
@@ -899,10 +907,6 @@
 o_end_treatment_state_rejection_msg = {"container": o_EndTreatmentEndStack_EndTreatmentEndStack, "type": "Text", "unnamed": 1, "visible": True}
 
 
-#Recirculate State
-o_text_object = {"type": "Text", "unnamed": 1, "visible": True}
-o_bullet_object = {"type": "StepBullet", "unnamed": 1, "visible": True}
-
 #Containers for recirculate state
 o_EndTreatmentRecirculateStack_EndTreatmentRecirculateStack = {"container": o_Gui_MainView, "objectName": "_EndTreatmentRecirculateStack", "type": "EndTreatmentRecirculateStack", "visible": True}
 o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase = {"container": o_EndTreatmentRecirculateStack_EndTreatmentRecirculateStack, "objectName": "_EndTreatmentBase", "type": "EndTreatmentBase", "visible": True}
@@ -1036,3 +1040,4 @@
 
 
 
+