Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rb6f86ce89361e33d989f6a9d01eb94c344a6384f --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision b6f86ce89361e33d989f6a9d01eb94c344a6384f) @@ -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 //TODO uncomment loggedIn - 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 Record" ), // Institutional Record ] 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 @@ -246,6 +250,10 @@ push( _serviceDecommission ) break + case SettingsStack.InstitutionalRecord: + push( _settingsInstitutionalRecord ) + break + default: console.debug("Unknown Index", vIndex) break @@ -268,6 +276,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 +300,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 )}