bug fix from merge clonflict

· /sources/model/MModel.h

(-0, +1)

| History

| Source

| Diff

]]> Fri, 07 Aug 2026 14:18:45 -0700 Nicholas Ramirez https://devapps.diality.us/changelog/leahi-application?cs=bc97db7aaffa2e2115d2049bbcda2da34fb8f9a8 https://devapps.diality.us/changelog/leahi-application?cs=bc97db7aaffa2e2115d2049bbcda2da34fb8f9a8 Nicholas Ramirez committed bc97db7 on branch feature/LDT-5414-prime in leahi-application LDT-5417 Disposable Tube Set Auto Priming Process - SW - 01- Pre-Tx - Prime - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

push finishing steps to prime

· /sources/gui/GuiGlobals.h	(-2, +2)	| History	| Source	| Diff
· /sources/gui/qml/compounds/CheckListView.qml	(-60, +27)	| History	| Source	| Diff
· /sources/gui/qml/globals/Variables.qml	(-3, +3)	| History	| Source	| Diff
· /sources/gui/qml/pages/pretreatment/PreTreatmentPrime.qml	(-27, +6)	| History	| Source	| Diff
· /sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp	(-36, +10)	| History	| Source	| Diff
· /sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.h	(-13, +12)	| History	| Source	| Diff

]]> Fri, 07 Aug 2026 13:00:52 -0700 Nicholas Ramirez https://devapps.diality.us/changelog/leahi-application?cs=e68c1cc0f53b3c03943af4b70c46b5954603b53a https://devapps.diality.us/changelog/leahi-application?cs=e68c1cc0f53b3c03943af4b70c46b5954603b53a Nicholas Ramirez committed e68c1cc on branch feature/LDT-5414-prime in leahi-application LDT-5417 Disposable Tube Set Auto Priming Process - SW - 01- Pre-Tx - Prime - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

add prime data

· /leahi.pro	(-9, +8)	| History	| Source	| Diff
· /sources/canbus/MessageGlobals.h	(-1, +1)	| History	| Source	| Diff
· /sources/gui/GuiGlobals.h	(-1, +1)	| History	| Source	| Diff
· /sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(-29, +25)	| History	| Source	| Diff
· /sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(-0, +6)	| History	| Source	| Diff
· /sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h	(-118, +0)	| History	| Source	| Diff
· /sources/model/td/data/pretreatment/MPreTreatmentStatesData.cpp	(-0, +68)	| History	| Source
· /sources/model/td/data/pretreatment/MPreTreatmentStatesData.h	(-0, +106)	| History	| Source
· /sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp	(-124, +0)	| History	| Source	| Diff
· /sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h	(-116, +0)	| History	| Source	| Diff
· /sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp	(-2, +2)	| History	| Source	| Diff
· /sources/view/td/data/pretreatment/VPreTreatmentStatesData.cpp	(-0, +96)	| History	| Source
· /sources/view/td/data/pretreatment/VPreTreatmentStatesData.h	(-0, +89)	| History	| Source

]]> Fri, 07 Aug 2026 10:31:23 -0700 Nicholas Ramirez https://devapps.diality.us/changelog/leahi-application?cs=d62949c62c5512952e86a427285ef0dc72344248 https://devapps.diality.us/changelog/leahi-application?cs=d62949c62c5512952e86a427285ef0dc72344248 Nicholas Ramirez committed d62949c on branch feature/LDT-5414-prime in leahi-application LDT-5417 Disposable Tube Set Auto Priming Process - SW - 01- Pre-Tx - Prime - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

added prime code

· /leahi.pro	(-6, +13)	| History	| Source	| Diff
· /sources/canbus/MessageGlobals.h	(-2, +2)	| History	| Source	| Diff
· /sources/gui/GuiGlobals.h	(-1, +1)	| History	| Source	| Diff
· /sources/gui/qml/components/HeaderBar.qml	(-0, +1)	| History	| Source	| Diff
· /sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml	(-5, +0)	| History	| Source	| Diff
· /sources/gui/qml/pages/pretreatment/PreTreatmentPrime.qml	(-61, +41)	| History	| Source	| Diff
· /sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(-0, +2)	| History	| Source	| Diff
· /sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h	(-1, +1)	| History	| Source	| Diff
· /sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp	(-49, +0)	| History	| Source	| Diff
· /sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.h	(-79, +0)	| History	| Source	| Diff
· /sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.h	(-1, +1)	| History	| Source	| Diff
· /sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustRequests.h	(-1, +1)	| History	| Source	| Diff
· /sources/model/td/data/MTDValvesData.cpp	(-6, +0)	| History	| Source	| Diff
· /sources/model/td/data/MTDValvesData.h	(-6, +0)	| History	| Source	| Diff
· /sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp	(-0, +55)	| History	| Source
… 7 more files in changeset.

]]> Fri, 07 Aug 2026 10:02:00 -0700 Dara Navaei https://devapps.diality.us/cru/LEAHI-APPLICATION-LDT-5414-1 https://devapps.diality.us/cru/LEAHI-APPLICATION-LDT-5414-1 Dara Navaei started review LEAHI-APPLICATION-LDT-5414-1 ]]> Fri, 07 Aug 2026 09:53:40 -0700 Nicholas Ramirez https://devapps.diality.us/cru/LEAHI-APPLICATION-LDT-5074-3/#c31119 https://devapps.diality.us/cru/LEAHI-APPLICATION-LDT-5074-3/#c31119 Nicholas Ramirez replied to Nicholas Ramirez in LEAHI-APPLICATION-LDT-5074-3

updated

combined files

fixed

updated

· /sources/model/hd/alarm/MAlarmMapping.cpp

(-3, +3)

| History

| Source

| Diff

]]> Thu, 06 Aug 2026 17:07:55 -0700 https://devapps.diality.us/cru/LEAHI-APPLICATION-LDT-5246-1 https://devapps.diality.us/cru/LEAHI-APPLICATION-LDT-5246-1 Stephen Quong and Behrouz NematiPour finished reviewing LEAHI-APPLICATION-LDT-5246-1 LEAHI-APPLICATION-LDT-5246_System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I ]]> Thu, 06 Aug 2026 17:02:38 -0700 Behrouz NematiPour https://devapps.diality.us/changelog/leahi-application?cs=df61c476838011a343a6930fd5b30404629379bc https://devapps.diality.us/changelog/leahi-application?cs=df61c476838011a343a6930fd5b30404629379bc Behrouz NematiPour committed df61c47 on branch feature/LDT-5074-feature-complete, feature/LDT-5331-pre-tx-usability-requests and 2 more in leahi-application Merge branch 'feature/LDT-5246-bicarb-Low' into staging

· /leahi.pro	(-4, +12)	| History	| Source	| Diff
· /leahi.qrc	(-0, +3)	| History	| Source	| Diff
· /sources/canbus/MessageDispatcher.cpp	(-0, +16)	| History	| Source	| Diff
· /sources/canbus/MessageDispatcher.h	(-0, +1)	| History	| Source	| Diff
· /sources/canbus/MessageGlobals.h	(-1, +6)	| History	| Source	| Diff
· /sources/canbus/MessageInterpreter.cpp	(-1, +4)	| History	| Source	| Diff
· /sources/gui/GuiGlobals.cpp	(-1, +3)	| History	| Source	| Diff
· /sources/gui/GuiGlobals.h	(-3, +8)	| History	| Source	| Diff
· /sources/gui/qml/main.qml	(-2, +7)	| History	| Source	| Diff
· /sources/model/MModel.h	(-5, +20)	| History	| Source	| Diff
· /sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h	(-1, +26)	| History	| Source	| Diff
· /sources/view/VView.h	(-1, +3)	| History	| Source	| Diff

]]> Thu, 06 Aug 2026 16:59:04 -0700 Nicholas Ramirez https://devapps.diality.us/cru/LEAHI-APPLICATION-LDT-5158-1/#c31106 https://devapps.diality.us/cru/LEAHI-APPLICATION-LDT-5158-1/#c31106 Nicholas Ramirez commented on LEAHI-APPLICATION-LDT-5158-1

add FW enum to VTreatmentAdjustmentDryBicartDisconnect

· /leahi.pro	(-0, +16)	| History	| Source	| Diff
· /sources/canbus/MessageDispatcher.cpp	(-0, +40)	| History	| Source	| Diff
· /sources/canbus/MessageDispatcher.h	(-0, +3)	| History	| Source	| Diff
· /sources/canbus/MessageGlobals.h	(-0, +9)	| History	| Source	| Diff
· /sources/canbus/MessageInterpreter.cpp	(-0, +8)	| History	| Source	| Diff
· /sources/gui/GuiGlobals.cpp	(-0, +4)	| History	| Source	| Diff
· /sources/gui/GuiGlobals.h	(-1, +13)	| History	| Source	| Diff
· /sources/gui/qml/main.qml	(-0, +8)	| History	| Source	| Diff
· /sources/gui/qml/pages/treatment/TreatmentStack.qml	(-1, +40)	| History	| Source	| Diff
· /sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml	(-42, +28)	| History	| Source	| Diff
· /sources/model/MModel.h	(-0, +35)	| History	| Source	| Diff
· /sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h	(-0, +82)	| History	| Source	| Diff
· /sources/view/VView.h	(-0, +4)	| History	| Source	| Diff
· /sources/view/td/data/treatment/VTDTreatmentStatesData.cpp	(-1, +1)	| History	| Source	| Diff

]]> Thu, 06 Aug 2026 16:08:55 -0700 https://devapps.diality.us/cru/LEAHI-APPLICATION-LDT-5232-1 https://devapps.diality.us/cru/LEAHI-APPLICATION-LDT-5232-1 Stephen Quong and Behrouz NematiPour finished reviewing LEAHI-APPLICATION-LDT-5232-1 LEAHI-APPLICATION-LDT-5232_HDF - SW - 01 - HDF - Messaging & Models - R&I ]]> Thu, 06 Aug 2026 16:07:28 -0700 Nicholas Ramirez https://devapps.diality.us/cru/LEAHI-APPLICATION-LDT-4767-1 https://devapps.diality.us/cru/LEAHI-APPLICATION-LDT-4767-1 Nicholas Ramirez Closed LEAHI-APPLICATION-LDT-4767-1 ]]> Thu, 06 Aug 2026 16:06:53 -0700 Nicholas Ramirez https://devapps.diality.us/cru/LEAHI-APPLICATION-LDT-5158-1/#c31103 https://devapps.diality.us/cru/LEAHI-APPLICATION-LDT-5158-1/#c31103 Nicholas Ramirez commented on LEAHI-APPLICATION-LDT-5158-1

add FW enum to HDF state adjustment

fix bug that was fixed in develop branch

combine views - Move adjustRO watermode into here

change mValue to mStatus

bn approves

BN approves

BN approves

BN approves

do the same as InstitutionalRequestData in applicationController

BN approves

]]>