Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -r6a06de0b01e39939cc4f6c541da88cb0c8cd2a1b --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 6a06de0b01e39939cc4f6c541da88cb0c8cd2a1b) @@ -70,9 +70,9 @@ readonly property bool visibleSetDateTime : loggedIn || onlyUpdating readonly property bool visibleDeviceConfiguration : onlyManufacturing && loggedIn readonly property bool visibleDeviceRegistration : onlyManufacturing && loggedIn + readonly property bool visibleInstitutionalRecord : true - enum ItemsIndex { Information , VolumeBrightness , @@ -91,7 +91,8 @@ SWUpdate , RootSSHAccess , FactoryReset , - Decommission + Decommission , + InstitutionalRecord } property var itemsText : [ qsTr("Information" ), // Information @@ -112,6 +113,7 @@ qsTr("Enable Root SSH" ), // RootSSHAccess qsTr("Factory Reset" ), // FactoryReset qsTr("Decommissioning" ), // Decommission + qsTr("Institutional Configurations" ), // Institutional Configurations ] property var itemsEnabled : [ true , // Information @@ -132,6 +134,7 @@ true , // RootSSHAccess true , // FactoryReset true , // Decommission + true , // Institutional Record ] property var itemsVisible : [ visibleInformation , // Information @@ -152,6 +155,7 @@ visibleRootSSHAccess , // RootSSHAccess visibleFactoryReset , // FactoryReset visibleDecommission , // Decommission + visibleInstitutionalRecord , // Institutional Record ] SettingsHome { id : _settingsHome @@ -238,14 +242,19 @@ push( _SettingsRootSSHAccess) break - case SettingsStack.FactoryReset: + case SettingsStack.FactoryReset: push( _serviceFactoryReset ) break case SettingsStack.Decommission: push( _serviceDecommission ) break + case SettingsStack.InstitutionalRecord: + vAdjustmentInstitutionalRecord.doAdjustment() + push( _settingsInstitutionalRecord ) + break + default: console.debug("Unknown Index", vIndex) break @@ -268,6 +277,7 @@ SettingsRootSSHAccess { id: _SettingsRootSSHAccess } SettingsFactoryReset { id: _serviceFactoryReset } SettingsDecommission { id: _serviceDecommission } + SettingsInstitutionalRecord { id: _settingsInstitutionalRecord } function gotoServiceMode( vservice ) { //DEBUG console.log (" 0 ---------- ", _GuiView.manufactMode, _GuiView.manufactSetup, vservice, stackView.initialItem, stackView.currentItem, stackView.depth) @@ -291,6 +301,17 @@ } } + Connections { target: vAdjustmentInstitutionalRecord + function onAdjustmentTriggered ( vValue ) { + if ( vAdjustmentInstitutionalRecord.adjustment_Accepted ) { + _settingsHome.notificationText = "" + } + else { + _settingsHome.notificationText = vAdjustmentInstitutionalRecord.text() + } + } + } + Connections { target: vHDOperationMode function onServiceChanged ( vValue ) { gotoServiceMode( vValue )} function onStandbyWaitDisinfectChanged ( vValue ) { page( _settingsHome , vValue )}