leahi-application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.

    • -42
    • +62
    /sources/gui/qml/compounds/ValueAdjuster.qml
    • -10
    • +9
    /sources/gui/qml/globals/Variables.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.

    • -146
    • +0
    /sources/gui/qml/compounds/StoppedSlider.qml
    • -12
    • +21
    /sources/gui/qml/compounds/ValueAdjuster.qml
Bamboo Commit: Updated MAlarmMapping.cpp

    • -8
    • +8
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'staging' into develop

Merge branch 'feature/LDT-1063-Device-Setting-SW-01-Information-Version' into staging

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.

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

uppdate vitals measurement to combobox

    • -7
    • +7
    /sources/gui/qml/components/BaseComboBox.qml
    • -5
    • +2
    /sources/view/hd/data/VTreatmentRanges.cpp
    • -1
    • +1
    /sources/view/hd/data/VTreatmentRanges.h
LDT-2689 Patient Vitals - SW - 01 - Enhancement - Round timestamp - R&I - 03: SDD - Design Diagram - plantuml

update puml

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

add 2 min fw response timer

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

- add Rx header to rx manager

- add base list view (WIP)

    • -3
    • +21
    /sources/gui/qml/pages/ManagerStack.qml
    • -0
    • +102
    /sources/gui/qml/pages/rxmanager/RxManagerHeader.qml
    • -0
    • +79
    /sources/gui/qml/pages/rxmanager/RxManagerList.qml
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
    • +8
    /sources/gui/qml/compounds/BPHREntry.qml
    • -0
    • +1
    /sources/gui/qml/globals/Variables.qml
LDT-2691 Patient Vitals - SW - 01 - Enhancement - Round timestamp - R&I - 05: DEV - Feature Implementation

Interval timout rounding to clock finished

    • -0
    • +17
    /sources/gui/qml/components/VitalsButton.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

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

add bug fixes from create rx

    • binary
    /SDDs/VitalsLayout.png
LDT-2689 Patient Vitals - SW - 01 - Enhancement - Round timestamp - R&I - 03: SDD - Design Diagram - plantuml

addd sdd layou8t diagram

    • -0
    • +44
    /SDDs/VitalsLayout.puml
Merge branch 'staging' into develop

Bamboo Commit: Updated MAlarmMapping.cpp

    • -8
    • +8
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'feature/LDT-1440-ultrafiltration' into staging

    • -16
    • +71
    /sources/gui/qml/components/Slider.qml
    • -1
    • +1
    /sources/gui/qml/components/TouchRect.qml
    • -0
    • +146
    /sources/gui/qml/compounds/StoppedSlider.qml
    • -4
    • +13
    /sources/gui/qml/globals/Variables.qml
  1. … 3 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

    • -8
    • +8
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'feature/LDT-2264-patient-vitals' into staging

    • -1
    • +3
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +1
    /sources/gui/qml/components/CloseButton.qml
    • -10
    • +14
    /sources/gui/qml/components/HeaderBar.qml
    • -1
    • +17
    /sources/gui/qml/components/TextEntry.qml
    • -2
    • +16
    /sources/gui/qml/globals/Variables.qml
  1. … 3 more files in changeset.
LDT-2269 Patient Vitals - SW - 01 - R&I - 05: DEV - Feature Implementation

code cleanup and make numpad slide animation smoother

LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated TreatmentUltrafiltrationItem.qml to update visible based on whether Start, Edit, or Confirm screens are visible.

- Updated TreatmentUltrafiltrationItem.qml to only allow the Confirm screen to be shown if UF treatment item is already open.

- Updated TreatmentAdjustmentUltrafiltrationConfirm.qml to send confirmed UF request volume with proper precision.

LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated MainHome.qml to remove Start Treatment button.

    • -20
    • +7
    /sources/gui/qml/pages/MainHome.qml
LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- UpdateTreatmentAdjustmentUltrafiltrationStart.qml to remove icon from pause button.

- Updated leahi.qrc to remove PauseDarkBlue.png since it is no longer being used.

LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Removed LabelUnitContainer.qml.

LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated NotificationBarSmall.qml to only expose individual properties and not entire component.

LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated MTreatmentAdjustRequests.h to remove Box/M.Box columns from doxygen headers.

LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated VTreatmentRanges to change ultrafiltrationVolume to RANGESET and added comments regarding missing Def, Min, Max, Res for all sets.

    • -0
    • +5
    /sources/view/hd/data/VTreatmentRanges.cpp
    • -1
    • +1
    /sources/view/hd/data/VTreatmentRanges.h