Index: sources/gui/qml/components/DebugDataColumn.qml =================================================================== diff -u -r53b262fea2d4b5bd78ff878fda0848f3737e7b74 -r7f55cb6ec0878b36ebadee3935b916d91d60c77c --- sources/gui/qml/components/DebugDataColumn.qml (.../DebugDataColumn.qml) (revision 53b262fea2d4b5bd78ff878fda0848f3737e7b74) +++ sources/gui/qml/components/DebugDataColumn.qml (.../DebugDataColumn.qml) (revision 7f55cb6ec0878b36ebadee3935b916d91d60c77c) @@ -47,7 +47,7 @@ font.pixelSize: fontPixelSizeTitle font.underline: true bottomPadding: 5 - font.family: Fonts.fontFamilyDebug + font.family: Fonts.fontFamilyFixed } Repeater { id: _repeater model: _root.model @@ -58,7 +58,7 @@ horizontalAlignment: _root.horizontalAlignmentText color: Colors.textMain font.pixelSize: fontPixelSizeText - font.family: Fonts.fontFamilyDebug + font.family: Fonts.fontFamilyFixed Text { objectName : _root.textObjectName + "L" + index @@ -68,7 +68,7 @@ anchors.baseline: parent.baseline anchors.left : parent.right horizontalAlignment: Text.AlignLeft - font.family: Fonts.fontFamilyDebug + font.family: Fonts.fontFamilyFixed } } } Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -r7c7a07e17ffe6636f138f1a99bdbebbbe4fdea08 -r7f55cb6ec0878b36ebadee3935b916d91d60c77c --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 7c7a07e17ffe6636f138f1a99bdbebbbe4fdea08) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 7f55cb6ec0878b36ebadee3935b916d91d60c77c) @@ -87,6 +87,6 @@ readonly property int fontPixelDebugTitle : 25 readonly property int fontPixelDebugText : 28 readonly property int fontPixelDebugLabel : 15 - readonly property string fontFamilyDebug : "Noto Sans CJK SC" + readonly property string fontFamilyFixed : "Noto Sans CJK SC" } Index: sources/gui/qml/pages/settings/SettingsDGCleaning.qml =================================================================== diff -u -r9b54c54dbe75f2bd6d04ea73d48e1247682002e8 -r7f55cb6ec0878b36ebadee3935b916d91d60c77c --- sources/gui/qml/pages/settings/SettingsDGCleaning.qml (.../SettingsDGCleaning.qml) (revision 9b54c54dbe75f2bd6d04ea73d48e1247682002e8) +++ sources/gui/qml/pages/settings/SettingsDGCleaning.qml (.../SettingsDGCleaning.qml) (revision 7f55cb6ec0878b36ebadee3935b916d91d60c77c) @@ -46,24 +46,30 @@ 1,1,1,1,1, ] itemsValueLeftMargin: 500 + itemsUnitLeftMargin : 700 + itemsText : [ + "Cleaning Last Status" , // title + qsTr("Last Basic Flush Complete" ), + qsTr("Last Chemical Disinfect Start" ), + qsTr("Last Chemical Disinfect Complete" ), + qsTr("Last Chemical Disinfect Flush Complete" ), + qsTr("Last Heat Disinfect Complete" ), + ] itemsValue : [ "" , vAdjustDGCleaningUsage.lastBasicFlushCompleteDate , vAdjustDGCleaningUsage.lastChemDisStartDate , vAdjustDGCleaningUsage.lastChemDisCompleteDate , vAdjustDGCleaningUsage.lastChemDisFlushCompleteDate , vAdjustDGCleaningUsage.lastHeatDisCompleteDate , - // vAdjustDGCleaningUsage.lastHeatActiveCoolCompleteDate , - // vAdjustDGCleaningUsage.lastFilterFlushCompleteDate , - // vAdjustDGCleaningUsage.lastResetTime , ] - itemsText : [ - "Cleaning Last Status" , // title - qsTr("Last Basic Flush Complete" ), - qsTr("Last Chemical Disinfect Start" ), - qsTr("Last Chemical Disinfect Complete" ), - qsTr("Last Chemical Disinfect Flush Complete" ), - qsTr("Last Heat Disinfect Complete" ), + itemsUnit : [ + "" , + vAdjustDGCleaningUsage.lastBasicFlushCompleteTime , + vAdjustDGCleaningUsage.lastChemDisStartTime , + vAdjustDGCleaningUsage.lastChemDisCompleteTime , + vAdjustDGCleaningUsage.lastChemDisFlushCompleteTime , + vAdjustDGCleaningUsage.lastHeatDisCompleteTime , ] } Index: sources/utility/format.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r7f55cb6ec0878b36ebadee3935b916d91d60c77c --- sources/utility/format.cpp (.../format.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/utility/format.cpp (.../format.cpp) (revision 7f55cb6ec0878b36ebadee3935b916d91d60c77c) @@ -203,6 +203,7 @@ */ QString Format::fromEpoch(qint64 vEpoch, QString vFormat) { + if ( ! vEpoch ) return ""; QDateTime dateTime = QDateTime::fromSecsSinceEpoch(vEpoch); return dateTime.toString(vFormat); } Index: sources/view/settings/VAdjustmentDGCleaningUsage.cpp =================================================================== diff -u -r9b54c54dbe75f2bd6d04ea73d48e1247682002e8 -r7f55cb6ec0878b36ebadee3935b916d91d60c77c --- sources/view/settings/VAdjustmentDGCleaningUsage.cpp (.../VAdjustmentDGCleaningUsage.cpp) (revision 9b54c54dbe75f2bd6d04ea73d48e1247682002e8) +++ sources/view/settings/VAdjustmentDGCleaningUsage.cpp (.../VAdjustmentDGCleaningUsage.cpp) (revision 7f55cb6ec0878b36ebadee3935b916d91d60c77c) @@ -32,21 +32,31 @@ // DG Cleaning Usage roWaterGenTotalL ( vData.mRoWaterGenTotalL ); roWaterGenSinceLastServiceL ( vData.mRoWaterGenSinceLastServiceL ); - lastBasicFlushCompleteDate ( Format::fromEpoch(vData.mLastBasicFlushCompleteDateEpoch , _datetimeFormat )); - lastChemDisStartDate ( Format::fromEpoch(vData.mLastChemDisStartDateEpoch , _datetimeFormat )); - lastChemDisCompleteDate ( Format::fromEpoch(vData.mLastChemDisCompleteDateEpoch , _datetimeFormat )); - lastChemDisFlushCompleteDate ( Format::fromEpoch(vData.mLastChemDisFlushCompleteDateEpoch , _datetimeFormat )); - lastHeatDisCompleteDate ( Format::fromEpoch(vData.mLastHeatDisCompleteDateEpoch , _datetimeFormat )); - lastHeatActiveCoolCompleteDate ( Format::fromEpoch(vData.mLastHeatActiveCoolCompleteDateEpoch , _datetimeFormat )); - lastFilterFlushCompleteDate ( Format::fromEpoch(vData.mLastFilterFlushCompleteDateEpoch , _datetimeFormat )); - lastResetTime ( Format::fromEpoch(vData.mLastResetTimeEpoch , _datetimeFormat )); + lastBasicFlushCompleteDate ( Format::fromEpoch(vData.mLastBasicFlushCompleteDateEpoch , _dateFormat )); + lastChemDisStartDate ( Format::fromEpoch(vData.mLastChemDisStartDateEpoch , _dateFormat )); + lastChemDisCompleteDate ( Format::fromEpoch(vData.mLastChemDisCompleteDateEpoch , _dateFormat )); + lastChemDisFlushCompleteDate ( Format::fromEpoch(vData.mLastChemDisFlushCompleteDateEpoch , _dateFormat )); + lastHeatDisCompleteDate ( Format::fromEpoch(vData.mLastHeatDisCompleteDateEpoch , _dateFormat )); + lastHeatActiveCoolCompleteDate ( Format::fromEpoch(vData.mLastHeatActiveCoolCompleteDateEpoch , _dateFormat )); + lastFilterFlushCompleteDate ( Format::fromEpoch(vData.mLastFilterFlushCompleteDateEpoch , _dateFormat )); + lastBasicFlushCompleteTime ( Format::fromEpoch(vData.mLastBasicFlushCompleteDateEpoch , _timeFormat )); + lastChemDisStartTime ( Format::fromEpoch(vData.mLastChemDisStartDateEpoch , _timeFormat )); + lastChemDisCompleteTime ( Format::fromEpoch(vData.mLastChemDisCompleteDateEpoch , _timeFormat )); + lastChemDisFlushCompleteTime ( Format::fromEpoch(vData.mLastChemDisFlushCompleteDateEpoch , _timeFormat )); + lastHeatDisCompleteTime ( Format::fromEpoch(vData.mLastHeatDisCompleteDateEpoch , _timeFormat )); + lastHeatActiveCoolCompleteTime ( Format::fromEpoch(vData.mLastHeatActiveCoolCompleteDateEpoch , _timeFormat )); + lastFilterFlushCompleteTime ( Format::fromEpoch(vData.mLastFilterFlushCompleteDateEpoch , _timeFormat )); + + lastResetTime ( Format::fromEpoch(vData.mLastResetTimeEpoch , _dateFormat + " " +_timeFormat)); + // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the previous values before being set. *** adjustment(true); // set here only because adjustment parent needs it, but HD Service does not } void View::VAdjustDGCleaningUsage::onActionReceive(const SettingsData &) { - _datetimeFormat = _Settings.dateFormat() + " " + _Settings.timeFormat(); + _dateFormat = _Settings.dateFormat(); + _timeFormat = _Settings.timeFormat(); } Index: sources/view/settings/VAdjustmentDGCleaningUsage.h =================================================================== diff -u -r9b54c54dbe75f2bd6d04ea73d48e1247682002e8 -r7f55cb6ec0878b36ebadee3935b916d91d60c77c --- sources/view/settings/VAdjustmentDGCleaningUsage.h (.../VAdjustmentDGCleaningUsage.h) (revision 9b54c54dbe75f2bd6d04ea73d48e1247682002e8) +++ sources/view/settings/VAdjustmentDGCleaningUsage.h (.../VAdjustmentDGCleaningUsage.h) (revision 7f55cb6ec0878b36ebadee3935b916d91d60c77c) @@ -38,7 +38,8 @@ // friends friend class ::tst_views; - QString _datetimeFormat = "yyyy/MM/dd HH:mm"; + QString _dateFormat = "yyyy/MM/dd"; + QString _timeFormat = "HH:mm"; // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI @@ -48,13 +49,23 @@ // DG Cleaning data PROPERTY( float , roWaterGenTotalL , 0) PROPERTY( float , roWaterGenSinceLastServiceL , 0) + PROPERTY( QString , lastBasicFlushCompleteDate , "") PROPERTY( QString , lastChemDisStartDate , "") PROPERTY( QString , lastChemDisCompleteDate , "") PROPERTY( QString , lastChemDisFlushCompleteDate , "") PROPERTY( QString , lastHeatDisCompleteDate , "") PROPERTY( QString , lastHeatActiveCoolCompleteDate , "") PROPERTY( QString , lastFilterFlushCompleteDate , "") + + PROPERTY( QString , lastBasicFlushCompleteTime , "") + PROPERTY( QString , lastChemDisStartTime , "") + PROPERTY( QString , lastChemDisCompleteTime , "") + PROPERTY( QString , lastChemDisFlushCompleteTime , "") + PROPERTY( QString , lastHeatDisCompleteTime , "") + PROPERTY( QString , lastHeatActiveCoolCompleteTime , "") + PROPERTY( QString , lastFilterFlushCompleteTime , "") + PROPERTY( QString , lastResetTime , "") VIEW_DEC_CLASS(VAdjustDGCleaningUsage)