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-3194-isolated-uf-adjustment

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

    • -24
    • +24
    ./treatment/adjustments/TreatmentAdjustmentIsolatedUFConfirm.qml
  1. … 1 more file in changeset.
LDT-3199: Isolated UF - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated TreatmentAdjustmentUltrafiltrationStack.qml to remove commented out code.

    • -1
    • +0
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationStack.qml
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
    • +126
    ./treatment/adjustments/TreatmentAdjustmentDurationStack.qml
    • -255
    • +0
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml
    • -0
    • +255
    ./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.

    • -6
    • +6
    ./treatment/adjustments/TreatmentAdjustmentIsolatedUFConfirm.qml
    • -4
    • +4
    ./treatment/adjustments/TreatmentAdjustmentIsolatedUFDurationEdit.qml
    • -0
    • +183
    ./treatment/adjustments/TreatmentAdjustmentIsolatedUFVolumeEdit.qml
    • -183
    • +0
    ./treatment/adjustments/TreatmentAdjustmentIsolatedUFVolumeGoalEdit.qml
    • -14
    • +14
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml
  1. … 29 more files in changeset.
LDT-3111: Blood Prime - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated TreatmentBloodPrime.qml to fix QML error.

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
    ./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.

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

    • -1
    • +1
    ./endtreatment/EndTreatmentEndStack.qml
    • -3
    • +3
    ./pretreatment/create/PreTreatmentCreateContent.qml
  1. … 6 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.

    • -1
    • +1
    ./treatment/adjustments/TreatmentAdjustmentIsolatedUFDurationEdit.qml
    • -1
    • +1
    ./treatment/adjustments/TreatmentAdjustmentIsolatedUFVolumeGoalEdit.qml
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
    • +139
    ./treatment/adjustments/TreatmentAdjustmentIsolatedUFConfirm.qml
    • -0
    • +150
    ./treatment/adjustments/TreatmentAdjustmentIsolatedUFDurationEdit.qml
    • -0
    • +183
    ./treatment/adjustments/TreatmentAdjustmentIsolatedUFVolumeGoalEdit.qml
    • -2
    • +93
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml
    • -40
    • +11
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -63
    • +12
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
    • -49
    • +12
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
  1. … 42 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
    ./treatment/TreatmentBloodPrime.qml
  1. … 12 more files in changeset.
Merge branch 'feature/LDT-2805-edit-treatment-parameters' into staging

    • -0
    • +156
    ./treatment/adjustments/TreatmentAdjustmentDurationEdit.qml
    • -142
    • +104
    ./treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml
    • -0
    • +273
    ./treatment/adjustments/TreatmentAdjustmentSetPoints.qml
    • -12
    • +21
    ./treatment/sections/TreatmentFlows.qml
  1. … 17 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 TreatmentHome.qml to use text() instead of adjustment_ReasonText when displaying rejection reasons.

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.

    • -63
    • +11
    ./treatment/sections/TreatmentFlowsComponent.qml
  1. … 3 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 TreatmentStack.qml to revert to using text() instead of adjustment_ReasonText for displaying rejection reasons.

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

- Added LabelUnitText.qml

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

    • -74
    • +29
    ./treatment/adjustments/TreatmentAdjustmentDurationConfirm.qml
    • -30
    • +15
    ./treatment/adjustments/TreatmentAdjustmentDurationEdit.qml
  1. … 2 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 TreatmentAdjustmentDuration.qml to add comments for clarity.

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
    • +0
    ./posttreatment/PostTreatmentStack.qml
  1. … 1 more file in changeset.
LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

upated navigation for pretreatmetn steps

    • -14
    • +80
    ./pretreatment/PreTreatmentStack.qml
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

    • -123
    • +70
    ./pretreatment/PreTreatmentStack.qml
Merge branch 'feature/LDT-2825-institutional' into staging

  1. … 8 more files in changeset.
Merge branch 'feature/LDT-3000-end-of-treatment' into staging

    • -4
    • +5
    ./treatment/TreatmentSectionHeader.qml
  1. … 10 more files in changeset.
LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

fix transistioning between opmodes

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

update usermode to advanced mode

    • -20
    • +47
    ./pretreatment/PreTreatmentStack.qml
    • -1
    • +1
    ./pretreatment/create/PreTreatmentCreateContent.qml
    • -0
    • +52
    ./settings/SettingsAdvancedMode.qml
  1. … 3 more files in changeset.
LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

add advanced/standard mode steps

    • -1
    • +1
    ./posttreatment/PostTreatmentStack.qml
    • -42
    • +113
    ./pretreatment/PreTreatmentStack.qml
LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

add fw slot from td responses

    • -10
    • +13
    ./posttreatment/PostTreatmentStack.qml
  1. … 1 more file in changeset.