Index: sources/view/VView.h
===================================================================
diff -u -r28f3f8dd18981262995386d29d3c2ab31418bfc4 -r13e65c3d271d503c2e2e2f1f20736652c470f8cc
--- sources/view/VView.h	(.../VView.h)	(revision 28f3f8dd18981262995386d29d3c2ab31418bfc4)
+++ sources/view/VView.h	(.../VView.h)	(revision 13e65c3d271d503c2e2e2f1f20736652c470f8cc)
@@ -1,16 +1,16 @@
 /*!
- * 
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ *
+ * Copyright (c) 2020-2022 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 vview.h
- * \author (last) Behrouz NematiPour
- * \date (last) 13-Aug-2020
- * \author (original) Behrouz NematiPour
- * \date (original) 10-Mar-2020
- * 
+ *
+ * \file    VView.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      10-Mar-2022
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  26-Aug-2020
+ *
  */
 #pragma once
 
@@ -83,14 +83,14 @@
 //--------------------------------------------------------------------------------//
 
 //--------------------------------------------------------------------------------//
-// The Adjustment child definition in cpp
+// The Adjustment child DEFinition in cpp and DEClaration in .h
 #define VIEW_DEC_CLASS_ADJUSTMENT(vCLASS, vDATATYPE)\
     VIEW_DEC_CLASS(vCLASS)                          \
     VIEW_DEC_SLOT(vDATATYPE)                        \
 //--------------------------------------------------------------------------------//
-#define VIEW_DEF_CLASS_ADJUSTMENT(vCLASS, vDATATYPE)                                \
+#define VIEW_DEF_CLASS_ADJUSTMENT(vCLASS)                                           \
     using namespace View;                                                           \
-    vCLASS::vCLASS(QObject *parent) : VTreatmentAdjustmentResponseBase(parent) {    \
+    vCLASS::vCLASS(QObject *parent) : VAdjustmentResponseBase(parent) {             \
         initConnections();                                                          \
     }                                                                               \
 //--------------------------------------------------------------------------------//
@@ -99,45 +99,102 @@
 //--------- Please add the view type to the lists below to register them ---------//
 //--------------------------------------------------------------------------------//
 //--------------------------------------------------------------------------------//
-#define REGISTER_VIEW_TYPES                                       \
-    using namespace View;                                         \
-                                                                  \
-    REGISTER_TYPE( VAlarmStatus                                 ) \
-    REGISTER_TYPE( VPowerOff                                    ) \
-                                                                  \
-    REGISTER_TYPE( VTreatmentBloodFlow                          ) \
-    REGISTER_TYPE( VTreatmentDialysateFlow                      ) \
-    REGISTER_TYPE( VTreatmentUltrafiltration                    ) \
-    REGISTER_TYPE( VTreatmentPressureOcclusion                  ) \
-    REGISTER_TYPE( VTreatmentTime                               ) \
-    REGISTER_TYPE( VTreatmentRanges                             ) \
-    REGISTER_TYPE( VTreatmentSaline                             ) \
-    REGISTER_TYPE( VTreatmentHeparin                            ) \
-    REGISTER_TYPE( VHDOperationMode                             ) \
-    REGISTER_TYPE( VHDTreatmentStates                           ) \
-                                                                  \
-    REGISTER_TYPE( VDGDrainPump                                 ) \
-    REGISTER_TYPE( VDGHeaters                                   ) \
-    REGISTER_TYPE( VDGLoadCellReadings                          ) \
-    REGISTER_TYPE( VDGOperationMode                             ) \
-    REGISTER_TYPE( VDGPressures                                 ) \
-    REGISTER_TYPE( VDGROPump                                    ) \
-    REGISTER_TYPE( VDGReservoir                                 ) \
-    REGISTER_TYPE( VDGTemperatures                              ) \
-    REGISTER_TYPE( VDGValvesStates                              ) \
-                                                                  \
-    REGISTER_TYPE( VTreatmentAdjustmentDuration                 ) \
-    REGISTER_TYPE( VTreatmentAdjustmentFlows                    ) \
-    REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationInit      ) \
-    REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationState     ) \
-    REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationEdit      ) \
-    REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationConfirm   ) \
-    REGISTER_TYPE( VTreatmentAdjustmentSaline                   ) \
-    REGISTER_TYPE( VTreatmentAdjustmentHeparin                  ) \
-    REGISTER_TYPE( VTreatmentAdjustmentPressuresLimits          ) \
-    REGISTER_TYPE( VTreatmentCreate                             ) \
-    REGISTER_TYPE( VPriming                                     ) \
-    REGISTER_TYPE( VTreatmentBegin                              ) \
-    REGISTER_TYPE( VTreatmentEnd                                ) \
-    
+#define REGISTER_VIEW_TYPES                                               \
+    using namespace View;                                                 \
+    REGISTER_TYPE( VGeneralEvent                                        ) \
+    /* CONFIRM  */                                                        \
+    REGISTER_TYPE( VConfirm                                             ) \
+    /* POST     */                                                        \
+    REGISTER_TYPE( VHDPOSTData                                          ) \
+    REGISTER_TYPE( VDGPOSTData                                          ) \
+    /* Device   */                                                        \
+    REGISTER_TYPE( VDevice                                              ) \
+    /* Settings */                                                        \
+    REGISTER_TYPE( VSettings                                            ) \
+    REGISTER_TYPE( VAdjustmentVersions                                  ) \
+    REGISTER_TYPE( VAdjustmentServiceMode                               ) \
+    REGISTER_TYPE( VAdjustmentServiceDates                              ) \
+    REGISTER_TYPE( VDateTime                                            ) \
+    REGISTER_TYPE( VNetworkModel                                        ) \
+    REGISTER_TYPE( VAdjustmentAlarmVolume                               ) \
+    REGISTER_TYPE( VBluetooth                                           ) \
+    /* Alarm         */                                                   \
+    REGISTER_TYPE( VAlarmStatus                                         ) \
+    REGISTER_TYPE( VAlarmActiveList                                     ) \
+    /* Treatment Common */                                                \
+    REGISTER_TYPE( VTreatmentVitals                                     ) \
+    /* Data - States */                                                   \
+    REGISTER_TYPE( VHDOperationMode                                     ) \
+    REGISTER_TYPE( VPreTreatmentStates                                  ) \
+    REGISTER_TYPE( VHDTreatmentStates                                   ) \
+    REGISTER_TYPE( VPostTreatmentStates                                 ) \
+    REGISTER_TYPE( VDisinfectStates                                     ) \
+    /* In-Treatment - Data */                                             \
+    REGISTER_TYPE( VTreatmentBloodFlow                                  ) \
+    REGISTER_TYPE( VTreatmentDialysateFlow                              ) \
+    REGISTER_TYPE( VTreatmentUltrafiltration                            ) \
+    REGISTER_TYPE( VTreatmentPressureOcclusion                          ) \
+    REGISTER_TYPE( VTreatmentTime                                       ) \
+    REGISTER_TYPE( VTreatmentRanges                                     ) \
+    REGISTER_TYPE( VTreatmentSaline                                     ) \
+    REGISTER_TYPE( VTreatmentHeparin                                    ) \
+    /* End-Treatment */                                                   \
+    REGISTER_TYPE( VTreatmentRinseback                                  ) \
+    REGISTER_TYPE( VTreatmentRecirculate                                ) \
+    REGISTER_TYPE( VTreatmentBloodPrime                                 ) \
+    REGISTER_TYPE( VTreatmentStop                                       ) \
+    /* Device - Data */                                                   \
+    REGISTER_TYPE( VHDAccelerometer                                     ) \
+    REGISTER_TYPE( VHDSyringePump                                       ) \
+    REGISTER_TYPE( VHDBloodLeak                                         ) \
+    REGISTER_TYPE( VHDAirBubble                                         ) \
+    REGISTER_TYPE( VHDAirTrap                                           ) \
+    /* DG - Data */                                                       \
+    REGISTER_TYPE( VDGDrainPump                                         ) \
+    REGISTER_TYPE( VDGHeaters                                           ) \
+    REGISTER_TYPE( VDGLoadCellReadings                                  ) \
+    REGISTER_TYPE( VDGOperationMode                                     ) \
+    REGISTER_TYPE( VDGPressures                                         ) \
+    REGISTER_TYPE( VDGROPump                                            ) \
+    REGISTER_TYPE( VDGReservoir                                         ) \
+    REGISTER_TYPE( VDGTemperatures                                      ) \
+    REGISTER_TYPE( VDGValvesStates                                      ) \
+    REGISTER_TYPE( VDGAccelerometer                                     ) \
+    REGISTER_TYPE( VDGConductivity                                      ) \
+    /* Pre-Treatment */                                                   \
+    REGISTER_TYPE( VPreTreatmentAdjustmentInitTreatment                 ) \
+    REGISTER_TYPE( VDGFilterFlush                                       ) \
+    REGISTER_TYPE( VPreTreatmentAdjustmentWaterSample                   ) \
+    REGISTER_TYPE( VPreTreatmentAdjustmentConsumablesConfirm            ) \
+    REGISTER_TYPE( VPreTreatmentSelfTestNoCartridge                     ) \
+    REGISTER_TYPE( VPreTreatmentAdjustmentDisposablesConfirm            ) \
+    REGISTER_TYPE( VPreTreatmentSelfTestDry                             ) \
+    REGISTER_TYPE( VPreTreatmentAdjustmentDisposablesPrime              ) \
+    REGISTER_TYPE( VPreTreatmentDisposablesPrime                        ) \
+    REGISTER_TYPE( VPreTreatmentAdjustmentPatientConnectionBegin        ) \
+    REGISTER_TYPE( VPreTreatmentAdjustmentUltrafiltrationInit           ) \
+    REGISTER_TYPE( VPreTreatmentAdjustmentPatientConnectionConfirm      ) \
+    REGISTER_TYPE( VPreTreatmentAdjustmentStartTreatment                ) \
+    /* In-Treatment */                                                    \
+    REGISTER_TYPE( VTreatmentAdjustmentDuration                         ) \
+    REGISTER_TYPE( VTreatmentAdjustmentFlows                            ) \
+    REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationState             ) \
+    REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationEdit              ) \
+    REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationConfirm           ) \
+    REGISTER_TYPE( VTreatmentAdjustmentSaline                           ) \
+    REGISTER_TYPE( VTreatmentAdjustmentHeparin                          ) \
+    REGISTER_TYPE( VTreatmentAdjustmentRinseback                        ) \
+    REGISTER_TYPE( VTreatmentAdjustmentRecirculate                      ) \
+    REGISTER_TYPE( VTreatmentAdjustmentEnd                              ) \
+    REGISTER_TYPE( VTreatmentAdjustmentPressuresLimits                  ) \
+    REGISTER_TYPE( VTreatmentCreate                                     ) \
+    /* Post-Treatment */                                                  \
+    REGISTER_TYPE( VPostTreatmentAdjustmentPatientDisconnectionConfirm  ) \
+    REGISTER_TYPE( VPostTreatmentAdjustmentDisposablesRemovalConfirm    ) \
+    REGISTER_TYPE( VPostTreatmentAdjustmentTreatmentLog                 ) \
+    /* Disinfection */                                                    \
+    REGISTER_TYPE( VDisinfectDGData                                     ) \
+    REGISTER_TYPE( VDisinfectAdjustDisinfect                            ) \
+    REGISTER_TYPE( VDisinfectAdjustChemicalConfirm                      ) \
+
 //--------------------------------------------------------------------------------//