Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Adding AlarmMapping for now for the develop.

    • -11
    • +11
    ./model/hd/alarm/MAlarmMapping.cpp
  1. … 2 more files in changeset.
LDT-5163 SW Misc & Enhc - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

    • -0
    • +47
    ./model/dd/adjustment/settings/MAdjustDDCalibrationAcidConcentratesRecordResponse.cpp
    • -0
    • +80
    ./model/dd/adjustment/settings/MAdjustDDCalibrationAcidConcentratesRecordResponse.h
    • -0
    • +47
    ./model/dd/adjustment/settings/MAdjustDDCalibrationConcentratePumpRecordResponse.cpp
    • -0
    • +80
    ./model/dd/adjustment/settings/MAdjustDDCalibrationConcentratePumpRecordResponse.h
    • -0
    • +41
    ./model/dd/adjustment/settings/MAdjustDDCalibrationD12DialysatePumpRecordResponse.cpp
    • -0
    • +74
    ./model/dd/adjustment/settings/MAdjustDDCalibrationD12DialysatePumpRecordResponse.h
    • -0
    • +44
    ./model/dd/adjustment/settings/MAdjustDDCalibrationD48DialysatePumpRecordResponse.cpp
    • -0
    • +77
    ./model/dd/adjustment/settings/MAdjustDDCalibrationD48DialysatePumpRecordResponse.h
    • -0
    • +48
    ./model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.cpp
    • -0
    • +80
    ./model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.h
    • -0
    • +48
    ./model/dd/adjustment/settings/MDDCalibrationConcentratePumpRecordResponse.cpp
    • -0
    • +42
    ./model/dd/adjustment/settings/MDDCalibrationD12DialysatePumpRecordResponse.cpp
  1. … 5 more files in changeset.
Merge branch 'feature/LDT-5414-prime' into staging

  1. … 1 more file in changeset.
Merge branch 'feature/LDT-5445-end-of-treatment' into staging

fix qml warning

Merge branch 'staging' into feature/LDT-5158-integration-calibration

    • -10
    • +10
    ./model/hd/alarm/MAlarmMapping.cpp
  1. … 1 more file in changeset.
LDT-5163 SW Misc & Enhc - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

    • -16
    • +15
    ./gui/qml/components/HeaderBar.qml
    • -0
    • +47
    ./model/dd/adjustment/settings/MAdjustDDCalibrationTemperatureRecordResponse.cpp
    • -0
    • +80
    ./model/dd/adjustment/settings/MAdjustDDCalibrationTemperatureRecordResponse.h
LDT-5163 SW Misc & Enhc - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

added all request models

    • -2
    • +23
    ./view/settings/VCalibrationSettings.cpp
    • -2
    • +20
    ./view/settings/VCalibrationSettings.h
add bug fixes and updated menu

LDT-5448 End of Treatment - SW - 01- Notification - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

add dry dem orequests

LDT-5163 SW Misc & Enhc - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

add dry demo fixes

LDT-5163 SW Misc & Enhc - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

push more messaging for calibration

LDT-5163 SW Misc & Enhc - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

    • -20
    • +20
    ./view/settings/VCalibrationSettings.cpp
    • -4
    • +0
    ./view/settings/VCalibrationSettings.h
LDT-5448 End of Treatment - SW - 01- Notification - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

    • -1
    • +6
    ./gui/qml/components/HeaderBarPopup.qml
    • -5
    • +12
    ./gui/qml/dialogs/EndTreatmentDialog.qml
Headerbar popup update

    • -0
    • +5
    ./gui/qml/components/HeaderBarPopup.qml
push alarm confirm bug fix

ldt-5416 Disposable Tube Set Auto Priming Process - SW - 01- Pre-Tx - Prime - R&I - 02: SDD - Design Diagram - plantuml & Review

ADD PUML DIAGRAM

  1. … 2 more files in changeset.
Adding AlarmMapping for now for the develop.

  1. … 2 more files in changeset.
Removing the layers and dropshadow and the diagnostics screen

    • -1
    • +1
    ./gui/qml/components/HeaderBarPopup.qml
    • -13
    • +13
    ./gui/qml/components/ModalDialog.qml
    • -11
    • +11
    ./gui/qml/dialogs/AlarmDialog.qml
    • -1
    • +1
    ./gui/qml/dialogs/NotificationDialog.qml
    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentHDF.qml
    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentHeparin.qml
    • -13
    • +13
    ./gui/qml/pages/treatment/TreatmentSection.qml
    • -16
    • +16
    ./gui/qml/pages/treatment/TreatmentTrends.qml
  1. … 3 more files in changeset.
Removing the layers and dropshadow and the diagnostics screen

    • -1
    • +1
    ./gui/qml/components/HeaderBarPopup.qml
    • -13
    • +13
    ./gui/qml/components/ModalDialog.qml
    • -11
    • +11
    ./gui/qml/dialogs/AlarmDialog.qml
    • -1
    • +1
    ./gui/qml/dialogs/NotificationDialog.qml
    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentHDF.qml
    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentHeparin.qml
    • -13
    • +13
    ./gui/qml/pages/treatment/TreatmentSection.qml
    • -16
    • +16
    ./gui/qml/pages/treatment/TreatmentTrends.qml
  1. … 3 more files in changeset.
LDT-5417 Disposable Tube Set Auto Priming Process - SW - 01- Pre-Tx - Prime - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

bug fix from merge clonflict

push fixes

    • -60
    • +27
    ./gui/qml/compounds/CheckListView.qml
LDT-5417 Disposable Tube Set Auto Priming Process - SW - 01- Pre-Tx - Prime - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

push finishing steps to prime

    • -60
    • +27
    ./gui/qml/compounds/CheckListView.qml
LDT-5417 Disposable Tube Set Auto Priming Process - SW - 01- Pre-Tx - Prime - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

add prime data

  1. … 1 more file in changeset.
LDT-5417 Disposable Tube Set Auto Priming Process - SW - 01- Pre-Tx - Prime - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

added prime code

    • -0
    • +86
    ./model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.h
  1. … 7 more files in changeset.
LDT-5082 SW Misc & Enhc - SW - 01 - Miscellaneous - Feature Complete - R&I - 08: DEV - Dialin Implementation

address cr comments

    • -1
    • +1
    ./gui/qml/pages/settings/SettingsInformation.qml
    • -4
    • +4
    ./gui/qml/pages/settings/SettingsROInput.qml
    • -32
    • +0
    ./view/settings/VAdjustRoWaterMode.cpp
    • -40
    • +0
    ./view/settings/VAdjustRoWaterMode.h
  1. … 3 more files in changeset.
Merge remote-tracking branch 'origin/staging' into feature/LDT-5074-feature-complete

    • -0
    • +9
    ./gui/qml/pages/settings/SettingsStack.qml
  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/staging' into feature/LDT-5331-pre-tx-usability-requests

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

Merge branch 'feature/LDT-5246-bicarb-Low' into staging

  1. … 2 more files in changeset.