sources

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
    ./view/settings/VDuetRoWaterDG.h
DEN-15072 RO Water Input Mode

- Implemented the view

- Implemented the post

    • -7
    • +18
    ./gui/qml/pages/settings/SettingsStack.qml
    • -0
    • +81
    ./view/settings/VDuetRoWaterDG.cpp
    • -0
    • +101
    ./view/settings/VDuetRoWaterDG.h
  1. … 1 more file in changeset.
DEN-15072 RO Water Input Mode

- Implemented the models

    • -0
    • +64
    ./model/dg/adjustment/settings/MDuetRoWaterDG.cpp
    • -0
    • +165
    ./model/dg/adjustment/settings/MDuetRoWaterDG.h
  1. … 2 more files in changeset.
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.

    • -11
    • +7
    ./gui/qml/pages/settings/SettingsWiFi.qml
DEN-15072 RO Water Input Mode

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

    • -0
    • +76
    ./gui/qml/pages/settings/SettingsStack.qml
Bamboo Commit: Updated MAlarmMapping.cpp

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

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

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

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

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

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

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

    • -1
    • +1
    ./gui/qml/components/GridSelection.qml
    • -20
    • +14
    ./model/hd/alarm/MAlarmMapping.cpp
DEN-14955 Tx Create Reject

- Simplified the RangeSlider getColor function

DEN-14955 Tx Create Reject

- Removed the not needed titleColor of the option button

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

- code enhancement

- option buttons rejection improvement

    • -2
    • +3
    ./gui/qml/components/GridSelection.qml
Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -1
    • +1
    ./gui/qml/components/DebugDataColumn.qml
    • -1
    • +1
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -2
    • +2
    ./model/dg/data/MDGConductivityData.cpp
  1. … 43 more files in changeset.
Merge branch 'DEN-14936-UI-BN-S93' into staging

    • -42
    • +64
    ./gui/qml/dialogs/DiagnosticsDialog.qml
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
    ./model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    ./gui/qml/pages/settings/SettingsStack.qml
    • -20
    • +14
    ./model/hd/alarm/MAlarmMapping.cpp
CR: Addressing Code Review comment UI-DEN-14936-1#c16983

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

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

    • -0
    • +1
    ./gui/qml/components/GridSelection.qml
DEN-15017 Ultrafiltration Volume Cannot Be Set to 0 L

revert back the commit e454ad

DEN-14955 Slider - add missing }

DEN-11539: Service password initial setup

- removed the console log debug line

    • -1
    • +1
    ./gui/qml/pages/settings/SettingsStack.qml
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
    ./gui/qml/pages/UserConfirmation.qml
    • -36
    • +24
    ./gui/qml/pages/settings/SettingsStack.qml
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
    ./gui/qml/pages/UserConfirmation.qml
    • -10
    • +28
    ./gui/qml/pages/settings/SettingsStack.qml