leahi-application

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

Merge branch 'feature/LDT-3106-blood-prime' into staging

LDT-3197: Isolated UF - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

- Updated Isolated UF sequence diagram to fix MSG and specify which screen rejection reason is being displayed on.

    • binary
    /SDDs/TreatmentAdjustmentIsolatedUF.png
    • -5
    • +5
    /SDDs/TreatmentAdjustmentIsolatedUF.puml
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.

    • -50
    • +2
    /sources/canbus/MessageInterpreter.cpp
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
    /sources/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.

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.

    • -2
    • +2
    /sources/canbus/MessageInterpreter.cpp
  1. … 19 more files in changeset.
LDT-3199: Isolated UF - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated leahi.pro to remove sources/view/hd/data/VTreatmentRanges.h.

Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-3194-isolated-uf-adjustment

    • -0
    • +2
    /sources/gui/qml/globals/Variables.qml
    • -0
    • +333
    /sources/view/td/data/VTreatmentRanges.cpp
    • -0
    • +125
    /sources/view/td/data/VTreatmentRanges.h
Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-3106-blood-prime

Bamboo Commit: Updated MAlarmMapping.cpp

    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'feature/LDT-2937-rinseback' into staging

LDT-3197: Isolated UF - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

- Updated SDDs/TreatmentAdjustmentIsolatedUF.puml to match style.

    • binary
    /SDDs/TreatmentAdjustmentIsolatedUF.png
    • -7
    • +7
    /SDDs/TreatmentAdjustmentIsolatedUF.puml
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.

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

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

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
    /sources/view/td/data/VTreatmentRanges.cpp
    • -7
    • +30
    /sources/view/td/data/VTreatmentRanges.h
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-3197: Isolated UF - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

- Updated Isolated UF message IDs.

    • binary
    /SDDs/TreatmentAdjustmentIsolatedUF.png
    • -12
    • +12
    /SDDs/TreatmentAdjustmentIsolatedUF.puml
LDT-3111: Blood Prime - SW - 01 - R&I - 05: DEV - Feature Implementation

= Updated Blood Prime progress message ID.

LDT-3109: Blood Prime - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

- Updated Blood Prime progress message ID.

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

- Updated Blood Prime progress message ID.