Activity leahi-application/sources

Merge branch 'feature/LDT-3000-end-of-treatment' into staging

- -2
- +1
./canbus/MessageDispatcher.cpp
- History
- Source
- Diff
./canbus/MessageDispatcher.cpp
- -1
- +1
./canbus/MessageGlobals.h
- History
- Source
- Diff
./canbus/MessageGlobals.h
- -1
- +1
./canbus/MessageInterpreter.cpp
- History
- Source
- Diff
./canbus/MessageInterpreter.cpp
- -4
- +4
./gui/GuiGlobals.h
- History
- Source
- Diff
./gui/GuiGlobals.h
- -0
- +7
./gui/qml/components/HeaderBar.qml
- History
- Source
- Diff
./gui/qml/components/HeaderBar.qml
- -1
- +7
./gui/qml/dialogs/ConfirmDialog.qml
- History
- Source
- Diff
./gui/qml/dialogs/ConfirmDialog.qml
- -0
- +1
./gui/qml/globals/Colors.qml
- History
- Source
- Diff
./gui/qml/globals/Colors.qml
- -12
- +14
./gui/qml/main.qml
- History
- Source
- Diff
./gui/qml/main.qml
- -4
- +5
./gui/qml/pages/treatment/TreatmentSectionHeader.qml
- History
- Source
- Diff
./gui/qml/.../TreatmentSectionHeader.qml
- -6
- +6
./gui/qml/pages/treatment/TreatmentStack.qml
- History
- Source
- Diff
./gui/qml/.../treatment/TreatmentStack.qml
… 2 more files in changeset.

Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

- Complete implementation of Add Rx profile with Create treatment screen

- Change Controller writing to use QHash

- added Saline Volume to profile.

Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

- Complete implementation of Add Rx profile with Create treatment screen

- Change Controller writing to use QHash

- added Saline Volume to profile.

LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

fix transistioning between opmodes

LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

update usermode to advanced mode

LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

add advanced/standard mode steps

Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

-Add dialog to qrc and main.ql=ml

- -0
- +1
./gui/qml/main.qml
- History
- Source
- Diff
./gui/qml/main.qml
… 1 more file in changeset.

Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

-Add dialog to qrc and main.ql=ml

- -0
- +1
./gui/qml/main.qml
- History
- Source
- Diff
./gui/qml/main.qml
… 1 more file in changeset.

Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

- add RX manager dialog

- Add base of Pretreatment page for rx profile. Need to adjust back signal

Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

- add RX manager dialog

- Add base of Pretreatment page for rx profile. Need to adjust back signal

LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

add fw slot from td responses

LDT-2830 Service - SW - 01 - Institutional - R&I - 05: DEV - Feature Implementation

LDT-2830 Service - SW - 01 - Institutional - R&I - 05: DEV - Feature Implementation

addressing CR comments

- -0
- +1
./gui/qml/pages/settings/SettingsInstitutionalRecord.qml
- History
- Source
- Diff
./gui/qml/.../SettingsInstitutionalRecord.qml
- -78
- +78
./view/settings/VAdvancedInstitutionalRecord.cpp
- History
- Source
- Diff
./view/.../VAdvancedInstitutionalRecord.cpp
- -42
- +20
./view/settings/VAdvancedInstitutionalRecord.h
- History
- Source
- Diff
./view/.../VAdvancedInstitutionalRecord.h
- -202
- +202
./view/settings/VInstitutionalRecord.cpp
- History
- Source
- Diff
./view/settings/VInstitutionalRecord.cpp
- -34
- +34
./view/settings/VInstitutionalRecord.h
- History
- Source
- Diff
./view/settings/VInstitutionalRecord.h
… 1 more file in changeset.

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

address cr comment

- -22
- +4
./gui/qml/components/ModalDialog.qml
- History
- Source
- Diff
./gui/qml/components/ModalDialog.qml
- -1
- +1
./gui/qml/dialogs/ConfirmDialog.qml
- History
- Source
- Diff
./gui/qml/dialogs/ConfirmDialog.qml

LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

post treatment auto eject implemented

LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

ud[date pretreatment flow to make header static

LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

upodate instruction nview and for new design

Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

*Write functionality working to create an RX profile given a QStringList

- -69
- +55
./storage/RxProfilesController.cpp
- History
- Source
- Diff
./storage/RxProfilesController.cpp
- -9
- +5
./storage/RxProfilesController.h
- History
- Source
- Diff
./storage/RxProfilesController.h
- -16
- +3
./view/VRxProfiles.cpp
- History
- Source
- Diff
./view/VRxProfiles.cpp
- -1
- +1
./view/VRxProfiles.h
- History
- Source
- Diff
./view/VRxProfiles.h

Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

*Write functionality working to create an RX profile given a QStringList

- -69
- +55
./storage/RxProfilesController.cpp
- History
- Source
- Diff
./storage/RxProfilesController.cpp
- -9
- +5
./storage/RxProfilesController.h
- History
- Source
- Diff
./storage/RxProfilesController.h
- -16
- +3
./view/VRxProfiles.cpp
- History
- Source
- Diff
./view/VRxProfiles.cpp
- -1
- +1
./view/VRxProfiles.h
- History
- Source
- Diff
./view/VRxProfiles.h

LDT-2830 Service - SW - 01 - Institutional - R&I - 05: DEV - Feature Implementation

address cr comments

LDT-2830 Service - SW - 01 - Institutional - R&I - 05: DEV - Feature Implementation

update advanced insitutional to move modell to c++

LDT-2830 Service - SW - 01 - Institutional - R&I - 05: DEV - Feature Implementation

update model for insitutional settings

LDT-2830 Service - SW - 01 - Institutional - R&I - 05: DEV - Feature Implementation

addressing CR comments and moving model to c++ from qml

More
df08b07
changed 1 file
develop

Bamboo Commit: Updated MAlarmMapping.cpp

- -11
- +14
./model/hd/alarm/MAlarmMapping.cpp
- History
- Source
- Diff
./model/hd/alarm/MAlarmMapping.cpp

More
3355d1b
changed 1 file
develop

Bamboo Commit: Updated MAlarmMapping.cpp

- -14
- +11
./model/hd/alarm/MAlarmMapping.cpp
- History
- Source
- Diff
./model/hd/alarm/MAlarmMapping.cpp

More
72289d4
changed 6 files
develop

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

- -1
- +0
./canbus/MessageGlobals.h
- History
- Source
- Diff
./canbus/MessageGlobals.h
- -1
- +0
./canbus/MessageInterpreter.cpp
- History
- Source
- Diff
./canbus/MessageInterpreter.cpp
- -7
- +3
./gui/GuiGlobals.h
- History
- Source
- Diff
./gui/GuiGlobals.h
- -2
- +0
./gui/qml/main.qml
- History
- Source
- Diff
./gui/qml/main.qml
- -5
- +0
./model/MModel.h
- History
- Source
- Diff
./model/MModel.h
… 1 more file in changeset.

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

defeature heparin fix

LDT-2810: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 05: DEV - Feature Implementation

- Updated treatment adjustments to use officially assigned message IDs.

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

address cr comment

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

address cr comments

sources

Stats

Commits this week: 28

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)