Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml
===================================================================
diff -u -ref6f19bc46fc5f85be9c4093c8ea0a8759b072e2 -r26433c42f2efa2cb18af95f523581c7eeeff049d
--- sources/gui/qml/dialogs/DiagnosticsDialog.qml	(.../DiagnosticsDialog.qml)	(revision ef6f19bc46fc5f85be9c4093c8ea0a8759b072e2)
+++ sources/gui/qml/dialogs/DiagnosticsDialog.qml	(.../DiagnosticsDialog.qml)	(revision 26433c42f2efa2cb18af95f523581c7eeeff049d)
@@ -1,13 +1,13 @@
 /*!
  *
- * Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file    DiagnosticsDialog.qml
- * \author  (last)      Behrouz NematiPour
- * \date    (last)      04-Apr-2023
+ * \author  (last)      Dara Navaei
+ * \date    (last)      05-Mar-2024
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  11-May-2021
  *
@@ -91,6 +91,7 @@
             vDGDrainPump.targetFLPMO    .toFixed(2) ,
             vDGDrainPump.currentA       .toFixed(2) ,
             vDGDrainPump.direction                  ,
+            vDGDrainPump.maxonRPM                   ,
         ]
         label: [
             "TgtSpd",
@@ -100,6 +101,7 @@
             "tgt"   ,
             "cur"   ,
             "dir"   ,
+            "mxn"   ,
         ]
     }
 
@@ -230,6 +232,9 @@
             vDGTemperatures.interalTHDRTD               .toFixed(2) ,
             vDGTemperatures.internalCondSnsrTemp        .toFixed(2) ,
             vDGTemperatures.baroTempSensor              .toFixed(2) ,
+            // NOTE: the below fields are commented out due to lack of real estate in the diagnostics screen
+            //vDGTemperatures.dialysateInletMvngAvg       .toFixed(2) ,
+            //vDGTemperatures.redundantOutletMvngAvg      .toFixed(2) ,
         ]
         label: [
             "TPi"   ,
@@ -253,6 +258,9 @@
             "iTHD"  ,
             "iCond" ,
             "baro"  ,
+            // NOTE: the below fields are commented out due to lack of real estate in the diagnostics screen
+            // TDiAvg,
+            // TROAvg,
         ]
     }
 
@@ -302,11 +310,15 @@
             vHDAirBubble    .venousAirBubbleStatus  ,
             vHDAirTrap      .airTrapLowerLevel      ,
             vHDAirTrap      .airTrapUpperLevel      ,
+            vHDAirTrap      .airTrapRawLowerLevel   ,
+            vHDAirTrap      .airTrapRawUpperLevel   ,
         ]
         label: [
             "ADV"   ,
             "ATll"  ,
             "ATul"  ,
+            "ATRll" ,
+            "ATRul" ,
         ]
     }
 
@@ -539,7 +551,7 @@
         x: col(5)
         y: row(5.5)
         model: [
-            _alarmItem.alarm_AlarmID ,
+            _alarmItem.hasAlarm ? _alarmItem.alarm_AlarmID : 0,
         ]
         label: [
             "Top" ,