Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'feature/LDT-4767-enhancement-Isolated-UF' into develop

    • -1
    • +3
    ./gui/qml/pages/treatment/TreatmentStack.qml
Bamboo Commit: Updated MAlarmMapping.cpp

    • -2
    • +102
    ./model/hd/alarm/MAlarmMapping.cpp
Merge remote-tracking branch 'origin/staging' into feature/LDT-5246-bicarb-Low

LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

added treatment pause to dry demo menu

LDT-5235 HDF - SW - 01 - HDF - Messaging & Models - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

fix minor buigs

    • -2
    • +2
    ./gui/qml/pages/treatment/TreatmentHDF.qml
Merge remote-tracking branch 'origin/staging' into feature/LDT-5232-hdf

    • -0
    • +3
    ./gui/qml/pages/treatment/TreatmentStack.qml
LDT-5334 SW Misc & Enhc - SW - 01 - Pre-Tx - Usability Support - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

bug fix

LDT-5248 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 02: SDD - Design Diagram - plantuml & Review

LDT-5082 SW Misc & Enhc - SW - 01 - Miscellaneous - Feature Complete - R&I - 08: DEV - Dialin Implementation

addressed cr comments

    • -1
    • +1
    ./gui/qml/pages/settings/SettingsInformation.qml
    • -3
    • +2
    ./gui/qml/pages/settings/SettingsROInput.qml
    • -0
    • +39
    ./model/dd/adjustment/settings/MRoWaterModeResponse.cpp
    • -0
    • +70
    ./model/dd/adjustment/settings/MRoWaterModeResponse.h
  1. … 9 more files in changeset.
Merge remote-tracking branch 'origin/staging' into feature/LDT-5074-feature-complete

LDT-4964 Service - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

address CR commetns

    • -1
    • +0
    ./gui/qml/dialogs/CalibrationDialog.qml
    • -1
    • +0
    ./view/settings/VCalibrationSettings.h
Merge remote-tracking branch 'origin/staging' into feature/LDT-4767-enhancement-Isolated-UF

LDT-5334 SW Misc & Enhc - SW - 01 - Pre-Tx - Usability Support - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

updated to allow only certain options availabel for modaity

LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

update low priiority alarm color

LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

fiunalize alarm dialog sizes

LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

add headerbar butto nto open dialog and finished dialog

    • -0
    • +28
    ./gui/qml/components/DryBicartDisconnectButton.qml
    • -5
    • +3
    ./gui/qml/compounds/ProcessStatusView.qml
  1. … 1 more file in changeset.
LDT-5109: SW Misc & Enhc - SW - 01 - Miscellaneous - Leahi Qt6 & UB24 & Squish9.2.2 - rebuild/test - R&I - 05: DEV - Feature Implementation

- Updated C++ files so they automatically compile for Qt5 vs Qt6 based on Qt kit used for building.

- Updated QML so that Qt5 is the default state of the files and Qt6 changes are marked and commented out.

    • -0
    • +15
    ./gui/qml/components/ModalDialog.qml
    • -0
    • +5
    ./gui/qml/pages/settings/SettingsExportLogs.qml
  1. … 16 more files in changeset.
LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

added dialog and component for drain bicart items

    • -0
    • +33
    ./gui/qml/compounds/DryBicartDisconnect.qml
    • -2
    • +33
    ./gui/qml/compounds/ProcessStatusView.qml
    • -0
    • +40
    ./gui/qml/dialogs/DryBicartDisconnectDialog.qml
    • -0
    • +38
    ./gui/qml/dialogs/DryBicartDisconnectDialog.qml.autosave
  1. … 1 more file in changeset.
LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

added syringe to td diagnostics

    • -1
    • +34
    ./gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
    • -71
    • +0
    ./model/hd/data/MHDSyringePumpData.cpp
    • -113
    • +0
    ./model/hd/data/MHDSyringePumpData.h
    • -0
    • +68
    ./model/td/data/MTDSyringePumpData.cpp
    • -0
    • +110
    ./model/td/data/MTDSyringePumpData.h
    • -34
    • +0
    ./view/hd/data/VHDSyringePumpData.cpp
  1. … 4 more files in changeset.
LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

added model and view classes

    • -0
    • +58
    ./model/td/data/treatment/MTreatmentDryBicartDisconnectData.cpp
    • -0
    • +70
    ./model/td/data/treatment/MTreatmentDryBicartDisconnectData.h
  1. … 4 more files in changeset.
LDT-5235 HDF - SW - 01 - HDF - Messaging & Models - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

LDT-5334 SW Misc & Enhc - SW - 01 - Pre-Tx - Usability Support - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

update to transition pages per pre -tx stae

LDT-5334 SW Misc & Enhc - SW - 01 - Pre-Tx - Usability Support - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

removed secondary id

    • -127
    • +0
    ./gui/qml/dialogs/PatientIdEntry.qml
  1. … 1 more file in changeset.
LDT-5334 SW Misc & Enhc - SW - 01 - Pre-Tx - Usability Support - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

add pre tx states model update

  1. … 1 more file in changeset.
LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

Merge remote-tracking branch 'origin/staging' into feature/LDT-4919-SW-Integration-Rinseback

LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

  1. … 1 more file in changeset.
LDT-5235 HDF - SW - 01 - HDF - Messaging & Models - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

HDF implementatio ncompeolte

    • -6
    • +25
    ./gui/qml/pages/treatment/TreatmentHDF.qml
    • -1
    • +40
    ./gui/qml/pages/treatment/TreatmentStack.qml
    • -1
    • +1
    ./view/td/data/treatment/VTreatmentHDFData.cpp
    • -1
    • +1
    ./view/td/data/treatment/VTreatmentHDFData.h
LDT-5235 HDF - SW - 01 - HDF - Messaging & Models - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

c++ models for 7 messages created

  1. … 12 more files in changeset.
LDT-4984 SW Misc & Enhc - SW - 01 - SW Integration - Pre-Tx - R&I - 05: DEV - Feature Implementation

address cr comments