Fisheye on application/sources/view/settings

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

Dara Navaei — Tue, 14 May 2024 13:56:20 -0700

Dara Navaei committed a8c3c4e on branch model_unit_test_fix, release/p1 and 2 more in application

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

· /sources/canbus/MessageDispatcher.cpp

(-2, +2)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.h

(-2, +2)

| History

| Source

| Diff

· /sources/canbus/MessageGlobals.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageInterpreter.cpp

(-2, +2)

| History

| Source

| Diff

· /sources/gui/GuiGlobals.h

(-2, +2)

| History

| Source

| Diff

· /sources/model/MModel.h

(-2, +2)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| 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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

… 17 more files in changeset.

application (model_unit_test_fix): DEN-16851: New Alarm for Increased Occlusion Sensitivity - Added the following fields to mssage 0x0009: arterial long f...

Behrouz NematiPour — Tue, 14 May 2024 13:16:42 -0700

Behrouz NematiPour committed e305f7f on branch model_unit_test_fix, release/p1 and 3 more in application

DEN-16851: New Alarm for Increased Occlusion Sensitivity - Added the following fields to mssage 0x0009: arterial long filter, venous long filter, blood pump occl long filter, partial occl base line

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

DEN-16862: Add a command to reset HD during UI software install

- Added a command to request an HD reset during the UI software and while HD is in service mode.

DEN-16864: UI Bloodflow message is incomplete

- Updated the payload of the following messages: 0x002C, 0x0005, 0x0008, 0x006C.

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.

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

- Addressed the code review comments.

· /sources/canbus/MessageDispatcher.cpp

(-0, +12)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.h

(-0, +3)

| History

| Source

| Diff

· /sources/canbus/MessageGlobals.h

(-6, +9)

| History

| Source

| Diff

· /sources/canbus/MessageInterpreter.cpp

(-0, +4)

| History

| Source

| Diff

· /sources/gui/GuiGlobals.h

(-0, +2)

| History

| Source

| Diff

· /sources/model/MModel.h

(-1, +11)

| History

| Source

| Diff

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

(-6, +10)

| History

| Source

| Diff

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

(-4, +7)

| History

| Source

| Diff

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

(-0, +8)

| History

| Source

| Diff

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

(-0, +6)

| History

| Source

| Diff

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

(-0, +30)

| History

| Source

| Diff

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

(-4, +12)

| History

| Source

| Diff

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

(-0, +6)

| History

| Source

| Diff

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

(-0, +4)

| History

| Source

| Diff

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

(-9, +12)

| History

| Source

| Diff

… 16 more files in changeset.

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

Dara Navaei — Thu, 28 Mar 2024 13:59:28 -0700

Dara Navaei committed b78bf6b on branch model_unit_test_fix, release/p1 and 3 more in application

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

· /sources/ApplicationController.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/ApplicationController.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/MainStack.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/disinfect/DisinfectStack.qml	(-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/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	(-1, +1)	\| History	\| Source	\| Diff

application (release/stagingmerge-DEN-16786-ui-dn-s119): DEN-16785: Make Chem Disinfect and Chem Flush Disinfect Buttons Invisible per Instit Config Status...

Behrouz NematiPour — Thu, 28 Mar 2024 11:35:01 -0700

Behrouz NematiPour committed bf89446 on branch model_unit_test_fix, release/p1 and 4 more in application

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

- Added code to application controller to call for request institutional record.

- Added code in the disinfect stack qml to dynamically adjust the disinfect buttons upon enable chemical disinfect value

- Changed the status of chemical disinfect in the institutional record to enabled or disabled from 1 or 0

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.

DEN-16784: BACK Button Appears during Disinfection Screen after Ending Treatment

- Fixed the disinfect back button being visible on after treatment disinfection.

- Set the hasCancel to false when op_mode sets back to the StandbyWaitTreatment.

- Removed the disinfect back button hide on touch.

· /sources/ApplicationController.cpp	(-0, +11)	\| History	\| Source	\| Diff
· /sources/ApplicationController.h	(-0, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/MainStack.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/disinfect/DisinfectStack.qml	(-22, +7)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h	(-27, +28)	\| History	\| Source	\| Diff
· /sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp	(-1, +0)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentInstitutionalRecord.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentInstitutionalRecord.h	(-3, +3)	\| History	\| Source	\| Diff

application (release/stagingmerge-DEN-16786-ui-dn-s119): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Wed, 20 Mar 2024 11:21:55 -0700

Dara Navaei committed a9524b7 on branch model_unit_test_fix, release/p1 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/pages/disinfect/DisinfectStack.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml	(-2, +2)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp	(-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/settings/VAdjustmentInstitutionalRecord.cpp	(-2, +2)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentInstitutionalRecord.h	(-2, +2)	\| History	\| Source	\| Diff

application (release/stagingmerge-DEN-16786-ui-dn-s119): DEN-16773: Add Chemical Disinfect Enable To the Institutional Record...

Behrouz NematiPour — Tue, 19 Mar 2024 15:45:12 -0700

Behrouz NematiPour committed 1f22587 on branch model_unit_test_fix, release/p1 and 5 more in application

DEN-16773: Add Chemical Disinfect Enable To the Institutional Record

Added enable chemical disinfect to the institutional configurations

DEN-16773: Add Chemical Disinfect Enable To the Institutional Record

- Added code to display the reject reason in chemical disinfect flush

DEN-16773: Add Chemical Disinfect Enable To the Institutional Record

- Addressed the code review comment

DEN-16773: Add Chemical Disinfect Enable To the Institutional Record

- Addressed a code review comment

· /sources/canbus/MessageGlobals.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/disinfect/DisinfectStack.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp	(-6, +10)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h	(-0, +2)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentInstitutionalRecord.cpp	(-12, +14)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentInstitutionalRecord.h	(-0, +3)	\| History	\| Source	\| Diff

application (release/stagingmerge-DEN-16786-ui-dn-s119): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Thu, 07 Mar 2024 14:01:34 -0800

Dara Navaei committed 2467780 on branch model_unit_test_fix, release/p1 and 7 more in application

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

· /sources/ApplicationPost.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/cloudsync/CloudSyncController.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/cloudsync/CloudSyncController.h

(-1, +1)

| History

| Source

| Diff

· /sources/device/DeviceController.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/device/DeviceController.h

(-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

· /sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml

(-5, +5)

| History

| Source

| Diff

· /sources/gui/qml/pages/treatment/TreatmentHome.qml

(-1, +1)

| History

| Source

| Diff

· /sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp

(-5, +5)

| History

| Source

| Diff

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

(-0, +14)

| History

| Source

| Diff

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

(-20, +14)

| History

| Source

| Diff

· /sources/storage/FileHandler.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/storage/FileHandler.h

(-1, +1)

| History

| Source

| Diff

· /sources/storage/Logger.cpp

(-1, +1)

| History

| Source

| Diff

… 17 more files in changeset.

application (release/stagingmerge-DEN-16786-ui-dn-s119): DENBUG-163: High Venous Pressure Alarm 130 Triggers During Normal Treatment Operation...

Behrouz NematiPour — Thu, 07 Mar 2024 12:51:10 -0800

Behrouz NematiPour committed 6a06de0 on branch model_unit_test_fix, release/p1 and 8 more in application

DENBUG-163: High Venous Pressure Alarm 130 Triggers During Normal Treatment Operation

Added air trap raw lower level and air trap raw upper level to be logged and displayed on the diagnostics screen

DEN-16693: Institutional Settings Implementation

Initial commit of the inititutional record MVC implementation.

DEN-16693: Institutional Settings Implementation

Updated the qml file to display the insititutional record. Updated the model and view classes.

Bamboo Commit: Updated MAlarmMapping.cpp

DENBUG-199: Alarm 280 (DG Fault: DRP Direction Fault) Triggered during Pre-Treatment Sequence

Added the Maxon RPM to the handled messages to be logged.

DEN-16693: Institutional Settings Implementation

Updated the institutional record screen columns.

DEN-16693: Institutional Settings Implementation

Updated the units width in the institutional record.

DEN-16693: Institutional Settings Implementation

Changed the prescribed UF volume to L from mL.

DEN-16693: Institutional Settings Implementation

Updated the title of the Institutional Configurations and updated the heparin units

DEN-16693: Institutional Settings Implementation

Changed the name of the Institutional Configurations to Institutional Configs to be able to fit in the tab

DEN-16693: Institutional Settings Implementation

- Touch grid column spacing shrank from 100 to 50.

- Settings column width expanded from 300 to 325.

- Changed the Institutional Configs to Institutional Configurations on settings items.

DEN-16693: Institutional Settings Implementation

- Addressed the code review comments

· /AlarmMapping.csv

(-5, +5)

| History

| Source

| Diff

· /cppcheck.err

(-82, +163)

| History

| Source

| Diff

· /cppcheck.log

(-222, +271)

| History

| Source

| Diff

· /denali.pro

(-0, +4)

| History

| Source

| Diff

· /denali.pro.user

(-4, +5)

| History

| Source

| Diff

· /denali.qrc

(-0, +1)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.cpp

(-0, +12)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.h

(-0, +1)

| History

| Source

| Diff

· /sources/canbus/MessageGlobals.h

(-2, +4)

| History

| Source

| Diff

· /sources/canbus/MessageInterpreter.cpp

(-1, +2)

| History

| Source

| Diff

· /sources/gui/GuiGlobals.cpp

(-0, +1)

| History

| Source

| Diff

· /sources/gui/GuiGlobals.h

(-0, +4)

| History

| Source

| Diff

· /sources/gui/qml/compounds/TouchGrid.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/dialogs/DiagnosticsDialog.qml

(-0, +6)

| History

| Source

| Diff

· /sources/gui/qml/main.qml

(-0, +3)

| History

| Source

| Diff

… 20 more files in changeset.

application (release/stagingmerge-DEN-16786-ui-dn-s119): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Thu, 18 Jan 2024 22:32:59 -0800

Dara Navaei committed a9b3b24 on branch model_unit_test_fix, release/p1 and 10 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

(-2, +2)

| 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

… 598 more files in changeset.

application (release/stagingmerge-DEN-16786-ui-dn-s119): DENBUG-182: Phantom Alarm Screen Appears After Clearing Last Alarm...

Behrouz NematiPour — Wed, 17 Jan 2024 06:25:40 -0800

Behrouz NematiPour committed b543920 on branch model_unit_test_fix, release/p1 and 11 more in application

DENBUG-182: Phantom Alarm Screen Appears After Clearing Last Alarm

DENBUG-185: UI shows version without period in between (ECO-11648, ECO-11616)

DENBUG-182: Phantom Alarm Screen Appears After Clearing Last Alarm

Addressing Code Review comments

Addressing code review comments

compatibility needs the separator before the value

DENBUG-182: Phantom Alarm Screen Appears After Clearing Last Alarm

- the order of the QML PROPERTYs cannot exactly predicted therefore setting them if not needed has to be avoided.

- a new method _init has been added to the PROPERTY_BASE to reset the property value without triggering the changed method so the property will get updated on the next round if the same value as before has been sent. ( the issue could be if code return after the alarmID = 0 on next alarm if the same ID send since the value is the same the QML will not get any signal to update, by changing the private property the signal will be triggered.)

DENBUG-182: Phantom Alarm Screen Appears After Clearing Last Alarm

- the order of the QML PROPERTYs cannot exactly predicted therefore setting them if not needed has to be avoided.

- set the alarmID to 0 to trigger the next change since we skip the property updated if the alarmID is 0.

DENBUG-182: Phantom Alarm Screen Appears After Clearing Last Alarm

· /main.cpp	(-5, +11)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/TouchRect.qml	(-6, +20)	\| History	\| Source	\| Diff
· /sources/view/hd/alarm/VAlarmStatus.cpp	(-22, +27)	\| History	\| Source	\| Diff
· /sources/view/settings/VDuetRoWaterDG.h	(-1, +1)	\| History	\| Source	\| Diff

application (release/stagingmerge-DEN-16786-ui-dn-s119): DEN-16551: Wi-Fi security protocol TKIP encryption shall be removed.

Behrouz NematiPour — Fri, 08 Dec 2023 20:20:03 -0800

Behrouz NematiPour committed 1a47367 on branch model_unit_test_fix, release/p1 and 11 more in application

DEN-16551: Wi-Fi security protocol TKIP encryption shall be removed.

· /sources/view/settings/VNetworkModel.cpp	(-0, +3)	\| History	\| Source	\| Diff
· /sources/view/settings/VNetworkModel.h	(-5, +6)	\| History	\| Source	\| Diff
· /sources/wifi/WifiInterface.cpp	(-9, +9)	\| History	\| Source	\| Diff
· /sources/wifi/WifiInterface.h	(-2, +11)	\| History	\| Source	\| Diff

application (release/stagingmerge-DEN-16786-ui-dn-s119): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Mon, 09 Oct 2023 15:33:06 -0700

Dara Navaei committed 1a9eb27 on branch master, @Environement_Swith and 88 more in application

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

· /sources/canbus/MessageInterpreter.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/SliderCreateTreatment.qml	(-2, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/TouchArea.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Fonts.qml	(-2, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Variables.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsDecommission.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsFactoryReset.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml	(-2, +2)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-20, +14)	\| History	\| Source	\| Diff
· /sources/storage/Logger.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/storage/Logger.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/storage/StorageGlobals.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/storage/StorageGlobals.h	(-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/settings/VDuetRoWaterDG.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VSettings.cpp	(-1, +1)	\| History	\| Source	\| Diff

application (release/stagingmerge-DEN-16786-ui-dn-s119): DEN-16485: Service password accepts no special character passwords...

Behrouz NematiPour — Mon, 09 Oct 2023 04:17:59 -0700

Behrouz NematiPour committed be1cfa2 on branch master, @Environement_Swith and 88 more in application

DEN-16485: Service password accepts no special character passwords

- The dash ( - ) is special in regex and needs escape.

· /sources/view/settings/VSettings.cpp

(-1, +1)

| History

| Source

| Diff

application (release/stagingmerge-DEN-16786-ui-dn-s119): DEN-16435: Factory Reset deletes service password from System.conf...

Behrouz NematiPour — Thu, 28 Sep 2023 19:42:11 -0700

Behrouz NematiPour committed 515f804 on branch master, @Environement_Swith and 88 more in application

DEN-16435: Factory Reset deletes service password from System.conf

- Fixed the Confirmation Dialog confirm call which caused both the Decommissioning and Factory Reset to be called.

- Fixed the PlantUML section of the VDuetRoWaterDG class.

· /sources/gui/qml/pages/settings/SettingsDecommission.qml	(-1, +3)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsFactoryReset.qml	(-1, +3)	\| History	\| Source	\| Diff
· /sources/view/settings/VDuetRoWaterDG.h	(-42, +39)	\| History	\| Source	\| Diff

application (release/stagingmerge-DEN-16786-ui-dn-s119): DEN-16256: Updated - UI.P1B : Display UF Rate...

Behrouz NematiPour — Tue, 26 Sep 2023 10:21:43 -0700

Behrouz NematiPour committed c6e2812 on branch master, @Environement_Swith and 88 more in application

DEN-16256: Updated - UI.P1B : Display UF Rate

- minor clean up, layout fix and typo fixes

· /sources/gui/qml/components/TouchArea.qml	(-0, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Fonts.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml	(-4, +6)	\| History	\| Source	\| Diff
· /sources/view/settings/VSettings.cpp	(-1, +1)	\| History	\| Source	\| Diff

application (release/stagingmerge-DEN-16786-ui-dn-s119): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Mon, 11 Sep 2023 16:07:03 -0700

Dara Navaei committed a7c580f on branch master, @Environement_Swith and 93 more in application

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

· /main.cpp

(-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/bluetooth/BluetoothInterface.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/bluetooth/BluetoothInterface.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.cpp

(-2, +2)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.h

(-2, +2)

| History

| Source

| Diff

· /sources/canbus/MessageGlobals.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageInterpreter.cpp

(-2, +2)

| History

| Source

| Diff

· /sources/device/DeviceController.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/device/DeviceController.h

(-1, +1)

| History

| Source

| Diff

· /sources/device/DeviceModels.h

(-1, +1)

| History

| Source

| Diff

· /sources/device/DeviceView.cpp

(-1, +1)

| History

| Source

| Diff

… 42 more files in changeset.

application (release/stagingmerge-DEN-16786-ui-dn-s119): Fixing merge conflict

Behrouz NematiPour — Mon, 11 Sep 2023 15:46:51 -0700

Behrouz NematiPour committed b623221 on branch master, @Environement_Swith and 93 more in application

Fixing merge conflict

· /sources/gui/qml/pages/settings/SettingsInformation.qml	(-21, +19)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsStack.qml	(-0, +3)	\| History	\| Source	\| Diff
· /sources/view/settings/VHDUsageInfo.cpp	(-7, +5)	\| History	\| Source	\| Diff
· /sources/view/settings/VHDUsageInfo.h	(-8, +4)	\| History	\| Source	\| Diff

application (release/stagingmerge-DEN-16786-ui-dn-s119): DEN-16334: UI: Service password minimum length shall be 10 and minimum iteration shall be 10k...

Behrouz NematiPour — Mon, 11 Sep 2023 12:34:17 -0700

Behrouz NematiPour committed 7189d77 on branch master, @Environement_Swith and 94 more in application

DEN-16334: UI: Service password minimum length shall be 10 and minimum iteration shall be 10k

- changed the micro to reflect the non-backward compatibility.

- Also changed the source of reading the version's section from the Bamboo script to the compatible.h.

· /main.cpp	(-6, +6)	\| History	\| Source	\| Diff
· /sources/view/settings/VSettings.cpp	(-1, +1)	\| History	\| Source	\| Diff

application (release/stagingmerge-DEN-16786-ui-dn-s119): DEN-16262: Added - UI.P1B : HD/DG usage counter...

Fri, 08 Sep 2023 14:41:47 -0700

Vy committed 36d49ba on branch master, @Environement_Swith and 94 more in application

DEN-16262: Added - UI.P1B : HD/DG usage counter

Add string property to format the total hours in hh:mm format

· /sources/gui/qml/pages/settings/SettingsInformation.qml	(-4, +4)	\| History	\| Source	\| Diff
· /sources/view/settings/VHDUsageInfo.cpp	(-1, +10)	\| History	\| Source	\| Diff
· /sources/view/settings/VHDUsageInfo.h	(-5, +7)	\| History	\| Source	\| Diff

application (release/stagingmerge-DEN-16786-ui-dn-s119): DEN-16262: Added - UI.P1B : HD/DG usage counter...

Fri, 08 Sep 2023 14:02:44 -0700

Vy committed 6be4023 on branch master, @Environement_Swith and 94 more in application

DEN-16262: Added - UI.P1B : HD/DG usage counter

Added the MV for the HD usage information

Modify the TouchGrid to accomodate indentation of subCategories

· /denali.pro	(-0, +4)	\| History	\| Source	\| Diff
· /sources/canbus/MessageDispatcher.cpp	(-0, +11)	\| History	\| Source	\| Diff
· /sources/canbus/MessageDispatcher.h	(-0, +1)	\| History	\| Source	\| Diff
· /sources/canbus/MessageGlobals.h	(-0, +2)	\| History	\| Source	\| Diff
· /sources/canbus/MessageInterpreter.cpp	(-0, +2)	\| History	\| Source	\| Diff
· /sources/gui/GuiGlobals.cpp	(-0, +1)	\| History	\| Source	\| Diff
· /sources/gui/GuiGlobals.h	(-0, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/compounds/TouchGrid.qml	(-1, +3)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-2, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsInformation.qml	(-6, +28)	\| History	\| Source	\| Diff
· /sources/model/MModel.h	(-1, +19)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/settings/MAdjustHDRequests.h	(-0, +30)	\| History	\| Source	\| Diff
· /sources/model/hd/data/MHDUsageInfoResponse.cpp	(-0, +57)	\| History	\| Source
· /sources/model/hd/data/MHDUsageInfoResponse.h	(-0, +91)	\| History	\| Source
· /sources/view/VView.h	(-0, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VHDUsageInfo.cpp	(-0, +46)	\| History	\| Source
· /sources/view/settings/VHDUsageInfo.h	(-0, +71)	\| History	\| Source

application (release/stagingmerge-DEN-16786-ui-dn-s119): DEN-16319: Updated - UI log does not record blood pressure cuff bluetooth pairing...

Tue, 05 Sep 2023 15:52:51 -0700

Vy committed a3260d6 on branch master, @Environement_Swith and 94 more in application

DEN-16319: Updated - UI log does not record blood pressure cuff bluetooth pairing

Modify the logged message to better indicate the bluetooth connection and paired status

· /sources/bluetooth/BluetoothInterface.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VBluetooth.cpp	(-3, +4)	\| History	\| Source	\| Diff

application (release/stagingmerge-DEN-16786-ui-dn-s119): DEN-16319: Updated - UI log does not record blood pressure cuff bluetooth pairing...

Tue, 05 Sep 2023 15:08:50 -0700

Vy committed e3cfef3 on branch master, @Environement_Swith and 94 more in application

DEN-16319: Updated - UI log does not record blood pressure cuff bluetooth pairing

Remove unused bt model constructors in MBluetooth

Make use of the devicePair member variable, removing added isPaired

Remove pairing getter function

· /sources/bluetooth/BluetoothInterface.cpp	(-19, +4)	\| History	\| Source	\| Diff
· /sources/bluetooth/BluetoothInterface.h	(-1, +0)	\| History	\| Source	\| Diff
· /sources/model/settings/MBluetooth.cpp	(-24, +0)	\| History	\| Source	\| Diff
· /sources/model/settings/MBluetooth.h	(-17, +0)	\| History	\| Source	\| Diff
· /sources/view/settings/VBluetooth.cpp	(-6, +2)	\| History	\| Source	\| Diff

application (release/stagingmerge-DEN-16786-ui-dn-s119): DEN-16319: Fixed - UI log does not record blood pressure cuff bluetooth pairing...

Thu, 31 Aug 2023 16:46:12 -0700

Vy committed 8247dc0 on branch master, @Environement_Swith and 94 more in application

DEN-16319: Fixed - UI log does not record blood pressure cuff bluetooth pairing

Add bool status to the MBluetooth for paired state

Update the notifyStateChanged for the Connect/disconnect state to properly log

Add pairing check function in the bluetooth interface to allow querying of paired state

· /sources/bluetooth/BluetoothInterface.cpp	(-2, +19)	\| History	\| Source	\| Diff
· /sources/bluetooth/BluetoothInterface.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/settings/MBluetooth.cpp	(-0, +11)	\| History	\| Source	\| Diff
· /sources/model/settings/MBluetooth.h	(-0, +9)	\| History	\| Source	\| Diff
· /sources/view/settings/VBluetooth.cpp	(-2, +13)	\| History	\| Source	\| Diff

application (release/stagingmerge-DEN-16786-ui-dn-s119): DEN-16334: UI: Service password minimum length shall be 10

Behrouz NematiPour — Wed, 30 Aug 2023 20:29:55 -0700

Behrouz NematiPour committed 6ccee3f on branch master, @Environement_Swith and 94 more in application

DEN-16334: UI: Service password minimum length shall be 10

· /main.cpp	(-27, +42)	\| History	\| Source	\| Diff
· /sources/device/DeviceController.cpp	(-1, +6)	\| History	\| Source	\| Diff
· /sources/device/DeviceController.h	(-0, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/AlarmItem.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/PowerItem.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsRootSSHAccess.qml	(-2, +0)	\| History	\| Source	\| Diff
· /sources/utility/encryption.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VSettings.cpp	(-3, +3)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Mon, 21 Aug 2023 15:31:25 -0700

Dara Navaei committed 75e10e5 on branch master, @Environement_Swith and 101 more in application

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

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

application (bugfix/DEN-16597-UI-BN-S114): DEN-16021: Fixed : UI: Unable to Change Date and Time in HD Settings...

Wed, 16 Aug 2023 15:57:05 -0700

Vy committed 927113e on branch master, @Environement_Swith and 102 more in application

DEN-16021: Fixed : UI: Unable to Change Date and Time in HD Settings

Remove unnecessary timeSpec setting

Add consts

· /sources/view/settings/VDateTime.cpp

(-16, +13)

| History

| Source

| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-16021: Fixed : UI: Unable to Change Date and Time in HD Settings...

Wed, 16 Aug 2023 14:47:14 -0700

Vy committed 5b9ecb0 on branch master, @Environement_Swith and 102 more in application

DEN-16021: Fixed : UI: Unable to Change Date and Time in HD Settings

Corrected UTC conversion on doConfirm action

Added error handling for date_time_set script process failing

· /sources/view/settings/VDateTime.cpp	(-7, +25)	\| History	\| Source	\| Diff
· /sources/view/settings/VDateTime.h	(-0, +1)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Tue, 08 Aug 2023 14:28:09 -0700

Dara Navaei committed ec31f94 on branch master, @Environement_Swith and 109 more in application

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

· /sources/ApplicationController.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/ApplicationController.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/ApplicationPost.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/GuiController.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/GuiController.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/main.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-20, +14)	\| History	\| Source	\| Diff
· /sources/storage/Logger.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/storage/Settings.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/storage/Settings.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/hd/data/VTreatmentRanges.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/hd/data/VTreatmentRanges.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentAlarmVolume.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentAlarmVolume.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VDuetRoWaterDG.cpp	(-1, +1)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-15487: Updated - UI: POST: UI needs to report an error if the configuration files, or parameter(s) are missing....

Behrouz NematiPour — Sun, 06 Aug 2023 18:20:40 -0700

Behrouz NematiPour committed 0eb3d05 on branch master, @Environement_Swith and 110 more in application

DEN-15487: Updated - UI: POST: UI needs to report an error if the configuration files, or parameter(s) are missing.

DEN-16104: UI: Reorder the sequence of the messages in POST from UI to HD

· /sources/ApplicationController.cpp	(-36, +64)	\| History	\| Source	\| Diff
· /sources/ApplicationController.h	(-5, +5)	\| History	\| Source	\| Diff
· /sources/ApplicationPost.cpp	(-16, +1)	\| History	\| Source	\| Diff
· /sources/ApplicationPost.h	(-5, +11)	\| History	\| Source	\| Diff
· /sources/gui/GuiController.cpp	(-4, +4)	\| History	\| Source	\| Diff
· /sources/gui/GuiController.h	(-2, +2)	\| History	\| Source	\| Diff
· /sources/storage/Logger.h	(-0, +1)	\| History	\| Source	\| Diff
· /sources/storage/Settings.cpp	(-7, +17)	\| History	\| Source	\| Diff
· /sources/storage/Settings.h	(-3, +5)	\| History	\| Source	\| Diff
· /sources/view/hd/data/VTreatmentRanges.cpp	(-5, +3)	\| History	\| Source	\| Diff
· /sources/view/hd/data/VTreatmentRanges.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentAlarmVolume.cpp	(-2, +5)	\| History	\| Source	\| Diff
· /sources/view/settings/VAdjustmentAlarmVolume.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VDuetRoWaterDG.cpp	(-2, +6)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Tue, 25 Jul 2023 16:40:51 -0700

Dara Navaei committed 611bbf4 on branch master, @Environement_Swith and 113 more in application

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

· /sources/ApplicationController.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/ApplicationController.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/canbus/MessageGlobals.h	(-2, +2)	\| History	\| Source	\| Diff
· /sources/canbus/MessageInterpreter.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/GuiGlobals.h	(-2, +2)	\| History	\| Source	\| Diff
· /sources/model/MModel.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-20, +14)	\| History	\| Source	\| Diff
· /sources/model/hd/data/post/MHDRTCEpochData.cpp	(-5, +5)	\| History	\| Source	\| Diff
· /sources/model/hd/data/post/MHDRTCEpochData.h	(-5, +5)	\| History	\| Source	\| Diff
· /sources/storage/Logger.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/storage/Logger.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/storage/Settings.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/storage/StorageGlobals.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/storage/StorageGlobals.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/hd/alarm/VAlarmActiveList.cpp	(-2, +2)	\| History	\| Source	\| Diff
· /sources/view/settings/VDateTime.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VDateTime.h	(-2, +2)	\| History	\| Source	\| Diff