Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -rb9eb580cf3997837af24757ceaf845af62501a1e -r78b3d1f4e6675e6a8c5ae3801d134e2d7a49ad06 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision b9eb580cf3997837af24757ceaf845af62501a1e) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 78b3d1f4e6675e6a8c5ae3801d134e2d7a49ad06) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file SettingsStack.qml - * \author (last) Behrouz NematiPour - * \date (last) 28-Jul-2023 + * \author (last) Dara Navaei + * \date (last) 24-Oct-2024 * \author (original) Behrouz NematiPour * \date (original) 16-Apr-2021 * @@ -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 @@ -101,7 +102,7 @@ qsTr("DG Cleaning" ), // DGCleaning qsTr("DG Scheduling" ), // DGScheduling qsTr("Service" ), // servicePassword - qsTr("Set Date And Time" ), // SetDateTime + qsTr("Set Date and Time" ), // SetDateTime qsTr("Export Logs" ), // ExportLogs qsTr("Set Language" ), // Language qsTr("Water Input Mode" ), // RoInput @@ -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 @@ -177,6 +181,9 @@ vDevice.status = "" switch (vIndex) { case SettingsStack.Information: + vAdjustmentVersions .doAdjustment() + vAdjustmentServiceDates .doAdjustment() + vHDUsageInfo .doAdjustment() push(_settingsInformation) break @@ -235,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 @@ -265,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) @@ -288,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 )}