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(); }