Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-3078 Support of the transition to the Beta System - SW - 01 - R&I - 06: DEV - Diagnostic - if needed

update DD diagnostics to beta vales

    • -8
    • +75
    ./gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
    • -23
    • +0
    ./gui/qml/dialogs/diagnostics/DiagnosticsFP.qml
LDT-3077 Support of the transition to the Beta System - SW - 01 - R&I - 05: DEV - Feature Implementation

remove FP valves

    • -16
    • +8
    ./gui/qml/dialogs/diagnostics/DiagnosticsFP.qml
    • -78
    • +0
    ./model/fp/data/MFPValvesStatesData.cpp
    • -107
    • +0
    ./model/fp/data/MFPValvesStatesData.h
    • -11
    • +14
    ./model/hd/alarm/MAlarmMapping.cpp
    • -27
    • +44
    ./view/dd/data/VDDValvesStatesData.cpp
    • -7
    • +22
    ./view/dd/data/VDDValvesStatesData.h
    • -49
    • +0
    ./view/fp/data/VFPValvesStatesData.cpp
    • -67
    • +0
    ./view/fp/data/VFPValvesStatesData.h
  1. … 1 more file in changeset.
Merge branch 'feature/LDT-2666-ultrafiltration-no-pause' into staging

    • -9
    • +8
    ./gui/qml/compounds/LabelUnitContainer.qml
LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Updated to use common LabelUnitContainer height in UF screens.

LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Updated TreatmentAdjustmentUltrafiltration.qml to use StackItem.page function to push edit screen.

LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Updated TreatmentAdjustmentUltrafiltration.qml to always push confirm screen when UF settings change response is received and use StackItem.page function to push new screen.

LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Updated Variables.qml to add width and height of UF new value containers in confirmation screen.

- Updated TreatmentAdjustmentUltrafiltration.qml to allow adjustments to be processed no matter what screen it is currently displaying, remove title text binding, and fix/add objectNames.

- Updated UF start, edit, and confirm screens to add objectNames.

- Updated TreatmentAdjustmentUltrafiltrationEdit.qml to update slots.

LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Updated LabelUnitContainer.qml to remove textPixelSize and showUnit properties. Unit visiblity is now based on unitText length.

- Updated TreatmentAdjustmentBase.qml to remove customization of notification banner and rely on defaults.

- Updated TreatmentAdjustmentUltrafiltrationEdit.qml so LabelUnitContainer height matches metrics height.

    • -4
    • +2
    ./gui/qml/compounds/LabelUnitContainer.qml
LDT-2691 Patient Vitals - SW - 01 - Enhancement - Round timestamp - R&I - 05: DEV - Feature Implementation

Update logic when enableBPCuff flag is set to off/on

LDT-2691 Patient Vitals - SW - 01 - Enhancement - Round timestamp - R&I - 05: DEV - Feature Implementation

fix anchoring on instantiated close button to use default

LDT-2691 Patient Vitals - SW - 01 - Enhancement - Round timestamp - R&I - 05: DEV - Feature Implementation

address all CR comments

    • -4
    • +10
    ./gui/qml/components/BaseComboBox.qml
    • -6
    • +3
    ./gui/qml/compounds/LabelUnitContainer.qml
LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Updated ValueAdjuster.qml to calculate canIncrement and canDecrement to round to the next lower step for maximum and next higher step for minimum.

    • -3
    • +17
    ./gui/qml/compounds/ValueAdjuster.qml
LDT-2691 Patient Vitals - SW - 01 - Enhancement - Round timestamp - R&I - 05: DEV - Feature Implementation

add default interval an a private variable

LDT-2691 Patient Vitals - SW - 01 - Enhancement - Round timestamp - R&I - 05: DEV - Feature Implementation

Update to run timer in background with default 15 min interval for trends

LDT-2732 Service - SW - 01 - Service - R&I - 05: DEV - Feature Implementation

Update to run timer in background with default 15 min interval for trends

LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Updated TreatmentAdjustmentUltrafiltration.qml to parent Start, Edit, and Confirm screens in stack.

LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Updated TreatmentAdjustmentUltrafiltration.qml to prevent trying to push confirm screen when edit screen is not active.

LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Updated LabelUnitContainer.qml to update text anchoring to align on baselines.

- Updated TreatmentAdjustmentUltrafiltrationMetrics.qml, TreatmentAdjustmentBase.qml, TreatmentAdjustmentUltrafiltrationMetrics.qml, TreatmentAdjustmentUltrafiltrationEdit.qml, and TreatmentAdjustmentUltrafiltrationStart.qml for changes to UI design.

- Updated ValueAdjuster.qml to change increment and decrement functions to handle when value is not on step increment.

- Updated TreatmentAdjustmentUltrafiltration.qml to fix handling of notification text for adjustment rejection reasons.

    • -1
    • +1
    ./gui/qml/compounds/LabelUnitContainer.qml
    • -18
    • +35
    ./gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml
    • -42
    • +62
    ./gui/qml/compounds/ValueAdjuster.qml
LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Removed StoppedlSlider.qml

- Updated LabelUnitContainer.qml to allow adjustable text size and to show blank if unit text is blank.

- Updated ValueAdjuster.qml to allow changing text color and make increment and decrement stop on step increments if current value is not.

- Updated TreatmentAdjustmentUltrafiltrationConfirm.qml to use LabelUnitContainers to show values.

- Updated TreatmentAdjustmentUltrafiltrationEdit.qml for changes to UI design (removed StoppedSlider and use ValueAdjuster).

- Updated TreatmentUltrafiltration.qml to use UF set volume for maximum value in progress bar.

    • -8
    • +9
    ./gui/qml/compounds/LabelUnitContainer.qml
    • -146
    • +0
    ./gui/qml/compounds/StoppedSlider.qml
    • -12
    • +21
    ./gui/qml/compounds/ValueAdjuster.qml
  1. … 1 more file in changeset.
LDT-2691 Patient Vitals - SW - 01 - Enhancement - Round timestamp - R&I - 05: DEV - Feature Implementation

code cleanup

LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Moved TreatmentUltrafiltrationItem.qml to TreatmentAdjustmentUltrafiltration.qml.

- Updated TreatmentAdjustmentUltrafiltration.qml to make it derive from TreatmentAdjustmentBase.qml and internally create a stack to handle the Start, Edit, and Confirm screens.

- Updated TreatmentAdjustmentUltrafiltrationStart.qml, TreatmentAdjustmentUltrafiltrationEdit.qml, and TreatmentAdjustmentUltrafiltrationConfirm.qml to change to derive from Item instead of TreatmentAdjustmentBase.qml.

- Updated TreatmentStack.qml to move some properties to components where they are being used and removed some unused propties.

    • -6
    • +17
    ./gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml
    • -15
    • +3
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 1 more file in changeset.
LDT-2691 Patient Vitals - SW - 01 - Enhancement - Round timestamp - R&I - 05: DEV - Feature Implementation

uppdate vitals measurement to combobox

LDT-2691 Patient Vitals - SW - 01 - Enhancement - Round timestamp - R&I - 05: DEV - Feature Implementation

add 2 min fw response timer

LDT-2691 Patient Vitals - SW - 01 - Enhancement - Round timestamp - R&I - 05: DEV - Feature Implementation

Update sizing of unit label contrainer componenents for vital popups

    • -3
    • +6
    ./gui/qml/compounds/LabelUnitContainer.qml
LDT-2691 Patient Vitals - SW - 01 - Enhancement - Round timestamp - R&I - 05: DEV - Feature Implementation

Interval timout rounding to clock finished

    • -0
    • +17
    ./gui/qml/components/VitalsButton.qml
    • -18
    • +0
    ./gui/qml/pages/treatment/TreatmentHome.qml
LDT-2691 Patient Vitals - SW - 01 - Enhancement - Round timestamp - R&I - 05: DEV - Feature Implementation

uppdate close icon and minor update to vitals dialog - rename bp measurement interval to vitals interval

LDT-2691 Patient Vitals - SW - 01 - Enhancement - Round timestamp - R&I - 05: DEV - Feature Implementation

add bug fixes from create rx

  1. … 1 more file in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

Merge branch 'feature/LDT-1440-ultrafiltration' into staging

    • -0
    • +146
    ./gui/qml/compounds/StoppedSlider.qml
    • -3
    • +3
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 3 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp