Index: leahi.pro
===================================================================
diff -u -rcb9c48c7c307690dcafcfd16ef412fe660291692 -rad78225384a974269b18c0fe3b55a7d64f77d813
--- leahi.pro	(.../leahi.pro)	(revision cb9c48c7c307690dcafcfd16ef412fe660291692)
+++ leahi.pro	(.../leahi.pro)	(revision ad78225384a974269b18c0fe3b55a7d64f77d813)
@@ -60,10 +60,12 @@
     sources/model/td \
     sources/model/td/data \
     sources/model/td/data/treatment \
+    sources/model/td/data/treatmentlog \
     sources/model/td/alarm \
     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 +79,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 \
@@ -170,10 +173,11 @@
     sources/model/fp/data/MFPPressuresData.h \
     sources/model/fp/data/MFPROPumpData.h \
     sources/model/fp/data/MFPTemperatureData.h \
-    sources/model/fp/data/MFPValvesStatesData.h \
+    sources/model/td/adjustment/settings/MAdjustTDAdvancedInstitutionalRecordResponse.h \
     sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.h \
     sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h \
     sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.h \
+    sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h \
     sources/model/td/data/MTDAirBubbleData.h \
     sources/model/td/data/MTDAirPumpData.h \
@@ -185,6 +189,8 @@
     sources/model/td/data/MTDValvesData.h \
     sources/model/td/data/MTDVoltageData.h \
     sources/model/td/data/treatment/MTreatmentBloodFlowData.h \
+    sources/model/td/data/treatment/MTreatmentBloodPrimeData.h \
+    sources/model/td/data/treatment/MTreatmentIsolatedUFData.h \
     sources/model/td/data/treatment/MTreatmentParametersSetPointData.h \
     sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h \
     sources/model/td/data/treatment/MTreatmentSalineData.h \
@@ -204,10 +210,27 @@
     sources/device/DeviceModels.h \
     \ # ---------- Models - TD - Data                                           //// ----- @LEAHIZED
     sources/model/td/data/MTDOpModeData.h \
+    \ # ---------- Models - TD - Data - Treatment Log
+    sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.h \
+    sources/model/td/data/treatmentlog/MTreatmentLogEventData.h \
     \ # ---------- Models - TD - Adjustment - In-Treatment                      //// ----- @LEAHIZED
+    sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateFlowRateResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateTemperatureResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFDurationEditResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeEditResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFConfirmResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h \
     \ # ---------- Views - TD - Data - States                                   //// ----- @LEAHIZED
     sources/view/dd/data/VDDBloodLeakData.h \
     sources/view/dd/data/VDDConcentratePumpData.h \
@@ -226,19 +249,66 @@
     sources/view/fp/data/VFPPressuresData.h \
     sources/view/fp/data/VFPROPumpData.h \
     sources/view/fp/data/VFPTemperatureData.h \
-    sources/view/fp/data/VFPValvesStatesData.h \
-    sources/view/hd/data/VTreatmentRanges.h \
+    sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \
+    sources/view/settings/VAdvancedInstitutionalRecord.h \
     sources/view/td/data/VTDAirBubbleData.h \
     sources/view/td/data/VTDAirPumpData.h \
     sources/view/td/data/VTDAirTrapData.h \
     sources/view/td/data/VTDBatteryData.h \
     sources/view/td/data/VTDEjectorData.h \
     sources/view/td/data/VTDOpModeData.h \
+    sources/view/td/data/VTDSwitchesData.h \
+    sources/view/td/data/VTDTemperatureData.h \
+    sources/view/td/data/VTDValvesData.h \
+    sources/view/td/data/VTDVoltageData.h \
+    sources/view/td/data/VTreatmentRanges.h \
+    \ # ---------- Views - TD - Data - In-Treatment
+    sources/view/td/data/treatment/VTDTreatmentStatesData.h \
+    sources/view/td/data/treatment/VTreatmentBloodFlow.h \
+    sources/view/td/data/treatment/VTreatmentBloodPrimeData.h \
+    sources/view/td/data/treatment/VTreatmentIsolatedUFData.h \
+    sources/view/td/data/treatment/VTreatmentParametersSetPointData.h \
+    sources/view/td/data/treatment/VTreatmentPressureOcclusion.h \
+    sources/view/td/data/treatment/VTreatmentSalineData.h \
+    sources/view/td/data/treatment/VTreatmentTime.h \
+    sources/view/td/data/treatment/VTreatmentTrends.h \
+    sources/view/td/data/treatment/VTreatmentUltrafiltrationData.h \
     \ # ---------- Views - TD - Adjustment - In-Treatment
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodPrime.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateFlowRate.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateTemperature.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentFlows.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFConfirm.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h \
+    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
+    sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.h \
+    sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.h \
+    sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.h \
+    \ # ---------- Models - DD - Adjustment - Settings
+    sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.h \
+    \ # ---------- Models - TD - Adjustment - End-Treatment
+    sources/model/td/adjustment/treatment/MTreatmentAdjustEndResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustRinsebackResponse.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
@@ -255,7 +325,6 @@
     sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h \
     sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h \
     sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h \
-    sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h \
     sources/model/dg/adjustment/settings/MDuetRoWaterDG.h \
     \ # ---------- Models - Alarm
     sources/model/hd/alarm/MAlarmStatusData.h \
@@ -270,29 +339,22 @@
     sources/model/hd/adjustment/MAdjustPowerOff.h \
     sources/model/hd/adjustment/settings/MAdjustHDRequests.h \
     \ # ---------- Models - HD - Adjustment - Settings
-    sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.h \
     sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h \
     \ # ---------- Models - HD - Adjustment - Pre-Treatment
     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/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/MTreatmentAdjustDurationResponse.h \
     sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.h \
     sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.h \
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h \
     \ # ---------- Models - HD - Adjustment - End-Treatment
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.h \
     sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.h \
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.h \
     \ # ---------- Models - HD - Adjustment - Post-Treatment
     sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustRequests.h \
     sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h \
@@ -319,19 +381,14 @@
     sources/model/hd/data/treatment/MTreatmentHeparinData.h \
     sources/model/hd/data/treatment/MTreatmentRinsebackData.h \
     sources/model/hd/data/treatment/MTreatmentRecirculateData.h \
-    sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h \
     sources/model/hd/data/treatment/MTreatmentStopData.h \
     sources/model/hd/data/post/MHDRTCEpochData.h \
     sources/model/hd/data/MHDUsageInfoResponse.h \
     \ # ---------- Models - HD - Data - Treatment Log
-    sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.h \
     sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.h \
-    sources/model/hd/data/treatmentlog/MTreatmentLogEventData.h \
     \ # ---------- Models - DG - Adjustment
     sources/model/dg/adjustment/settings/MAdjustDGRequests.h \
     sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.h \
-    \ # ---------- Models - DG - Adjustment - Settings
-    sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.h \
     \ # ---------- Models - DG - Data - Pre-Treatment - Progress
     sources/model/dg/data/pretreatment/MDGFilterFlushData.h \
     \ # ---------- Models - DG - Data - Disinfect - Progress
@@ -381,10 +438,7 @@
     sources/view/settings/VCloudSync.h \
     sources/view/settings/VHDUsageInfo.h \
     sources/view/settings/VAdjustmentInstitutionalRecord.h \
-    \ # ---------- Views - TD - Adjustment - In-Treatment
-    sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h \
-    sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h \
-    sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h \
+    sources/view/settings/VInstitutionalRecord.h \
     \ # ---------- Views - Alarm
     sources/view/hd/alarm/VAlarmStatus.h \
     sources/view/hd/alarm/VAlarmActiveList.h \
@@ -396,17 +450,12 @@
     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/VTreatmentAdjustmentDuration.h \
-    sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.h \
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h \
-    sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h \
     \ # ---------- Views - HD - Adjustment - End-Treatment
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.h \
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.h \
@@ -433,7 +482,6 @@
     sources/view/hd/data/treatment/VTreatmentHeparinData.h \
     sources/view/hd/data/treatment/VTreatmentRinsebackData.h \
     sources/view/hd/data/treatment/VTreatmentRecirculateData.h \
-    sources/view/hd/data/treatment/VTreatmentBloodPrimeData.h \
     sources/view/hd/data/treatment/VTreatmentStopData.h \
     \ # ---------- Views - DG - Data - Pre-Treatment - Progress
     sources/view/dg/data/pretreatment/VDGFilterFlushData.h \
@@ -455,18 +503,7 @@
     sources/utility/format.h \
     sources/utility/types.h \
     sources/utility/encryption.h \
-    sources/utility/qrcodegen.h \
-    sources/view/td/data/VTDSwitchesData.h \
-    sources/view/td/data/VTDTemperatureData.h \
-    sources/view/td/data/VTDValvesData.h \
-    sources/view/td/data/VTDVoltageData.h \
-    sources/view/td/data/treatment/VTDTreatmentStatesData.h \
-    sources/view/td/data/treatment/VTreatmentBloodFlow.h \
-    sources/view/td/data/treatment/VTreatmentParametersSetPointData.h \
-    sources/view/td/data/treatment/VTreatmentPressureOcclusion.h \
-    sources/view/td/data/treatment/VTreatmentSalineData.h \
-    sources/view/td/data/treatment/VTreatmentTime.h \
-    sources/view/td/data/treatment/VTreatmentUltrafiltrationData.h
+    sources/utility/qrcodegen.h
 
 SOURCES += \
     \ # common
@@ -500,11 +537,11 @@
     sources/model/fp/data/MFPPressuresData.cpp \
     sources/model/fp/data/MFPROPumpData.cpp \
     sources/model/fp/data/MFPTemperatureData.cpp \
-    sources/model/fp/data/MFPValvesStatesData.cpp \
+    sources/model/td/adjustment/settings/MAdjustTDAdvancedInstitutionalRecordResponse.cpp \
     sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.cpp \
     sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.cpp \
     sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.cpp \
-    sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.cpp \
+    sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.cpp \
     sources/model/td/data/MTDAirBubbleData.cpp \
     sources/model/td/data/MTDAirPumpData.cpp \
     sources/model/td/data/MTDAirTrapData.cpp \
@@ -515,6 +552,8 @@
     sources/model/td/data/MTDValvesData.cpp \
     sources/model/td/data/MTDVoltageData.cpp \
     sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp \
+    sources/model/td/data/treatment/MTreatmentBloodPrimeData.cpp \
+    sources/model/td/data/treatment/MTreatmentIsolatedUFData.cpp \
     sources/model/td/data/treatment/MTreatmentParametersSetPointData.cpp \
     sources/model/td/data/treatment/MTreatmentPressureOcclusionData.cpp \
     sources/model/td/data/treatment/MTreatmentSalineData.cpp \
@@ -542,7 +581,6 @@
     sources/view/fp/data/VFPPressuresData.cpp \
     sources/view/fp/data/VFPROPumpData.cpp \
     sources/view/fp/data/VFPTemperatureData.cpp \
-    sources/view/fp/data/VFPValvesStatesData.cpp \
     sources/view/hd/data/post/VHDPOSTData.cpp \
     sources/bluetooth/BluetoothInterface.cpp \
     sources/cloudsync/CloudSyncController.cpp \
@@ -553,10 +591,30 @@
     sources/device/DeviceModels.cpp \
     \ # ---------- Models - TD - Data - States
     sources/model/td/data/MTDOpModeData.cpp \
+    \ # ---------- Models - TD - Data - Treatment Log
+    sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.cpp \
+    sources/model/td/data/treatmentlog/MTreatmentLogEventData.cpp \
     \ # ---------- Models - TD - Adjustment - In-Treatment
-    sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp \
-    sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateFlowRateResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateTemperatureResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFDurationEditResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeEditResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFConfirmResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp \
+    \ # ---------- Models - TD - Adjustment - End-Treatment
+    sources/model/td/adjustment/treatment/MTreatmentAdjustEndResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustRinsebackResponse.cpp \
     \ # ---------- Models - CONFIRM
     sources/model/confirm/MDuetConfirmHDi.cpp \
     \ # ---------- Models - POST
@@ -571,7 +629,6 @@
     sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp \
     sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp \
     sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp \
-    sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp \
     sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp \
     \ # ---------- Models - Alarm
     sources/model/hd/alarm/MAlarmStatusData.cpp \
@@ -582,32 +639,32 @@
     \ # ---------- Models - Data - States
     sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp \
     sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp \
-    \ # ---------- Models - TD - Adjustment - In-Treatment
-    sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp \
+    \ # ---------- Models - TD - Adjustment - Settings
+    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
     sources/model/hd/adjustment/MAdjustPowerOff.cpp \
     \ # ---------- Models - HD - Adjustment - Settings
-    sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.cpp \
     sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp \
     \ # ---------- 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/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/MTreatmentAdjustDurationResponse.cpp \
     sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.cpp \
     sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp \
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp \
     \ # ---------- Models - HD - Adjustment - End-Treatment
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.cpp \
     sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp \
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.cpp \
     \ # ---------- Models - HD - Adjustment - Post-Treatment
     sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp \
     sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.cpp \
@@ -627,7 +684,6 @@
     sources/model/hd/data/treatment/MTreatmentHeparinData.cpp \
     sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp \
     sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp \
-    sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp \
     sources/model/hd/data/treatment/MTreatmentStopData.cpp \
     sources/model/hd/data/post/MHDRTCEpochData.cpp \
     sources/model/hd/data/MHDUsageInfoResponse.cpp \
@@ -636,12 +692,9 @@
     sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp \
     sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp \
     \ # ---------- Models - HD - Data - Treatment Log
-    sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.cpp \
     sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.cpp \
-    sources/model/hd/data/treatmentlog/MTreatmentLogEventData.cpp \
     \ # ---------- Models - DG - Adjustment
     \ # ---------- Models - DG - Adjustment - Settings
-    sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.cpp \
     sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.cpp \
     \ # ---------- Models - DG - Data - Pre-Treatment - Progress
     sources/model/dg/data/pretreatment/MDGFilterFlushData.cpp \
@@ -673,18 +726,52 @@
     sources/view/VGeneralEvent.cpp \
     sources/device/DeviceView.cpp \
     \ # ---------- Views - TD - States Data
+    sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \
+    sources/view/settings/VAdvancedInstitutionalRecord.cpp \
     sources/view/td/data/VTDAirBubbleData.cpp \
     sources/view/td/data/VTDAirPumpData.cpp \
     sources/view/td/data/VTDAirTrapData.cpp \
     sources/view/td/data/VTDBatteryData.cpp \
     sources/view/td/data/VTDEjectorData.cpp \
     sources/view/td/data/VTDOpModeData.cpp \
+    sources/view/td/data/VTDSwitchesData.cpp \
+    sources/view/td/data/VTDTemperatureData.cpp \
+    sources/view/td/data/VTDValvesData.cpp \
+    sources/view/td/data/VTDVoltageData.cpp \
+    sources/view/td/data/VTreatmentRanges.cpp \
+    \ # ---------- Views - TD - Data - In-Treatment
+    sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \
+    sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \
+    sources/view/td/data/treatment/VTreatmentBloodPrimeData.cpp \
+    sources/view/td/data/treatment/VTreatmentIsolatedUFData.cpp \
+    sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp \
+    sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp \
+    sources/view/td/data/treatment/VTreatmentSalineData.cpp \
+    sources/view/td/data/treatment/VTreatmentTime.cpp \
+    sources/view/td/data/treatment/VTreatmentTrends.cpp \
+    sources/view/td/data/treatment/VTreatmentUltrafiltrationData.cpp \
     \ # ---------- Views - TD - Adjustment - In-Treatment
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodPrime.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateFlowRate.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateTemperature.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentFlows.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFConfirm.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.cpp \
-    sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitals.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp \
     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
@@ -706,6 +793,7 @@
     sources/view/settings/VAdjustmentDGCleaningUsage.cpp \
     sources/view/settings/VHDUsageInfo.cpp \
     sources/view/settings/VAdjustmentInstitutionalRecord.cpp \
+    sources/view/settings/VInstitutionalRecord.cpp \
     \ # ---------- Views - HD - Adjustment
     sources/view/VAdjustmentResponseBase.cpp \
     \ # ---------- Views - HD - Adjustment - common
@@ -714,17 +802,12 @@
     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/VTreatmentAdjustmentDuration.cpp \
-    sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.cpp \
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.cpp \
-    sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp \
     \ # ---------- Views - HD - Adjustment - End-Treatment
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.cpp \
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.cpp \
@@ -747,11 +830,9 @@
     sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp \
     sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp \
     \ # ---------- Views - HD - Data - In-Treatment
-    sources/view/hd/data/VTreatmentRanges.cpp \
     sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp \
     sources/view/hd/data/treatment/VTreatmentHeparinData.cpp \
     \ # ---------- Views - HD - Data - End-Treatment
-    sources/view/hd/data/treatment/VTreatmentBloodPrimeData.cpp \
     sources/view/hd/data/treatment/VTreatmentRinsebackData.cpp \
     sources/view/hd/data/treatment/VTreatmentRecirculateData.cpp \
     sources/view/hd/data/treatment/VTreatmentStopData.cpp \
@@ -775,18 +856,7 @@
     sources/utility/format.cpp \
     sources/utility/types.cpp \
     sources/utility/encryption.cpp \
-    sources/utility/qrcodegen.cpp \
-    sources/view/td/data/VTDSwitchesData.cpp \
-    sources/view/td/data/VTDTemperatureData.cpp \
-    sources/view/td/data/VTDValvesData.cpp \
-    sources/view/td/data/VTDVoltageData.cpp \
-    sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \
-    sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \
-    sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp \
-    sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp \
-    sources/view/td/data/treatment/VTreatmentSalineData.cpp \
-    sources/view/td/data/treatment/VTreatmentTime.cpp \
-    sources/view/td/data/treatment/VTreatmentUltrafiltrationData.cpp
+    sources/utility/qrcodegen.cpp
 
 RESOURCES += \
     leahi.qrc