application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-15026: UI: Heparin Bolus/Continuous Volume/Rate Set to 0.2 When "OFF" Option is Selected

- Fix Slider OFF value issue to be sent as 0 instead of min

- Removed SliderArrows Hold&Press timer due to unexpected behavior during demo until more tests

- Added PreTx Ultrafiltration Setup Arrows and TickMarks

- Modified the RangeSlider Arrows to keep the min/max while inactive to active and then adjust to able user to select min and max bound values by arrow with single click.

    • -4
    • +8
    /sources/gui/qml/components/RangeSlider.qml
    • -0
    • +1
    /sources/gui/qml/components/Slider.qml
    • -24
    • +23
    /sources/gui/qml/components/SliderArrows.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

    • -31
    • +37
    /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

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

    • -1
    • +1
    /sources/gui/qml/components/GridSelection.qml
    • -2
    • +2
    /sources/gui/qml/components/RangeSlider.qml
    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-14937-UI-VD-S93-2' into staging

DEN-14955 Tx Create Reject

- Simplified the RangeSlider getColor function

    • -9
    • +3
    /sources/gui/qml/components/RangeSlider.qml
DEN-14955 Tx Create Reject

- Removed the not needed titleColor of the option button

    • -1
    • +0
    /sources/gui/qml/components/GridSelection.qml
DEN-14955 Tx Create Reject

- code enhancement

- option buttons rejection improvement

    • -2
    • +3
    /sources/gui/qml/components/GridSelection.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

    • -1
    • +1
    /sources/model/dg/data/MDGConductivityData.h
    • -1
    • +1
    /sources/model/dg/data/MDGDrainPumpData.cpp
    • -1
    • +1
    /sources/model/dg/data/MDGDrainPumpData.h
    • -2
    • +2
    /sources/model/dg/data/MDGROPumpData.cpp
  1. … 43 more files in changeset.
Merge branch 'DEN-14936-UI-BN-S93' into staging

    • -12
    • +12
    /sources/canbus/MessageGlobals.h
CR: Addressing Code Review comment UI-DEN-14936-1#c16985

http://devapps.diality.us:8060/cru/UI-DEN-14936-1#c16985

DEN-14955 Tx Create Reject - Add heparin type reject marking in 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

    • -1
    • +1
    /sources/gui/qml/pages/UserConfirmation.qml
    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-14937-UI-VD-S93-ServicePass' into staging

CR: Addressing Code Review comment UI-DEN-14936-1#c16983

http://devapps.diality.us:8060/cru/UI-DEN-14936-1#c16983

    • -40
    • +40
    /sources/model/dg/data/MDGConductivityData.cpp
    • -1
    • +1
    /sources/model/dg/data/MDGConductivityData.h
DEN-14955 Tx Create Rejection - Include the type buttons' reject reason - Modify to make gridSelection title color changeable

    • -0
    • +1
    /sources/gui/qml/components/GridSelection.qml
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-15017 Ultrafiltration Volume Cannot Be Set to 0 L

revert back the commit e454ad

    • -0
    • +2
    /sources/gui/qml/globals/Variables.qml
DEN-14955 Slider - Update the other sliders with switches in the preTx Create screen to also handle properly the on/off-inactive/active state

DEN-14955 Sliders - Update code to properly handle the ON/OFF inactive/active visual state - Remove active setting of Heparin Stop slider in pre Tx create

    • -18
    • +34
    /sources/gui/qml/components/Slider.qml
DEN-14955 Slider - add missing }

DEN-11539: Service password initial setup

- removed the console log debug line

DEN-11539: Service password initial setup

- added hashing for the service password and did some clean up.

- improved the navigation

- made the service password mandatory to navigate to the service menu, so HD message can't navigate the UI to service screen without user entering the password.

    • -10
    • +9
    /sources/gui/qml/pages/UserConfirmation.qml
    • -20
    • +56
    /sources/view/settings/VSettings.cpp
DEN-14955 ServicePassword - Add secondary password line input to userConfirmation - Add logic for checking password entry - Add a mock encrypt function to signify needing encryption

    • -4
    • +48
    /sources/gui/qml/pages/UserConfirmation.qml