leahi-application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'feature/LDT-1656-headerbar-storage' into staging

Merge branch 'staging' into develop

Merge branch 'feature/LDT-1788-general-alarm-instructions-with-new-design' into staging

LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

address CR comments

LDT-1641 HeaderBar - SW - 01 - Information - R&I - 05: DEV - Feature Implementation

Add information popup to project. Need to fix QR Code

    • -27
    • +9
    /sources/gui/qml/components/HeaderBar.qml
    • -0
    • +60
    /sources/gui/qml/dialogs/headerbar/InformationDialog.qml
LDT-1601HeaderBar - SW - 01 - Settings - R&I - 05: DEV - Feature Implementation

Add updates to popup and address cr comment

    • -2
    • +3
    /sources/gui/qml/components/Slider.qml
LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation - Updated CloseButton.qml to change position based on updated UI design. - Updated TreatmentAdjustmentBase.qml to change header Back button position and title style based on updated UI design.

    • -1
    • +1
    /sources/gui/qml/components/CloseButton.qml
LDT-1661 HeaderBar - SW - 01 - Storage Indicator - R&I - 05: DEV - Feature Implementation

address cr comments

LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

make the progress bar thinner on component

LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

address CR commetns and fix qml errors

    • -3
    • +6
    /sources/view/hd/alarm/VAlarmStatus.cpp
LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

remove figure test

LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

fix build error

LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

address CR comment

LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

address pr comments

LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

address CR comments

    • -3
    • +1
    /sources/view/hd/alarm/VAlarmStatus.cpp
LDT-1661 HeaderBar - SW - 01 - Storage Indicator - R&I - 05: DEV - Feature Implementation

Remove redundant SDCProgressItem and udpate header bar to double click to open diagnistics

    • -0
    • +17
    /sources/gui/qml/components/HeaderBar.qml
LDT-1599 HeaderBar - SW - 01 - Settings - R&I - 03: SDD - Design Diagram - plantuml

add puml file

    • binary
    /SDDs/Settings_Popup.png
    • -0
    • +78
    /SDDs/Settings_Popup.puml
    • -5
    • +2
    /sources/gui/qml/components/HeaderBar.qml
Merge branch 'staging' into develop

LDT-1601HeaderBar - SW - 01 - Settings - R&I - 05: DEV - Feature Implementation

Added settings popup to project to update brightness and alarm.

    • -1
    • +1
    /sources/gui/qml/components/HeaderBar.qml
    • -1
    • +2
    /sources/gui/qml/components/Slider.qml
    • -0
    • +143
    /sources/gui/qml/dialogs/headerbar/SettingsDialog.qml
LDT-1659 HeaderBar - SW - 01 - Storage Indicator - R&I - 03: SDD - Design Diagram - plantuml

Add .puml diagram

    • binary
    /SDDs/Storage_Popup.png
    • -0
    • +55
    /SDDs/Storage_Popup.puml
LDT-1661 HeaderBar - SW - 01 - Storage Indicator - R&I - 05: DEV - Feature Implementation

Add storage popup to project

    • -11
    • +7
    /sources/gui/qml/components/HeaderBar.qml
    • -0
    • +40
    /sources/gui/qml/dialogs/headerbar/StorageDialog.qml
Merge branch 'feature/LDT-1536-headerbar-wifi-indicator' into staging

LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

Addressing even MORE CR comments

    • -1
    • +1
    /sources/gui/qml/components/ModalDialog.qml
LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

addressing more CR comments

    • -3
    • +3
    /sources/gui/qml/components/ModalDialog.qml
LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

address CR comments and make drop shadow color of header bar dialogs lighter

    • -7
    • +1
    /sources/gui/qml/components/HeaderBar.qml
    • -7
    • +7
    /sources/gui/qml/components/ModalDialog.qml
Merge branch 'staging' into develop

LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

address CR comments

    • -20
    • +18
    /sources/device/DeviceController.cpp
LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

address CR comments

    • -22
    • +24
    /sources/device/DeviceController.cpp
    • -19
    • +52
    /sources/gui/qml/components/HeaderBar.qml
LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

Add check to set Connection Error if wifi script fails

    • -13
    • +18
    /sources/device/DeviceController.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -29
    • +29
    /sources/model/hd/alarm/MAlarmMapping.cpp