Index: sources/view/settings/VCalibrationSettings.h
===================================================================
diff -u -r50d6907ed1bef8273ad246a823073153016997e1 -r969fb65fb9857c0a6a84cb9f7d591d16de40e898
--- sources/view/settings/VCalibrationSettings.h	(.../VCalibrationSettings.h)	(revision 50d6907ed1bef8273ad246a823073153016997e1)
+++ sources/view/settings/VCalibrationSettings.h	(.../VCalibrationSettings.h)	(revision 969fb65fb9857c0a6a84cb9f7d591d16de40e898)
@@ -6,10 +6,8 @@
 // Project
 #include "main.h" // Doxygen : do not remove
 #include "VAdjustmentResponseBase.h"
-//#include "MAdjustTDInstitutionalRecordResponse.h"
 #include "MListModel.h"
 #include "MSettings.h"
-//#include "MTDInstitutionalRecordResponse.h"
 
 namespace View {
 
@@ -26,95 +24,48 @@
     // friends
     friend class ::tst_views;
 
-
-
     enum {
         eRole_Title = Qt::UserRole + 1  ,
-        eRole_Units                     ,
-        eRole_Min                       ,
-        eRole_Max                       ,
-        eRole_Step                      ,
-        eRole_Decimal                   ,
-        eRole_MinVal                    ,
-        eRole_MaxVal                    ,
-        eRole_DefVal                    ,
-        eRole_RejectionMin              ,
-        eRole_RejectionMax              ,
-        eRole_RejectionDef              ,
-        eRole_CanOff                    ,
+        eRole_Component                 ,
+        eRole_Payload                   ,
     } DataRole;
 
     enum {
-        eBloodFlowRate                   ,
-        eDialysateFlowRate               ,
-        eTreatmentDuration               ,
-        eHeparinBolusVolume              ,
-        eHeparinDispenseRate             ,
-        eHeparinStopTime                 ,
-        eDialysateTemperature            ,
-        eAcidCompositionPotassium        ,
-        eAcidCompositionCalcium          ,
-        eBicarbFinalDialysateComposition ,
-        eSodiumFinalDialysateComposition ,
-        eFluidBolusVolume                ,
-        eArterialPressureLimit           ,
-        eVenousPressureLimit             ,
-        eVenousAsymPressureLimit         ,
-        eTMPWindowLimit                  ,
-        eUFVolume                        ,
-        eVitalsInterval                  ,
-        eRinsebackVolume                 ,
-        eRinsebackFlowRate               ,
-        eSubstitutionVolume
+        ePressure               ,
+        eTemperature            ,
+        eConcentratePump        ,
+        eDialysatePumpD48       ,
+        eDialysatePumpD1        ,
+        eAcidTypes              ,
+        eBicarbTypes            ,
+        eAccelerometer          ,
+        eBloodLeak
     } Records;
 
     // 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)
+    TRIGGER( bool           , adjustment        , 0 )
 
-//    RANGESET( quint32       , bloodFlowRate                                 , 0)
-//    RANGESET( quint32       , dialysateFlowRate                             , 0)
-//    RANGESET( quint32       , treatmentDuration                             , 0)
-//    RANGESET( float         , heparinBolusVolume                            , 0)
-//    RANGESET( float         , heparinDispensingRate                         , 0)
-//    RANGESET( quint32       , heparinStopTime                               , 0)
-//    RANGESET( float         , dialysateTemp                                 , 0)
-//    RANGESET( float         , acidConcentratePotassium                      , 0)
-//    RANGESET( float         , acidConcentrateCalcium                        , 0)
-//    RANGESET( quint32       , fluidBolusVolume                              , 0)
-//    RANGESET( quint32       , bicarbFinalDialysateComposition               , 0)
-//    RANGESET( quint32       , sodiumFinalDialysateComposition               , 0)
-//    RANGESET( qint32        , arterialPressureLimitWindow                   , 0)
-//    RANGESET( qint32        , venousPressureLimitWindow                     , 0)
-//    RANGESET( qint32        , venousPressureLimitAsymtrc                    , 0)
-//    RANGESET( qint32        , trancembrncPressureLimitWindow                , 0)
-//    RANGESET( float         , ultrafiltrationVolume                         , 0)
-//    RANGESET( quint32       , rinsebackVolume                               , 0)
-//    RANGESET( quint32       , rinsebackFlowRate                             , 0)
-//    RANGESET( float         , substitutionVolume                            , 0)
+    PROPERTY(QStringList    , columnTitle       , {})
+    PROPERTY(QVariantList   , rejectionReasons  , {})
 
     Q_PROPERTY(MListModel*  model        READ model       NOTIFY didModelChange)
 
-    VIEW_DEC_CLASS(VCalibrationSettings);
+    VIEW_DEC_CLASS(VCalibrationSettings); /// REMOVE ONCE RESPONSE INPOMEPLEENTED
 //    VIEW_DEC_CLASS_ADJUSTMENT(VCalibrationSettings, InstitutionalRecordResponseData )
-//    VIEW_DEC_SLOT(SettingsData                                                      )
-//    VIEW_DEC_SLOT(AdjustInstitutionalRecordResponseData                             )
 
 private:
     MListModel* model () { return &_calibrationList;  }
     MListModel  _calibrationList;
-    void        initModel();
+    QVariantList createInitPayload(int vCount);
+    quint32 getEpochUTC();
 
 public slots:
-//    void doAdjustment() {
-//        InstitutionalRequestData data;
-//        emit didAdjustment(data);
-//    }
+    void refreshList (int vIndex);
+    void doAdjustment(int vIndex, int vSensorIndex, QVariantList vPayload);
 
-//    void clearRejectionReason(const int &vRow, const int &vRange);
 
 signals:
-//    void didAdjustment(const InstitutionalRequestData &vData);
     void didModelChange();
 };
 }