Clone Tools
  • last updated a few minutes 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

Merge remote-tracking branch 'origin/staging' into feature/LDT-3855-sw-enhc-general-alarm

  1. … 1 more file in changeset.
Merge branch 'feature/LDT-3834-sw-misc-enhc-stop-state' into staging

  1. … 1 more file in changeset.
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

    • -27
    • +12
    ./gui/qml/pages/treatment/TreatmentTrends.qml
    • -12
    • +2
    ./view/td/data/treatment/VTreatmentTrends.cpp
LDT-3860 SW Misc & Enhc - SW - 01 - General Alarm - Temporary Break - R&I - 05: DEV - Feature Implementation

addres cr comments

    • -5
    • +0
    ./gui/qml/dialogs/NotificationDialog.qml
Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-2707-trends

    • -11
    • +19
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 2 more files in changeset.
LDT-3860 SW Misc & Enhc - SW - 01 - General Alarm - Temporary Break - R&I - 05: DEV - Feature Implementation

fix spacing on alarm list dialog

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

update notification dialog

    • -0
    • +356
    ./gui/qml/dialogs/AlarmDialog.qml
    • -13
    • +5
    ./gui/qml/dialogs/AlarmListDialog.qml
    • -335
    • +53
    ./gui/qml/dialogs/NotificationDialog.qml
  1. … 1 more file in changeset.
LDT-3860 SW Misc & Enhc - SW - 01 - General Alarm - Temporary Break - R&I - 05: DEV - Feature Implementation

fix button color and qml wqartning

    • -1
    • +0
    ./gui/qml/components/HelpNotification.qml
    • -0
    • +5
    ./gui/qml/dialogs/NotificationDialog.qml
LDT-3800-enhancements-usability-requests

add temporary break button to alarm dialog

    • -0
    • +24
    ./gui/qml/components/HelpNotification.qml
    • -93
    • +88
    ./gui/qml/dialogs/NotificationDialog.qml
  1. … 1 more file in changeset.
LDT-3839 SW Misc & Enhc - SW - 01 - Stop State - R&I - 05: DEV - Feature Implementation

update stop state logic on alarm dialog

    • -13
    • +12
    ./gui/qml/dialogs/NotificationDialog.qml
LDT-3839 SW Misc & Enhc - SW - 01 - Stop State - R&I - 05: DEV - Feature Implementation

update message id for tx stop state

    • -83
    • +0
    ./model/hd/data/treatment/MTreatmentStopData.h
    • -0
    • +49
    ./model/td/data/treatment/MTreatmentStopData.cpp
    • -0
    • +83
    ./model/td/data/treatment/MTreatmentStopData.h
    • -26
    • +0
    ./view/hd/data/treatment/VTreatmentStopData.cpp
    • -44
    • +0
    ./view/hd/data/treatment/VTreatmentStopData.h
    • -0
    • +26
    ./view/td/data/treatment/VTreatmentStopData.cpp
    • -0
    • +44
    ./view/td/data/treatment/VTreatmentStopData.h
  1. … 1 more file in changeset.
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

    • -0
    • +1
    ./gui/qml/compounds/InstructionView.qml
LDT-3703 SW Misc & Enhc - SW - 01 - New Design - Rinseback - R&I - 05: DEV - Feature Implementation

address cr comments

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

  1. … 1 more file in changeset.
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
    ./gui/qml/dialogs/ConfirmDialog.qml
    • -0
    • +31
    ./gui/qml/dialogs/RinsebackCompleteDialog.qml
  1. … 1 more file in changeset.
LDT-3683 SW Misc & Enhc - SW - 01 - New Design - Ultrafiltration - R&I - 05: DEV - Feature Implementation

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

    • -0
    • +11
    ./gui/qml/pages/treatment/TreatmentHome.qml
  1. … 1 more file in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

Merge branch 'feature/LDT-3516-sw-integration-101' into staging

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

  1. … 1 more file in changeset.
LDT-3579 Misc SW Enhancements - SW - 01 - General Aesthetics - 02-S24 - R&I - 05: DEV - Feature Implementation

address cr comments

LDT-3521 Misc SW Enhancements - SW - 01 - SW Integration 101 - R&I - 05: DEV - Feature Implementation

update button layout for treatment section header

LDT-3521 Misc SW Enhancements - SW - 01 - SW Integration 101 - R&I - 05: DEV - Feature Implementation

move expand button to top header bar of componenet

    • -4
    • +6
    ./gui/qml/pages/treatment/TreatmentSection.qml
LDT-3579 Misc SW Enhancements - SW - 01 - General Aesthetics - 02-S24 - R&I - 05: DEV - Feature Implementation

address cr commejnts

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

    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentHeparin.qml
  1. … 1 more file in changeset.