leahi-application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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-3312 Misc SW Enhancements - SW - 01 - General Aesthetics - R&I - 05: DEV - Feature Implementation

push updated changes

    • -2
    • +2
    /sources/gui/qml/components/SDCInfo.qml
    • -8
    • +8
    /sources/gui/qml/compounds/SettingsSlider.qml
    • -1
    • +1
    /sources/view/hd/data/VTreatmentRanges.cpp
    • -0
    • +2
    /sources/view/hd/data/VTreatmentRanges.h
LDT-3312 Misc SW Enhancements - SW - 01 - General Aesthetics - R&I - 05: DEV - Feature Implementation

push update enhancements

    • -4
    • +4
    /sources/gui/qml/components/BaseComboBox.qml
    • -24
    • +17
    /sources/gui/qml/components/HeaderBar.qml
    • -1
    • +0
    /sources/gui/qml/components/ProgressBar.qml
    • -1
    • +0
    /sources/gui/qml/components/RangeBar.qml
    • -17
    • +2
    /sources/gui/qml/components/RangeMarker.qml
    • -0
    • +89
    /sources/gui/qml/components/SDCInfo.qml
    • -0
    • +123
    /sources/gui/qml/compounds/SettingsSlider.qml
    • -6
    • +6
    /sources/gui/qml/dialogs/LockDialog.qml
  1. … 11 more files in changeset.
LDT-3179 Pre-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementationg

change views and models from hd to td

  1. … 3 more files in changeset.
LDT-3111: Blood Prime - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated TreatmentBloodPrime.qml to fix QML error.

LDT-3179 Pre-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementationg

removed obsolete comment

    • -1
    • +1
    /sources/gui/qml/components/StepIndicator.qml
LDT-3179 Pre-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementationg

address cr comment

    • -66
    • +23
    /sources/gui/qml/components/StepIndicator.qml
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.

LDT-3177 Pre-Treatment - SW - 01 - Foundation - R&I - 03: SDD - Design Diagram - plantuml

add updated sdd

    • binary
    /SDDs/Pre-Treatment.png
LDT-3179 Pre-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementationg

address cr comments

    • -0
    • +130
    /SDDs/Pre-Treatment.puml
    • -2
    • +2
    /sources/gui/qml/components/WaitDone.qml
    • -2
    • +0
    /sources/gui/qml/compounds/CheckListView.qml
    • -11
    • +16
    /sources/view/settings/VSettings.cpp
LDT-3179 Pre-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementationg

add message id

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

- Updated Blood_Prime.png to change style.

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

- Updated Rinseback.puml to add user interaction to start rinseback.

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.

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

- Updated Blood Prime sequence diagram.

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

- Updated Rinseback sequence diagram to remove redundant sequence.

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

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

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

- Updated leahi.pro for moved VTreatmentRanges.h/cpp.

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

- Updated Rinseback sequence diagram.

    • -235
    • +0
    /sources/view/hd/data/VTreatmentRanges.cpp
    • -99
    • +0
    /sources/view/hd/data/VTreatmentRanges.h
    • -0
    • +235
    /sources/view/td/data/VTreatmentRanges.cpp
    • -0
    • +99
    /sources/view/td/data/VTreatmentRanges.h
LDT-3179 Pre-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementation

push commented out lines

    • -1
    • +0
    /sources/gui/qml/components/StackItem.qml
LDT-3177 Pre-Treatment - SW - 01 - Foundation - R&I - 03: SDD - Design Diagram - plantuml

push sdd

    • binary
    /SDDs/PreTreatment.png
    • -0
    • +118
    /SDDs/PreTreatment.puml
LDT-3179 Pre-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementation

push fixing indentations

Pre-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementation

LDT-3179 Pre-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementation

    • -1
    • +1
    /sources/gui/qml/components/ConfirmButton.qml
    • -5
    • +5
    /sources/gui/qml/components/HeaderBar.qml
    • -0
    • +1
    /sources/gui/qml/components/StackItem.qml
    • -2
    • +3
    /sources/gui/qml/components/StepBullet.qml
    • -3
    • +20
    /sources/gui/qml/components/StepIndicator.qml
    • -0
    • +46
    /sources/gui/qml/components/SubStepIndicator.qml
    • -4
    • +5
    /sources/gui/qml/components/TimeCircle.qml
    • -2
    • +9
    /sources/gui/qml/components/WaitDone.qml
    • -2
    • +7
    /sources/gui/qml/compounds/CheckListView.qml
  1. … 19 more files in changeset.
Merge branch 'feature/LDT-3139-blood-set-auto-load' into staging