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 \