Index: suite_leahi/shared/scripts/configuration/config.py =================================================================== diff -u -r845657f82743b8c2699e7ce608bacf1330561553 -r4561f35a21442271c5db3a1c875e6eacd4c19fac --- suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision 845657f82743b8c2699e7ce608bacf1330561553) +++ suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision 4561f35a21442271c5db3a1c875e6eacd4c19fac) @@ -18,5 +18,24 @@ 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" \ No newline at end of file +WIFI_POPUP_TEXT = "WiFi Connection Error" Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -r845657f82743b8c2699e7ce608bacf1330561553 -r4561f35a21442271c5db3a1c875e6eacd4c19fac --- suite_leahi/shared/scripts/names.py (.../names.py) (revision 845657f82743b8c2699e7ce608bacf1330561553) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision 4561f35a21442271c5db3a1c875e6eacd4c19fac) @@ -2,8 +2,6 @@ from objectmaphelper import * -AUT_NAME ="leahi" - # Top Parents o_Gui_MainView = { "type": "Gui::MainView", "unnamed": 1 } o_QQuickView = { "type": "QQuickView" } @@ -40,7 +38,6 @@ o_dialyste_cond_title_Text = {"container": mainTreatmentScreen, "id": "_dialysateCond", "objectName": "dialysateCondComponent", "type": "TreatmentFlowsComponent" } o_treatmentTimeNotificationBarSmall = {"container": mainTreatmentScreen, "objectName": "notification", "type": "NotificationBarSmall" } - # settings_service_export_logs o_listView_ListView = {"container": o_Gui_MainView, "id": "_listView", "type": "ListView", "unnamed": 1 } o_listView_delegateControl = {"container": o_listView_ListView, "index": 2, "objectName": "delegateControl", "type": "Item" } @@ -58,6 +55,19 @@ 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 } Index: suite_leahi/suite.conf =================================================================== diff -u -re2c906a7b5fde31d48d168f097fe6a5a2ab0afea -r4561f35a21442271c5db3a1c875e6eacd4c19fac --- suite_leahi/suite.conf (.../suite.conf) (revision e2c906a7b5fde31d48d168f097fe6a5a2ab0afea) +++ suite_leahi/suite.conf (.../suite.conf) (revision 4561f35a21442271c5db3a1c875e6eacd4c19fac) @@ -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 VERSION=3 WRAPPERS=Qt