Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-4456 Edit Treatment Parameters During Treatment - SW - 01 - Integration - R&I - 05: DEV - Feature Implementation

fix build issue common enum

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

Merge remote-tracking branch 'origin/staging' into feature/LDT-4451-edit-tx-parameters

LDT-4456 Edit Treatment Parameters During Treatment - SW - 01 - Integration - R&I - 05: DEV - Feature Implementation

fix defualt values for adjustment

LDT-4216 NON-FEATURE: SW Misc & Enhc - SW - 01 - Create Rx - Final Flag Prm - R&I - 03: SDD - Design Diagram - plantuml

fix post merge errors

Merge branch 'staging' into feature/LDT-4213-create-rx-final-flag

    • -2
    • +1
    ./gui/qml/pages/treatment/TreatmentHDF.qml
    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentHeparin.qml
    • -6
    • +6
    ./gui/qml/pages/treatment/TreatmentTrends.qml
Merge remote-tracking branch 'origin/staging' into feature/LDT-4193-enhancement-water-sample

  1. … 2 more files in changeset.
LDT-4456 Edit Treatment Parameters During Treatment - SW - 01 - Integration - R&I - 05: DEV - Feature Implementation

update venous window ranges

LDT-4456 Edit Treatment Parameters During Treatment - SW - 01 - Integration - R&I - 05: DEV - Feature Implementation

update pressure payload

    • -13
    • +17
    ./gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
LDT-4196 NON-FEATURE: SW Misc & Enhc - SW - 01 - Water/Dialysate Sample - R&I - 03: SDD - Design Diagram - plantuml

address cr changes

LDT-4456 Edit Treatment Parameters During Treatment - SW - 01 - Integration - R&I - 05: DEV - Feature Implementation

fix common

LDT-4456 Edit Treatment Parameters During Treatment - SW - 01 - Integration - R&I - 05: DEV - Feature Implementation

fix italicising directly in string

LDT-4456 Edit Treatment Parameters During Treatment - SW - 01 - Integration - R&I - 05: DEV - Feature Implementation

updated duration adjustment

LDT-4456 Edit Treatment Parameters During Treatment - SW - 01 - Integration - R&I - 05: DEV - Feature Implementation

update set points adjustment

    • -3
    • +2
    ./gui/qml/pages/treatment/TreatmentStack.qml
LDT-4456 Edit Treatment Parameters During Treatment - SW - 01 - Integration - R&I - 05: DEV - Feature Implementation

update pressures adjustment

    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentStack.qml
LDT-4456 Edit Treatment Parameters During Treatment - SW - 01 - Integration - R&I - 05: DEV - Feature Implementation

Update UF Adjustment

LDT-4216 NON-FEATURE: SW Misc & Enhc - SW - 01 - Create Rx - Final Flag Prm - R&I - 03: SDD - Design Diagram - plantuml

address cr comments

Merge remote-tracking branch 'origin/staging' into feature/LDT-4213-create-rx-final-flag

    • -4
    • +4
    ./gui/qml/pages/treatment/TreatmentTrends.qml
LDT-4196 NON-FEATURE: SW Misc & Enhc - SW - 01 - Water/Dialysate Sample - R&I - 03: SDD - Design Diagram - plantuml

addres cr comments move darkmode to vsettings

    • -2
    • +2
    ./gui/qml/compounds/AutoStepController.qml
    • -6
    • +6
    ./gui/qml/compounds/InstructionView.qml
    • -24
    • +24
    ./gui/qml/dialogs/AlarmDialog.qml
    • -10
    • +10
    ./gui/qml/dialogs/AlarmListDialog.qml
LDT-4196 NON-FEATURE: SW Misc & Enhc - SW - 01 - Water/Dialysate Sample - R&I - 03: SDD - Design Diagram - plantuml

address cr comments

    • -3
    • +21
    ./gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
    • -0
    • +49
    ./model/dd/data/MDDOperationModeData.cpp
    • -0
    • +82
    ./model/dd/data/MDDOperationModeData.h
    • -49
    • +0
    ./model/dg/data/MDGOperationModeData.cpp
    • -82
    • +0
    ./model/dg/data/MDGOperationModeData.h
  1. … 12 more files in changeset.
LDT-4196 NON-FEATURE: SW Misc & Enhc - SW - 01 - Water/Dialysate Sample - R&I - 03: SDD - Design Diagram - plantuml

address comments

    • -2
    • +1
    ./gui/qml/pages/treatment/TreatmentHDF.qml
    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentHeparin.qml
  1. … 14 more files in changeset.
Merge remote-tracking branch 'origin/staging' into feature/LDT-4193-enhancement-water-sample

    • -11
    • +11
    ./gui/qml/dialogs/AlarmDialog.qml
  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/staging' into feature/LDT-4161-tx-review

fix merge issues

Bamboo Commit: Updated MAlarmMapping.cpp

Merge remote-tracking branch 'origin/staging' into feature/LDT-4161-tx-review

  1. … 1 more file in changeset.
Demo changes to make the application lighter.

    • -2
    • +2
    ./view/dd/data/VDDConductivityData.cpp
    • -1
    • +1
    ./view/td/data/treatment/VTreatmentTrends.cpp
  1. … 5 more files in changeset.
LDT-4166 Post-Treatment - SW - 01 - TxReview - R&I - 05: DEV - Feature Implementation

clean up post tx stack

LDT-4166 Post-Treatment - SW - 01 - TxReview - R&I - 05: DEV - Feature Implementation

remove commented out lines

LDT-4166 Post-Treatment - SW - 01 - TxReview - R&I - 05: DEV - Feature Implementation

refactor Pre/ Post workflow

LDT-4166 Post-Treatment - SW - 01 - TxReview - R&I - 05: DEV - Feature Implementation

address cr comments

    • -0
    • +26
    ./gui/qml/components/LegendItem.qml
  1. … 1 more file in changeset.