Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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
LDT-3179 Pre-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementationg

address CR comments

  1. … 3 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

    • -10
    • +103
    ./view/td/data/VTreatmentRanges.cpp
  1. … 1 more file in changeset.
LDT-3312 Misc SW Enhancements - SW - 01 - General Aesthetics - R&I - 05: DEV - Feature Implementation

push updated changes

    • -8
    • +8
    ./gui/qml/compounds/SettingsSlider.qml
LDT-3312 Misc SW Enhancements - SW - 01 - General Aesthetics - R&I - 05: DEV - Feature Implementation

push update enhancements

    • -24
    • +17
    ./gui/qml/components/HeaderBar.qml
    • -17
    • +2
    ./gui/qml/components/RangeMarker.qml
    • -0
    • +89
    ./gui/qml/components/SDCInfo.qml
    • -0
    • +123
    ./gui/qml/compounds/SettingsSlider.qml
    • -1
    • +0
    ./gui/qml/dialogs/EndTreatmentDialog.qml
    • -1
    • +1
    ./gui/qml/dialogs/NotificationDialog.qml
    • -120
    • +36
    ./gui/qml/dialogs/headerbar/HeaderbarSettings.qml
    • -41
    • +0
    ./gui/qml/dialogs/headerbar/HeaderbarStorage.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
    ./gui/qml/components/StepIndicator.qml
LDT-3179 Pre-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementationg

address cr comment

    • -66
    • +23
    ./gui/qml/components/StepIndicator.qml
    • -5
    • +6
    ./gui/qml/components/SubStepIndicator.qml
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-3179 Pre-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementationg

address cr comments

    • -2
    • +1
    ./gui/qml/components/SubStepIndicator.qml
  1. … 5 more files in changeset.
LDT-3179 Pre-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementationg

add 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.
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
    ./gui/qml/pages/settings/SettingsStack.qml
Pre-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementation

    • -369
    • +0
    ./view/settings/VSettings.cpp.autosave
LDT-3179 Pre-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementation

    • -1
    • +1
    ./gui/qml/components/ConfirmButton.qml
    • -3
    • +20
    ./gui/qml/components/StepIndicator.qml
    • -0
    • +46
    ./gui/qml/components/SubStepIndicator.qml
    • -3
    • +2
    ./gui/qml/compounds/InstructionView.qml
    • -1
    • +0
    ./gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml
  1. … 19 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.

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
    ./gui/qml/components/ProgressBarEx.qml
    • -2
    • +10
    ./gui/qml/compounds/LabelUnitText.qml
    • -75
    • +23
    ./gui/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
    ./gui/qml/pages/treatment/TreatmentStack.qml
    • -0
    • +49
    ./model/td/data/treatment/MTreatmentBloodPrimeData.cpp
    • -0
    • +83
    ./model/td/data/treatment/MTreatmentBloodPrimeData.h
    • -0
    • +26
    ./view/td/data/treatment/VTreatmentBloodPrimeData.cpp
    • -0
    • +44
    ./view/td/data/treatment/VTreatmentBloodPrimeData.h
  1. … 3 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp