Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/staging' into feature/LDT-4193-enhancement-water-sample

  1. … 3 more files in changeset.
LDT-4196 NON-FEATURE: SW Misc & Enhc - SW - 01 - Water/Dialysate Sample - R&I - 03: SDD - Design Diagram - plantuml

address cr changes

  1. … 1 more file in changeset.
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
    ./qml/compounds/AutoStepController.qml
    • -10
    • +10
    ./qml/dialogs/AlarmListDialog.qml
  1. … 2 more files in changeset.
LDT-4196 NON-FEATURE: SW Misc & Enhc - SW - 01 - Water/Dialysate Sample - R&I - 03: SDD - Design Diagram - plantuml

address cr comments

  1. … 21 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
    ./qml/pages/treatment/TreatmentHDF.qml
    • -1
    • +1
    ./qml/pages/treatment/TreatmentHeparin.qml
  1. … 14 more files in changeset.
Merge remote-tracking branch 'origin/staging' into feature/LDT-4193-enhancement-water-sample

  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/staging' into feature/LDT-4161-tx-review

fix merge issues

  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/staging' into feature/LDT-4161-tx-review

  1. … 2 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
    ./qml/components/LegendItem.qml
  1. … 2 more files in changeset.
LDT-4198 NON-FEATURE: SW Misc & Enhc - SW - 01 - Water/Dialysate Sample - R&I - 05: DEV - Feature Implementation

add updated gen dialsate

  1. … 5 more files in changeset.
address cr comment

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

address CR comments

    • -0
    • +71
    ./qml/components/ScrollBarVH.qml
    • -4
    • +4
    ./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-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

  1. … 10 more files 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

    • -3
    • +6
    ./qml/pages/settings/SettingsROInput.qml
    • -1
    • +1
    ./qml/pages/settings/SettingsStack.qml
  1. … 10 more files in changeset.
LDT-4198 NON-FEATURE: SW Misc & Enhc - SW - 01 - Water/Dialysate Sample - R&I - 05: DEV - Feature Implementation

update M and V

  1. … 17 more files in changeset.
LDT-4166 Post-Treatment - SW - 01 - TxReview - R&I - 05: DEV - Feature Implementation

fix alarm clearing when switching opmodes

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

add water sample broadcast msg

  1. … 19 more files in changeset.
LDT-4198 NON-FEATURE: SW Misc & Enhc - SW - 01 - Water/Dialysate Sample - R&I - 05: DEV - Feature Implementation

Dark mode added and ffinished

    • -1
    • +1
    ./qml/compounds/AutoStepController.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

addark mode

    • -3
    • +5
    ./qml/compounds/AutoStepController.qml
LDT-4166 Post-Treatment - SW - 01 - TxReview - R&I - 05: DEV - Feature Implementation

add final touches

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

add top lgeend

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

fionish reveiw screen

  1. … 2 more files in changeset.
LDT-3937 Post-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementation

Hide buttons when validated