Index: suite_leahi/shared/scripts/configuration/utility.py
===================================================================
diff -u -rc7d96b722594bb29a7bbc3689715b90af6e3d616 -rb29968830a0ad7bfb6b1711404ece8e3f6b656eb
--- suite_leahi/shared/scripts/configuration/utility.py	(.../utility.py)	(revision c7d96b722594bb29a7bbc3689715b90af6e3d616)
+++ suite_leahi/shared/scripts/configuration/utility.py	(.../utility.py)	(revision b29968830a0ad7bfb6b1711404ece8e3f6b656eb)
@@ -2,14 +2,14 @@
 import test
 import object
 import names
+from squish import *
+from leahi_dialin.ui import utils
+from datetime import datetime
 from leahi_dialin.ui.td_messaging import TD_Messaging
-from leahi_dialin.common.td_defs import TDOpModes,TDTreatmentStates
 from configuration import config, navigation
 
 td =TD_Messaging()
-from leahi_dialin.ui import utils
-from builtins import int as pyInt
-   
+
 def get_object_from_names(names_dict, error_message = "Missing object", timeout_ms = 200):
     """
         To get an object with try..except catching to prevent script errors when the object is not found on the GUI
@@ -136,14 +136,16 @@
     set_value_based_on_target(names.o_PreTreatmentCreate_bloodFlowRateControl_ValueAdjuster, 60)
     set_value_based_on_target(names.o_PreTreatmentCreate_dialysateFlowRateControl_ValueAdjuster, 75)
     set_value_based_on_target(names.o_PreTreatmentCreate_durationControl_ValueAdjuster, 75)
-    set_value_based_on_target(names.o_PreTreatmentCreate_heparinBolusVolumeControl_ValueAdjuster, 0.4)
-    set_value_based_on_target(names.o_PreTreatmentCreate_heparinDispensingRateControl_ValueAdjuster, 0.5)
-    set_value_based_on_target(names.o_PreTreatmentCreate_heparinStopTimeControl_ValueAdjuster, 60)
+    heparinValue =navigation.get_ini_value("/home/denali/Public/luis/config/configurations/Settings/System.conf", section ="Feature Configurations", key ="HeparinSyringePump")
+    if heparinValue == "1":
+        set_value_based_on_target(names.o_PreTreatmentCreate_heparinBolusVolumeControl_ValueAdjuster, 0.4)
+        set_value_based_on_target(names.o_PreTreatmentCreate_heparinDispensingRateControl_ValueAdjuster, 0.5)
+        set_value_based_on_target(names.o_PreTreatmentCreate_heparinStopTimeControl_ValueAdjuster, 60)
     select_different_dropdown(names.o_PreTreatmentCreate_acidConcentrateComboBox_BaseComboBox,config.ACID_CONCENTRATE,2)
     set_value_based_on_target(names.o_PreTreatmentCreate_dialysateTemperatureControl_ValueAdjuster,37.0)
     select_different_dropdown(names.o_PreTreatmentCreate_dialyzerTypeComboBox_BaseComboBox,config.DIALYZER_TYPE,2)
     set_value_based_on_target(names.o_PreTreatmentCreate_salineBolusVolumeControl_ValueAdjuster, 200)
-    select_different_dropdown(names.o_PreTreatment_vitalsCombobox_BaseCombobox,config.VITALS,1)
+    set_value_based_on_target(names.o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom,1)
     select_different_dropdown(names.o_PreTreatmentCreate_bicarbonateConcentrateComboBox_BaseComboBox,config.BICARBONATE,0)
     Validatebutton = setObjectText(obj = names.o_preTreatmentStack_Text, text =config.VALIDATE)
     squish.mouseClick(squish.waitForObject(Validatebutton))
@@ -167,10 +169,9 @@
                                             vDialysateTempRejectReason                   = 0,
                                             vHeparinDispensingRateRejectReason           = 0,
                                             vHeparinBolusVolumeRejectReason              = 0
-                                           )
-    
-    confirmButton = setObjectText(obj = names.o_preTreatmentStack_Text,text = config.CONFIRM )
-    squish.mouseClick(squish.waitForObject(confirmButton))
+                                            )
+    confirm = squish.waitForObjectExists(names.o_preTreatmentStack_confirmButton_ConfirmButton, 3000)
+    squish.mouseClick(confirm)
     test.endSection()
     
 def findAllObjectsById(parent, target_id):
@@ -189,11 +190,7 @@
         results.extend(findAllObjectsById(child, target_id))
 
     return results
- 
 
-
-
-
 def set_value_with_slider(value_field_obj, slider_obj,parameter):
     """
     Opens the slider and moves it gradually to the target value (step of 10).
@@ -220,13 +217,15 @@
         final_value = waitForObject(value_field_obj).value
         test.verify(final_value!= value, f"{parameter} slider adjusted correctly to {final_value}")
         squish.mouseRelease(slider, squish.Qt.LeftButton)
-        
         if object.exists(slider_obj):
             test.log(f"Waiting for {parameter} slider to close...")
-        
             waitFor(lambda: not object.exists(slider_obj), 1000)
     except LookupError as e:
         test.fail(f"{parameter}: LookupError - {e}")
+                
+def get_current_date_and_time(date_format='%Y/%b/%d - %H:%M'):
+    date = datetime.now()
+    return str(date.strftime(date_format))
         
 def click_left_until_off(object_name):
     """