Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-3194-isolated-uf-adjustment

    • -1
    • +0
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 1 more file in changeset.
LDT-3199: Isolated UF - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated MessageInterpreter.h/cpp to remove adjustUltrafiltrationEdit and adjustUltrafiltrationConfirm and change to use notify.

LDT-3199: Isolated UF - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated LabelUnitText.qml to remove declared enum and instead use Text.Align enum.

    • -15
    • +10
    ./gui/qml/compounds/LabelUnitText.qml
LDT-3199: Isolated UF - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated TreatmentAdjustmentUltrafiltrationStack.qml to remove commented out code.

LDT-3199: Isolated UF - SW - 01 - R&I - 05: DEV - Feature Implementation

- Moved TreatmentAdjustmentDuration.qml to TreatmentAdjustmentDurationStack.qml.

- Moved TreatmentAdjustmentUltrafiltration.qml to TreatmentAdjustmentUltrafiltrationStack.qml.

    • -5
    • +5
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 1 more file in changeset.
LDT-3199: Isolated UF - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated MTreatmentAdjustRequests.h doxygen header.

LDT-3199: Isolated UF - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated MTreatmentAdjustRequests.h doxygen headers.

LDT-3199: Isolated UF - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated MTreatmentAdjustIsolatedUFConfirmResponse.h to fix doxygen header.

LDT-3199: Isolated UF - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated MTreatment models to derive them from MAbstractModel.

LDT-3199: Isolated UF - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated VTreatmentAdjustmentIsolatedUFConfirm.cpp to remove debug output.

LDT-3199: Isolated UF - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated to change all instances of Volume Goal to Volume or SetVolume in all Isolated UF models and views.

  1. … 19 more files in changeset.
Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-3194-isolated-uf-adjustment

    • -0
    • +333
    ./view/td/data/VTreatmentRanges.cpp
    • -0
    • +125
    ./view/td/data/VTreatmentRanges.h
  1. … 2 more files in changeset.
Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-3106-blood-prime

  1. … 1 more file in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

LDT-3199: Isolated UF - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated MessageDispatcher.cpp to remove debug output.

LDT-2942: Rinseback - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated VDDValvesStatesData.cpp for changes to enums in common repo.

    • -3
    • +3
    ./view/dd/data/VDDValvesStatesData.cpp
LDT-3111: Blood Prime - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated VDDValvesStatesData.cpp for changes to enums in common repo.

    • -3
    • +3
    ./view/dd/data/VDDValvesStatesData.cpp
Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-3106-blood-prime

LDT-2940: Rinseback - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

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

    • -10
    • +103
    ./view/td/data/VTreatmentRanges.cpp
  1. … 1 more file in changeset.
LDT-3111: Blood Prime - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated TreatmentBloodPrime.qml to fix QML error.

LDT-3199: Isolated UF - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated Isolated UF message IDs.

LDT-3111: Blood Prime - SW - 01 - R&I - 05: DEV - Feature Implementation

= Updated Blood Prime progress message ID.

LDT-3111: Blood Prime - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated Blood Prime progress message ID.

LDT-3111: Blood Prime - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated TreatmentBloodPrime.qml to remove unnecessary import and remove fluid bolus adjustment.

- Updated TreatmentStack.qml to remove fluid bolus adjustment from blood prime screen.

    • -6
    • +0
    ./gui/qml/pages/treatment/TreatmentStack.qml
LDT-2942: Rinseback - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated EndTreatmentRinseback.qml to remove unnecessary import and update TimeText id/objectName.

LDT-2940: Rinseback - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

- Updated Rinseback sequence diagram.

    • -235
    • +0
    ./view/hd/data/VTreatmentRanges.cpp
    • -0
    • +235
    ./view/td/data/VTreatmentRanges.cpp
    • -0
    • +99
    ./view/td/data/VTreatmentRanges.h
  1. … 2 more files in changeset.
fix bug

    • -3
    • +11
    ./gui/qml/compounds/ValueAdjuster.qml
LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

address cr comments

Merge branch 'staging' into feature/LDT-3139-blood-set-auto-load

    • -28
    • +36
    ./gui/qml/pages/settings/SettingsStack.qml
  1. … 1 more file in changeset.
LDT-3199: Isolated UF - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated TreatmentAdjustmentIsolatedUFDurationEdit.qml and TreatmentAdjustmentIsolatedUFVolumeGoalEdit.qml to change TreatmentAdjustmentIsolatedUFMetrics to TreatmentAdjustmentUltrafiltrationMetrics.