Index: suite_leahi/shared/scripts/configuration/config.py =================================================================== diff -u -r4e2b2a08fb10fb528e782a505eaab19f63874cc4 -rf6d23e89ccf01b57313b0e920f013dc1027706d4 --- suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision 4e2b2a08fb10fb528e782a505eaab19f63874cc4) +++ suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision f6d23e89ccf01b57313b0e920f013dc1027706d4) @@ -18,8 +18,30 @@ EXPORT_LOG_PROGRESS_STATUS = "Service log export to USB in progress ... " SERVICE_SCREEN_TITLE_TEXT = "Service" +# Headerbar_information_popup +INFORMATION_PARAMETERS = [ + "OS Version", "UI Version", "TD Version", "TD FPGA Version", + "TD Serial Number", "DD Version", "DD FPGA Version", "DD Serial Number", +] +#Device Settings Information Version +INFORMATION_SCREEN_TITLE_TEXT = "Information" +INFORMATION_TITLES = ["Information", "Versions"] +VERSION_PARAMETERS = [ + "Information", "UI Version", "TD Version", "TD FPGA Version", + "TD Serial Number", "DD Version", "DD FPGA Version", "DD Serial Number" +] +SERVICES_PARAMETERS = [ + "TD Last Service Date", "TD Next Service Date", + "DD Last Service Date", "DD Next Service Date" +] +SERIVCES_TITLE = "Service" +WATER_PARAMETERS = ["Water Configuration", "Water Input"] + +#HeaderBar WiFi +WIFI_POPUP_TEXT = "WiFi Connection Error" + # Device Settings WiFi WIFI_TEXT = "Wi-Fi" WIFI_PARAMETERS_TEXTS = ["SSID", "IP Address", "Gateway", "Subnet Mask", "DNS"] WIFI_SCREEN_SCAN_BUTTON_TEXT = "SCAN" -DISABLED = False \ No newline at end of file +DISABLED = False Index: suite_leahi/shared/scripts/configuration/utility.py =================================================================== diff -u -rc641ef1cd371fa90784d7fc843072987ed9c0d92 -rf6d23e89ccf01b57313b0e920f013dc1027706d4 --- suite_leahi/shared/scripts/configuration/utility.py (.../utility.py) (revision c641ef1cd371fa90784d7fc843072987ed9c0d92) +++ suite_leahi/shared/scripts/configuration/utility.py (.../utility.py) (revision f6d23e89ccf01b57313b0e920f013dc1027706d4) @@ -30,5 +30,13 @@ found = findObjectById(child, id) if found: return found + return None - return None \ No newline at end of file +def findChildByText(parent_object, target_text): + """Recursively finds a child object by its text property.""" + for child in object.children(parent_object): + if hasattr(child, "text") and str(child.text) == target_text: + return child + found = findChildByText(child, target_text) + if found: + return found Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -rfddb8614c64345cc0ad8fe2a98a892529e76924d -rf6d23e89ccf01b57313b0e920f013dc1027706d4 --- suite_leahi/shared/scripts/names.py (.../names.py) (revision fddb8614c64345cc0ad8fe2a98a892529e76924d) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision f6d23e89ccf01b57313b0e920f013dc1027706d4) @@ -2,8 +2,6 @@ from objectmaphelper import * -AUT_NAME ="leahi" - # Top Parents o_Gui_MainView = { "type": "Gui::MainView", "unnamed": 1 } o_QQuickView = { "type": "QQuickView" } @@ -57,6 +55,25 @@ o_ExportLogsNotificationBar = {"container": o_SettingsExportLogs, "id": "_information", "type": "NotificationBarSmall" } o_DeviceSettingsGrid = {"container": o_SettingsHome, "id": "_grid", "type": "Grid", } +#HeaderBar Information Pop up +o_InformationIconButton = {"container": o_Gui_MainView, "id": "_informationButton", "type": "IconButton", "unnamed": 1 } +o_InformationParameters = {"container": o_Overlay, "type": "Text", "unnamed": 1 } +o_VersionColumn = {"container": o_Overlay, "id": "_versionColumn", "type": "Column", "unnamed": 1 } + +# Device Settings Information Version +o_DeviceSettingsInformation = {"container": o_SettingsHome, "id": "_touchItem", "type": "TouchRect", "unnamed": 1 } +o_InformationPageTitleText = {"container": o_SettingsInformation, "id": "_titleText", "type": "Text", "unnamed": 1 } +o_SettingsBase_SettingsInformation = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsBase" } +o_SettingsBase_Information_Text = {"container": o_SettingsBase_SettingsInformation, "type": "Text", "unnamed": 1 } +o_SettingsBase_SettingsInformation_2 = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsInformation" } +o_SettingsBase_grid_Grid = {"container": o_SettingsBase_SettingsInformation_2, "id": "_grid", "type": "Grid", "unnamed": 1 } + +#HeaderBar WiFi +o_HeaderBar_WiFi_IconButton = {"container": o_Gui_MainView, "id": "_wifiButton", "type": "IconButton", "unnamed": 1 } +o_HeaderBar_WiFi_Popup = {"container": o_Overlay, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1 } +o_HeaderBar_Wifi_PopuoParameters = {"container": o_Overlay, "type": "Text", "unnamed": 1 } +o_HeaderBar_WiFi_IconImage = {"container": o_Gui_MainView, "id": "_iconImage", "source": "qrc:/images/iWifi", "type": "Image", "unnamed": 1 } + #Device Settings Wi-Fi o_SettingsBase_SettingsInformation = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsBase" } o_SettingsBase_Information_Text = {"container": o_SettingsBase_SettingsInformation, "type": "Text", "unnamed": 1 } Index: suite_leahi/suite.conf =================================================================== diff -u -re2c906a7b5fde31d48d168f097fe6a5a2ab0afea -rf6d23e89ccf01b57313b0e920f013dc1027706d4 --- suite_leahi/suite.conf (.../suite.conf) (revision e2c906a7b5fde31d48d168f097fe6a5a2ab0afea) +++ suite_leahi/suite.conf (.../suite.conf) (revision f6d23e89ccf01b57313b0e920f013dc1027706d4) @@ -1,6 +1,6 @@ AUT=leahi LANGUAGE=Python OBJECTMAPSTYLE=script -TEST_CASES=tst_solution_infusion tst_main_treatment tst_service_export_logs +TEST_CASES=tst_solution_infusion tst_main_treatment tst_service_export_logs tst_device_settings_information_version tst_headerbar_information_popup tst_headerbar_wifi_indicator tst_device_settings_wifi VERSION=3 WRAPPERS=Qt