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-3323-enhancements-rinseback-bloodflow

  1. … 2 more files in changeset.
Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-3323-enhancements-rinseback-bloodflow

  1. … 9 more files in changeset.
Merge remote-tracking branch 'origin/staging' into feature/LDT-3174-pre-treatment-foundations

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

  1. … 2 more files in changeset.
LDT-3328: Misc SW Enhancements - SW - 01 - BloodPrime-Rinseback - R&I - 05: DEV - Feature Implementation

- Updated EndTreatmentRinseback.qml to add comment.

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.

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.

    • -0
    • +255
    ./pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStack.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.

    • -0
    • +183
    ./pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFVolumeEdit.qml
  1. … 28 more files in changeset.
LDT-3328: Misc SW Enhancements - SW - 01 - BloodPrime-Rinseback - R&I - 05: DEV - Feature Implementation

- Updated TreatmentStack.qml to clear header bar title for Blood Prime once screen is deactivated.

LDT-3328: Misc SW Enhancements - SW - 01 - BloodPrime-Rinseback - R&I - 05: DEV - Feature Implementation

- Added models and view for Blood Prime Commmand Request and Response.

- Updated Blood Prime screen for changes to UI/UX designs.

- Updated Logger.cpp and VTDOpModeData.cpp to removed references to enum removed in common.

    • -47
    • +174
    ./pages/treatment/TreatmentBloodPrime.qml
    • -5
    • +14
    ./pages/treatment/TreatmentStack.qml
  1. … 15 more files in changeset.
LDT-3328: Misc SW Enhancements - SW - 01 - BloodPrime-Rinseback - R&I - 05: DEV - Feature Implementation - Updated Rinseback screen for updated UI/UX layout. - Updated HeaderBar.qml, EndTreatmentBase.qml, EndTreatmentRinsebackStack.qml, TreatmentStack.qml, to better handle title in header bar and prevent overlapping onto menu. - Updated MTreatmentAdjustRinsebackResponse.h/cpp to move to td directory.

    • -1
    • +1
    ./pages/endtreatment/EndTreatmentBase.qml
    • -2
    • +10
    ./pages/treatment/TreatmentStack.qml
  1. … 5 more files in changeset.
Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-3194-isolated-uf-adjustment

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

address CR comments

    • -2
    • +2
    ./pages/pretreatment/PreTreatmentPrime.qml
    • -0
    • +12
    ./pages/pretreatment/PreTreatmentStack.qml
  1. … 4 more files in changeset.
LDT-3111: Blood Prime - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated TreatmentBloodPrime.qml to fix QML error.

    • -1
    • +0
    ./pages/treatment/TreatmentBloodPrime.qml
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

    • -2
    • +2
    ./compounds/StepNavigationTitleBar.qml
    • -6
    • +8
    ./pages/pretreatment/PreTreatmentStack.qml
LDT-3179 Pre-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementationg

address cr comments

    • -33
    • +2
    ./pages/pretreatment/PreTreatmentBase.qml
    • -7
    • +6
    ./pages/pretreatment/PreTreatmentStack.qml
  1. … 8 more files in changeset.
LDT-3179 Pre-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementationg

add message id

  1. … 2 more files 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.

    • -10
    • +5
    ./pages/treatment/TreatmentBloodPrime.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

    • -12
    • +0
    ./pages/pretreatment/PreTreatmentStack.qml
LDT-3179 Pre-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementation

push fixing indentations

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

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

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

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

    • -0
    • +1
    ./compounds/LabelUnitValueAdjuster.qml
    • -75
    • +23
    ./compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml
    • -0
    • +150
    ./pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFDurationEdit.qml
    • -0
    • +183
    ./pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFVolumeGoalEdit.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.

    • -34
    • +97
    ./pages/treatment/TreatmentBloodPrime.qml
  1. … 12 more files in changeset.
Merge branch 'feature/LDT-2805-edit-treatment-parameters' into staging

    • -0
    • +72
    ./pages/treatment/TreatmentHome.qml
    • -32
    • +47
    ./pages/treatment/TreatmentStack.qml
  1. … 13 more files in changeset.