Index: leahi.pro
===================================================================
diff -u -rd9993ef9458e1c25abc86a63d4d10b666ff8cd2c -rad78225384a974269b18c0fe3b55a7d64f77d813
--- leahi.pro	(.../leahi.pro)	(revision d9993ef9458e1c25abc86a63d4d10b666ff8cd2c)
+++ leahi.pro	(.../leahi.pro)	(revision ad78225384a974269b18c0fe3b55a7d64f77d813)
@@ -60,6 +60,7 @@
     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 \
@@ -209,6 +210,9 @@
     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 \
@@ -267,6 +271,7 @@
     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 \
@@ -380,9 +385,7 @@
     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 \
@@ -588,6 +591,9 @@
     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/MTreatmentAdjustBloodPrimeResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.cpp \
@@ -686,9 +692,7 @@
     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/MAdjustDGCleaningUsageResponse.cpp \
@@ -744,6 +748,7 @@
     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 \
Index: leahi.qrc
===================================================================
diff -u -r2283d645185c14bf358aff5ea59bed5087692146 -rad78225384a974269b18c0fe3b55a7d64f77d813
--- leahi.qrc	(.../leahi.qrc)	(revision 2283d645185c14bf358aff5ea59bed5087692146)
+++ leahi.qrc	(.../leahi.qrc)	(revision ad78225384a974269b18c0fe3b55a7d64f77d813)
@@ -49,7 +49,6 @@
     </qresource>
     <qresource prefix="/dialogs/headerbar">
         <file alias="HeaderbarWiFi.qml">sources/gui/qml/dialogs/headerbar/HeaderbarWiFi.qml</file>
-        <file alias="HeaderbarStorage.qml">sources/gui/qml/dialogs/headerbar/HeaderbarStorage.qml</file>
         <file alias="HeaderbarSettings.qml">sources/gui/qml/dialogs/headerbar/HeaderbarSettings.qml</file>
         <file alias="HeaderbarPrescription.qml">sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml</file>
         <file alias="HeaderbarInformation.qml">sources/gui/qml/dialogs/headerbar/HeaderbarInformation.qml</file>
@@ -98,7 +97,6 @@
         <file alias="iHomeBackground">resources/images/HomeBackground.png</file>
         <file alias="iCloudSync">resources/images/CloudSync.png</file>
         <file alias="iInformation">resources/images/Information.png</file>
-        <file alias="iStorage">resources/images/Storage.png</file>
         <file alias="iHelp">resources/images/help.png</file>
         <file alias="iMenuDot">resources/images/Menu_Dot.png</file>
         <file alias="iArrowLeftDisabled">resources/images/ArrowLeftDisabled.png</file>
@@ -110,6 +108,8 @@
         <file alias="iEyeClosed">resources/images/eye_closed.png</file>
         <file alias="iStepCheck">resources/images/stepCheck.png</file>
         <file alias="iCompleteCheck">resources/images/complete_check.png</file>
+        <file alias="iBrightness">resources/images/Brightness.png</file>
+        <file alias="iVolume">resources/images/Volume.png</file>
         <file alias="iWaterSampleFail">resources/images/water_sample_fail.png</file>
         <file alias="iWaterSamplePass">resources/images/water_sample_pass.png</file>
     </qresource>
@@ -179,6 +179,7 @@
         <file alias="TreatmentCompleteButton.qml">sources/gui/qml/components/TreatmentCompleteButton.qml</file>
         <file alias="RangedValue.qml">sources/gui/qml/components/RangedValue.qml</file>
         <file alias="SubStepIndicator.qml">sources/gui/qml/components/SubStepIndicator.qml</file>
+        <file alias="SDCInfo.qml">sources/gui/qml/components/SDCInfo.qml</file>
     </qresource>
     <qresource prefix="/compounds">
         <file alias="PressureRangeSlider.qml">sources/gui/qml/compounds/PressureRangeSlider.qml</file>
@@ -195,6 +196,7 @@
         <file alias="InstitutionalContainer.qml">sources/gui/qml/compounds/InstitutionalContainer.qml</file>
         <file alias="ValueAdjusterCustom.qml">sources/gui/qml/compounds/ValueAdjusterCustom.qml</file>
         <file alias="LabelUnitValueAdjuster.qml">sources/gui/qml/compounds/LabelUnitValueAdjuster.qml</file>
+        <file alias="SettingsSlider.qml">sources/gui/qml/compounds/SettingsSlider.qml</file>
     </qresource>
     <qresource prefix="/">
         <file>qtquickcontrols2.conf</file>
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rd9993ef9458e1c25abc86a63d4d10b666ff8cd2c -rad78225384a974269b18c0fe3b55a7d64f77d813
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision d9993ef9458e1c25abc86a63d4d10b666ff8cd2c)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision ad78225384a974269b18c0fe3b55a7d64f77d813)
@@ -324,8 +324,8 @@
             ID_AdjustTreatmentLogRsp                    = 0x760F, // 118 //// ----- @CRAPIZED: had to change to avoid duplication
             // Treatment Log Data
             ID_TreatmentLogAvrgeData                    = 0x940F, // 148 //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_TreatmentLogAlarmData                    = 0x950F, // 149 //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_TreatmentLogEventData                    = 0x960F, // 150 //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_TreatmentLogAlarmData                    = 0x6A00, // 106  //// ----- @LEAHIZED
+            ID_TreatmentLogEventData                    = 0x6B00, // 107  //// ----- @LEAHIZED
 
             // Disinfect
             ID_AdjustDisinfectModeReq                   = 0x9A0F, // 154    //// ----- @CRAPIZED: had to change to avoid duplication
Index: sources/gui/qml/globals/Colors.qml
===================================================================
diff -u -r2283d645185c14bf358aff5ea59bed5087692146 -rad78225384a974269b18c0fe3b55a7d64f77d813
--- sources/gui/qml/globals/Colors.qml	(.../Colors.qml)	(revision 2283d645185c14bf358aff5ea59bed5087692146)
+++ sources/gui/qml/globals/Colors.qml	(.../Colors.qml)	(revision ad78225384a974269b18c0fe3b55a7d64f77d813)
@@ -45,7 +45,6 @@
     readonly property color treatmentSectionHeader          : "#1A2E42"
     readonly property color treatmentSectionMain            : "#1A3046"
     readonly property color mainTreatmentLighterBlue        : "#1F3D5A"
-    readonly property color mainTreatmentDarkerBlue         : "#142C49"
     readonly property color mainTreatmentOrange             : "#FFB836"
     readonly property color mainTreatmentIsoBlue            : "#C3F9FF"
     readonly property color mainTreatmentGreen              : "#BBFFA3"
@@ -55,11 +54,11 @@
 
     readonly property color backgroundUltrafiltrationButton : "#31568F"
     readonly property color textValueUltrafiltrationButtonFg: "#98aec2"
-    readonly property color dialogText                      : "#343434"
+    readonly property color dialogText                      : "#2E5E92"
     readonly property color alarmDialogText                 : "#343434"
     readonly property color alarmDialogGreyText             : "#838080"
-    readonly property color dialogShadowColor               : "#334E759C"
-    readonly property color dialogValueColor                : "#3D8EEF"
+    readonly property color dialogShadowColor               : "#EAE9E9"
+    readonly property color dialogValueColor                : "#385E92"
     readonly property color darkDialogColor                 : "#091E31"
 
     readonly property color backgroundRangeRect             : "#2E4F76"
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r2283d645185c14bf358aff5ea59bed5087692146 -rad78225384a974269b18c0fe3b55a7d64f77d813
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 2283d645185c14bf358aff5ea59bed5087692146)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision ad78225384a974269b18c0fe3b55a7d64f77d813)
@@ -124,6 +124,7 @@
 import VFPTemperature                                       0.1
 import VFPBoostPump                                         0.1
 // In-Treatment - Adjustemnt
+import VTreatmentAdjustmentBloodPrime                       0.1
 import VTreatmentAdjustmentBolusVolume                      0.1
 import VTreatmentAdjustmentDurationEdit                     0.1
 import VTreatmentAdjustmentDurationConfirm                  0.1
@@ -301,6 +302,7 @@
     VTreatmentRanges                                    { id: vTreatmentRanges                                      }
     VTreatmentTrends                                    { id: vTreatmentTrends                                      }
 
+    VTreatmentAdjustmentBloodPrime                      { id: vTreatmentAdjustmentBloodPrime                        }
     VTreatmentAdjustmentBolusVolume                     { id: vTreatmentAdjustmentBolusVolume                       }
     VTreatmentAdjustmentIsolatedUFDurationEdit          { id: vTreatmentAdjustmentIsolatedUFDurationEdit            }
     VTreatmentAdjustmentIsolatedUFVolumeEdit            { id: vTreatmentAdjustmentIsolatedUFVolumeEdit              }
@@ -352,7 +354,7 @@
         disable                 : _GuiView.manufactSetup || _GuiView.updateSetup
         hidden                  : true // it should be hidden by default since the landing screen changed to init and it does not have the main menu until the POST passes.
         width                   : Variables.applicationWidth
-        isMainMenu              : true
+        model                   : _model
 
         Component.onCompleted   : {
             _settingsStack.visible = false
@@ -366,6 +368,12 @@
             _managerStack .visible = vIndex === 1
             _settingsStack.visible = vIndex === 2
         }
+
+        ListModel { id: _model
+            ListElement {   text: qsTr("Treatment")     ; visible: true   }
+            ListElement {   text: qsTr("Prescriptions") ; visible: true   }
+            ListElement {   text: qsTr("Settings")      ; visible: true   }
+        }
     }
 
     Connections { target: vTDOpMode
@@ -410,7 +418,6 @@
     AcidConcentrateAdjustment   { id: _acidConcentrateAdjustment    }
     HeaderbarPrescription       { id: _headerbarPrescription        }
     HeaderbarWiFi               { id: _headerbarWifi                }
-    HeaderbarStorage            { id: _headerbarStorage             }
     HeaderbarSettings           { id: _headerbarSettings            }
     HeaderbarInformation        { id: _headerbarInformation         }
     TreatmentAdjustmentVitals   { id: _treatmentAdjustmentVitals    }
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r5a505f86c26c8e1fd6d584cd53a3765c25120781 -rad78225384a974269b18c0fe3b55a7d64f77d813
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 5a505f86c26c8e1fd6d584cd53a3765c25120781)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision ad78225384a974269b18c0fe3b55a7d64f77d813)
@@ -114,7 +114,18 @@
         }
     }
 
-    ScreenItem                  { id: _treatmentTrends      } // TODO: make me!
+    TreatmentTrends             { id: _treatmentTrends
+        objectName: "_treatmentTrends"
+        Connections { target: vTDOpMode
+            function onInTreatmentChanged() {
+                if (vTDOpMode.inTreatment) {
+                    _treatmentTrends.isParamExpanded = true
+                    vTreatmentTrends.doClearData()
+                }
+            }
+        }
+    }
+
     TreatmentHeparin            { id: _treatmentHeparin     }
     Connections { target: _treatmentHeparin
         function onIdleTimeout  ( ) {
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml
===================================================================
diff -u -rbea36be2766046e63c4e82539a630b5cee7ce1c6 -rad78225384a974269b18c0fe3b55a7d64f77d813
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml	(.../TreatmentAdjustmentVitals.qml)	(revision bea36be2766046e63c4e82539a630b5cee7ce1c6)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml	(.../TreatmentAdjustmentVitals.qml)	(revision ad78225384a974269b18c0fe3b55a7d64f77d813)
@@ -59,26 +59,30 @@
         _bphrEntry.heartRate  = vHeartRate  ? vHeartRate : ""
     }
 
-    function confirm() {
+    function confirm(isManual) {
         numPad.hide()
         _root.close()
         vTreatmentVitals.doConfirm(
                     _bphrEntry.systolic   ,
                     _bphrEntry.diastolic  ,
                     _bphrEntry.heartRate
-                    )
+                )
+
+        if (isManual) {
+            vTreatmentTrends.onManualVitals(
+                _bphrEntry.systolic ,
+                _bphrEntry.diastolic,
+                _bphrEntry.heartRate
+            )
+        }
+
         _headerBar.vitalsRecorded()
     }
 
     onOpened: {
         notificationText = notificationTextString
-        vTreatmentVitals.doTimerStop()
     }
 
-    onClosed: {
-        vTreatmentVitals.doTimerStart()
-    }
-
     onCloseClicked: {
         numPad.hide()
         numPad.visible = false
@@ -113,7 +117,7 @@
                 margins         : 0
 
             }
-            onClicked   : _root.confirm()
+            onClicked   : _root.confirm(true)
         }
 
         Item { id: _separator
@@ -173,15 +177,14 @@
     Connections { target: vTreatmentVitals
         // On Timeout - Vitals Request
         function onDidTimeout () {
+            // interval set to OFF but 15 min default timer still running
             if ( ! vTreatmentVitals.interval ) {
-                // TODO: interval set to OFF but 15 min default timer still running
                 return
             }
 
-            // On Timeout request vitas if BP cuff is enabled or shjow popup for manual entry
+            // On Timeout request vitals if BP cuff is enabled or show popup for manual entry
             if ( vTreatmentVitals.enableBPCuff ) {
                 vTreatmentAdjustmentVitals.doRequest()
-                vTreatmentVitals.doTimerStart()
             }
             else {
                 _root.open ()
@@ -194,7 +197,7 @@
         // Vitals Reading Ready
         function onAdjustmentTriggered  ( vValue ) {
             _root.update  ( vTreatmentVitals.systolic__rt, vTreatmentVitals.diastolic_rt, vTreatmentVitals.heartRate_rt )
-            _root.confirm()
+            _root.confirm(false)
         }
     }