Index: leahi.pro
===================================================================
diff -u -rc9764bd0ad823c5c1725d7c7f556290c2c459d4d -r4035fe64301494f2e1b5c9811e55efa2c6c55aa1
--- leahi.pro	(.../leahi.pro)	(revision c9764bd0ad823c5c1725d7c7f556290c2c459d4d)
+++ leahi.pro	(.../leahi.pro)	(revision 4035fe64301494f2e1b5c9811e55efa2c6c55aa1)
@@ -64,6 +64,7 @@
     sources/model/td/adjustment \
     sources/model/td/adjustment/settings \
     sources/model/td/adjustment/treatment \
+    sources/model/td/adjustment/pretreatment \
     sources/model/dd    \
     sources/model/dd/data   \
     sources/model/dd/adjustment \
@@ -77,6 +78,7 @@
     sources/view/td/data \
     sources/view/td/data/treatment \
     sources/view/td/adjustment/treatment \
+    sources/view/td/adjustment/pretreatment \
     sources/view/dd \
     sources/view/dd/data \
     sources/view/confirm \
@@ -261,6 +263,9 @@
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitals.h \
+    \ # ---------- Views - TD - Adjustment - Pre-Treatment
+    sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h \
+    sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h \
     \ # ---------- Models - TD - Adjustment - In-Treatment
     sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.h \
     \ # ---------- Models - TD - Adjustment - Settings
@@ -271,6 +276,9 @@
     sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.h \
     \ # ---------- Models - TD - Adjustment - End-Treatment
     sources/model/td/adjustment/treatment/MTreatmentAdjustEndResponse.h \
+    \ # ---------- Models - TD - Adjustment - Pre-Treatment
+    sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h \
+    sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h \
     \ # ---------- Models - confirm
     sources/model/confirm/MDuetConfirmHDi.h \
     \ # ---------- Models - POST
@@ -307,12 +315,10 @@
     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/MPreTreatmentAdjustDisposablesConfirmResponse.h \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.h \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.h \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.h \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.h \
-    sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h \
     \ # ---------- Models - HD - Adjustment - In-Treatment
     sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h \
     sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.h \
@@ -418,12 +424,10 @@
     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/VPreTreatmentAdjustmentDisposablesConfirm.h \
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.h \
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.h \
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.h \
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.h \
-    sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h \
     \ # ---------- Views - HD - Adjustment - In-Treatment
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h \
     \ # ---------- Views - HD - Adjustment - End-Treatment
@@ -615,6 +619,9 @@
     sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp \
     sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.cpp \
     sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.cpp \
+    \ # ---------- Models - TD - Adjustment - Pre-Treatment
+    sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \
+    sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \
     \ # ---------- Models - DD - Adjustment - Settings
     sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp \
     \ # ---------- Models - HD - Adjustment
@@ -625,12 +632,10 @@
     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/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp \
-    sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \
     \ # ---------- Models - HD - Adjustment - In-Treatment
     sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.cpp \
     sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp \
@@ -724,6 +729,9 @@
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitals.cpp \
+    \ # ---------- Views - TD - Adjustment - Pre-Treatment
+    sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp \
+    sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp \
     \ # ---------- Views - CONFIRM
     sources/view/confirm/VConfirm.cpp \
     \ # ---------- Views - POST
@@ -754,12 +762,10 @@
     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/VPreTreatmentAdjustmentDisposablesConfirm.cpp \
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.cpp \
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.cpp \
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp \
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp \
-    sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp \
     \ # ---------- Views - HD - Adjustment - In-Treatment
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.cpp \
     \ # ---------- Views - HD - Adjustment - End-Treatment