Index: suite_leahi/shared/scripts/configuration/config.py =================================================================== diff -u -r525a83f4f0a858c74d9b475e3760f1921ac1052f -r1847777089b517d342e407db9dd8d0be611c2232 --- suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision 525a83f4f0a858c74d9b475e3760f1921ac1052f) +++ suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision 1847777089b517d342e407db9dd8d0be611c2232) @@ -112,8 +112,9 @@ HEARTRATE_39 = "39" RED_COLOR = "#c53b33" -VISIBLE = True + FEATURE_CONFIGURATIONS = "Feature Configurations" # Settings Service DEFAULT_SERVICE_PASSWORD_RAW = "Atal.Matal.22leh" # TODO need to update if we ever change the default +CONFIGURATIONS_PATH = "Public/luis/config/configurations/" Index: suite_leahi/shared/scripts/configuration/navigation.py =================================================================== diff -u -r3668d4a9747b75c20be05a1245edb041cb91cc4b -r1847777089b517d342e407db9dd8d0be611c2232 --- suite_leahi/shared/scripts/configuration/navigation.py (.../navigation.py) (revision 3668d4a9747b75c20be05a1245edb041cb91cc4b) +++ suite_leahi/shared/scripts/configuration/navigation.py (.../navigation.py) (revision 1847777089b517d342e407db9dd8d0be611c2232) @@ -4,8 +4,8 @@ from leahi_dialin.ui.td_messaging import TD_Messaging from leahi_dialin.common.td_defs import TDOpModes, TDStandbyStates from configuration import config, utility -from configparser import ConfigParser -from pathlib import Path +from configparser import ConfigParser +from pathlib import Path td_simulator = TD_Messaging() @@ -90,12 +90,13 @@ """ test.startSection("Method to navigation in the pretreatment page ") - stepId = squish.waitForObjectExists(names.o_preTreatmentStack_stepIndicator_StepIndicator) + stepId = squish.waitForObjectExists(names.o_preTreatmentStack_stepIndicator_StepIndicator) stepnames = utility.findAllObjectsById(stepId, "_text") - value = get_ini_value("/home/denali/Public/luis/config/configurations/Settings/System.conf", section ="AdvancedMode", key ="AdvancedMode") - standard = stepnames[1:] + SYSTEM_PATH = Path.home() / config.CONFIGURATIONS_PATH / "Settings/System.conf" + value = get_ini_value(SYSTEM_PATH, section ="AdvancedMode", key ="AdvancedMode") + standard = stepnames[1:] if value == "0": - standard = stepnames[3:] + standard = stepnames[3:] Nextbutton = utility.setObjectText(obj =names.o_preTreatmentStack_Text, text =config.NEXT) squish.mouseClick(squish.waitForObject(Nextbutton)) Index: suite_leahi/tst_patient_vitals/test.py =================================================================== diff -u -r1d28d6cdae000977ba5eda3580f6d3132bbeb002 -r1847777089b517d342e407db9dd8d0be611c2232 --- suite_leahi/tst_patient_vitals/test.py (.../test.py) (revision 1d28d6cdae000977ba5eda3580f6d3132bbeb002) +++ suite_leahi/tst_patient_vitals/test.py (.../test.py) (revision 1847777089b517d342e407db9dd8d0be611c2232) @@ -15,26 +15,29 @@ # Python import os import can - -# plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.protocols import CAN -from leahi_dialin.utils import conversions - import names import time import builtins -from leahi_dialin.ui import utils -from configuration import utility -from configuration import config,navigation -from leahi_dialin.ui.td_messaging import TD_Messaging -from leahi_dialin.common.td_defs import TDOpModes,TDTreatmentStates -from datetime import datetime -import squish -td =TD_Messaging() -can_interface = td.can_interface +# plugin specific +from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.protocols import CAN +from leahi_dialin.utils import conversions +from leahi_dialin.ui import utils +from configuration import utility +from configuration import config,navigation +from leahi_dialin.ui.td_messaging import TD_Messaging +from leahi_dialin.common.td_defs import TDOpModes,TDTreatmentStates +from datetime import datetime +from pathlib import Path +from configuration.getrejectiontext import ScopedRejectionRepository +td = TD_Messaging() +can_interface = td.can_interface + +conf_path = Path.home() / config.CONFIGURATIONS_PATH / "Alarms/Rejections.conf" +repo = ScopedRejectionRepository(path=conf_path) + vitalsrequest = None def check_bp_cuff_enabled(): @@ -136,7 +139,8 @@ mouseClick(waitForObject(names.o_measureVitalsButton_TouchRect)) td.td_vitals_adjustment_response(vRejectionReason=1) rejectionReason = utility.get_object_from_names(names.o_notification_bar) - test.compare(rejectionReason.text, "Rejected Reason: [1] Request is not allowed in the current operating mode", "Rejection Reason text should be :" + str(rejectionReason.text)) + REJECT_TEXT = repo.get("1", "Title") + test.compare(rejectionReason.text, "Rejected Reason: [1]" + REJECT_TEXT, "Rejection Reason text should be :" + str(rejectionReason.text)) test.endSection() def validate_time_interval(vital_interval_obj, int_min):