application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
StagingMerge - DEN-17260-ui-dn-release-21 (13 commits squashed)

DEN-17260: UI-DN-Release-21

- DEN-17261: Corrected the treatment logs doxygen and data type for potassium and calcium.

DEN-17260: UI-DN-Release-21

- DENBUG-298: Removed the Maximum Saline Bolus State

- DENBUG-298: Added Deliver Saline Bolus in treatment stop.

DENBUG-298: User unable to deliver saline bolus during alarm conditions where the blood pump is recirculating

- Reduced the font size of fluid value font from 32 to 28.

DEN-17269: Change_version_format_from_dot_to_dash

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

DENBUG-302: When treatment time is updated mid-treatment, update UF rate to keep the volume prescription the same

- Modified message 0xBA to send up to 4 float payloads to the UI

- Changed MDuetConfirmHD to receive and process the new payloads

- Changed VConfirm to update the confirm messages that have {} in them and replace them with actual values

DENBUG-298: User unable to deliver saline bolus during alarm conditions where the blood pump is recirculating

- Updated the TreatmentSaline.qml file to clear the reject reasons associated with saline bolus once the treatment state has changed.

DENBUG-302: When treatment time is updated mid-treatment, update UF rate to keep the volume prescription the same

- Updated the VConfirm to trigger the confirm messages even if the ID has not changed.

DENBUG-298: User unable to deliver saline bolus during alarm conditions where the blood pump is recirculating

- Updated the code to clear the saline bolus related reject reasons upon changing the saline bolus states.

DENBUG-298: User unable to deliver saline bolus during alarm conditions where the blood pump is recirculating

- Added code to clear the saline bolus reject reason upon changing the treatment states.

DENBUG-302: When treatment time is updated mid-treatment, update UF rate to keep the volume prescription the same

- Updated the code to round up the UF rate that is displayed on the UF rate change screen.

DENBUG-302: When treatment time is updated mid-treatment, update UF rate to keep the volume prescription the same

- Updated the current UF rate in the VTreatmentUltrafiltration to be rounded up.

- Removed commented code.

DENBUG-302: When treatment time is updated mid-treatment, update UF rate to keep the volume prescription the same

- Made UF Rate related values in VTreatmentAdjustmentUltrafiltrationEdit to be rounded up prior to displaying on the UI.

DENBUG-302: When treatment time is updated mid-treatment, update UF rate to keep the volume prescription the same

- Addressed the code review comments

    • -2
    • +13
    /sources/gui/qml/pages/MainStack.qml
    • -10
    • +21
    /sources/model/confirm/MDuetConfirmHDi.h
    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
  1. … 3 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

    • -15
    • +21
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 605 more files in changeset.
Merge branch 'release/stagingmerge-DEN-17206-UI-BN-Release20' into release/p1b/staging

DENBUG-287 ( DEN-16823 ) : Tx Log Export Success Message via USB is Hidden Behind REQUEST_REJECT_REASON_DRAIN_NOT_COMPLETE Msg

- DEN-16823: Tx Log Export Success Message via USB is Hidden Behind REQUEST_REJECT_REASON_DRAIN_NOT_COMPLETE Msg

- Cherry Picked from Dara's commit

DEN-17161: Incorrect Calcium Value recorded in TX logs

- Cherry picked from Dara's commit 8fa28af55b1a183b75fb6ddd800192e88ac8d258.

DENBUG-294: UI: Log export between different devices on the same USB drive has conflict of names.

DENBUG-294: UI: Log export between different devices on the same USB drive has conflict of names.

- Added functionality to properly backup the BootPOST log which is the log before getting the HDSerial.

- It will get backed up if it is in the current day and system just has changed to the new log file due to receiving of the serial.

- When trying to back up the normal logs (logs with serial), will try for its BootPOST log, if exists will get backed up.

DENBUG-294: UI: Log export between different devices on the same USB drive has conflict of names.

- renamed the BootPOST log before backing up so won't remain Serial-less on the device.

DENBUG-294: UI: Log export between different devices on the same USB drive has conflict of names.

- now using the old "denali" added log format for update/manufacturing

- and delete them with the lockdown.sh script.

DENBUG-294: UI: Log export between different devices on the same USB drive has conflict of names.

- after the reboot the newly created BootPOST could not get renamed because of the same file already exists, therefore application is now append the new one to the oldone with serial and deletes the new one.

- since the BootPOST log files are small in size like 5~10K this should affect the performance of the system.

    • -1302
    • +1324
    /sources/device/DeviceController.cpp
    • -0
    • +1
    /sources/gui/qml/pages/TreatmentFlowBase.qml
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -2
    • +2
    /sources/model/hd/data/MHDBloodLeakData.cpp
    • -2
    • +2
    /sources/model/hd/data/MHDBloodLeakData.h
    • -2
    • +2
    /sources/view/hd/data/VHDBloodLeakData.cpp
    • -2
    • +2
    /sources/view/hd/data/VHDBloodLeakData.h
Merge branch 'release/stagingmerge-DEN-17098-release_18_changes' into release/p1b/staging

DEN-17093: Blood Leak Zeroing in Treatment

- Added a new enum in dialysis for blood leak zeroing

- Updated the payloads for message 0x6C

- Changed "Date And Time" to "Date and Time"

DEN-17093: Blood Leak Zeroing in Treatment

- Added a new field to message 0x2F00 to log dialysate pump inlet to blood leak detector flush volume

- Removed the blood leak zeroing state enum read

DEN-17093: Blood Leak Zeroing in Treatment

- Fixed a typo

DEN-17093: Blood Leak Zeroing in Treatment

- Updated the payload of message 0x2F

- Updated the payload of message 0x0F

- Updated the payload of message 0x6C

DEN-17093: Blood Leak Zeroing in Treatment

- Fixed blood leak view class

    • -12
    • +36
    /sources/model/hd/data/MHDBloodLeakData.cpp
    • -12
    • +30
    /sources/model/hd/data/MHDBloodLeakData.h
    • -4
    • +10
    /sources/view/hd/data/VHDBloodLeakData.cpp
    • -4
    • +10
    /sources/view/hd/data/VHDBloodLeakData.h
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    /sources/gui/qml/compounds/BPHREntry.qml
    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -1
    • +1
    /sources/model/settings/MWifiNetwork.h
    • -2
    • +2
    /sources/view/settings/VHDUsageInfo.cpp
Merge branch 'release/stagingmerge-DEN-17017-ui-bn-release-17' into release/p1b/staging

Release 17 Code Review branch

git checkout release/stagingmerge-DEN-17017-ui-bn-release-17

git diff HEAD staging > ../stagingmerge-DEN-17017-ui-bn-release-17.patch

git apply ../stagingmerge-DEN-17017-ui-bn-release-17.patch

    • -2
    • +8
    /sources/gui/qml/compounds/BPHREntry.qml
    • -28
    • +44
    /sources/gui/qml/pages/disinfect/DisinfectStack.qml
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -10
    • +2
    /sources/model/hd/data/MHDUsageInfoResponse.cpp
    • -25
    • +20
    /sources/model/settings/MWifiNetwork.h
    • -6
    • +11
    /sources/view/settings/VAdjustmentServiceDates.cpp
    • -12
    • +15
    /sources/view/settings/VHDUsageInfo.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -15
    • +21
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'staging'

    • -4
    • +4
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-16839-UI-BN-Whitney-1B1' into staging

DEN-16961: UI: Release P1B branches to be created for the IDE

- Modified the UI versioning to match the new release branching:

release/p1b/<master, staging, develop>

in oppose to:

release/<p1, p1_staging, ...>

Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -14
    • +14
    /sources/cloudsync/CloudSyncController.h
    • -14
    • +14
    /sources/device/DeviceController.cpp
    • -1
    • +1
    /sources/gui/qml/components/TextEntry.qml
    • -1
    • +1
    /sources/gui/qml/pages/UserConfirmation.qml
  1. … 9 more files in changeset.
Merge branch 'DEN-16839-UI-BN-Whitney-1B1' into staging

    • -2
    • +2
    /sources/view/settings/VDuetRoWaterDG.h
DEN-16958 UI: Add arrow keys to Virtual Keyboard

- This feature did not get approved to be part of the 1B1, there for it has been reverted back and will later be added when there is less risk.