Index: leahi.pro
===================================================================
diff -u -rea37bc16ab57586729e332c2a9df3299f91012ca -rb0ad6789ac542b1c24db1d89af3d4e1411a4d4f1
--- leahi.pro	(.../leahi.pro)	(revision ea37bc16ab57586729e332c2a9df3299f91012ca)
+++ leahi.pro	(.../leahi.pro)	(revision b0ad6789ac542b1c24db1d89af3d4e1411a4d4f1)
@@ -165,13 +165,15 @@
     sources/model/dd/data/MDDPressuresData.h \
     sources/model/dd/data/MDDTemperaturesData.h \
     sources/model/dd/data/MDDValvesStatesData.h \
+    sources/model/dd/data/MDDOperationModeData.h \
     sources/model/fp/adjustment/settings/MAdjustFPVersionsResponse.h \
     sources/model/fp/data/MFPBoostPumpData.h \
     sources/model/fp/data/MFPConductivityData.h \
     sources/model/fp/data/MFPFlowData.h \
     sources/model/fp/data/MFPLevelData.h \
     sources/model/fp/data/MFPPressuresData.h \
     sources/model/fp/data/MFPROPumpData.h \
+    sources/model/fp/data/MFPRORejectionPercentageData.h \
     sources/model/fp/data/MFPTemperatureData.h \
     sources/model/td/adjustment/settings/MAdjustTDAdvancedInstitutionalRecordResponse.h \
     sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.h \
@@ -189,6 +191,7 @@
     sources/model/td/data/MTDTemperatureData.h \
     sources/model/td/data/MTDValvesData.h \
     sources/model/td/data/MTDVoltageData.h \
+    sources/model/td/data/MWaterSampleData.h \
     sources/model/td/data/treatment/MTreatmentBloodFlowData.h \
     sources/model/td/data/treatment/MTreatmentBloodPrimeData.h \
     sources/model/td/data/treatment/MTreatmentIsolatedUFData.h \
@@ -234,7 +237,8 @@
     sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h \
     \ # ---------- Views - TD - Data - States                                   //// ----- @LEAHIZED
-    sources/view/VListModel.h \
+    sources/view/VHeaderbarModel.h \
+    sources/view/VWaterSampleModel.h \
     sources/view/dd/data/VDDBloodLeakData.h \
     sources/view/dd/data/VDDConcentratePumpData.h \
     sources/view/dd/data/VDDConductivityData.h \
@@ -245,12 +249,14 @@
     sources/view/dd/data/VDDPressuresData.h \
     sources/view/dd/data/VDDTemperaturesData.h \
     sources/view/dd/data/VDDValvesStatesData.h \
+    sources/view/dd/data/VDDOperationModeData.h \
     sources/view/fp/data/VFPBoostPumpData.h \
     sources/view/fp/data/VFPConductivityData.h \
     sources/view/fp/data/VFPFlowData.h \
     sources/view/fp/data/VFPLevelData.h \
     sources/view/fp/data/VFPPressuresData.h \
     sources/view/fp/data/VFPROPumpData.h \
+    sources/view/fp/data/VFPRORejectionPercentageData.h \
     sources/view/fp/data/VFPTemperatureData.h \
     sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \
     sources/view/settings/VAdvancedInstitutionalRecord.h \
@@ -266,6 +272,7 @@
     sources/view/td/data/VTDValvesData.h \
     sources/view/td/data/VTDVoltageData.h \
     sources/view/td/data/VTreatmentRanges.h \
+    sources/view/td/data/VWaterSampleData.h \
     \ # ---------- Views - TD - Data - In-Treatment
     sources/view/td/data/treatment/VTDTreatmentStatesData.h \
     sources/view/td/data/treatment/VTreatmentBloodFlow.h \
@@ -300,6 +307,7 @@
     \ # ---------- Views - TD - Adjustment - Pre-Treatment
     sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h \
     sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h \
+    sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \
     \ # ---------- Views - TD - Adjustment - Post-Treatment
     sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h \
     sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h \
@@ -319,6 +327,7 @@
     \ # ---------- Models - TD - Adjustment - Pre-Treatment
     sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h \
     sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h \
+    sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResultResponse.h \
     \ # ---------- Models - TD - Adjustment - Post-Treatment
     sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustRequests.h \
     sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h \
@@ -359,7 +368,6 @@
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h \
-    sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.h \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.h \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.h \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.h \
@@ -404,7 +412,6 @@
     sources/model/dg/data/MDGGeneralEvent.h \
     sources/model/dg/data/MDGDrainPumpData.h \
     sources/model/dg/data/MDGLoadCellReadingsData.h \
-    sources/model/dg/data/MDGOperationModeData.h \
     sources/model/dg/data/MDGReservoirData.h \
     sources/model/dg/data/MDGROPumpData.h \
     sources/model/dg/data/MDGAccelerometerData.h \
@@ -455,7 +462,6 @@
     sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h \
     \ # ---------- Views - HD - Adjustment - Pre-Treatment
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.h \
-    sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.h \
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.h \
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.h \
@@ -490,7 +496,6 @@
     \ # ---------- Views - DG - Data - Disinfection - Progress
     \ # ---------- Views - DG - States
     \ # ---------- Views - DG - Data
-    sources/view/dg/data/VDGOperationModeData.h \
     sources/view/dg/data/VDGDrainPumpData.h \
     sources/view/dg/data/VDGLoadCellReadingsData.h \
     sources/view/dg/data/VDGROPumpData.h \
@@ -531,13 +536,15 @@
     sources/model/dd/data/MDDPressuresData.cpp \
     sources/model/dd/data/MDDTemperaturesData.cpp \
     sources/model/dd/data/MDDValvesStatesData.cpp \
+    sources/model/dd/data/MDDOperationModeData.cpp \
     sources/model/fp/adjustment/settings/MAdjustFPVersionsResponse.cpp \
     sources/model/fp/data/MFPBoostPumpData.cpp \
     sources/model/fp/data/MFPConductivityData.cpp \
     sources/model/fp/data/MFPFlowData.cpp \
     sources/model/fp/data/MFPLevelData.cpp \
     sources/model/fp/data/MFPPressuresData.cpp \
     sources/model/fp/data/MFPROPumpData.cpp \
+    sources/model/fp/data/MFPRORejectionPercentageData.cpp \
     sources/model/fp/data/MFPTemperatureData.cpp \
     sources/model/td/adjustment/settings/MAdjustTDAdvancedInstitutionalRecordResponse.cpp \
     sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.cpp \
@@ -554,6 +561,7 @@
     sources/model/td/data/MTDTemperatureData.cpp \
     sources/model/td/data/MTDValvesData.cpp \
     sources/model/td/data/MTDVoltageData.cpp \
+    sources/model/td/data/MWaterSampleData.cpp \
     sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp \
     sources/model/td/data/treatment/MTreatmentBloodPrimeData.cpp \
     sources/model/td/data/treatment/MTreatmentIsolatedUFData.cpp \
@@ -568,7 +576,8 @@
     sources/model/ui/data/MUIBloodPressureData.cpp \
     sources/storage/Settings.cpp \
     sources/storage/TreatmentLog.cpp \
-    sources/view/VListModel.cpp \
+    sources/view/VHeaderbarModel.cpp \
+    sources/view/VWaterSampleModel.cpp \
     sources/view/dd/data/VDDBloodLeakData.cpp \
     sources/view/dd/data/VDDConcentratePumpData.cpp \
     sources/view/dd/data/VDDConductivityData.cpp \
@@ -579,12 +588,14 @@
     sources/view/dd/data/VDDPressuresData.cpp \
     sources/view/dd/data/VDDTemperaturesData.cpp \
     sources/view/dd/data/VDDValvesStatesData.cpp \
+    sources/view/dd/data/VDDOperationModeData.cpp \
     sources/view/fp/data/VFPBoostPumpData.cpp \
     sources/view/fp/data/VFPConductivityData.cpp \
     sources/view/fp/data/VFPFlowData.cpp \
     sources/view/fp/data/VFPLevelData.cpp \
     sources/view/fp/data/VFPPressuresData.cpp \
     sources/view/fp/data/VFPROPumpData.cpp \
+    sources/view/fp/data/VFPRORejectionPercentageData.cpp \
     sources/view/fp/data/VFPTemperatureData.cpp \
     sources/view/hd/data/post/VHDPOSTData.cpp \
     sources/bluetooth/BluetoothInterface.cpp \
@@ -651,6 +662,7 @@
     \ # ---------- Models - TD - Adjustment - Pre-Treatment
     sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \
     sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \
+    sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResultResponse.cpp \
     \ # ---------- Models - TD - Adjustment - Post-Treatment
     sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp \
     sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.cpp \
@@ -666,7 +678,6 @@
     \ # ---------- Models - HD - Adjustment - Pre-Treatment
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp \
-    sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.cpp \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp \
@@ -708,7 +719,6 @@
     sources/model/dg/data/MDGGeneralEvent.cpp \
     sources/model/dg/data/MDGDrainPumpData.cpp \
     sources/model/dg/data/MDGLoadCellReadingsData.cpp \
-    sources/model/dg/data/MDGOperationModeData.cpp \
     sources/model/dg/data/MDGReservoirData.cpp \
     sources/model/dg/data/MDGROPumpData.cpp \
     sources/model/dg/data/MDGAccelerometerData.cpp \
@@ -744,6 +754,7 @@
     sources/view/td/data/VTDValvesData.cpp \
     sources/view/td/data/VTDVoltageData.cpp \
     sources/view/td/data/VTreatmentRanges.cpp \
+    sources/view/td/data/VWaterSampleData.cpp \
     \ # ---------- Views - TD - Data - In-Treatment
     sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \
     sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \
@@ -778,6 +789,7 @@
     \ # ---------- Views - TD - Adjustment - Pre-Treatment
     sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp \
     sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp \
+    sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \
     \ # ---------- Views - TD - Adjustment - Post-Treatment
     sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.cpp \
     sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp \
@@ -810,7 +822,6 @@
     sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp \
     \ # ---------- Views - HD - Adjustment - Pre-Treatment
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.cpp \
-    sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.cpp \
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.cpp \
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.cpp \
@@ -848,7 +859,6 @@
     \ # ---------- Views - DG - Data
     sources/view/dg/data/VDGDrainPumpData.cpp \
     sources/view/dg/data/VDGLoadCellReadingsData.cpp \
-    sources/view/dg/data/VDGOperationModeData.cpp \
     sources/view/dg/data/VDGROPumpData.cpp \
     sources/view/dg/data/VDGReservoirData.cpp \
     sources/view/dg/data/VDGAccelerometerData.cpp \
Index: leahi.qrc
===================================================================
diff -u -rd82802819678ccdb5d2cf480cf06071c4b4b4197 -rb0ad6789ac542b1c24db1d89af3d4e1411a4d4f1
--- leahi.qrc	(.../leahi.qrc)	(revision d82802819678ccdb5d2cf480cf06071c4b4b4197)
+++ leahi.qrc	(.../leahi.qrc)	(revision b0ad6789ac542b1c24db1d89af3d4e1411a4d4f1)
@@ -132,6 +132,10 @@
         <file alias="iBloodpump">resources/images/bloodpump.png</file>
         <file alias="iEditYellow">resources/images/edit_yellow.png</file>
         <file alias="iLeahiConsole">resources/images/leahi-console.png</file>
+        <file alias="iMoon">resources/images/moon.png</file>
+        <file alias="iSun">resources/images/sun.png</file>
+        <file alias="iCarbonFilter1">resources/images/carbon_filter_1.png</file>
+        <file alias="iCarbonFilter2">resources/images/carbon_filter_2.png</file>
     </qresource>
     <qresource prefix="/components">
         <file alias="MainMenu.qml">sources/gui/qml/components/MainMenu.qml</file>
Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r70d6ebddd11a5df068f059fd563a0c1d0b50a2a3 -rb0ad6789ac542b1c24db1d89af3d4e1411a4d4f1
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 70d6ebddd11a5df068f059fd563a0c1d0b50a2a3)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision b0ad6789ac542b1c24db1d89af3d4e1411a4d4f1)
@@ -238,7 +238,6 @@
     case Gui::GuiActionType::ID_AdjustInitTreatmentReq                  : INTERPRET_TRANSMIT_MESSAGE(AdjustInitTreatmentRequestData                 ); break;
     case Gui::GuiActionType::ID_AdjustParametersValidationReq           : INTERPRET_TRANSMIT_MESSAGE(AdjustParametersValidationRequestData          ); break;
     case Gui::GuiActionType::ID_AdjustParametersConfirmReq              : INTERPRET_TRANSMIT_MESSAGE(AdjustParametersConfirmRequestData             ); break;
-    case Gui::GuiActionType::ID_AdjustWaterSampleReq                    : INTERPRET_TRANSMIT_MESSAGE(AdjustWaterSampleRequestData                   ); break;
     case Gui::GuiActionType::ID_AdjustWaterSampleResultReq              : INTERPRET_TRANSMIT_MESSAGE(AdjustWaterSampleResultRequestData             ); break;
     case Gui::GuiActionType::ID_AdjustConsumablesConfirmReq             : INTERPRET_TRSMT_MT_MESSAGE(AdjustConsumablesConfirmRequestData            ); break;
     case Gui::GuiActionType::ID_AdjustDisposablesConfirmReq             : INTERPRET_TRSMT_MT_MESSAGE(AdjustDisposablesConfirmRequestData            ); break;
@@ -516,16 +515,19 @@
     case Gui::GuiActionType::ID_SelfTestNoCartridgeData             : ok = notify<Model::MPreTreatmentSelfTestNoCartridge           >(vMessage, vData, Gui::GuiActionType::ID_SelfTestNoCartridgeData           ); break;
     case Gui::GuiActionType::ID_SelfTestDryData                     : ok = notify<Model::MPreTreatmentSelfTestDry                   >(vMessage, vData, Gui::GuiActionType::ID_SelfTestDryData                   ); break;
     case Gui::GuiActionType::ID_DisposablesPrimeData                : ok = notify<Model::MPreTreatmentDisposablesPrime              >(vMessage, vData, Gui::GuiActionType::ID_DisposablesPrimeData              ); break;
-    // ----- Pre-Treatment - Adjust
+
+        // ----- Pre-Treatment - Adjust
     case Gui::GuiActionType::ID_AdjustInitTreatmentRsp              : ok = notify<Model::MAdjustInitTreatmentResponse               >(vMessage, vData, Gui::GuiActionType::ID_AdjustInitTreatmentRsp            ); break;
     case Gui::GuiActionType::ID_AdjustParametersValidationRsp       : ok = notify<Model::MAdjustParametersValidationResponse        >(vMessage, vData, Gui::GuiActionType::ID_AdjustParametersValidationRsp     ); break;
-    case Gui::GuiActionType::ID_AdjustWaterSampleRsp                : ok = notify<Model::MAdjustWaterSampleResponse                 >(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleRsp              ); break;
+    case Gui::GuiActionType::ID_AdjustWaterSampleResultRsp          : ok = notify<Model::MAdjustWaterSampleResultResponse           >(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleResultRsp        ); break;
     case Gui::GuiActionType::ID_AdjustDisposablesConfirmRsp         : ok = notify<Model::MAdjustDisposablesConfirmResponse          >(vMessage, vData, Gui::GuiActionType::ID_AdjustDisposablesConfirmRsp       ); break;
     case Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp           : ok = notify<Model::MAdjustDisposablesPrimeResponse            >(vMessage, vData, Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp         ); break;
     case Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp     : ok = notify<Model::MAdjustPatientConnectionBeginResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp   ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp        : ok = notify<Model::MAdjustUltrafiltrationInitResponse         >(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp      ); break;
     case Gui::GuiActionType::ID_AdjustPatientConnectionConfirmRsp   : ok = notify<Model::MAdjustPatientConnectionConfirmResponse    >(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientConnectionConfirmRsp ); break;
     case Gui::GuiActionType::ID_AdjustStartTreatmentRsp             : ok = notify<Model::MAdjustStartTreatmentResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustStartTreatmentRsp           ); break;
+    case Gui::GuiActionType::ID_AdjustWaterSampleData               : ok = notify<Model::MWaterSample                               >(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleData             ); break;
+//    case Gui::GuiActionType::ID_AdjustWaterSampleTimeout            : ok = notify<Model::MAdjustWaterSampleResponse                 >(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleTimeout          ); break;
 
     // ----- In-Treatment - Datum
     case Gui::GuiActionType::ID_TreatmentTime                       : ok = notify<Model::MTreatmentTime                             >(vMessage, vData, Gui::GuiActionType::ID_TreatmentTime                     ); break;
@@ -591,7 +593,8 @@
 
     // unhandled messages: these will only be logged as received message
     // there has nothing been defined for these messages.
-    default                                                         :      printUnhandled                                        (vMessage                                                                      ); break;
+//    default                                                         :      printUnhandled                                        (vMessage                                                                      ); break;
+    default: break; //FIXME later enabled
     }
 
     return ok;
@@ -617,6 +620,8 @@
     switch (vMessage.actionId) { // notice we are in receive mode
     case Gui::GuiActionType::ID_Acknow                      : ok = true;                                                                    /* TODO : implement notify<>() */              break;
         LOG_APPED(QString("DD,CheckIn," + QVariant(vData).toStringList().join(',')));                                                                                                      break;
+
+    /*
     // ----- POST
     case Gui::GuiActionType::ID_DGPostSingleResultData      : ok = notify<Model::MDGPostSingleResult            >(vMessage, vData, Gui::GuiActionType::ID_DGPostSingleResultData        ); break;
     case Gui::GuiActionType::ID_DGPostFinalResultData       : ok = notify<Model::MDGPostFinalResult             >(vMessage, vData, Gui::GuiActionType::ID_DGPostFinalResultData         ); break;
@@ -625,7 +630,6 @@
     case Gui::GuiActionType::ID_DGROPumpData                : ok = notify<Model::MDGROPump                      >(vMessage, vData, Gui::GuiActionType::ID_DGROPumpData                  ); break;
     case Gui::GuiActionType::ID_DDPressuresData             : ok = notify<Model::MDDPressures                   >(vMessage, vData, Gui::GuiActionType::ID_DDPressuresData               ); break;
     case Gui::GuiActionType::ID_DGDrainPumpData             : ok = notify<Model::MDGDrainPump                   >(vMessage, vData, Gui::GuiActionType::ID_DGDrainPumpData               ); break;
-    case Gui::GuiActionType::ID_DGOperationModeData         : ok = notify<Model::MDGOperationMode               >(vMessage, vData, Gui::GuiActionType::ID_DGOperationModeData           ); break;
     case Gui::GuiActionType::ID_DGReservoirData             : ok = notify<Model::MDGReservoir                   >(vMessage, vData, Gui::GuiActionType::ID_DGReservoirData               ); break;
     case Gui::GuiActionType::ID_DDValvesStatesData          : ok = notify<Model::MDDValvesStates                >(vMessage, vData, Gui::GuiActionType::ID_DDValvesStatesData            ); break;
     case Gui::GuiActionType::ID_DDHeatersData               : ok = notify<Model::MDDHeaters                     >(vMessage, vData, Gui::GuiActionType::ID_DDHeatersData                 ); break;
@@ -636,24 +640,34 @@
     case Gui::GuiActionType::ID_DDDebugText                 : ok = notify<Model::MDGDebugText                   >(vMessage, vData, Gui::GuiActionType::ID_DDDebugText                   ); break;
     case Gui::GuiActionType::ID_DGGeneralEvent              : ok = notify<Model::MDGGeneralEvent                >(vMessage, vData, Gui::GuiActionType::ID_DGGeneralEvent                ); break;
     case Gui::GuiActionType::ID_DGAccelerometerData         : ok = notify<Model::MDGAccelerometer               >(vMessage, vData, Gui::GuiActionType::ID_DGAccelerometerData           ); break;
-    case Gui::GuiActionType::ID_DDConductivityData          : ok = notify<Model::MDDConductivityData            >(vMessage, vData, Gui::GuiActionType::ID_DDConductivityData            ); break;
-    case Gui::GuiActionType::ID_DDGenDialysateData          : ok = notify<Model::MDDGenDialysateData            >(vMessage, vData, Gui::GuiActionType::ID_DDGenDialysateData            ); break;
     case Gui::GuiActionType::ID_DDLevelData                 : ok = notify<Model::MDDLevelData                   >(vMessage, vData, Gui::GuiActionType::ID_DDLevelData                   ); break;
     case Gui::GuiActionType::ID_DDBloodLeakData             : ok = notify<Model::MDDBloodLeakData               >(vMessage, vData, Gui::GuiActionType::ID_DDBloodLeakData               ); break;
     // ----- Datum - Pre-Treatment progress
     case Gui::GuiActionType::ID_DGFilterFlushData           : ok = notify<Model::MDGFilterFlush                 >(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlushData             ); break;
     // DG Response Messages
-    case Gui::GuiActionType::ID_AdjustVersionsDDRsp         : ok = notify<Model::MAdjustVersionsDDResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDDRsp           ); break;
-    case Gui::GuiActionType::ID_AdjustSerialDDRsp           : ok = notify<Model::MAdjustSerialNumberDDResponse  >(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDDRsp             ); break;
     case Gui::GuiActionType::ID_AdjustServiceDatesDGRsp     : ok = notify<Model::MAdjustServiceDatesDGResponse  >(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesDGRsp       ); break;
-    case Gui::GuiActionType::ID_AdjustDDDateTimeRsp         : ok = notify<Model::MAdjustDDDateTimeResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustDDDateTimeRsp           ); break;
     case Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp    : ok = notify<Model::MAdjustDGCleaningUsageResponse >(vMessage, vData, Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp      ); break;
     // RO Water
     case Gui::GuiActionType::ID_DuetRoWaterStatDGq          : ok = notify<Model::MDuetRoWaterStatDGq            >(vMessage, vData, Gui::GuiActionType::ID_DuetRoWaterStatDGq            ); break;
     case Gui::GuiActionType::ID_DuetRoWaterModeDGr          : ok = notify<Model::MDuetRoWaterModeDGr            >(vMessage, vData, Gui::GuiActionType::ID_DuetRoWaterModeDGr            ); break;
     // unhandled messages: these will only be logged as received message
     // there has nothing been defined for these messages.
     default                                                 :      printUnhandled                                (vMessage                                                              ); break;
+    */
+        ///////////////////////////////////////
+        //// FIXME: RO LOOP TEST
+        ///////////////////////////////////////
+
+
+    case Gui::GuiActionType::ID_DDGenDialysateData          : ok = notify<Model::MDDGenDialysateData            >(vMessage, vData, Gui::GuiActionType::ID_DDGenDialysateData            ); break;
+    case Gui::GuiActionType::ID_DDConductivityData          : ok = notify<Model::MDDConductivityData            >(vMessage, vData, Gui::GuiActionType::ID_DDConductivityData            ); break;
+
+    case Gui::GuiActionType::ID_AdjustDDDateTimeRsp         : ok = notify<Model::MAdjustDDDateTimeResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustDDDateTimeRsp           ); break;
+    case Gui::GuiActionType::ID_DDOperationModeData         : ok = notify<Model::MDDOperationMode               >(vMessage, vData, Gui::GuiActionType::ID_DDOperationModeData           ); break;
+    case Gui::GuiActionType::ID_AdjustVersionsDDRsp         : ok = notify<Model::MAdjustVersionsDDResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDDRsp           ); break;
+    case Gui::GuiActionType::ID_AdjustSerialDDRsp           : ok = notify<Model::MAdjustSerialNumberDDResponse  >(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDDRsp             ); break;
+
+    default: break; //FIXME later enabled
     }
 
     return ok;
@@ -681,20 +695,22 @@
         LOG_APPED(QString("FP,CheckIn," + QVariant(vData).toStringList().join(',')));                                                                                                      break;
 
     // FP data messages
-    case Gui::GuiActionType::ID_FPROPumpData                : ok = notify<Model::MFPROPump                      >(vMessage, vData, Gui::GuiActionType::ID_FPROPumpData              ); break;
-    case Gui::GuiActionType::ID_FPPressuresData             : ok = notify<Model::MFPPressures                   >(vMessage, vData, Gui::GuiActionType::ID_FPPressuresData           ); break;
-    case Gui::GuiActionType::ID_FPLevelData                 : ok = notify<Model::MFPLevel                       >(vMessage, vData, Gui::GuiActionType::ID_FPLevelData               ); break;
-    case Gui::GuiActionType::ID_FPFlowSensorData            : ok = notify<Model::MFPFlow                        >(vMessage, vData, Gui::GuiActionType::ID_FPFlowSensorData          ); break;
-    case Gui::GuiActionType::ID_FPConductivityData          : ok = notify<Model::MFPConductivity                >(vMessage, vData, Gui::GuiActionType::ID_FPConductivityData        ); break;
-    case Gui::GuiActionType::ID_FPTemperaturesData          : ok = notify<Model::MFPTemperature                 >(vMessage, vData, Gui::GuiActionType::ID_FPTemperaturesData        ); break;
-    case Gui::GuiActionType::ID_FPROBoosterPumpData         : ok = notify<Model::MFPBoostPump                   >(vMessage, vData, Gui::GuiActionType::ID_FPROBoosterPumpData       ); break;
+    case Gui::GuiActionType::ID_FPROPumpData                : ok = notify<Model::MFPROPump                      >(vMessage, vData, Gui::GuiActionType::ID_FPROPumpData                  ); break;
+    case Gui::GuiActionType::ID_FPPressuresData             : ok = notify<Model::MFPPressures                   >(vMessage, vData, Gui::GuiActionType::ID_FPPressuresData               ); break;
+    case Gui::GuiActionType::ID_FPLevelData                 : ok = notify<Model::MFPLevel                       >(vMessage, vData, Gui::GuiActionType::ID_FPLevelData                   ); break;
+    case Gui::GuiActionType::ID_FPFlowSensorData            : ok = notify<Model::MFPFlow                        >(vMessage, vData, Gui::GuiActionType::ID_FPFlowSensorData              ); break;
+    case Gui::GuiActionType::ID_FPConductivityData          : ok = notify<Model::MFPConductivity                >(vMessage, vData, Gui::GuiActionType::ID_FPConductivityData            ); break;
+    case Gui::GuiActionType::ID_FPTemperaturesData          : ok = notify<Model::MFPTemperature                 >(vMessage, vData, Gui::GuiActionType::ID_FPTemperaturesData            ); break;
+    case Gui::GuiActionType::ID_FPROBoosterPumpData         : ok = notify<Model::MFPBoostPump                   >(vMessage, vData, Gui::GuiActionType::ID_FPROBoosterPumpData           ); break;
+    case Gui::GuiActionType::ID_FPRORejectionPercentageData : ok = notify<Model::MFPRORejectionPercentage       >(vMessage, vData, Gui::GuiActionType::ID_FPRORejectionPercentageData   ); break;
 
     // FP Response Messages
     case Gui::GuiActionType::ID_AdjustVersionsFPRsp         : ok = notify<Model::MAdjustVersionsFPResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsFPRsp       ); break;
 
     // unhandled messages: these will only be logged as received message
     // there has nothing been defined for these messages.
-    default                                                 :      printUnhandled                                (vMessage                                                          ); break;
+//    default                                                 :      printUnhandled                                (vMessage                                                          ); break;
+    default: break; //FIXME later enabled
     }
 
     return ok;
Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -rfb1185f1c17778a9f8b300170d8d635a1532f6b4 -rb0ad6789ac542b1c24db1d89af3d4e1411a4d4f1
--- sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision fb1185f1c17778a9f8b300170d8d635a1532f6b4)
+++ sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision b0ad6789ac542b1c24db1d89af3d4e1411a4d4f1)
@@ -342,5 +342,6 @@
     // Concentration
     readonly property string unitTextConcentration          : qsTr("mEq/L")
     readonly property string unitTextHeparinConcentration   : qsTr("IU/mL")
-
+    // - hepatitis
+    readonly property string unitHepatitis                  : qsTr("HbsAg")
 }
Index: sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml
===================================================================
diff -u -r3365ef23a278ef93f2bf6ff10b5637ad4f1b9d83 -rb0ad6789ac542b1c24db1d89af3d4e1411a4d4f1
--- sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml	(.../PostTreatmentReview.qml)	(revision 3365ef23a278ef93f2bf6ff10b5637ad4f1b9d83)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml	(.../PostTreatmentReview.qml)	(revision b0ad6789ac542b1c24db1d89af3d4e1411a4d4f1)
@@ -34,14 +34,11 @@
         spacing     : Variables.defaultMargin
         height      : 75
 
-        anchors {
-            top             : header.bottom
-            topMargin       : Variables.defaultMargin / 2
-            left            : parent.left
-            leftMargin      : Variables.defaultMargin * 4
-            right           : parent.right
-            rightMargin     : Variables.defaultMargin * 4
-        }
+    ScrollBar {
+        anchors.fill: _flickable
+        flickable   : _flickable
+        color       : Colors.backgroundDialog
+    }
 
         Item { id: _legend
             width: _root.columnWidth