Index: leahi.pro
===================================================================
diff -u -r5b83234771fac143552fa8106027d0ed8730c4d5 -r2283d645185c14bf358aff5ea59bed5087692146
--- leahi.pro	(.../leahi.pro)	(revision 5b83234771fac143552fa8106027d0ed8730c4d5)
+++ leahi.pro	(.../leahi.pro)	(revision 2283d645185c14bf358aff5ea59bed5087692146)
@@ -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/MTreatmentAdjustBloodFlowRateResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.h \
@@ -266,6 +270,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 \
@@ -378,9 +383,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 \
@@ -586,6 +589,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/MTreatmentAdjustBloodFlowRateResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.cpp \
@@ -683,9 +689,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 \
@@ -741,6 +745,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 -r5b83234771fac143552fa8106027d0ed8730c4d5 -r2283d645185c14bf358aff5ea59bed5087692146
--- leahi.qrc	(.../leahi.qrc)	(revision 5b83234771fac143552fa8106027d0ed8730c4d5)
+++ leahi.qrc	(.../leahi.qrc)	(revision 2283d645185c14bf358aff5ea59bed5087692146)
@@ -159,6 +159,7 @@
         <file alias="Footer.qml">sources/gui/qml/components/Footer.qml</file>
         <file alias="TextEntry.qml">sources/gui/qml/components/TextEntry.qml</file>
         <file alias="ScrollBar.qml">sources/gui/qml/components/ScrollBar.qml</file>
+        <file alias="ScrollBar2.qml">sources/gui/qml/components/ScrollBar2.qml</file>
         <file alias="FooterStatic.qml">sources/gui/qml/components/FooterStatic.qml</file>
         <file alias="TimeEntry.qml">sources/gui/qml/components/TimeEntry.qml</file>
         <file alias="Label.qml">sources/gui/qml/components/Label.qml</file>
@@ -267,6 +268,7 @@
         <file alias="TreatmentSection.qml">sources/gui/qml/pages/treatment/TreatmentSection.qml</file>
         <file alias="TreatmentSectionHeader.qml">sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml</file>
         <file alias="TreatmentHeparin.qml">sources/gui/qml/pages/treatment/TreatmentHeparin.qml</file>
+        <file alias="TreatmentTrends.qml">sources/gui/qml/pages/treatment/TreatmentTrends.qml</file>
     </qresource>
     <qresource prefix="/pages/treatment/sections">
         <file alias="TreatmentFlows.qml">sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml</file>
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r5b83234771fac143552fa8106027d0ed8730c4d5 -r2283d645185c14bf358aff5ea59bed5087692146
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 5b83234771fac143552fa8106027d0ed8730c4d5)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 2283d645185c14bf358aff5ea59bed5087692146)
@@ -320,8 +320,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 -r5b83234771fac143552fa8106027d0ed8730c4d5 -r2283d645185c14bf358aff5ea59bed5087692146
--- sources/gui/qml/globals/Colors.qml	(.../Colors.qml)	(revision 5b83234771fac143552fa8106027d0ed8730c4d5)
+++ sources/gui/qml/globals/Colors.qml	(.../Colors.qml)	(revision 2283d645185c14bf358aff5ea59bed5087692146)
@@ -93,6 +93,9 @@
     readonly property color panelBackgroundColor            : "#12FFFFFF"
     readonly property color panelBorderColor                : "#4DB5B5B5"
     readonly property color panelInvalidBorderColor         : "#FFA500"
+    readonly property color panelBackground                 : "#2A3F53"
+    readonly property color panelBorder                     : "#324C65"
+
     readonly property color heparinPanelBorderColor         : "#CC42556B"
     readonly property color heparinSectionHeader            : "#384B60"
     readonly property color heparinActive                   : "#429C4A"
Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -r5b83234771fac143552fa8106027d0ed8730c4d5 -r2283d645185c14bf358aff5ea59bed5087692146
--- sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision 5b83234771fac143552fa8106027d0ed8730c4d5)
+++ sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision 2283d645185c14bf358aff5ea59bed5087692146)
@@ -310,6 +310,8 @@
     readonly property string unitTextDispensingRate         : qsTr("mL/hr")
     readonly property string unitTextRate                   : qsTr("L/h")
     readonly property string unitTextDialCond               : qsTr("mS/cm")
+    // - Pressures
+    readonly property string unitPressure                   : qsTr("mmHg")
     // - Vitals
     readonly property string unitTextBloodPressure          : qsTr("mmHg")
     readonly property string unitTextHeartBeat              : qsTr("BPM" )
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r5b83234771fac143552fa8106027d0ed8730c4d5 -r2283d645185c14bf358aff5ea59bed5087692146
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 5b83234771fac143552fa8106027d0ed8730c4d5)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 2283d645185c14bf358aff5ea59bed5087692146)
@@ -81,6 +81,7 @@
 import VTreatmentStop                                       0.1
 import VTreatmentRanges                                     0.1
 import VTreatmentHeparin                                    0.1
+import VTreatmentTrends                                     0.1
 
 // Pre-Treatment
 import VPreTreatmentAdjustmentInitTreatment                 0.1
@@ -298,6 +299,8 @@
     VTreatmentCreate                                    { id: vTreatmentCreate                                      }
 
     VTreatmentRanges                                    { id: vTreatmentRanges                                      }
+    VTreatmentTrends                                    { id: vTreatmentTrends                                      }
+
     VTreatmentAdjustmentBolusVolume                     { id: vTreatmentAdjustmentBolusVolume                       }
     VTreatmentAdjustmentIsolatedUFDurationEdit          { id: vTreatmentAdjustmentIsolatedUFDurationEdit            }
     VTreatmentAdjustmentIsolatedUFVolumeEdit            { id: vTreatmentAdjustmentIsolatedUFVolumeEdit              }
@@ -369,6 +372,23 @@
         function onStandbyWaitDisinfectChanged  ( vValue ) { _mainMenu.isTreatment() }
     }
 
+    Connections { target: vTreatmentVitals
+        function onDidTimeout() {
+            // interval set to OFF so just record without vitals
+            if ( ! vTreatmentVitals.interval ) {
+                vTreatmentTrends.onNoVitalsRecord()
+            }
+            // interval is set and BP cuff is available
+            else if ( vTreatmentVitals.enableBPCuff ) {
+                vTreatmentTrends.onIntervalRequestVitals()
+            }
+        }
+    }
+
+    Connections { target: vTreatmentAdjustmentVitals
+        function onDidTimeout() { vTreatmentTrends.onIntervalTimeoutVitals() }
+    }
+
     Connections { target: _mainStack
         function onIsCreateRx  ( vState ) { _headerBar.isCreateRx = vState }
     }
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -rf0f6a52911547cba480cf48473c95a2389e6a1a4 -r2283d645185c14bf358aff5ea59bed5087692146
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision f0f6a52911547cba480cf48473c95a2389e6a1a4)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 2283d645185c14bf358aff5ea59bed5087692146)
@@ -96,7 +96,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  ( ) {