Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -rd2c4e611703fcb97794975dbc28f9a030b84bbf0 -r232dc65ad1d642f750547db6c480da534704a2c4 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision d2c4e611703fcb97794975dbc28f9a030b84bbf0) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 232dc65ad1d642f750547db6c480da534704a2c4) @@ -71,6 +71,7 @@ readonly property bool visibleDeviceRegistration : onlyManufacturing && loggedIn readonly property bool visibleInstitutionalRecord : true readonly property bool visibleFeatureConfigurations : loggedIn + readonly property bool visibleAdvancedInstitutional : loggedIn readonly property bool visibleLocalization : loggedIn readonly property bool visibleUserModes : loggedIn @@ -96,28 +97,30 @@ FactoryReset , Decommission , InstitutionalRecord , + AdvancedInstitutional , UserMode , FeatureConfigurations } property var itemsText : [ - qsTr("Device Information" ), // Device Information - qsTr("Volume And Brightness" ), // VolumeBrightness - qsTr("Wi-Fi" ), // WiFi - qsTr("Device Cleaning" ), // DGCleaning - qsTr("DG Scheduling" ), // DGScheduling - qsTr("Service" ), // servicePassword - qsTr("Date and Time" ), // SetDateTime - qsTr("Export Logs" ), // ExportLogs - qsTr("Language" ), // Localization - qsTr("Water Input Mode" ), // RoInput - qsTr("Calibration" ), // Calibration - qsTr("Device Configuration" ), // Device Configuration - qsTr("Device Registration" ), // DeviceRegistration - qsTr("Software Update" ), // SWUpdate - qsTr("Enable Root SSH" ), // RootSSHAccess - qsTr("Factory Reset" ), // FactoryReset - qsTr("Decommissioning" ), // Decommission - qsTr("Institutional Configurations" ), // Institutional Configurations + qsTr("Device Information" ), // Device Information + qsTr("Volume And Brightness" ), // VolumeBrightness + qsTr("Wi-Fi" ), // WiFi + qsTr("Device Cleaning" ), // DGCleaning + qsTr("DG Scheduling" ), // DGScheduling + qsTr("Service" ), // servicePassword + qsTr("Date and Time" ), // SetDateTime + qsTr("Export Logs" ), // ExportLogs + qsTr("Language" ), // Localization + qsTr("Water Input Mode" ), // RoInput + qsTr("Calibration" ), // Calibration + qsTr("Device Configuration" ), // Device Configuration + qsTr("Device Registration" ), // DeviceRegistration + qsTr("Software Update" ), // SWUpdate + qsTr("Enable Root SSH" ), // RootSSHAccess + qsTr("Factory Reset" ), // FactoryReset + qsTr("Decommissioning" ), // Decommission + qsTr("Institutional Settings" ), // Institutional Configurations + qsTr("Advanced Institutional Settings" ), // AdvancedInstitutional qsTr("User Modes" ), // User Modes qsTr("Feature Configurations" ), // FeatureConfigurations ] @@ -141,6 +144,7 @@ visibleFactoryReset , // FactoryReset visibleDecommission , // Decommission visibleInstitutionalRecord , // Institutional Record + visibleAdvancedInstitutional , // AdvancedInstitutional visibleUserModes , // User Modes visibleFeatureConfigurations , // FeatureConfigurations ] @@ -236,10 +240,15 @@ break case SettingsStack.InstitutionalRecord: - vAdjustmentInstitutionalRecord.doAdjustment() + vInstitutionalRecord.doAdjustment() push( _settingsInstitutionalRecord ) break + case SettingsStack.AdvancedInstitutional: + vAdvancedInstitutionalRecord.doAdjustment() + push( _settingsAdvancedInstitutional ) + break + case SettingsStack.FeatureConfigurations: push( _settingsFeatureConfigurations ) break @@ -274,9 +283,10 @@ SettingsFactoryReset { id: _serviceFactoryReset } SettingsDecommission { id: _serviceDecommission } SettingsInstitutionalRecord { id: _settingsInstitutionalRecord } - SettingsFeatureConfigurations { id: _settingsFeatureConfigurations} + SettingsAdvancedInstitutional { id: _settingsAdvancedInstitutional} SettingsLocalization { id: _settingLocalization } SettingsUserMode { id: _settingUserMode } + SettingsFeatureConfigurations { id: _settingsFeatureConfigurations} function gotoServiceMode( vservice ) { //DEBUG console.log (" 0 ---------- ", _GuiView.manufactMode, _GuiView.manufactSetup, vservice, stackView.initialItem, stackView.currentItem, stackView.depth) @@ -297,17 +307,6 @@ } } - Connections { target: vAdjustmentInstitutionalRecord - function onAdjustmentTriggered ( vValue ) { - if ( vAdjustmentInstitutionalRecord.adjustment_Accepted ) { - _settingsHome.notificationText = "" - } - else { - _settingsHome.notificationText = vAdjustmentInstitutionalRecord.text() - } - } - } - Connections { target: vTDOpMode function onServiceChanged ( vValue ) { gotoServiceMode( vValue )} function onStandbyWaitDisinfectChanged ( vValue ) { page( _settingsHome , vValue )}