Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/staging' into feature/LDT-3174-pre-treatment-foundations

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

    • -1
    • +0
    ./qml/pages/treatment/TreatmentStack.qml
  1. … 1 more file in changeset.
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
    ./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
    ./qml/pages/treatment/TreatmentStack.qml
  1. … 1 more file in changeset.
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. … 26 more files in changeset.
Merge branch 'staging' into feature/LDT-3174-pre-treatment-foundations

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

  1. … 4 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.
LDT-3179 Pre-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementationg

address CR comments

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

  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

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

address cr comment

    • -66
    • +23
    ./qml/components/StepIndicator.qml
    • -2
    • +2
    ./qml/compounds/StepNavigationTitleBar.qml
LDT-3199: Isolated UF - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated Isolated UF message IDs.

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

- Updated Blood Prime progress message ID.

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

address cr comments

  1. … 8 more files in changeset.
LDT-3179 Pre-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementationg

add message id

  1. … 1 more file in changeset.
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
    ./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-3179 Pre-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementation

push commented out lines

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

push fixing indentations

    • -39
    • +39
    ./qml/pages/settings/SettingsStack.qml
LDT-3179 Pre-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementation

    • -0
    • +46
    ./qml/components/SubStepIndicator.qml
    • -0
    • +5
    ./qml/compounds/StepNavigationTitleBar.qml
  1. … 19 more files in changeset.
fix bug

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

    • -28
    • +36
    ./qml/pages/settings/SettingsStack.qml
  1. … 3 more files 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.

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

- Added Isolated UF Adjustment SDD puml and png files.

- Added Isolated UF Adjustment models and views.

- Updated GuiGlobals, MessageInterpreter, MessageGlobals, and MessageDispatcher to add Isolated UF models and views.

- Updated ProgressBarEx.qml and RangeMarker.qml to match UF UI/UX changes.

- Updated LabelUnitText.qml to add layouts.

- Updated LabelUnitValueAdjuster.qml to expose editable property of ValueAdjuster.

- Updated TreatmentAdjustmentUltrafiltrationMetrics.qml to use LabelUnitText.qml.

- Added TreatmentAdjustmentIsolatedUFConfirm.qml, TreatmentAdjustmentIsolatedUFDurationEdit.qml, TreatmentAdjustmentIsolatedUFVolumeGoalEdit.qml for Isolated UF treatment adjustments.

- Updated TreatmentAdjustmentUltrafiltration.qml to add Isolated UF adjustment functionality.

- Updated TreatmentAdjustmentUltrafiltrationConfirm.qml, TreatmentAdjustmentUltrafiltrationEdit.qml, TreatmentAdjustmentUltrafiltrationStart.qml for changes to TreatmentAdjustmentUltrafiltrationMetrics.qml.

- Updated VTDTreatmentStatesData.h to add txIsolatedUF property for Isolated UF mode.

- Added MTreatment, MTreatmentAdjust models and VTreatmentAdjust views for Isolated UF adjustment.

    • -11
    • +41
    ./qml/components/ProgressBarEx.qml
    • -0
    • +1
    ./qml/compounds/LabelUnitValueAdjuster.qml
    • -75
    • +23
    ./qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml
  1. … 34 more files in changeset.
LDT-3111: Blood Prime - SW - 01 - R&I - 05: DEV - Feature Implementation

- Added Blood Prime SDD puml and png files.

- Moved MTreatmentBloodPrimeData.h/cpp and VTreatmentBloodPrimeData.h/cpp from hd to td directory.

- Updated TreatmentStack.qml and TreatmentBloodPrime.qml per UI/UX changes.

    • -1
    • +6
    ./qml/pages/treatment/TreatmentStack.qml
  1. … 11 more files in changeset.
Merge branch 'feature/LDT-2805-edit-treatment-parameters' into staging

    • -2
    • +2
    ./qml/compounds/LabelUnitContainer.qml
    • -88
    • +22
    ./qml/compounds/ValueAdjuster.qml
    • -0
    • +72
    ./qml/pages/treatment/TreatmentHome.qml
    • -32
    • +47
    ./qml/pages/treatment/TreatmentStack.qml
  1. … 11 more files in changeset.