Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.
LDT-4198 NON-FEATURE: SW Misc & Enhc - SW - 01 - Water/Dialysate Sample - R&I - 05: DEV - Feature Implementation

add updated gen dialsate

    • -12
    • +2
    ./gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
    • -18
    • +3
    ./model/dd/data/MDDGenDialysateData.cpp
    • -20
    • +4
    ./model/dd/data/MDDGenDialysateData.h
    • -6
    • +1
    ./view/dd/data/VDDGenDialysateData.cpp
address cr comment

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

address CR comments

    • -71
    • +0
    ./gui/qml/components/ScrollBar2.qml
    • -0
    • +71
    ./gui/qml/components/ScrollBarVH.qml
    • -5
    • +2
    ./gui/qml/dialogs/NotificationDialog.qml
    • -4
    • +4
    ./gui/qml/pages/treatment/TreatmentTrends.qml
  1. … 1 more file in changeset.
LDT-4198 NON-FEATURE: SW Misc & Enhc - SW - 01 - Water/Dialysate Sample - R&I - 05: DEV - Feature Implementation

finalize water samnple and udpate help icon

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

updated name to Prescirptaihje tobnwserpiogubhrweog4t

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

add requesting alarm list on alarm trigger/clear

    • -2
    • +19
    ./view/hd/alarm/VAlarmActiveList.cpp
LDT-4198 NON-FEATURE: SW Misc & Enhc - SW - 01 - Water/Dialysate Sample - R&I - 05: DEV - Feature Implementation

fix ro payload

LDT-4198 NON-FEATURE: SW Misc & Enhc - SW - 01 - Water/Dialysate Sample - R&I - 05: DEV - Feature Implementation

add fiunal topuches

LDT-4198 NON-FEATURE: SW Misc & Enhc - SW - 01 - Water/Dialysate Sample - R&I - 05: DEV - Feature Implementation

added RO rejection ratio

    • -0
    • +24
    ./gui/qml/dialogs/diagnostics/DiagnosticsFP.qml
    • -0
    • +45
    ./model/fp/data/MFPRORejectionPercentageData.cpp
    • -0
    • +79
    ./model/fp/data/MFPRORejectionPercentageData.h
    • -0
    • +16
    ./view/fp/data/VFPRORejectionPercentageData.cpp
    • -0
    • +34
    ./view/fp/data/VFPRORejectionPercentageData.h
  1. … 1 more file in changeset.
LDT-4198 NON-FEATURE: SW Misc & Enhc - SW - 01 - Water/Dialysate Sample - R&I - 05: DEV - Feature Implementation

finish designing waters ample [age uipdat

    • -136
    • +103
    ./gui/qml/dialogs/watersample/WaterSamplePage.qml
    • -3
    • +6
    ./gui/qml/pages/settings/SettingsROInput.qml
    • -1
    • +1
    ./gui/qml/pages/settings/SettingsStack.qml
  1. … 1 more file in changeset.
LDT-4218 NON-FEATURE: SW Misc & Enhc - SW - 01 - Create Rx - Final Flag Prm - R&I - 05: DEV - Feature Implementation

remove confirm \ cancel message

LDT-4198 NON-FEATURE: SW Misc & Enhc - SW - 01 - Water/Dialysate Sample - R&I - 05: DEV - Feature Implementation

added water sample data braodcast

LDT-4198 NON-FEATURE: SW Misc & Enhc - SW - 01 - Water/Dialysate Sample - R&I - 05: DEV - Feature Implementation

update M and V

  1. … 3 more files in changeset.
add result response M and V

  1. … 3 more files in changeset.
Fix TRENDS precision for pressures

    • -3
    • +3
    ./gui/qml/pages/treatment/TreatmentTrends.qml