application

sources

Clone Tools

Stats

Commits this week: 1
Total Committers: 14
Last Commit: 16 Dec
Commits this week: 1

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few minutes ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Thursday 06 Oct 2022
9:36 am

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -19
    • +19
    ./model/hd/alarm/MAlarmMapping.cpp
Wednesday 05 Oct 2022
7:08 pm

Behrouz NematiPour

DEN-13965: UI/HD Generic User Confirmation [Message Mapping]]

- Fixed the issue with the kyeValue of different categories overwriting by adding the category as the top level.

- I still have issue in saving for the settings, which writes duplicate.

Options
    • -3
    • +6
    ./canbus/MessageInterpreter.cpp
    • -1
    • +1
    ./model/hd/alarm/MAlarmMapping.cpp
    • -54
    • +37
    ./model/settings/MSettings.cpp
    • -17
    • +36
    ./model/settings/MSettings.h
    • -5
    • +10
    ./storage/Settings.cpp
    • -0
    • +1
    ./storage/StorageGlobals.cpp
    • -0
    • +1
    ./storage/StorageGlobals.h
    • -5
    • +6
    ./storage/TreatmentLog.cpp
    • -4
    • +5
    ./view/VTreatmentCreate.cpp
    • -29
    • +25
    ./view/hd/alarm/VAlarmStatus.cpp
    • -7
    • +7
    ./view/settings/VSettings.cpp
  12. … 1 more file in changeset.
Tuesday 04 Oct 2022
6:07 pm

Behrouz NematiPour

DEN-13965: UI/HD Generic User Confirmation [Message Mapping]]

- Code preparation for the implementation.

Options
    • -5
    • +30
    ./storage/Settings.h
    • -1
    • +5
    ./storage/StorageGlobals.cpp
    • -0
    • +6
    ./storage/StorageGlobals.h
    • -0
    • +38
    ./view/confirm/VConfirm.cpp
    • -0
    • +2
    ./view/confirm/VConfirm.h
    • -7
    • +7
    ./view/hd/alarm/VAlarmStatus.cpp
    • -9
    • +2
    ./view/hd/alarm/VAlarmStatus.h
    • -0
    • +1
    ./view/settings/VSettings.cpp
  9. … 1 more file in changeset.
12:01 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -14
    • +20
    ./model/hd/alarm/MAlarmMapping.cpp
12:00 pm

Dara Navaei

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Options
    • -1
    • +1
    ./canbus/MessageDispatcher.cpp
    • -1
    • +1
    ./canbus/MessageGlobals.h
    • -1
    • +1
    ./canbus/MessageInterpreter.cpp
    • -1
    • +1
    ./gui/GuiGlobals.cpp
    • -1
    • +1
    ./gui/GuiGlobals.h
    • -1
    • +1
    ./gui/qml/AlarmItem.qml
    • -1
    • +1
    ./gui/qml/PowerItem.qml
    • -1
    • +1
    ./gui/qml/components/Footer.qml
    • -1
    • +1
    ./gui/qml/components/TouchRect.qml
    • -1
    • +1
    ./gui/qml/dialogs/PowerOff.qml
    • -1
    • +1
    ./gui/qml/globals/Variables.qml
    • -1
    • +1
    ./gui/qml/pages/endtreatment/EndTreatmentEndStack.qml
    • -1
    • +1
    ./gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml
    • -1
    • +1
    ./gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml
    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentBloodPrime.qml
  16. … 14 more files in changeset.
10:51 am

Behrouz NematiPour

Merge branch 'DEN-13965-UI-BN-S80' into staging

Options
    • -0
    • +14
    ./canbus/MessageDispatcher.cpp
    • -1
    • +5
    ./canbus/MessageGlobals.h
    • -1
    • +4
    ./canbus/MessageInterpreter.cpp
    • -1
    • +3
    ./gui/GuiGlobals.cpp
    • -0
    • +11
    ./gui/GuiGlobals.h
    • -1
    • +7
    ./gui/qml/AlarmItem.qml
    • -4
    • +23
    ./gui/qml/globals/Variables.qml
    • -2
    • +0
    ./gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml
    • -0
    • +19
    ./model/MModel.h
    • -2
    • +2
    ./view/VView.h
    • -0
    • +1
    ./view/hd/alarm/VAlarmStatus.cpp
  12. … 2 more files in changeset.
Monday 03 Oct 2022
1:07 pm

Behrouz NematiPour

DEN-13939: IMP: Fixed the merge issue

- Not sure why git didn't get the changes on the ModalDialog's Norification changes to NotificationSmall, and caused the issue on the property IconVisible.

Options
    • -1
    • +1
    ./gui/qml/components/ModalDialog.qml
    • -2
    • +0
    ./gui/qml/dialogs/PowerOff.qml
    • -2
    • +1
    ./gui/qml/pages/MainHome.qml
    • -1
    • +1
    ./gui/qml/pages/MainStack.qml
    • -3
    • +1
    ./gui/qml/pages/TreatmentFlowBase.qml
    • -4
    • +4
    ./gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
    • -2
    • +0
    ./gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml
    • -0
    • +1
    ./gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml
    • -1
    • +1
    ./model/hd/alarm/MAlarmMapping.cpp
8:59 am

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -1
    • +1
    ./model/hd/alarm/MAlarmMapping.cpp
8:58 am

Behrouz NematiPour

Merge branch 'DEN-13965-UI-BN-S80' into develop

Options
    • -0
    • +14
    ./canbus/MessageDispatcher.cpp
    • -1
    • +5
    ./canbus/MessageGlobals.h
    • -1
    • +4
    ./canbus/MessageInterpreter.cpp
    • -1
    • +3
    ./gui/GuiGlobals.cpp
    • -0
    • +11
    ./gui/GuiGlobals.h
    • -1
    • +7
    ./gui/qml/AlarmItem.qml
    • -0
    • +19
    ./model/MModel.h
    • -2
    • +2
    ./view/VView.h
    • -0
    • +1
    ./view/hd/alarm/VAlarmStatus.cpp
  10. … 1 more file in changeset.
Friday 30 Sep 2022
6:57 pm

Behrouz NematiPour

DEN-13939: IMP: Implementation of the the message [0xBB00]

Options
    • -0
    • +14
    ./canbus/MessageDispatcher.cpp
    • -1
    • +2
    ./canbus/MessageInterpreter.cpp
    • -2
    • +12
    ./gui/qml/PowerItem.qml
    • -0
    • +9
    ./model/MModel.h
    • -2
    • +34
    ./model/hd/adjustment/treatment/MTreatmentAdjustRequests.h
    • -0
    • +17
    ./view/confirm/VConfirm.cpp
    • -0
    • +13
    ./view/confirm/VConfirm.h
4:41 pm

Behrouz NematiPour

DEN-13939: IMP: Implementation of the the message [0xBA00]

Messaging:

- Modified the message 0xBB00 required length from 3xU32 to 2xU32

- Renamed the VConfrimDialog to VConfirm, since the view class is not the actual dialog implementation.

- Merged the vPowerOff view to the VConfrim, and removed the VPowerOff view classes.

Alarm Integration:

- AlarmItem: add the hasAlarm to theAlarmMinimize as well to prevent the AlarmBar being visible when there is no active alarm.

- VAlarmStatus: fixed the issue with the hasAlarm property which was causing the AlarmDialog being visible while there was not active alarm.

Confirm Dialog:

- Used the PowerItem.qml and the PowerOff Dialog for Generic Confirm, and improved the code to be repurposed.

- Footer: updated the Footer component to be able to re-layout the touchrects without an open/close cycle.

- TouchRect: exposed the the buttons text.

Options
    • -2
    • +2
    ./canbus/MessageGlobals.h
    • -2
    • +1
    ./gui/GuiGlobals.cpp
    • -0
    • +7
    ./gui/GuiGlobals.h
    • -1
    • +7
    ./gui/qml/AlarmItem.qml
    • -31
    • +63
    ./gui/qml/PowerItem.qml
    • -8
    • +20
    ./gui/qml/components/Footer.qml
    • -0
    • +1
    ./gui/qml/components/TouchRect.qml
    • -22
    • +47
    ./gui/qml/dialogs/PowerOff.qml
    • -6
    • +0
    ./gui/qml/main.qml
    • -1
    • +1
    ./model/hd/alarm/MAlarmMapping.cpp
    • -25
    • +0
    ./view/VPowerOff.cpp
    • -48
    • +0
    ./view/VPowerOff.h
    • -3
    • +1
    ./view/VView.h
    • -0
    • +107
    ./view/confirm/VConfirm.cpp
    • -0
    • +69
    ./view/confirm/VConfirm.h
  16. … 5 more files in changeset.
3:28 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -1
    • +1
    ./model/hd/alarm/MAlarmMapping.cpp
Wednesday 28 Sep 2022
4:41 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -15
    • +24
    ./model/hd/alarm/MAlarmMapping.cpp
4:41 pm

Dara Navaei

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Options
    • -1
    • +1
    ./AlarmGenerator.cpp
    • -1
    • +1
    ./AlarmGenerator.h
    • -1
    • +1
    ./ApplicationController.cpp
    • -1
    • +1
    ./ApplicationController.h
    • -1
    • +1
    ./ApplicationPost.cpp
    • -1
    • +1
    ./ApplicationPost.h
    • -1
    • +1
    ./MainTimer.cpp
    • -1
    • +1
    ./Threads.cpp
    • -1
    • +1
    ./Threads.h
    • -1
    • +1
    ./bluetooth/BluetoothInterface.cpp
    • -1
    • +1
    ./canbus/FrameInterface.cpp
    • -1
    • +1
    ./canbus/MessageDispatcher.cpp
    • -1
    • +1
    ./canbus/MessageDispatcher.h
    • -1
    • +1
    ./canbus/MessageGlobals.h
    • -1
    • +1
    ./canbus/MessageInterpreter.cpp
  16. … 81 more files in changeset.
4:24 pm

Behrouz NematiPour

Merge branch 'DEN-13198-UI_BN_75' into staging

Options
    • -18
    • +55
    ./ApplicationController.cpp
    • -8
    • +26
    ./ApplicationPost.cpp
    • -1
    • +1
    ./MainTimer.cpp
    • -17
    • +17
    ./canbus/MessageDispatcher.cpp
    • -2
    • +5
    ./canbus/MessageDispatcher.h
    • -10
    • +7
    ./canbus/MessageGlobals.h
    • -19
    • +13
    ./canbus/MessageInterpreter.cpp
    • -2
    • +9
    ./cloudsync/CloudSyncController.cpp
    • -57
    • +42
    ./device/DeviceController.cpp
    • -3
    • +0
    ./device/DeviceController.h
    • -3
    • +0
    ./gui/GuiGlobals.cpp
    • -9
    • +6
    ./gui/GuiGlobals.h
    • -27
    • +50
    ./gui/GuiView.cpp
    • -5
    • +11
    ./gui/GuiView.h
    • -1
    • +0
    ./gui/qml/SDCProgressItem.qml
  16. … 31 more files in changeset.
Monday 26 Sep 2022
2:19 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -11
    • +11
    ./model/hd/alarm/MAlarmMapping.cpp
Thursday 22 Sep 2022
3:22 am

Behrouz NematiPour

DEN-13939: IMP: Implementation of the the message [0xBA00]

- The Model/View are implemented and exposed to QML.

Options
    • -0
    • +4
    ./canbus/MessageGlobals.h
    • -0
    • +2
    ./canbus/MessageInterpreter.cpp
    • -0
    • +3
    ./gui/GuiGlobals.cpp
    • -0
    • +4
    ./gui/GuiGlobals.h
    • -0
    • +6
    ./gui/qml/main.qml
    • -0
    • +10
    ./model/MModel.h
    • -0
    • +49
    ./model/confirm/MDuetConfirmHDi.cpp
    • -0
    • +85
    ./model/confirm/MDuetConfirmHDi.h
    • -2
    • +5
    ./model/hd/alarm/MAlarmMapping.cpp
    • -0
    • +2
    ./view/VView.h
    • -0
    • +46
    ./view/confirm/VConfirmDialog.cpp
    • -0
    • +56
    ./view/confirm/VConfirmDialog.h
  13. … 4 more files in changeset.
Wednesday 21 Sep 2022
9:23 am

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -1
    • +1
    ./model/hd/alarm/MAlarmMapping.cpp
Tuesday 20 Sep 2022
5:26 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -1
    • +2
    ./model/hd/alarm/MAlarmMapping.cpp
4:46 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -3
    • +3
    ./model/hd/alarm/MAlarmMapping.cpp
1:03 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -1
    • +2
    ./model/hd/alarm/MAlarmMapping.cpp
10:58 am

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -1
    • +1
    ./model/hd/alarm/MAlarmMapping.cpp
Monday 19 Sep 2022
4:21 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -4
    • +7
    ./model/hd/alarm/MAlarmMapping.cpp
Tuesday 13 Sep 2022
11:19 am

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -14
    • +20
    ./model/hd/alarm/MAlarmMapping.cpp
11:18 am

Dara Navaei

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Options
    • -1
    • +1
    ./ApplicationController.cpp
    • -1
    • +1
    ./ApplicationPost.cpp
    • -1
    • +1
    ./MainTimer.cpp
    • -6
    • +6
    ./_wip_/fileCopy/main.cpp
    • -1
    • +1
    ./canbus/MessageDispatcher.cpp
    • -1
    • +1
    ./canbus/MessageDispatcher.h
    • -1
    • +1
    ./canbus/MessageGlobals.h
    • -1
    • +1
    ./canbus/MessageInterpreter.cpp
    • -1
    • +1
    ./cloudsync/CloudSyncController.cpp
    • -1
    • +1
    ./cloudsync/CloudSyncController.h
    • -1
    • +1
    ./device/DeviceController.cpp
    • -1
    • +1
    ./device/DeviceController.h
    • -1
    • +1
    ./gui/GuiGlobals.cpp
    • -1
    • +1
    ./gui/GuiGlobals.h
    • -1
    • +1
    ./gui/GuiView.cpp
  16. … 86 more files in changeset.
10:47 am

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -3
    • +2
    ./model/hd/alarm/MAlarmMapping.cpp
10:43 am

Behrouz NematiPour

Merge branch 'DEN-12640-UI-BN-S79' into develop

Options
    • -4
    • +23
    ./gui/qml/globals/Variables.qml
10:42 am

Behrouz NematiPour

Merge branch 'Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging' into develop

Options
    • -0
    • +5
    ./gui/GuiGlobals.h
    • -0
    • +2
    ./gui/qml/pages/MainStack.qml
Monday 12 Sep 2022
2:03 am

Behrouz NematiPour

DEN-12640: UI: Pressure readings on blood prime / rinseback

- Added bottom line separators.

Options
    • -0
    • +1
    ./gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml
    • -0
    • +1
    ./gui/qml/pages/treatment/TreatmentBloodPrime.qml
    • -1
    • +1
    ./model/hd/alarm/MAlarmMapping.cpp
Sunday 11 Sep 2022
5:55 am

Behrouz NematiPour

DEN-12640: UI: Pressure readings on blood prime / rinseback

- The In-Line Blood Pressure monitor (ILBPM) has been added to the Rinseback and blood prime screen.

- It has been requested to place the ILBPM, at same place on all three screens (Main Treatment is the third one), but on the rinseback screen we don't have space for that. So it has been moved to top/left (it was buttom/left) and swapped with the FLOWS section.

- It needs to be negotiated with the team to make sure everyone agrees.

Options
    • -4
    • +23
    ./gui/qml/globals/Variables.qml
    • -0
    • +18
    ./gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml
    • -0
    • +18
    ./gui/qml/pages/treatment/TreatmentBloodPrime.qml
    • -46
    • +36
    ./gui/qml/pages/treatment/TreatmentHome.qml
    • -3
    • +7
    ./gui/qml/pages/treatment/sections/TreatmentPressures.qml