Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.
LDT-2810: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 05: DEV - Feature Implementation

- Updated GuiGlobals.cpp to add includes.

LDT-2096: Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

- complete Edit implementation

- complete Duplicate implementation

-complete Delete implementation

- Add slots in VTreatmentCreate to handle RXProfile model selected

- Add signals to help load the CreateRx Screen

    • -10
    • +11
    ./qml/components/BaseComboBox.qml
    • -20
    • +12
    ./qml/dialogs/RxManagerDialog.qml
    • -3
    • +9
    ./qml/pages/rxmanager/RxManagerHeader.qml
    • -1
    • +11
    ./qml/pages/rxmanager/RxManagerList.qml
  1. … 7 more files in changeset.
LDT-3142 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

address cr comments

    • -10
    • +5
    ./qml/compounds/InstructionView.qml
LDT-2810: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 05: DEV - Feature Implementation

- Updated TreatmentHome.qml to use text() instead of adjustment_ReasonText when displaying rejection reasons.

    • -3
    • +3
    ./qml/pages/treatment/TreatmentHome.qml
LDT-2810: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 05: DEV - Feature Implementation

- Updated RnagedValue.qml and ValueAdjuster.qml to prevent divide by 0 when step is 0.

    • -10
    • +14
    ./qml/components/RangedValue.qml
LDT-2810: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 05: DEV - Feature Implementation

- Added RangedValue.qml.

- Updated ValueAdjuster.qml and TreatmentFlowComponent.qml to use RangedValue.qml.

- Updated TreatmentAdjustmentSetPoints.qml to increase modal dialog size.

- Updated ValueAdjuster.qml to show value in red when outside of range.

    • -0
    • +106
    ./qml/components/RangedValue.qml
    • -92
    • +16
    ./qml/compounds/ValueAdjuster.qml
  1. … 1 more file in changeset.
LDT-2810: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 05: DEV - Feature Implementation

- Updated TreatmentStack.qml to revert to using text() instead of adjustment_ReasonText for displaying rejection reasons.

    • -3
    • +3
    ./qml/pages/treatment/TreatmentStack.qml
LDT-2810: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 05: DEV - Feature Implementation

- Updated TreatmentFlowsComponent.qml to use Variables.emptyEntry for blank entries.

LDT-2810: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 05: DEV - Feature Implementation

- Updated TreatmentAdjustmentSetPoints.qml to use Variables.emptyEntry for blank entries.

LDT-3142 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

fix validate button when on pre treatment

LDT-2810: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 05: DEV - Feature Implementation

- Updated LabelUnitText.qml to add objectNames.

LDT-2810: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 05: DEV - Feature Implementation

- Added LabelUnitText.qml

- Updated TreatmentAdjustmentDurationConfirm.qml and TreatmentAdjustmentDurationEdit.qml to use LabelUnitText.qml

    • -0
    • +86
    ./qml/compounds/LabelUnitText.qml
  1. … 1 more file in changeset.
LDT-2810: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 05: DEV - Feature Implementation

- Updated TreatmentAdjustmentDuration.qml to add comments for clarity.

LDT-2810: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 05: DEV - Feature Implementation

- Updated ValueAdjuster.qml to add comments.

LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

fix name of UF to Dialysate/UF

    • -1
    • +1
    ./qml/compounds/StepNavigationTitleBar.qml
LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

upated navigation for pretreatmetn steps

LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

update to optomize dynamically building pretreattment step map

LDT-2096: Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

- Fix issues due to merge in pretreatment create qml files

Merge branch 'feature/LDT-3072-beta-transition' into staging

  1. … 5 more files in changeset.
LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

fix treatment steps refrefreshing

Merge branch 'feature/LDT-2825-institutional' into staging

    • -31
    • +30
    ./qml/pages/settings/SettingsStack.qml
  1. … 5 more files in changeset.