leahi-application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'feature/LDT-783-stop-state' into staging

http://devapps.diality.us:8060/cru/LEAHI-APPLICATION-LDT-783-1#c23805

- completed the puml

- generated and added the png

Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'feature/LDT-2160-treatment-parameters-create-rx' into staging

Merge branch 'feature/LDT-926-Main-Treatment-Screen-SW-01-Diagnostics-Screen-FP' into staging

LDT-2163 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 03: SDD - Design Diagram - plantuml

Update SDDs per updated design

LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

rearrange heparin componenets to group liked ones

LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

DEMO TESItNG

    • -3
    • +3
    /sources/gui/qml/compounds/ValueAdjuster.qml
LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

clear errors on clear

LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

DEMO TESING

LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

demo testing

LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

demo testing

LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

demo testing

LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

testing update

LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

on cancel set validaiton to false

LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

clear hep stop time when going from rate OFF to something

LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

separeated validatoin adn confirm calls to stay until confirm and added cancel to pre treatmetn

LDT-2163 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 03: SDD - Design Diagram - plantuml

added puml diagram for create rx layout

    • binary
    /SDDs/CreateRxLayout.png
    • -0
    • +157
    /SDDs/CreateRxLayout.puml
LDT-2163 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 03: SDD - Design Diagram - plantuml

update diagram image

    • binary
    /SDDs/Create_Rx/FinalDiagram.png
LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

update clearing on standby

LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

update to only clear tx code when in standby mode

LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

fix dialysate flow rate resetting rejection reason

LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

fix floating point precision issue

    • -6
    • +11
    /sources/gui/qml/compounds/ValueAdjuster.qml
LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

updated behavior to clear hep stop time whe nhep dispensing rate is set

LDT-2163 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 03: SDD - Design Diagram - plantuml

add graphiz compenent diagram

    • -0
    • +273
    /SDDs/Create_Rx/FinalDiagram.dot
    • binary
    /SDDs/Create_Rx/Final_Diagram.png
    • binary
    /SDDs/Create_Rx/images/QRCode.png
    • binary
    /SDDs/Create_Rx/images/QRCodeRow.png
    • binary
    /SDDs/Create_Rx/images/QRCodeText.png
    • binary
    /SDDs/Create_Rx/images/acidConcentrate.png
    • binary
    /SDDs/Create_Rx/images/acidConcentrateContent.png
    • binary
    /SDDs/Create_Rx/images/acidConcentrateText.png
    • binary
    /SDDs/Create_Rx/images/bicarbonate.png
    • binary
    /SDDs/Create_Rx/images/bicarbonateContent.png
    • binary
    /SDDs/Create_Rx/images/bicarbonateText.png
    • binary
    /SDDs/Create_Rx/images/bloodFlowRate.png
    • binary
    /SDDs/Create_Rx/images/bloodFlowRateContent.png
    • binary
    /SDDs/Create_Rx/images/bloodFlowRateText.png
    • binary
    /SDDs/Create_Rx/images/bloodFlowRateUnit.png
  1. … 48 more files in changeset.
LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

allow hep time to show Off for 0

LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

renamed compound component

    • -0
    • +90
    /sources/gui/qml/compounds/LabelUnitContainer.qml
LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

address CR commetns

    • -2
    • +2
    /sources/gui/qml/components/BaseComboBox.qml
    • -8
    • +0
    /sources/gui/qml/components/ModalDialog.qml
    • -184
    • +0
    /sources/gui/qml/components/ValueControl.qml
    • -0
    • +196
    /sources/gui/qml/compounds/ValueAdjuster.qml
    • -1
    • +3
    /sources/gui/qml/globals/Variables.qml
    • -1
    • +1
    /sources/gui/qml/pages/TreatmentFlowBase.qml
    • -3
    • +4
    /sources/view/hd/data/VTreatmentRanges.cpp
    • -0
    • +1
    /sources/view/hd/data/VTreatmentRanges.h