Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h =================================================================== diff -u -r1c18f738693756ca1f0342c2cc158e32bc28f90b -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision 1c18f738693756ca1f0342c2cc158e32bc28f90b) +++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2019-2020 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 VPostTreatmentAdjustTreatmentLog.h * \author (last) Behrouz NematiPour - * \date (last) 11-Apr-2021 + * \date (last) 10-Aug-2023 * \author (original) Behrouz NematiPour * \date (original) 11-Apr-2021 * @@ -20,7 +20,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "TreatmentLog.h" // Model MPostTreatmentAdjustTreatmentLogResponse included in this controller header #include "MTreatmentLogAvrgeData.h" @@ -43,13 +43,18 @@ // friends friend class ::tst_views; - // coco begin validated: + // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // coco end + // disabled coco end + PROPERTY(bool , heparinDispensingRateOff , true) + PROPERTY(bool , heparinBolusVolumeOff , true) + + PROPERTY(QString , patientID , "") + PROPERTY(quint32 , bloodFlowRate , 0 ) PROPERTY(quint32 , dialysateFlowRate , 0 ) PROPERTY(quint32 , treatmentDuration , 0 ) @@ -68,8 +73,10 @@ PROPERTY(float , averageDialysateFlow , 0 ) PROPERTY(float , dialysateVolumeUsed , 0 ) PROPERTY(float , averageDialysateTemp , 0 ) + PROPERTY(float , originUFVolume , 0 ) PROPERTY(float , targetUFVolume , 0 ) PROPERTY(float , actualUFVolume , 0 ) + PROPERTY(float , originUFRate , 0 ) PROPERTY(float , targetUFRate , 0 ) PROPERTY(float , actualUFRate , 0 ) PROPERTY(quint32 , salineBolusVolume , 0 ) @@ -89,8 +96,12 @@ PROPERTY(QStringList , parametersUnit , _TreatmentLog.units ()) PROPERTY(QStringList , parametersText , {}) - PROPERTY(bool , isIdle , true) + PROPERTY(QString , txCode , "") + PROPERTY(QString , notification , "") + PROPERTY(bool , isIdle , true ) + PROPERTY(bool , isReady , false ) + VIEW_DEC_CLASS (VPostTreatmentAdjustmentTreatmentLog) VIEW_DEC_SLOT (AdjustTreatmentLogResponseData) VIEW_DEC_SLOT (TreatmentLogAvrgeData)