Fisheye on application/sources/view/settings

application (develop): Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

Tiffany Mejia — Thu, 05 Mar 2026 13:36:11 -0800

Tiffany Mejia committed 5e8293e on branch develop in application

Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

· /sources/ApplicationController.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/bluetooth/BluetoothInterface.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/bluetooth/BluetoothInterface.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/SDCProgressItem.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Colors.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Fonts.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Variables.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/storage/TreatmentLog.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/storage/TreatmentLog.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VBluetooth.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VBluetooth.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VNetworkModel.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VNetworkModel.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/wifi/WifiInterface.cpp	(-1, +1)	\| History	\| Source	\| Diff

application (staging): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Mon, 05 Jan 2026 15:12:29 -0800

Dara Navaei committed 52bd89b on branch bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect, develop, staging in application

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

· /alarmMapping.sh

(-1, +1)

| History

| Source

| Diff

· /cho.sh

(-1, +1)

| History

| Source

| Diff

· /cppcheck.sh

(-1, +1)

| History

| Source

| Diff

· /cr_objectives.sh

(-1, +1)

| History

| Source

| Diff

· /imake.sh

(-1, +1)

| History

| Source

| Diff

· /main.cpp

(-1, +1)

| History

| Source

| Diff

· /remove-exra-emptylines.sh

(-1, +1)

| History

| Source

| Diff

· /sources/AlarmGenerator.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/AlarmGenerator.h

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationController.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationController.h

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationPost.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationPost.h

(-1, +1)

| History

| Source

| Diff

· /sources/MainTimer.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/MainTimer.h

(-1, +1)

| History

| Source

| Diff

… 607 more files in changeset.

application (staging): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Thu, 13 Nov 2025 16:18:45 -0800

Dara Navaei committed 9b58df3 on branch bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect, develop, staging in application

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

· /sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-20, +14)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentInstitutionalRecord.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentInstitutionalRecord.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VDateTime.cpp	(-2, +2)	\| History	\| Source	\| Diff

application (DEN-17325-release_24_dn_staging): DEN-17325: Release 24 DN...

Dara Navaei — Wed, 12 Nov 2025 14:22:32 -0800

Dara Navaei committed e6e71cb on branch DEN-17325-release_24_dn_staging, bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect and 2 more in application

DEN-17325: Release 24 DN

- Commented out the timezone detection to prevent the display of the timezone on the screen.

· /sources/view/settings/VDateTime.cpp

(-2, +2)

| History

| Source

| Diff

application (DEN-17325-release_24_dn_staging): DENBUG-328: Venous Pressure alarm did not trigger when pressure dropped to 0 mmHg...

Dara Navaei — Thu, 06 Nov 2025 15:34:09 -0800

Dara Navaei committed 8b61e24 on branch DEN-17325-release_24_dn_staging, bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect and 2 more in application

DENBUG-328: Venous Pressure alarm did not trigger when pressure dropped to 0 mmHg

- Added a new field in the institutional configurations to display the value for the min venous pressure wide limit window

· /sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp	(-0, +4)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h	(-0, +3)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentInstitutionalRecord.cpp	(-0, +2)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentInstitutionalRecord.h	(-0, +3)	\| History	\| Source	\| Diff

application (DEN-17325-release_24_dn_staging): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Thu, 12 Jun 2025 15:58:12 -0700

Dara Navaei committed 538de4a on branch master, DEN-17325-release_24_dn_staging and 4 more in application

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

· /sources/canbus/MessageGlobals.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Variables.qml	(-2, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h	(-2, +2)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-20, +14)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentInstitutionalRecord.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentInstitutionalRecord.h	(-2, +2)	\| History	\| Source	\| Diff

application (DEN-17325-release_24_dn_staging): DENBUG-318: Rejection Ratio Setting Feature Implementation in Manufacturing Configuration For Treatment...

Dara Navaei — Wed, 28 May 2025 17:21:39 -0700

Dara Navaei committed accb081 on branch master, DEN-17295-ui-dn-release-22 and 5 more in application

DENBUG-318: Rejection Ratio Setting Feature Implementation in Manufacturing Configuration For Treatment

- Changed the Min RO Rejection Ratio to RO Rejection Ratio in the institutional record

· /sources/view/settings/VAdjustmentInstitutionalRecord.h

(-1, +1)

| History

| Source

| Diff

application (DEN-17325-release_24_dn_staging): DENBUG-318: Rejection Ratio Setting Feature Implementation in Manufacturing Configuration For Treatment...

Dara Navaei — Tue, 27 May 2025 17:02:29 -0700

Dara Navaei committed 0564077 on branch master, DEN-17295-ui-dn-release-22 and 5 more in application

DENBUG-318: Rejection Ratio Setting Feature Implementation in Manufacturing Configuration For Treatment

- Changed the max RO rejection ratio to min RO rejection ratio in institutional record

- Changed the min RO rejection ratio from float to quint32

- Added "%" to the min RO rejection ration value in the institutional record screen

· /sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp	(-3, +3)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h	(-3, +3)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentInstitutionalRecord.cpp	(-2, +2)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentInstitutionalRecord.h	(-3, +3)	\| History	\| Source	\| Diff

application (DEN-17325-release_24_dn_staging): DENBUG-318: Rejection Ratio Setting Feature Implementation in Manufacturing Configuration For Treatment...

Dara Navaei — Fri, 23 May 2025 15:25:41 -0700

Dara Navaei committed 635833d on branch master, DEN-17295-ui-dn-release-22 and 5 more in application

DENBUG-318: Rejection Ratio Setting Feature Implementation in Manufacturing Configuration For Treatment

- Updated the code to add max RO rejection ratio and min inlet water conductivity alarm limit to the HD institutional record and display it on the UI

· /sources/canbus/MessageGlobals.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp	(-81, +89)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h	(-54, +60)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentInstitutionalRecord.cpp	(-40, +44)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentInstitutionalRecord.h	(-38, +44)	\| History	\| Source	\| Diff

application (DEN-17325-release_24_dn_staging): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Fri, 04 Apr 2025 15:28:35 -0700

Dara Navaei committed 364084d on branch master, DEN-17295-ui-dn-release-22 and 5 more in application

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

· /sources/canbus/MessageGlobals.h

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/globals/Fonts.qml

(-2, +2)

| History

| Source

| Diff

· /sources/gui/qml/pages/MainStack.qml

(-2, +2)

| History

| Source

| Diff

· /sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml

(-2, +2)

| History

| Source

| Diff

· /sources/main.h

(-2, +2)

| History

| Source

| Diff

· /sources/model/confirm/MDuetConfirmHDi.cpp

(-2, +2)

| History

| Source

| Diff

· /sources/model/confirm/MDuetConfirmHDi.h

(-2, +2)

| History

| Source

| Diff

· /sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h

(-2, +2)

| History

| Source

| Diff

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

(-20, +14)

| History

| Source

| Diff

· /sources/storage/TreatmentLog.cpp

(-2, +2)

| History

| Source

| Diff

· /sources/view/confirm/VConfirm.cpp

(-2, +2)

| History

| Source

| Diff

· /sources/view/confirm/VConfirm.h

(-2, +2)

| History

| Source

| Diff

· /sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h

(-2, +2)

| History

| Source

| Diff

· /sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.cpp

(-2, +2)

| History

| Source

| Diff

· /sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp

(-1, +1)

| History

| Source

| Diff

… 3 more files in changeset.

application (DEN-17260-ui-dn-release-21): DEN-17269: Change_version_format_from_dot_to_dash...

Dara Navaei — Wed, 26 Mar 2025 17:17:03 -0700

Dara Navaei committed dcfbdc1 on branch master, DEN-17260-ui-dn-release-21 and 6 more in application

DEN-17269: Change_version_format_from_dot_to_dash

- Changed the format of the version from dot to dash before compatibility value.

· /sources/view/settings/VAdjustmentVersions.h

(-2, +2)

| History

| Source

| Diff

application (develop): Merge branch 'DEN-17260-ui-dn-release-21' into develop

Dara Navaei — Tue, 18 Mar 2025 14:50:45 -0700

Dara Navaei committed c47d668 on branch develop in application

Merge branch 'DEN-17260-ui-dn-release-21' into develop

· /sources/ApplicationController.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/bluetooth/BluetoothInterface.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/bluetooth/BluetoothInterface.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/cloudsync/CloudSyncController.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/SDCProgressItem.qml	(-2, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Colors.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Fonts.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Variables.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-3, +3)	\| History	\| Source	\| Diff
· /sources/storage/TreatmentLog.cpp	(-3, +3)	\| History	\| Source	\| Diff
· /sources/storage/TreatmentLog.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VBluetooth.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VBluetooth.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VNetworkModel.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VNetworkModel.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/wifi/WifiInterface.cpp	(-1, +1)	\| History	\| Source	\| Diff

application (DEN-17260-ui-dn-release-21): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Thu, 30 Jan 2025 20:28:49 -0800

Dara Navaei committed 124c2e3 on branch master, DEN-17260-ui-dn-release-21 and 7 more in application

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

· /alarmMapping.sh

(-1, +1)

| History

| Source

| Diff

· /cho.sh

(-1, +1)

| History

| Source

| Diff

· /cppcheck.sh

(-1, +1)

| History

| Source

| Diff

· /cr_objectives.sh

(-1, +1)

| History

| Source

| Diff

· /imake.sh

(-1, +1)

| History

| Source

| Diff

· /main.cpp

(-2, +2)

| History

| Source

| Diff

· /remove-exra-emptylines.sh

(-1, +1)

| History

| Source

| Diff

· /sources/AlarmGenerator.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/AlarmGenerator.h

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationController.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationController.h

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationPost.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationPost.h

(-1, +1)

| History

| Source

| Diff

· /sources/MainTimer.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/MainTimer.h

(-1, +1)

| History

| Source

| Diff

… 605 more files in changeset.

application (DEN-17260-ui-dn-release-21): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Wed, 25 Sep 2024 15:15:24 -0700

Dara Navaei committed c4dffe9 on branch master, DEN-17098-release_18_changes and 10 more in application

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

· /sources/canbus/MessageGlobals.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/compounds/BPHREntry.qml	(-2, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsInformation.qml	(-2, +2)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-20, +14)	\| History	\| Source	\| Diff
· /sources/model/hd/data/MHDUsageInfoResponse.cpp	(-2, +2)	\| History	\| Source	\| Diff
· /sources/model/hd/data/MHDUsageInfoResponse.h	(-2, +2)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentServiceDates.cpp	(-2, +2)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentServiceDates.h	(-2, +2)	\| History	\| Source	\| Diff
· /sources/view/settings/VHDUsageInfo.cpp	(-2, +2)	\| History	\| Source	\| Diff
· /sources/view/settings/VHDUsageInfo.h	(-2, +2)	\| History	\| Source	\| Diff

application (DEN-17260-ui-dn-release-21): DEN-16989: Treatment Information Not Showing on Information Screen...

Dara Navaei — Mon, 23 Sep 2024 10:41:32 -0700

Dara Navaei committed 7068ee4 on branch master, DEN-17055-ui-dn-release-17 and 11 more in application

DEN-16989: Treatment Information Not Showing on Information Screen

- Changed the HD usage info code to only show the hours without any decimals in the total hours as well as the hours since last service.

· /sources/view/settings/VHDUsageInfo.cpp

(-2, +2)

| History

| Source

| Diff

application (DEN-17260-ui-dn-release-21): DEN-16989: Treatment Information Not Showing on Information Screen...

Dara Navaei — Fri, 20 Sep 2024 15:58:54 -0700

Dara Navaei committed 8b6ec30 on branch master, DEN-17055-ui-dn-release-17 and 11 more in application

DEN-16989: Treatment Information Not Showing on Information Screen

- Changed the HD usage info total number of hours and total number of hours since last service to be displayed only with 1 decimal point.

· /sources/view/settings/VHDUsageInfo.cpp

(-2, +6)

| History

| Source

| Diff

application (DEN-17260-ui-dn-release-21): DEN-16989: Treatment Information Not Showing on Information Screen...

Dara Navaei — Thu, 19 Sep 2024 17:25:58 -0700

Dara Navaei committed 2344b22 on branch master, DEN-17055-ui-dn-release-17 and 11 more in application

DEN-16989: Treatment Information Not Showing on Information Screen

- Addressed the code review comment

· /sources/view/settings/VAdjustmentServiceDates.cpp	(-4, +9)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentServiceDates.h	(-2, +3)	\| History	\| Source	\| Diff
· /sources/view/settings/VHDUsageInfo.cpp	(-1, +7)	\| History	\| Source	\| Diff
· /sources/view/settings/VHDUsageInfo.h	(-2, +3)	\| History	\| Source	\| Diff

application (DEN-17260-ui-dn-release-21): DEN-16989: Treatment Information Not Showing on Information Screen...

Dara Navaei — Mon, 16 Sep 2024 17:20:06 -0700

Dara Navaei committed 4c97573 on branch master, DEN-17055-ui-dn-release-17 and 11 more in application

DEN-16989: Treatment Information Not Showing on Information Screen

- Updated the UI code to just show the total treatment hours and the hours since last service in hours.

- Updated the UI code to just to show the last treatment start date in YYYY/MM/DD.

- Removed the last reset date and the CRC,

· /sources/canbus/MessageGlobals.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsInformation.qml	(-4, +2)	\| History	\| Source	\| Diff
· /sources/model/hd/data/MHDUsageInfoResponse.cpp	(-8, +0)	\| History	\| Source	\| Diff
· /sources/model/hd/data/MHDUsageInfoResponse.h	(-6, +0)	\| History	\| Source	\| Diff
· /sources/view/settings/VHDUsageInfo.cpp	(-10, +3)	\| History	\| Source	\| Diff
· /sources/view/settings/VHDUsageInfo.h	(-0, +2)	\| History	\| Source	\| Diff

application (release/stagingmerge-DEN-17098-release_18_changes): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Wed, 31 Jul 2024 02:44:36 -0700

Dara Navaei committed 5687815 on branch master, DEN-16553-UI-BN-WPA3-Support and 37 more in application

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

· /main.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationPost.cpp

(-14, +14)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.cpp

(-2, +2)

| History

| Source

| Diff

· /sources/cloudsync/CloudSyncController.cpp

(-14, +14)

| History

| Source

| Diff

· /sources/cloudsync/CloudSyncController.h

(-14, +14)

| History

| Source

| Diff

· /sources/device/DeviceController.cpp

(-14, +14)

| History

| Source

| Diff

· /sources/device/DeviceController.h

(-1, +1)

| History

| Source

| Diff

· /sources/gui/GuiView.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/gui/GuiView.h

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/components/TextEntry.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/main.qml

(-2, +2)

| History

| Source

| Diff

· /sources/gui/qml/pages/MainStack.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/pages/UserConfirmation.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml

(-1, +1)

| History

| Source

| Diff

… 9 more files in changeset.

application (release/stagingmerge-DEN-17098-release_18_changes): Merge branch 'DEN-16839-UI-BN-Whitney-1B1' into staging

Behrouz NematiPour — Wed, 31 Jul 2024 02:34:45 -0700

Behrouz NematiPour committed bcfa77b on branch master, DEN-16553-UI-BN-WPA3-Support and 37 more in application

Merge branch 'DEN-16839-UI-BN-Whitney-1B1' into staging

· /sources/canbus/MessageDispatcher.cpp	(-4, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml	(-1, +3)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml	(-1, +3)	\| History	\| Source	\| Diff
· /sources/view/settings/VDuetRoWaterDG.h	(-2, +2)	\| History	\| Source	\| Diff

application (develop): Merge branch 'DEN-16953-ui-dn-release-15' into develop

Behrouz NematiPour — Tue, 16 Jul 2024 13:18:23 -0700

Behrouz NematiPour committed affdd38 on branch develop in application

Merge branch 'DEN-16953-ui-dn-release-15' into develop

· /sources/canbus/MessageDispatcher.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VDuetRoWaterDG.h	(-2, +2)	\| History	\| Source	\| Diff

application (develop): Merge branch 'DEN-16839-UI-BN-Whitney-1B1' into develop

Behrouz NematiPour — Mon, 15 Jul 2024 18:59:46 -0700

Behrouz NematiPour committed 0461729 on branch develop in application

Merge branch 'DEN-16839-UI-BN-Whitney-1B1' into develop

· /sources/gui/qml/main.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VDuetRoWaterDG.h	(-2, +2)	\| History	\| Source	\| Diff

application (release/stagingmerge-DEN-17098-release_18_changes): CS-10: The Log upload to the cloud - Keep stashed files and some minor changes....

Behrouz NematiPour — Wed, 10 Jul 2024 20:12:59 -0700

Behrouz NematiPour committed a0ba11d on branch master, DEN-16553-UI-BN-WPA3-Support and 38 more in application

CS-10: The Log upload to the cloud - Keep stashed files and some minor changes.

- Added the Moda-flx logo to the branch

- added a build flag to bypass the POST fails

- fixed a typo in class definition.

- added the platform text to be displayed on the screen in which the application is executing for later better debugging.[ as //DEBUG: comment ]

- Added my note on BCuff connection to avoid loosing it. [ may need update ]

· /resources/logos/Moda-flx Logos/Moda-flx-Horizontal-Logo-RGB-Color.ai	(-0, +1163)	\| History	\| Source
· /resources/logos/Moda-flx Logos/Moda-flx-Horizontal-Logo-RGB-Color.jpg	(binary)	\| History	\| Source
· /resources/logos/Moda-flx Logos/Moda-flx-Square-Logo-RGB-Color.ai	(-0, +1248)	\| History	\| Source
· /resources/logos/Moda-flx Logos/Moda-flx-Square-Logo-RGB-Color.jpg	(binary)	\| History	\| Source
· /resources/logos/Moda-flx Logos/Moda-flx-Vertical-Logo-RGB-Color.ai	(-0, +1208)	\| History	\| Source
· /resources/logos/Moda-flx Logos/Moda-flx-Vertical-Logo-RGB-Color.jpg	(binary)	\| History	\| Source
· /sources/bluetooth/readme.md	(-0, +18)	\| History	\| Source
· /sources/gui/GuiView.cpp	(-0, +3)	\| History	\| Source	\| Diff
· /sources/gui/GuiView.h	(-0, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VDuetRoWaterDG.h	(-2, +2)	\| History	\| Source	\| Diff

application (release/stagingmerge-DEN-17098-release_18_changes): DEN-16956: UI: Add all ASCII symbols as acceptable for the Service Password...

Behrouz NematiPour — Wed, 10 Jul 2024 18:46:56 -0700

Behrouz NematiPour committed 2d6b78f on branch master, DEN-16553-UI-BN-WPA3-Support and 38 more in application

DEN-16956: UI: Add all ASCII symbols as acceptable for the Service Password

- Added all the ASCII symbols as acceptable for the service password.

!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~

· /sources/view/settings/VSettings.cpp

(-2, +6)

| History

| Source

| Diff

application (release/stagingmerge-DEN-17098-release_18_changes): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Fri, 10 May 2024 14:17:25 -0700

Dara Navaei committed 38ae7b9 on branch master, DEN-16553-UI-BN-WPA3-Support and 44 more in application

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

· /sources/canbus/MessageDispatcher.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageGlobals.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageInterpreter.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/gui/GuiGlobals.h

(-1, +1)

| History

| Source

| Diff

· /sources/model/MModel.h

(-1, +1)

| History

| Source

| Diff

· /sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp

(-2, +2)

| History

| Source

| Diff

· /sources/model/dg/adjustment/settings/MDuetRoWaterDG.h

(-2, +2)

| History

| Source

| Diff

· /sources/model/dg/data/MDGHeatersData.cpp

(-2, +2)

| History

| Source

| Diff

· /sources/model/dg/data/MDGHeatersData.h

(-2, +2)

| History

| Source

| Diff

· /sources/model/hd/adjustment/settings/MAdjustHDRequests.h

(-1, +1)

| History

| Source

| Diff

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

(-20, +14)

| History

| Source

| Diff

· /sources/model/hd/data/MHDBloodLeakData.cpp

(-2, +2)

| History

| Source

| Diff

· /sources/model/hd/data/MHDBloodLeakData.h

(-2, +2)

| History

| Source

| Diff

· /sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp

(-2, +2)

| History

| Source

| Diff

… 17 more files in changeset.

application (release/stagingmerge-DEN-17098-release_18_changes): DEN-16204: UI: FW: Pure Water mode turning on intermittently...

Dara Navaei — Fri, 10 May 2024 13:41:47 -0700

Dara Navaei committed 22b7b49 on branch master, DEN-16553-UI-BN-WPA3-Support and 45 more in application

DEN-16204: UI: FW: Pure Water mode turning on intermittently

- Addressed the code review comments.

· /sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp	(-0, +1)	\| History	\| Source	\| Diff
· /sources/view/VAdjustmentResponseBase.h	(-1, +0)	\| History	\| Source	\| Diff
· /sources/view/settings/VDuetRoWaterDG.cpp	(-8, +3)	\| History	\| Source	\| Diff
· /sources/view/settings/VDuetRoWaterDG.h	(-4, +4)	\| History	\| Source	\| Diff

application (release/stagingmerge-DEN-17098-release_18_changes): DEN-16204: UI: FW: Pure Water mode turning on intermittently...

Dara Navaei — Wed, 08 May 2024 11:13:05 -0700

Dara Navaei committed f691de7 on branch master, DEN-16553-UI-BN-WPA3-Support and 45 more in application

DEN-16204: UI: FW: Pure Water mode turning on intermittently

- Changed the order of the UI response message from firmware so the accept is always the first field.

· /sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp	(-3, +3)	\| History	\| Source	\| Diff
· /sources/model/dg/adjustment/settings/MDuetRoWaterDG.h	(-5, +5)	\| History	\| Source	\| Diff
· /sources/view/settings/VDuetRoWaterDG.cpp	(-1, +1)	\| History	\| Source	\| Diff

application (release/stagingmerge-DEN-17098-release_18_changes): DEN-16204: UI: FW: Pure Water mode turning on intermittently. - Added a new payload to send the current firmware value ...

Dara Navaei — Sat, 04 May 2024 20:21:57 -0700

Dara Navaei committed 988d403 on branch master, DEN-16553-UI-BN-WPA3-Support and 45 more in application

DEN-16204: UI: FW: Pure Water mode turning on intermittently. - Added a new payload to send the current firmware value with the response to a set from UI - Changed the RO only mode code to not flip the UI RO only status if the firmware rejected the set value and just get the status in the firmware

· /sources/canbus/MessageGlobals.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp	(-6, +10)	\| History	\| Source	\| Diff
· /sources/model/dg/adjustment/settings/MDuetRoWaterDG.h	(-6, +9)	\| History	\| Source	\| Diff
· /sources/view/VAdjustmentResponseBase.h	(-0, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VDuetRoWaterDG.cpp	(-4, +3)	\| History	\| Source	\| Diff

application (DEN-16553-UI-BN-WPA3-Support): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Thu, 28 Mar 2024 11:22:57 -0700

Dara Navaei committed c70ae33 on branch master, @Environement_Swith and 48 more in application

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

· /sources/ApplicationController.cpp	(-2, +2)	\| History	\| Source	\| Diff
· /sources/ApplicationController.h	(-2, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/MainStack.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/disinfect/DisinfectStack.qml	(-2, +2)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h	(-2, +2)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-20, +14)	\| History	\| Source	\| Diff
· /sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentInstitutionalRecord.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentInstitutionalRecord.h	(-2, +2)	\| History	\| Source	\| Diff

application (DEN-16553-UI-BN-WPA3-Support): DEN-16785: Make Chem Disinfect and Chem Flush Disinfect Buttons Invisible per Instit Config Status...

Behrouz NematiPour — Tue, 26 Mar 2024 18:53:06 -0700

Behrouz NematiPour committed a9e71bd on branch master, @Environement_Swith and 49 more in application

DEN-16785: Make Chem Disinfect and Chem Flush Disinfect Buttons Invisible per Instit Config Status

- used the itemVisible to hide the chemical flush and checmical disinfect.

- fixed the institutional model class comment.

- made the enableChemicaldisinfect enabled/true by default.

· /sources/gui/qml/pages/disinfect/DisinfectStack.qml	(-49, +7)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h	(-27, +28)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentInstitutionalRecord.h	(-1, +1)	\| History	\| Source	\| Diff