Index: shared/scripts/configuration/config.py =================================================================== diff -u -rdfe6dbd55749bab2f8390a241c1ac3df9e918389 -re5ababd5b6ce9c18a68ac18c941908dea6fecd88 --- shared/scripts/configuration/config.py (.../config.py) (revision dfe6dbd55749bab2f8390a241c1ac3df9e918389) +++ shared/scripts/configuration/config.py (.../config.py) (revision e5ababd5b6ce9c18a68ac18c941908dea6fecd88) @@ -254,7 +254,13 @@ "Magenta":"#fd28fd", "Orange": "#f2721c", "Peach":"#f1979a", "Red": "#c53b33", "Rose":"#fc178d", "Slate blue":"#7f7ffa", "Violet": "#6435c9", "White": "#ffffff", "Yellow": "#fcfc4d"} +#Service password loction +SERVICE_CONF_LOCATION = os.environ['HOME']+"/Projects/application/resources/settings/Service.conf" +#standby mode +GOODMORNING_START_TIME_SEC = 0 +GOODEVENING_START_TIME_SEC = 43200 + #ultrafilteration volume based on flow parameters. Python list contains Rotational speed, Motor speed, # MC speed, MC current and PWM. TREATMENT_ULTRAFILTRATION_FLOW_PARAMETERS = { @@ -431,10 +437,15 @@ PARAMETER_COUNT = 4 PARAMETER_INDEX = 5 - #cloud_sync_hd_opmodes OPMODE_INDEX = 5 SUBMODE = 6 HD_OPMODES_MSG_PARAMETER_LEN = 7 HD_OPMODES_CREDENTIAL_PARAMETER_LEN = 6 +DEVICE_SETTINGS_TEXT = "Device Settings" +SERVICE_TEXT = "Service" +PASSWORD = 123 +CONFIRM_TEXT = "CONFIRM" +SERVICE_BACK_BTN = "BACK" + Index: shared/scripts/configuration/utility.py =================================================================== diff -u -rf334a1c3a2a5ef0d38fc9f2a22622d29d08edc78 -re5ababd5b6ce9c18a68ac18c941908dea6fecd88 --- shared/scripts/configuration/utility.py (.../utility.py) (revision f334a1c3a2a5ef0d38fc9f2a22622d29d08edc78) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision e5ababd5b6ce9c18a68ac18c941908dea6fecd88) @@ -11,24 +11,21 @@ # @date (last) 15-Jan-2022 # ############################################################################ - - - import builtins -import csv -import names import os import glob import math import object import sys -import squish import time +import names +import squish import test - -from builtins import format +import csv +from dialin.ui import utils from builtins import int as pyInt from builtins import str as pyStr +from builtins import format from configuration import config from dialin.ui import utils from dialin.utils import * @@ -1019,7 +1016,6 @@ except OSError: test.log("Directory can not be created") - def get_cloud_sync_input_file(): """ This function is the handler for getting file from log folder. @@ -1112,4 +1108,24 @@ if expected_epoch_value > minimum_epoch_value and expected_epoch_value < maximum_epoch_value : return True return False - + +def keyboard_input(key_value): + names.o_keyboard_object["text"] = key_value + return names.o_keyboard_object + +def enter_keyboard_numeric_value(entry): + """ + Method to enter user desired + value using keypad + @param entry: (str) User expected value + """ + test.startSection("Entering {}".format(entry)) + for value in entry: + if value.isalpha(): + value = pyStr(value) + else: + value = pyInt(value) + key_val = squish.waitForObject(keyboard_input(value)) + squish.mouseClick(key_val) + utils.waitForGUI(0.1) + test.endSection() Index: shared/scripts/names.py =================================================================== diff -u -r7b1821e4eac91025e0363aaeae30677ca8afce41 -re5ababd5b6ce9c18a68ac18c941908dea6fecd88 --- shared/scripts/names.py (.../names.py) (revision 7b1821e4eac91025e0363aaeae30677ca8afce41) +++ shared/scripts/names.py (.../names.py) (revision e5ababd5b6ce9c18a68ac18c941908dea6fecd88) @@ -864,6 +864,7 @@ #cloud_sync_device_registeration #settings_Home +o_SettingsBase_SettingsBase = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsBase", "visible": True} o_settings_Text = {"container": o_Gui_MainView, "text": "Settings", "type": "Text", "unnamed": 1, "visible": True} o_SettingsHome_SettingsHome = {"container": o_Gui_MainView, "objectName": "_SettingsHome", "type": "SettingsHome", "visible": True} o_settings_home_text_obj = {"container": o_SettingsHome_SettingsHome, "type": "Text", "unnamed": 1, "visible": True} @@ -966,8 +967,8 @@ device_settings_screen = {"container": o_Gui_MainView, "text": "Treatment", "type": "Text", "unnamed": 1, "visible": True} o_SettingsHome_SettingsHome_2 = {"container": o_Gui_MainView, "objectName": "_SettingsHome", "type": "SettingsHome", "visible": True} o_SettingsHome_Wi_Fi_Text = {"container": o_SettingsHome_SettingsHome_2, "text": "Wi-Fi", "type": "Text", "unnamed": 1, "visible": True} -o_Gui_MainView_2 = {"type": "Gui::MainView", "unnamed": 1, "visible": True} -o_SettingsBase_SettingsWiFi = {"container": o_Gui_MainView_2, "objectName": "_SettingsBase", "type": "SettingsWiFi", "visible": True} +o_Gui_MainView = {"type": "Gui::MainView", "unnamed": 1, "visible": True} +o_SettingsBase_SettingsWiFi = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsWiFi", "visible": True} o_SettingsBase_Wi_Fi_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "Wi-Fi", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_IP_Address_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "IP Address", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_Gateway_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "Gateway", "type": "Text", "unnamed": 1, "visible": True} @@ -978,19 +979,36 @@ o_SettingsHome_Bluetooth_Cuff_Text = {"container": o_SettingsHome_SettingsHome_2, "text": "Bluetooth Cuff", "type": "Text", "visible": True} o_SettingsBase_Devices_Label = {"container": o_SettingsBase_SettingsBase, "text": "Devices", "type": "Label", "unnamed": 1, "visible": True} o_SettingsBase_Bluetooth_Cuff_Text = {"container": o_SettingsBase_SettingsBase, "text": "Bluetooth Cuff", "type": "Text", "unnamed": 1, "visible": True} -o_SettingsBase_SettingsDG = {"container": o_Gui_MainView_2, "objectName": "_SettingsBase", "type": "SettingsDG", "visible": True} +o_SettingsBase_SettingsDG = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsDG", "visible": True} o_SettingsBase_DG_Cleaning_Text = {"container": o_SettingsBase_SettingsDG, "text": "DG Cleaning", "type": "Text", "unnamed": 1, "visible": True} o_SettingsHome_DG_Cleaning_Text = {"container": o_SettingsHome_SettingsHome_2, "text": "DG Cleaning", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_Water_Flush_Text = {"container": o_SettingsBase_SettingsDG, "text": "Water Flush", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_Heat_Disinfection_Text = {"container": o_SettingsBase_SettingsDG, "text": "Heat Disinfection", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_Chemical_Disinfection_Text = {"container": o_SettingsBase_SettingsDG, "text": "Chemical Disinfection", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_backButton_BackButton = {"container": o_SettingsBase_SettingsWiFi, "gradient": 0, "objectName": "_backButton", "type": "BackButton", "visible": True} -o_back_button = {"container": o_Gui_MainView_2, "text": "BACK", "type": "Text", "unnamed": 1, "visible": False} +o_back_button = {"container": o_Gui_MainView, "text": "BACK", "type": "Text", "unnamed": 1, "visible": False} o_SettingsBase_SCAN_Text_2 = {"container": o_SettingsBase_SettingsBase, "text": "SCAN", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_ssidText_Text = {"container": o_SettingsBase_SettingsWiFi, "id": "_ssidText", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_input_TextInput = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} o_SettingsBase_input_TextInput_2 = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} o_SettingsBase_input_TextInput_3 = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} o_SettingsBase_input_TextInput_4 = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} + + +o_services_screen_text_obj = {"container": o_SettingsBase_SettingsBase, "type": "Text", "unnamed": 1, "visible": True} +o_settings_text = {"container":o_Gui_MainView , "text": "Settings", "type": "Text", "unnamed": 1, "visible": True} +o_service_text = {"container": o_Gui_MainView , "text": "Service", "type": "Text", "unnamed": 1, "visible": True} +o_userConfirmation_UserConfirmation = {"container": o_Gui_MainView, "objectName": "UserConfirmation", "type": "UserConfirmation", "visible": True} +o_service_text_title = {"container": o_userConfirmation_UserConfirmation, "text": "Service Password", "type": "Text", "unnamed": 1, "visible": True} +o_password_text_field = {"container": o_userConfirmation_UserConfirmation, "id": "_password", "type": "TextEntry", "unnamed": 1, "visible": True} +o_show_password = {"container": o_userConfirmation_UserConfirmation, "id": "_showPassword", "source": "qrc:/images/iEye", "type": "Image", "unnamed": 1, "visible": True} +o_switch_keyboard_to_keypad = {"container": o_Gui_MainView, "text": "&123", "type": "Text", "unnamed": 1, "visible": True} o_keyboard_object = {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True} +#virtal keypad input field +o_keypad_input = {"container": o_Gui_MainView, "id": "_keyText", "type": "Text", "unnamed": 1, "visible": True} +#virtal keypad back space key +o_back_space_key = {"container": o_Gui_MainView, "id": "_backspaceKeyIcon", "source": "qrc:/plugins/QtQuick/VirtualKeyboard/Styles/denali/images/iBackspace.svg", "type": "Image", "unnamed": 1, "visible": True} +o_service_confirm_btn = {"container": o_userConfirmation_UserConfirmation, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} +o_userConfirmation_backButton_BackButton = {"container": o_userConfirmation_UserConfirmation, "gradient": 0, "objectName": "_backButton", "type": "BackButton", "visible": True} +