application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-15072 RO Water Input Mode

- Updated the sequence diagram

    • -34
    • +41
    /sources/view/settings/VDuetRoWaterDG.h
DEN-15072 RO Water Input Mode

- Implemented the view

- Implemented the post

    • -0
    • +81
    /sources/view/settings/VDuetRoWaterDG.cpp
    • -0
    • +101
    /sources/view/settings/VDuetRoWaterDG.h
DEN-15072 RO Water Input Mode

- Implemented the models

    • -0
    • +13
    /sources/canbus/MessageDispatcher.cpp
    • -1
    • +6
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +1
    /sources/gui/qml/pages/UserConfirmation.qml
    • -0
    • +64
    /sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp
    • -0
    • +165
    /sources/model/dg/adjustment/settings/MDuetRoWaterDG.h
DEN-13537 UI: Wi-Fi Network Settings not all preserved by Device after reboot

- Decided to disable the WiFi static IP settings fro phase 1.

    • -3
    • +5
    /sources/gui/qml/components/TextEntry.qml
DEN-15072 RO Water Input Mode

- The UI portion which stores and retrieves the RO mode status.

    • -0
    • +16
    /sources/view/settings/VSettings.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

    • -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 - add missing }

DEN-11539: Service password initial setup

- removed the console log debug line