leahi-application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-3860 SW Misc & Enhc - SW - 01 - General Alarm - Temporary Break - R&I - 05: DEV - Feature Implementation

post merge confliuc iresolution

    • -4
    • +4
    /sources/gui/qml/dialogs/AlarmDialog.qml
Merge remote-tracking branch 'origin/staging' into feature/LDT-3855-sw-enhc-general-alarm

    • -1
    • +1
    /sources/gui/qml/dialogs/AlarmDialog.qml
Merge branch 'feature/LDT-3834-sw-misc-enhc-stop-state' into staging

Merge branch 'feature/LDT-2707-trends' into staging

LDT-2712: Trends and Screensaver Screens - SW - 01 - Trends Screen - R&I - 05: DEV - Feature Implementation

rem0oved obsolete dox comment

LDT-2712: Trends and Screensaver Screens - SW - 01 - Trends Screen - R&I - 05: DEV - Feature Implementation

address crf comments

LDT-3860 SW Misc & Enhc - SW - 01 - General Alarm - Temporary Break - R&I - 05: DEV - Feature Implementation

addres cr comments

Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-2707-trends

    • -0
    • +4
    /sources/gui/qml/globals/Variables.qml
    • -11
    • +19
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
LDT-3860 SW Misc & Enhc - SW - 01 - General Alarm - Temporary Break - R&I - 05: DEV - Feature Implementation

fix spacing on alarm list dialog

    • -3
    • +6
    /sources/gui/qml/dialogs/AlarmListDialog.qml
LDT-3860 SW Misc & Enhc - SW - 01 - General Alarm - Temporary Break - R&I - 05: DEV - Feature Implementation

update notification dialog

    • -0
    • +356
    /sources/gui/qml/dialogs/AlarmDialog.qml
    • -13
    • +5
    /sources/gui/qml/dialogs/AlarmListDialog.qml
LDT-3860 SW Misc & Enhc - SW - 01 - General Alarm - Temporary Break - R&I - 05: DEV - Feature Implementation

fix button color and qml wqartning

LDT-3800-enhancements-usability-requests

add temporary break button to alarm dialog

    • -0
    • +24
    /sources/gui/qml/components/HelpNotification.qml
    • -1
    • +11
    /sources/view/hd/alarm/VAlarmStatus.cpp
LDT-3839 SW Misc & Enhc - SW - 01 - Stop State - R&I - 05: DEV - Feature Implementation

update stop state logic on alarm dialog

LDT-3839 SW Misc & Enhc - SW - 01 - Stop State - R&I - 05: DEV - Feature Implementation

update message id for tx stop state

    • -0
    • +83
    /sources/model/td/data/treatment/MTreatmentStopData.h
    • -0
    • +26
    /sources/view/td/data/treatment/VTreatmentStopData.cpp
    • -0
    • +44
    /sources/view/td/data/treatment/VTreatmentStopData.h
Merge branch 'feature/LDT-3698-sw-misc-enhc-rinseback' into staging

Merge branch 'feature/LDT-3678-sw-misc-enhc-ultrafiltration' into staging

LDT-3683 SW Misc & Enhc - SW - 01 - New Design - Ultrafiltration - R&I - 05: DEV - Feature Implementation

ADDRESS CR COMMENTS

LDT-3703 SW Misc & Enhc - SW - 01 - New Design - Rinseback - R&I - 05: DEV - Feature Implementation

fix spaicng

LDT-3703 SW Misc & Enhc - SW - 01 - New Design - Rinseback - R&I - 05: DEV - Feature Implementation

address cr comments

    • -6
    • +6
    /sources/gui/qml/dialogs/ConfirmDialog.qml
LDT-3683 SW Misc & Enhc - SW - 01 - New Design - Ultrafiltration - R&I - 05: DEV - Feature Implementation

update unit

LDT-3703 SW Misc & Enhc - SW - 01 - New Design - Rinseback - R&I - 05: DEV - Feature Implementation

Remo0ve obsolete rinseback pages

LDT-3703 SW Misc & Enhc - SW - 01 - New Design - Rinseback - R&I - 05: DEV - Feature Implementation

fiknish rinseback updates

LDT-3703 SW Misc & Enhc - SW - 01 - New Design - Rinseback - R&I - 05: DEV - Feature Implementation

risneback ciompelte dialog ocmpelted

    • -0
    • +17
    /sources/gui/qml/dialogs/ConfirmDialog.qml
    • -0
    • +31
    /sources/gui/qml/dialogs/RinsebackCompleteDialog.qml
LDT-3683 SW Misc & Enhc - SW - 01 - New Design - Ultrafiltration - R&I - 05: DEV - Feature Implementation

Merge branch 'feature/LDT-3574-misc-sw-enhancements' into staging

Merge remote-tracking branch 'origin/staging' into feature/LDT-3574-misc-sw-enhancements

Bamboo Commit: Updated MAlarmMapping.cpp

    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'feature/LDT-3516-sw-integration-101' into staging

Merge branch 'feature/LDT-3413-hdf-main-tx-hdf-graph' into staging

Merge branch 'feature/LDT-3433-water-dialysate-and-blood-sample' into staging