Clone
 

nico ramirez <nramirez@diality.com> in leahi-application

Merge branch 'feature/LDT-3072-beta-transition' into develop

    • -1
    • +0
    /sources/canbus/MessageInterpreter.cpp
Merge branch 'staging' into develop

LDT-3051 Future Options - SW - 01 - R&I - 05: DEV - Feature Implementation

defeature heparin fix

LDT-3005 End of Treatment - SW - 01 - R&I - 05: DEV - Feature Implementation

address cr comment

    • -4
    • +22
    /sources/gui/qml/components/ModalDialog.qml
LDT-3005 End of Treatment - SW - 01 - R&I - 05: DEV - Feature Implementation

address cr comments

    • -5
    • +1
    /sources/gui/qml/dialogs/ConfirmDialog.qml
LDT-3051 Future Options - SW - 01 - R&I - 05: DEV - Feature Implementation

update per cr comments

    • -1
    • +1
    /sources/gui/qml/components/MainMenu.qml
LDT-2828 Service - SW - 01 - Institutional - R&I - 03: SDD - Design Diagram - plantuml

push SDD

    • binary
    /SDDs/Institutional.png
    • -0
    • +360
    /SDDs/Institutional.puml
LDT-2830 Service - SW - 01 - Institutional - R&I - 05: DEV - Feature Implementation

push institutional code

    • -3
    • +121
    /sources/canbus/MessageDispatcher.cpp
    • -2
    • +10
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +201
    /sources/gui/qml/compounds/InstitutionalContainer.qml
    • -6
    • +7
    /sources/gui/qml/compounds/ValueAdjuster.qml
    • -0
    • +157
    /sources/gui/qml/compounds/ValueAdjusterCustom.qml
  1. … 34 more files in changeset.
LDT-3051 Future Options - SW - 01 - R&I - 05: DEV - Feature Implementation

finish feature configurations

    • -6
    • +6
    /sources/gui/qml/components/MainMenu.qml
LDT-3049 Future Options - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

add design diagram

    • binary
    /SDDs/Feature_Configuration.png
    • -0
    • +63
    /SDDs/Feature_Configuration.puml
LDT-3051 Future Options - SW - 01 - R&I - 05: DEV - Feature Implementation

add featyyre cibfug screen

    • -0
    • +88
    /sources/gui/qml/pages/settings/SettingsFeatureConfigurations.qml
    • -5
    • +47
    /sources/view/settings/VSettings.cpp
LDT-2962 Heparin - SW - 01 - R&I - 05: DEV - Feature Implementation

address cr comment fix heparin type options uindefined

    • -0
    • +1
    /sources/view/hd/data/VTreatmentRanges.cpp
LDT-3078 Support of the transition to the Beta System - SW - 01 - R&I - 06: DEV - Diagnostic - if needed

update DD diagnostics to beta vales

LDT-3077 Support of the transition to the Beta System - SW - 01 - R&I - 05: DEV - Feature Implementation

remove FP valves

    • -1
    • +0
    /sources/canbus/MessageInterpreter.cpp
    • -4
    • +6
    /sources/model/dd/data/MDDValvesStatesData.h
    • -107
    • +0
    /sources/model/fp/data/MFPValvesStatesData.h
    • -11
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -27
    • +44
    /sources/view/dd/data/VDDValvesStatesData.cpp
    • -7
    • +22
    /sources/view/dd/data/VDDValvesStatesData.h
    • -67
    • +0
    /sources/view/fp/data/VFPValvesStatesData.h
LDT-3005 End of Treatment - SW - 01 - R&I - 05: DEV - Feature Implementation

cleanup

LDT-3005 End of Treatment - SW - 01 - R&I - 05: DEV - Feature Implementation

update message Ids

LDT-3003 End of Treatment - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

update message id

LDT-3003 End of Treatment - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

add SDD diagram

    • -0
    • +91
    /SDDs/EndTreatment.puml
    • binary
    /SDDs/End_Treatment.png
LDT-3005 End of Treatment - SW - 01 - R&I - 05: DEV - Feature Implementation

upload of code

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +7
    /sources/gui/qml/components/HeaderBar.qml
    • -0
    • +2
    /sources/gui/qml/components/IconButton.qml
    • -0
    • +34
    /sources/gui/qml/components/TreatmentCompleteButton.qml
    • -7
    • +25
    /sources/gui/qml/dialogs/ConfirmDialog.qml
    • -0
    • +37
    /sources/gui/qml/dialogs/EndTreatmentDialog.qml
    • -5
    • +5
    /sources/gui/qml/dialogs/LockDialog.qml
    • -0
    • +3
    /sources/gui/qml/globals/Variables.qml
  1. … 16 more files in changeset.
Insittutional

add message IDs

LDT-2962 Heparin - SW - 01 - R&I - 05: DEV - Feature Implementation

add message IDs

LDT-2960 Heparin - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

adddress cr comment

LDT-2960 Heparin - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

address cr comments

    • -2
    • +2
    /sources/gui/qml/components/HeaderBar.qml
    • -1
    • +5
    /sources/gui/qml/components/IdleTimer.qml
    • -2
    • +2
    /sources/gui/qml/components/MainMenu.qml
    • -2
    • +2
    /sources/gui/qml/globals/Variables.qml
    • -0
    • +355
    /sources/gui/qml/pages/treatment/TreatmentHeparin.qml
saving work

    • -0
    • +15
    /sources/view/settings/VSettings.cpp
LDT-2960 Heparin - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

push SDD

LDT-2825-institutional

Stashed work

    • binary
    /SDDs/Institutional.png
    • -0
    • +360
    /SDDs/Institutional.puml
    • -14
    • +43
    /etc/reports/alarms/AlarmMapping.csv
    • -14
    • +43
    /etc/reports/alarms/AlarmMapping.py
    • -3
    • +121
    /sources/canbus/MessageDispatcher.cpp
    • -2
    • +10
    /sources/canbus/MessageInterpreter.cpp
  1. … 43 more files in changeset.
LDT-2962 Heparin - SW - 01 - R&I - 05: DEV - Feature Implementation

add idle timeout for heparin screen

    • -0
    • +43
    /sources/gui/qml/components/IdleTimer.qml
    • -1
    • +1
    /sources/gui/qml/components/MainMenu.qml
LDT-2962 Heparin - SW - 01 - R&I - 05: DEV - Feature Implementation

implementation of heparin

    • -2
    • +3
    /sources/gui/qml/components/HeaderBar.qml
    • -11
    • +37
    /sources/gui/qml/components/MainMenu.qml
    • -0
    • +5
    /sources/gui/qml/globals/Variables.qml
  1. … 3 more files in changeset.
LDT-2732 Service - SW - 01 - Service - R&I - 05: DEV - Feature Implementation

address cr comments

    • -0
    • +67
    /sources/device/DeviceController.cpp
    • -5
    • +5
    /sources/gui/qml/components/HeaderBar.qml
    • -1
    • +1
    /sources/gui/qml/dialogs/ConfirmDialog.qml
  1. … 5 more files in changeset.
LDT-2732 Service - SW - 01 - Service - R&I - 05: DEV - Feature Implementation

address cr comments

    • -2
    • +2
    /sources/bluetooth/BluetoothInterface.cpp
    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp