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

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

Merge branch 'feature/LDT-2160-treatment-parameters-create-rx' into staging

  1. … 1 more file in changeset.
Merge branch 'feature/LDT-926-Main-Treatment-Screen-SW-01-Diagnostics-Screen-FP' into staging

  1. … 2 more files in changeset.
LDT-2163 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 03: SDD - Design Diagram - plantuml

Update SDDs per updated design

  1. … 4 more files in changeset.
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

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-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
    ./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-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
    ./gui/qml/compounds/LabelUnitContainer.qml
  1. … 1 more file in changeset.
LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

address CR commetns

    • -184
    • +0
    ./gui/qml/components/ValueControl.qml
    • -0
    • +196
    ./gui/qml/compounds/ValueAdjuster.qml
    • -9
    • +22
    ./gui/qml/dialogs/AcidConcentrateAdjustment.qml
  1. … 1 more file in changeset.
LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

address cr comments

    • -2
    • +18
    ./gui/qml/components/ValueControl.qml
LDT-2165 Treatment Parameters (Create Rx) - SW - 01 - (New Design) - R&I - 05: DEV - Feature Implementation

address cr comments

    • -7
    • +13
    ./gui/qml/components/ValueControl.qml
    • -0
    • +90
    ./gui/qml/compounds/PreTreatmentCreateItem.qml
    • -10
    • +13
    ./gui/qml/dialogs/AcidConcentrateAdjustment.qml
    • -23
    • +14
    ./view/hd/data/VTreatmentRanges.cpp
  1. … 1 more file in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

LDT-2076 Solution Infusion - SW - 01 - R&I - 05: DEV - Feature Implementation

address cr commens