Index: sources/view/settings/VAdjustmentInstitutionalRecord.h
===================================================================
diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -rc43d24c50f4344348d36d8ae9273797f4557356a
--- sources/view/settings/VAdjustmentInstitutionalRecord.h	(.../VAdjustmentInstitutionalRecord.h)	(revision a58f91b077c8131bea3dbde0fc338adb113fc9f3)
+++ sources/view/settings/VAdjustmentInstitutionalRecord.h	(.../VAdjustmentInstitutionalRecord.h)	(revision c43d24c50f4344348d36d8ae9273797f4557356a)
@@ -21,7 +21,7 @@
 // Project
 #include "main.h" // Doxygen : do not remove
 #include "VAdjustmentResponseBase.h"
-#include "MAdjustHDInstitutionalRecordResponse.h"
+#include "MAdjustTDInstitutionalRecordResponse.h"
 
 namespace View {
 
@@ -38,85 +38,97 @@
     // friends
     friend class ::tst_views;
 
-    const QStringList _titles {
-        tr("Blood Flow Rate"                ),
-        tr("Dialysate Flow Rate"            ),
-        tr("Treatment Duration"             ),
-        tr("Heparin Stop"                   ),
-        tr("Saline Bolus Volume"            ),
-        tr("Dialysate Temperature"          ),
-        tr("Arterial Pressure Limit"        ),
-        tr("Venous Pressure Limit"          ),
-        tr("Venous Asym Pressure Limit"     ),
-        tr("Prescribed UF Volume"           ),
-        tr("Heparin Dispense Rate"          ),
-        tr("Heparin Bolus Volume"           ),
-        tr("Chemical Disinfect"             ),
-    };
 
-    const QStringList _units {
-        tr("mL/min"                         ),
-        tr("mL/min"                         ),
-        tr("min"                            ),
-        tr("min"                            ),
-        tr("mL"                             ),
-        tr("C"                              ),
-        tr("mmHg"                           ),
-        tr("mmHg"                           ),
-        tr("mmHg"                           ),
-        tr("L"                              ),
-        tr("mL/hr"                          ),
-        tr("mL"                             ),
-        tr(""                               ),
-    };
-
-
-
     // The property adjustment_Triggered has to be always true
     // and to always trigger the change event to work as a notifier for GUI
     TRIGGER( bool      , adjustment     , 0)
 
-    PROPERTY(quint32 ,   minBloodFlowMLPM             , 0     )
-    PROPERTY(quint32 ,   maxBloodFlowMLPM             , 0     )
-    PROPERTY(quint32 ,   minDialysateFlowMLPM         , 0     )
-    PROPERTY(quint32 ,   maxDialysateFlowMLPM         , 0     )
-    PROPERTY(quint32 ,   minTxDurationMIN             , 0     )
-    PROPERTY(quint32 ,   maxTxDurationMIN             , 0     )
-    PROPERTY(quint32 ,   minStopHepDispBeforeTxEndMIN , 0     )
-    PROPERTY(quint32 ,   maxStopHepDispBeforeTxEndMIN , 0     )
-    PROPERTY(quint32 ,   minSalineBolVolumeML         , 0     )
-    PROPERTY(quint32 ,   maxSalineBolVolumeML         , 0     )
-    PROPERTY(float   ,   minDialysateTempC            , 0.0   )
-    PROPERTY(float   ,   maxDialysateTempC            , 0.0   )
-    PROPERTY(qint32  ,   minArtPressLimitWindowMMHG   , 0     )
-    PROPERTY(qint32  ,   maxArtPressLimitWindowMMHG   , 0     )
-    PROPERTY(qint32  ,   minVenPressLimitWindowMMHG   , 0     )
-    PROPERTY(qint32  ,   maxVenPressLimitWindowMMHG   , 0     )
-    PROPERTY(qint32  ,   minVenAsymPressLimitMMHG     , 0     )
-    PROPERTY(qint32  ,   maxVenAsymPressLimitMMHG     , 0     )
-    PROPERTY(float   ,   minUltrafiltrationVolumeL    , 0.0   )
-    PROPERTY(float   ,   maxUltrafiltrationVolumeL    , 0.0   )
-    PROPERTY(float   ,   minHepDispRateMLPM           , 0.0   )
-    PROPERTY(float   ,   maxHepDispRateMLPM           , 0.0   )
-    PROPERTY(float   ,   minHepBolVolumeML            , 0.0   )
-    PROPERTY(float   ,   maxHepBolVolumeML            , 0.0   )
-    PROPERTY(bool    ,   enableChemicalDisinfect      , true  )
+    RANGEVALUESET( quint32       , bloodFlowRate                                , 0)
+    RANGEVALUESET( quint32       , dialysateFlowRate                            , 0)
+    RANGEVALUESET( quint32       , treatmentDuration                            , 0)
+    RANGEVALUESET( float         , heparinBolusVolume                           , 0)
+    RANGEVALUESET( float         , heparinDispensingRate                        , 0)
+    RANGEVALUESET( quint32       , heparinStopTime                              , 0)
+    RANGEVALUESET( float         , dialysateTemp                                , 0)
+    RANGEVALUESET( float         , acidConcentratePotassium                     , 0)
+    RANGEVALUESET( float         , acidConcentrateCalcium                       , 0)
+    RANGEVALUESET( quint32       , bicarbFinalDialysateComposition              , 0)
+    RANGEVALUESET( quint32       , sodiumFinalDialysateComposition              , 0)
+    RANGEVALUESET( quint32       , fluidBolusVolume                             , 0)
+    RANGEVALUESET( qint32        , arterialPressureLimitWindow                  , 0)
+    RANGEVALUESET( qint32        , venousPressureLimitWindow                    , 0)
+    RANGEVALUESET( qint32        , venousPressureLimitAsymtrc                   , 0)
+    RANGEVALUESET( qint32        , trancembrncPressureLimitWindow               , 0)
+    RANGEVALUESET( float         , ultrafiltrationVolume                        , 0)
+    RANGEVALUESET( qint32        , vitalsInterval                               , 0)
+    RANGEVALUESET( quint32       , rinsebackVolume                              , 0)
+    RANGEVALUESET( quint32       , rinsebackFlowRate                            , 0)
+    RANGEVALUESET( float         , substitutionVolume                           , 0)
 
-    PROPERTY(QStringList  , parametersTitle             , titles())
-    PROPERTY(QStringList  , parametersText              , {}      )
-    PROPERTY(QStringList  , parametersUnit              , units ())
+    // rejection reasons
+    TRIGGER(quint32     , bloodFlowRateMinRejectionReason                       , 0)
+    TRIGGER(quint32     , bloodFlowRateMaxRejectionReason                       , 0)
+    TRIGGER(quint32     , bloodFlowRateDefRejectionReason                       , 0)
+    TRIGGER(quint32     , dialysateFlowRateMinRejectionReason                   , 0)
+    TRIGGER(quint32     , dialysateFlowRateMaxRejectionReason                   , 0)
+    TRIGGER(quint32     , dialysateFlowRateDefRejectionReason                   , 0)
+    TRIGGER(quint32     , treatmentDurationMinRejectionReason                   , 0)
+    TRIGGER(quint32     , treatmentDurationMaxRejectionReason                   , 0)
+    TRIGGER(quint32     , treatmentDurationDefRejectionReason                   , 0)
+    TRIGGER(quint32     , heparinBolusVolumeMinRejectionReason                  , 0)
+    TRIGGER(quint32     , heparinBolusVolumeMaxRejectionReason                  , 0)
+    TRIGGER(quint32     , heparinBolusVolumeDefRejectionReason                  , 0)
+    TRIGGER(quint32     , heparinDispensingRateMinRejectionReason               , 0)
+    TRIGGER(quint32     , heparinDispensingRateMaxRejectionReason               , 0)
+    TRIGGER(quint32     , heparinDispensingRateDefRejectionReason               , 0)
+    TRIGGER(quint32     , heparinStopTimeMinRejectionReason                     , 0)
+    TRIGGER(quint32     , heparinStopTimeMaxRejectionReason                     , 0)
+    TRIGGER(quint32     , dialysateTempMinRejectionReason                       , 0)
+    TRIGGER(quint32     , dialysateTempMaxRejectionReason                       , 0)
+    TRIGGER(quint32     , dialysateTempDefRejectionReason                       , 0)
+    TRIGGER(quint32     , acidConcentratePotassiumMinRejectionReason            , 0)
+    TRIGGER(quint32     , acidConcentratePotassiumMaxRejectionReason            , 0)
+    TRIGGER(quint32     , acidConcentrateCalciumMinRejectionReason              , 0)
+    TRIGGER(quint32     , acidConcentrateCalciumMaxRejectionReason              , 0)
+    TRIGGER(quint32     , bicarbFinalDialysateCompositionMinRejectionReason     , 0)
+    TRIGGER(quint32     , bicarbFinalDialysateCompositionMaxRejectionReason     , 0)
+    TRIGGER(quint32     , bicarbFinalDialysateCompositionDefRejectionReason     , 0)
+    TRIGGER(quint32     , sodiumFinalDialysateCompositionMinRejectionReason     , 0)
+    TRIGGER(quint32     , sodiumFinalDialysateCompositionMaxRejectionReason     , 0)
+    TRIGGER(quint32     , sodiumFinalDialysateCompositionDefRejectionReason     , 0)
+    TRIGGER(quint32     , fluidBolusVolumeMinRejectionReason                    , 0)
+    TRIGGER(quint32     , fluidBolusVolumeMaxRejectionReason                    , 0)
+    TRIGGER(quint32     , fluidBolusVolumeDefRejectionReason                    , 0)
+    TRIGGER(quint32     , arterialPressureLimitWindowMinRejectionReason         , 0)
+    TRIGGER(quint32     , arterialPressureLimitWindowMaxRejectionReason         , 0)
+    TRIGGER(quint32     , arterialPressureLimitWindowDefRejectionReason         , 0)
+    TRIGGER(quint32     , venousPressureLimitWindowMinRejectionReason           , 0)
+    TRIGGER(quint32     , venousPressureLimitWindowMaxRejectionReason           , 0)
+    TRIGGER(quint32     , venousPressureLimitWindowDefRejectionReason           , 0)
+    TRIGGER(quint32     , venousPressureLimitAsymtrcMinRejectionReason          , 0)
+    TRIGGER(quint32     , venousPressureLimitAsymtrcMaxRejectionReason          , 0)
+    TRIGGER(quint32     , venousPressureLimitAsymtrcDefRejectionReason          , 0)
+    TRIGGER(quint32     , trancembrncPressureLimitWindowMinRejectionReason      , 0)
+    TRIGGER(quint32     , trancembrncPressureLimitWindowMaxRejectionReason      , 0)
+    TRIGGER(quint32     , trancembrncPressureLimitWindowDefRejectionReason      , 0)
+    TRIGGER(quint32     , ultrafiltrationVolumeMinRejectionReason               , 0)
+    TRIGGER(quint32     , ultrafiltrationVolumeMaxRejectionReason               , 0)
+    TRIGGER(quint32     , ultrafiltrationVolumeDefRejectionReason               , 0)
+    TRIGGER(quint32     , vitalsIntervalDefRejectionReason                      , 0)
+    TRIGGER(quint32     , rinsebackVolumeMinRejectionReason                     , 0)
+    TRIGGER(quint32     , rinsebackVolumeMaxRejectionReason                     , 0)
+    TRIGGER(quint32     , rinsebackVolumeDefRejectionReason                     , 0)
+    TRIGGER(quint32     , rinsebackFlowRateMinRejectionReason                   , 0)
+    TRIGGER(quint32     , rinsebackFlowRateMaxRejectionReason                   , 0)
+    TRIGGER(quint32     , rinsebackFlowRateDefRejectionReason                   , 0)
+    TRIGGER(quint32     , substitutionVolumeMinRejectionReason                  , 0)
+    TRIGGER(quint32     , substitutionVolumeMaxRejectionReason                  , 0)
+    TRIGGER(quint32     , substitutionVolumeDefRejectionReason                  , 0)
 
     VIEW_DEC_CLASS_ADJUSTMENT(VAdjustmentInstitutionalRecord, AdjustInstitutionalRecordResponseData)
 
-private:
-    QStringList titles() { return _titles; }
-    QStringList units () { return _units ; }
-
 public slots:
-    void doAdjustment() {
-        AdjustInstitutionalRequestData data;
-        emit didAdjustment(data);
-    }
+    void doConfirm  ();
 
 signals:
     void didAdjustment(const AdjustInstitutionalRequestData &vData);