Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/staging' into feature/LDT-3433-water-dialysate-and-blood-sample

    • -13
    • +15
    ./gui/qml/components/HeaderBar.qml
  1. … 1 more file in changeset.
LDT-3438 Water, Dialysate, and Blood Sampling - SW - 01 - Water sample & Dialysate Checks - R&I - 05: DEV - Feature Implementation

CR comments

    • -6
    • +35
    ./view/td/data/VTreatmentRanges.cpp
LDT-3438 Water, Dialysate, and Blood Sampling - SW - 01 - Water sample & Dialysate Checks - R&I - 05: DEV - Feature Implementation

adderss CR comments

LDT-3398 HDF - SW - 01 - Main-Tx HDF Tab - R&I - 05: DEV - Feature Implementation

address cr comments

    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentHDF.qml
    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentHeparin.qml
    • -0
    • +31
    ./view/VListModel.cpp
  1. … 1 more file in changeset.
LDT-3438 Water, Dialysate, and Blood Sampling - SW - 01 - Water sample & Dialysate Checks - R&I - 05: DEV - Feature Implementation

address cr comments

    • -14
    • +13
    ./gui/qml/dialogs/watersample/WaterSamplePage.qml
    • -3
    • +3
    ./view/dd/data/VDDValvesStatesData.cpp
  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/staging' into feature/LDT-3393-hdf-main-tx-hdf-tab

    • -5
    • +16
    ./gui/qml/pages/treatment/TreatmentStack.qml
Bamboo Commit: Updated MAlarmMapping.cpp

LDT-3438 Water, Dialysate, and Blood Sampling - SW - 01 - Water sample & Dialysate Checks - R&I - 05: DEV - Feature Implementation

update msg id

  1. … 1 more file in changeset.
LDT-3398 HDF - SW - 01 - Main-Tx HDF Tab - R&I - 05: DEV - Feature Implementation

address CR comments

    • -13
    • +22
    ./gui/qml/components/HeaderBar.qml
    • -3
    • +2
    ./gui/qml/pages/treatment/TreatmentHDF.qml
    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentHeparin.qml
    • -5
    • +5
    ./gui/qml/pages/treatment/TreatmentStack.qml
    • -3
    • +3
    ./view/dd/data/VDDValvesStatesData.cpp
LDT-3438 Water, Dialysate, and Blood Sampling - SW - 01 - Water sample & Dialysate Checks - R&I - 05: DEV - Feature Implementation

update margins

LDT-3378: Misc SW Enhancements - SW - 01 - BloodPrime-02 - R&I - 05: DEV - Feature Implementation

- Updated TreatmentBloodPrime.qml to remove debug output.

LDT-3438 Water, Dialysate, and Blood Sampling - SW - 01 - Water sample & Dialysate Checks - R&I - 05: DEV - Feature Implementation

add water sample instruciton iamge

LDT-3438 Water, Dialysate, and Blood Sampling - SW - 01 - Water sample & Dialysate Checks - R&I - 05: DEV - Feature Implementation

update watersample margins and image

LDT-3378: Misc SW Enhancements - SW - 01 - BloodPrime-02 - R&I - 05: DEV - Feature Implementation

- Updated Blood Prime to add submode states for Run and Paused.

- Updated Blood Prime to add Timeout and Countdown to progress.

- Updated Blood Prime commands: removed Increase and Decrease, added Resume.

    • -5
    • +16
    ./gui/qml/pages/treatment/TreatmentStack.qml
LDT-3438 Water, Dialysate, and Blood Sampling - SW - 01 - Water sample & Dialysate Checks - R&I - 05: DEV - Feature Implementation

add content for Dialysate Check tab

LDT-3438 Water, Dialysate, and Blood Sampling - SW - 01 - Water sample & Dialysate Checks - R&I - 05: DEV - Feature Implementation

remove water sample from pre treatmetn and create dialog

    • -0
    • +30
    ./gui/qml/dialogs/watersample/WaterSampleBase.qml
    • -0
    • +73
    ./gui/qml/dialogs/watersample/WaterSampleDialog.qml
    • -0
    • +200
    ./gui/qml/dialogs/watersample/WaterSamplePage.qml
  1. … 1 more file in changeset.
LDT-3398 HDF - SW - 01 - Main-Tx HDF Tab - R&I - 05: DEV - Feature Implementation

added treatmetn mode p[opup[ and finsihed laying oout HDF tab with NO Graph

    • -15
    • +92
    ./gui/qml/pages/treatment/TreatmentHDF.qml
    • -0
    • +6
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 1 more file in changeset.
LDT-3398 HDF - SW - 01 - Main-Tx HDF Tab - R&I - 05: DEV - Feature Implementation

add HDF tab code with graph removed - wip

    • -0
    • +80
    ./gui/qml/pages/treatment/TreatmentHDF.qml
    • -8
    • +8
    ./gui/qml/pages/treatment/TreatmentHeparin.qml
    • -5
    • +6
    ./gui/qml/pages/treatment/TreatmentStack.qml
    • -0
    • +285
    ./gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml
  1. … 1 more file in changeset.
LDT-3312 Misc SW Enhancements - SW - 01 - General Aesthetics - R&I - 05: DEV - Feature Implementation

PUSH qml error fixes

    • -1
    • +0
    ./gui/qml/components/ProgressBarEx.qml
Merge branch 'staging' into feature/LDT-3307-misc-sw-enhancements

Merge branch 'staging' into feature/LDT-3307-misc-sw-enhancements

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

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

    • -5
    • +5
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/staging' into feature/LDT-3174-pre-treatment-foundations

  1. … 2 more files in changeset.
LDT-3312 Misc SW Enhancements - SW - 01 - General Aesthetics - R&I - 05: DEV - Feature Implementation

address CR comments

    • -31
    • +24
    ./gui/qml/components/SDCInfo.qml
    • -14
    • +1
    ./gui/qml/compounds/SettingsSlider.qml
    • -1
    • +7
    ./gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml
Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-3194-isolated-uf-adjustment

    • -1
    • +0
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 1 more file in changeset.
LDT-3328: Misc SW Enhancements - SW - 01 - BloodPrime-Rinseback - R&I - 05: DEV - Feature Implementation

- Updated EndTreatmentRinseback.qml to add comment.

LDT-3312 Misc SW Enhancements - SW - 01 - General Aesthetics - R&I - 05: DEV - Feature Implementation

adjust fonts of diagnosis popuip

    • -8
    • +4
    ./gui/qml/components/DebugDataColumn.qml
LDT-3199: Isolated UF - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated MessageInterpreter.h/cpp to remove adjustUltrafiltrationEdit and adjustUltrafiltrationConfirm and change to use notify.

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
    ./gui/qml/compounds/LabelUnitText.qml