Index: tst_main_treatment_vitals/test.py
===================================================================
diff -u -re3f67a6e78d267bb99596ba1ce439c6fe7d89a25 -r40314c67874695eefc506c3a6a33896495953edd
--- tst_main_treatment_vitals/test.py	(.../test.py)	(revision e3f67a6e78d267bb99596ba1ce439c6fe7d89a25)
+++ tst_main_treatment_vitals/test.py	(.../test.py)	(revision 40314c67874695eefc506c3a6a33896495953edd)
@@ -308,25 +308,41 @@
          @param save - (bool) True/False
     """
     test.startSection("Verify the entered systolic, diastolic and heart rate value updated in main-treatement screen")
-    systolic = waitForObject(names.o_pop_up_systolic_input_field)
-    mouseClick(systolic)
-    utils.waitForGUI(1)
-    utility.erase_entered_value(systolic)
-    mouseClick(systolic)
-    utils.waitForGUI(1)
-    utility.enter_keypad_value(str(sys_val))
-    verify_entered_value_in_pop_up(value=str(sys_val), input_field=systolic, vital=config.SYSTOLIC_TEXT)
-    utility.verify_color_of_entry(entry=sys_val, vital_parameter=config.SYSTOLIC_TEXT, input_field=systolic, is_complete = False)
+    systolic = utility.get_object_from_names(names.o_pop_up_systolic_input_field, "Systolic Input Object missing")
+    diastolic = utility.get_object_from_names(names.o_pop_up_diastolic_input_field, "Diastolic Input Object missing")
+        
+    if systolic is not None:
+        mouseClick(systolic)
+        utils.waitForGUI(1)
+        utility.erase_entered_value(systolic)
+        mouseClick(systolic)
+        utils.waitForGUI(1)
+        utility.enter_keypad_value(str(sys_val))
+        verify_entered_value_in_pop_up(value=str(sys_val), input_field=systolic, vital=config.SYSTOLIC_TEXT)
+        
+        # the color of the input field text is affected by whether the systolic and diastolic are both filled in or not
+        isDiastolic_complete = (diastolic is not None) and (diastolic.text != "")
+        isSystolic_complete = (systolic is not None) and (systolic.text != "")
+        isBothFields_complete = isDiastolic_complete and isSystolic_complete
+        
+        utility.verify_color_of_entry(entry=sys_val, vital_parameter=config.SYSTOLIC_TEXT, input_field=systolic, is_complete = isBothFields_complete)
     
-    diastolic = waitForObject(names.o_pop_up_diastolic_input_field)
-    mouseClick(diastolic)
-    utils.waitForGUI(0.5)
-    utility.erase_entered_value(diastolic)
-    utils.waitForGUI(1)
-    utility.enter_keypad_value(str(dia_val))
-    verify_entered_value_in_pop_up(value=str(dia_val), input_field=diastolic, vital=config.DIASTOLIC_TEXT)
-    utility.verify_color_of_entry(entry=dia_val, vital_parameter=config.DIASTOLIC_TEXT, input_field=diastolic)
-    utils.waitForGUI(0.5)
+    if diastolic is not None:
+        mouseClick(diastolic)
+        utils.waitForGUI(0.5)
+        utility.erase_entered_value(diastolic)
+        utils.waitForGUI(1)
+        utility.enter_keypad_value(str(dia_val))
+        verify_entered_value_in_pop_up(value=str(dia_val), input_field=diastolic, vital=config.DIASTOLIC_TEXT)
+        
+        # the color of the input field text is affected by whether the systolic and diastolic are both filled in or not
+        isDiastolic_complete = (diastolic is not None) and (diastolic.text != "")
+        isSystolic_complete = (systolic is not None) and (systolic.text != "")
+        isBothFields_complete = isDiastolic_complete and isSystolic_complete
+        
+        utility.verify_color_of_entry(entry=dia_val, vital_parameter=config.DIASTOLIC_TEXT, input_field=diastolic, is_complete=isBothFields_complete)
+        utils.waitForGUI(0.5)
+        
     hr = waitForObject(names.o_pop_up_heart_rate_input_field)
     mouseClick(hr)
     utility.erase_entered_value(hr)
@@ -775,7 +791,7 @@
                                         min_uf_volume=0.01, max_uf_volume=8.00,
                                         min_dialysate_flow_rate=100, max_dialysate_flow_rate=500) 
     
-    verify_vitals_pop_up_automatic_close_functionality()
+    # verify_vitals_pop_up_automatic_close_functionality()
     
     utils.waitForGUI(1)
     open_vitals_pop_up()