application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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
DEN-14955 Tx Create Rejection - Update code base on feedback from Behrouz on CR

    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
DEN-14955 Slider Bug fix - DEN-15026 Correct handling for slider and switch on/off

    • -7
    • +2
    /sources/gui/qml/components/Slider.qml
DEN-14955 - Slider fix DEN-15028 - Related the heparin stop time slider active state to the heparin dispensing active state

DEN-14955 Service Password - Add a validation CPP function for QML to call to check entry conforms to rules

    • -0
    • +27
    /sources/view/settings/VSettings.cpp
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

    • -6
    • +46
    /sources/model/dg/data/MDGValvesStatesData.h
    • -21
    • +15
    /sources/view/dg/data/VDGValvesStatesData.cpp
    • -7
    • +14
    /sources/view/dg/data/VDGValvesStatesData.h
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

    • -13
    • +21
    /sources/model/dg/data/MDGROPumpData.cpp
    • -12
    • +18
    /sources/model/dg/data/MDGROPumpData.h
    • -5
    • +7
    /sources/view/dg/data/VDGROPumpData.cpp
DEN-14955 : DEN-13152 bug fix - Fix slider to correctly accept value changes outside of slider-action induced changes

    • -1
    • +28
    /sources/gui/qml/components/Slider.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

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

    • -10
    • +58
    /sources/model/dg/data/MDGReservoirData.cpp
    • -11
    • +46
    /sources/model/dg/data/MDGReservoirData.h
    • -3
    • +15
    /sources/view/dg/data/VDGReservoirData.cpp
    • -3
    • +15
    /sources/view/dg/data/VDGReservoirData.h
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

DEN-14853 UI Out Of Sync With Firmware On Handled Messages

    • -12
    • +24
    /sources/model/dg/data/MDGDrainPumpData.cpp
    • -12
    • +22
    /sources/model/dg/data/MDGDrainPumpData.h
    • -4
    • +7
    /sources/view/dg/data/VDGDrainPumpData.cpp
    • -4
    • +7
    /sources/view/dg/data/VDGDrainPumpData.h
DEN-15017 Ultrafiltration Volume Cannot Be Set to 0 L

- Talked with Sean and to use the 0x1A00 message | #3:(F32) | \ref Data::mUltrafiltration_Volume_Min |.

    • -2
    • +0
    /sources/gui/qml/globals/Variables.qml
DEN-14955 TxCreateRejection - Update based on feedback from Behrouz - Fix positioning of the invalid parameter after FW response to avoid abnormal repositioning on slider update - Add a constant variable for the no reject reason - Remove modification to VALUESET and add trigger macro call to the VTreatmentCreate file

    • -0
    • +1
    /sources/gui/qml/globals/Variables.qml
    • -18
    • +14
    /sources/view/VTreatmentCreate.cpp
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

    • -10
    • +35
    /sources/model/dg/data/MDGConductivityData.h
    • -0
    • +8
    /sources/view/dg/data/VDGConductivityData.h