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 seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Saturday 02 Apr 2022
11:19 pm

Behrouz NematiPour

Merge branch 'DEN-12258-UI-BN-S66' into develop

Options
    • -14
    • +14
    ./model/hd/alarm/MAlarmMapping.cpp
9:47 pm

Behrouz NematiPour

DEN-12514: LTS: Support/Development

========== DevTest

- Fixed the reported bugs from the LTTS team:

+ https://github.com/Diality/testsuites/issues/38: Rejection messages are not displayed for heparin under main-treatment screen 38

+ https://github.com/Diality/testsuites/issues/37: "Self Test Complete!" message is not displayed when "DRY_SELF_TESTS_COMPLETE_STATE" is simulated #37

+ https://github.com/Diality/testsuites/issues/36: Indicators are not displayed for 'Wet Self tests" when "HD_PRIME_WET_SELF_TESTS_STATE" is simulated #36

========== CloudSync

- Changed the order of the device registration request and the device info send, in the order above.

========== Internal

- removed the emoji and language globe buttons from the second keyboard layout.

Options
    • -2
    • +2
    ./cloudsync/CloudSyncController.cpp
    • -3
    • +19
    ./gui/qml/pages/treatment/sections/TreatmentHeparin.qml
    • -8
    • +8
    ./gui/qml/plugins/virtualkeyboard/layouts/en_US/symbols.qml
    • -14
    • +14
    ./model/hd/alarm/MAlarmMapping.cpp
    • -0
    • +3
    ./view/hd/data/pretreatment/VPreTreatmentStatesData.cpp
    • -0
    • +3
    ./view/hd/data/pretreatment/VPreTreatmentStatesData.h
    • -7
    • +9
    ./view/hd/data/treatment/VHDTreatmentStatesData.cpp
    • -0
    • +1
    ./view/hd/data/treatment/VHDTreatmentStatesData.h
  9. … 3 more files in changeset.
Tuesday 29 Mar 2022
11:50 am

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -1
    • +1
    ./model/hd/alarm/MAlarmMapping.cpp
Monday 28 Mar 2022
1:38 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -1
    • +1
    ./model/hd/alarm/MAlarmMapping.cpp
12:39 pm

Behrouz NematiPour

DEN-12424: INT

- Adding the new 3 params of the alarm trigger

- Adding Rejection

- prepare for the singletons quit which are not in order, the quit should be done manually to be in order.

Options
    • -1
    • +1
    ./ApplicationController.cpp
    • -2
    • +0
    ./ApplicationController.h
    • -2
    • +1
    ./bluetooth/BluetoothInterface.h
    • -2
    • +0
    ./canbus/CanInterface.h
    • -2
    • +0
    ./canbus/FrameInterface.h
    • -2
    • +0
    ./canbus/MessageAcknowModel.h
    • -2
    • +0
    ./canbus/MessageDispatcher.h
    • -1
    • +1
    ./canbus/MessageGlobals.h
    • -2
    • +2
    ./cloudsync/CloudSyncController.h
    • -1
    • +1
    ./device/DeviceController.h
    • -2
    • +0
    ./gui/GuiController.h
    • -15
    • +21
    ./model/MAbstractDynamic.cpp
    • -1
    • +2
    ./model/MAbstractDynamic.h
    • -3
    • +3
    ./model/hd/alarm/MAlarmMapping.cpp
    • -0
    • +35
    ./model/hd/alarm/MAlarmTriggered.cpp
  16. … 6 more files in changeset.
Friday 25 Mar 2022
3:06 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -1
    • +1
    ./model/hd/alarm/MAlarmMapping.cpp
Wednesday 23 Mar 2022
11:04 pm

Behrouz NematiPour

DEN-12427: KBM: UI modifications to match the CS needs

- Fixing the device info and version response/report.

Options
    • -13
    • +15
    ./cloudsync/CloudSyncController.cpp
    • -2
    • +2
    ./cloudsync/CloudSyncController.h
    • -0
    • +1
    ./utility/types.h
  4. … 1 more file in changeset.
6:33 pm

Behrouz NematiPour

DEN-12427: KBM: Usual Meetings/Support/Development

- The UI will only send the 1006 (latest device state update) if only the state changes.

- Duplicate state updates will not log as an error and will only be ignore.

- The UI will always response back to 2006 (device state request) from CS with 1006 (latest device state) even if the state is the same as the last updated/requested.

Options
    • -8
    • +21
    ./cloudsync/CloudSyncController.cpp
    • -1
    • +4
    ./cloudsync/CloudSyncController.h
    • -3
    • +3
    ./model/hd/alarm/MAlarmMapping.cpp
    • -0
    • +16
    ./utility/format.cpp
    • -7
    • +7
    ./utility/format.h
    • -1
    • +1
    ./view/hd/adjustment/common/VCommonAdjustmentVitals.cpp
  7. … 2 more files in changeset.
2:34 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -1
    • +1
    ./model/hd/alarm/MAlarmMapping.cpp
Monday 21 Mar 2022
7:36 pm

Behrouz NematiPour

DEN-12426: LTS: Bug / CR / Develop Coco / Manual

- removed the "// coco begin validated" to disable the manually validated coverage.

Options
    • -11
    • +11
    ./ApplicationController.cpp
    • -2
    • +2
    ./MainTimer.cpp
    • -2
    • +2
    ./Threads.cpp
    • -2
    • +2
    ./bluetooth/BluetoothInterface.cpp
    • -16
    • +16
    ./canbus/CanInterface.cpp
    • -8
    • +8
    ./canbus/FrameInterface.cpp
    • -2
    • +2
    ./canbus/MessageAcknowModel.cpp
    • -2
    • +2
    ./canbus/MessageBuilder.cpp
    • -9
    • +9
    ./canbus/MessageDispatcher.cpp
    • -2
    • +2
    ./canbus/MessageGlobals.h
    • -4
    • +4
    ./canbus/MessageInterpreter.cpp
    • -2
    • +2
    ./cloudsync/CloudSyncController.cpp
    • -12
    • +12
    ./device/DeviceController.cpp
    • -12
    • +12
    ./gui/GuiController.cpp
    • -1
    • +1
    ./gui/GuiGlobals.cpp
  16. … 67 more files in changeset.
12:59 pm

Behrouz NematiPour

DEN-12334: Heparin Delivery Paused Text Does Not Appear

Options
    • -0
    • +2
    ./gui/qml/pages/treatment/sections/TreatmentHeparin.qml
10:21 am

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

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

Behrouz NematiPour

DEN-12438: The In-Treatment Dialysate Flow section value is not updated

During the change of the parent flow class to the Dialysate flow and Blood flow, one thing which has not been caught during the development and code review is that the length of the Dialysate flow has changed as well from 8 to 7.

It has been caught by LTTS during their regression testing.

Options
    • -1
    • +1
    ./canbus/MessageGlobals.h
  2. … 1 more file in changeset.
Friday 18 Mar 2022
7:19 pm

Behrouz NematiPour

DEN-12383: Heparin Volume Delivered Treatment Monitor Resolution Should Be 0.1 mL

Options
    • -2
    • +4
    ./gui/qml/pages/treatment/sections/TreatmentFluid.qml
    • -1
    • +2
    ./gui/qml/pages/treatment/sections/TreatmentHeparin.qml
12:06 pm

Behrouz NematiPour

Fixed the build issue.

Options
    • -2
    • +2
    ./gui/qml/AlarmItem.qml
  2. … 1 more file in changeset.
11:12 am

Behrouz NematiPour

DEN-11812 UI Keyboard displays text on the spacebar and has a wink emoji button

- added the keyboard layout and style to remove some buttons and remove the text on the spacebar.

- added DEBUG_DISABLE_MAXIMIZE, due to touch screen issue on some devices, the maximized alarm can't be minimized to see the screen underneath.

- While fixing some issues in the Dialin/Simulator, added the reject reason notification to the Treatment review screen and cleared the values on rejection.

- update the Dialysate Temperature max to the 37 from 38.

Options
    • -0
    • +3
    ./gui/GuiGlobals.cpp
    • -3
    • +10
    ./gui/qml/AlarmItem.qml
    • -0
    • +1
    ./gui/qml/pages/posttreatment/PostTreatmentReview.qml
    • -0
    • +113
    ./gui/qml/plugins/virtualkeyboard/layouts/en_GB/dialpad.qml
    • -0
    • +112
    ./gui/qml/plugins/virtualkeyboard/layouts/en_GB/digits.qml
    • -0
    • +96
    ./gui/qml/plugins/virtualkeyboard/layouts/en_GB/handwriting.qml
    • -0
    • +208
    ./gui/qml/plugins/virtualkeyboard/layouts/en_GB/main.qml
    • -0
    • +184
    ./gui/qml/plugins/virtualkeyboard/layouts/en_GB/numbers.qml
    • -0
    • +376
    ./gui/qml/plugins/virtualkeyboard/layouts/en_GB/symbols.qml
    • -0
    • +113
    ./gui/qml/plugins/virtualkeyboard/layouts/en_US/dialpad.qml
    • -0
    • +112
    ./gui/qml/plugins/virtualkeyboard/layouts/en_US/digits.qml
    • -0
    • +96
    ./gui/qml/plugins/virtualkeyboard/layouts/en_US/handwriting.qml
    • -0
    • +208
    ./gui/qml/plugins/virtualkeyboard/layouts/en_US/main.qml
    • -0
    • +184
    ./gui/qml/plugins/virtualkeyboard/layouts/en_US/numbers.qml
    • -0
    • +376
    ./gui/qml/plugins/virtualkeyboard/layouts/en_US/symbols.qml
  16. … 26 more files in changeset.
Thursday 17 Mar 2022
11:10 am

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -2
    • +3
    ./model/hd/alarm/MAlarmMapping.cpp
Sunday 13 Mar 2022
3:15 pm

Behrouz NematiPour

DEN-12262: INT: Support and debugging

- updated/tested the alarmMapping with new changes.

- added the staging to the alamMapping.sh call to checkout always on staging as the mainsteam.

Options
    • -1
    • +1
    ./model/hd/alarm/MAlarmMapping.cpp
    • -1
    • +1
    ./view/hd/alarm/VAlarmStatus.cpp
  3. … 1 more file in changeset.
Thursday 10 Mar 2022
7:41 pm

Behrouz NematiPour

DEN-12262: INT: Support and debugging

- Fixing the DG Valves/Temperature messages

- Fixing the CloudSync RegisterDeviceRequest

- Fixed/Cherry-Picked the Dialin-log conditions.

- Cleaned up the debug messages.

Options
    • -1
    • +0
    ./canbus/CanInterface.cpp
    • -7
    • +7
    ./canbus/FrameInterface.cpp
    • -1
    • +1
    ./canbus/MessageGlobals.h
    • -2
    • +2
    ./cloudsync/CloudSyncController.cpp
    • -18
    • +20
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -0
    • +4
    ./model/dg/data/MDGTemperaturesData.cpp
    • -23
    • +26
    ./model/dg/data/MDGTemperaturesData.h
    • -13
    • +14
    ./model/dg/data/MDGValvesStatesData.h
    • -1
    • +1
    ./model/hd/alarm/MAlarmMapping.cpp
    • -1
    • +1
    ./storage/FileHandler.cpp
    • -1
    • +1
    ./storage/Logger.cpp
    • -1
    • +1
    ./storage/Settings.cpp
    • -1
    • +1
    ./storage/TreatmentLog.cpp
    • -1
    • +1
    ./view/VTreatmentCreate.cpp
    • -1
    • +2
    ./view/dg/data/VDGTemperaturesData.cpp
  16. … 6 more files in changeset.
12:59 pm

Behrouz NematiPour

DEN-12262: INT: Log Dialin Messages

- Log Dialin messages as part of the unhandled messages.

Options
    • -0
    • +1
    ./canbus/MessageGlobals.h
    • -21
    • +46
    ./canbus/MessageInterpreter.cpp
    • -6
    • +6
    ./model/dg/data/MDGAccelerometerData.h
    • -6
    • +6
    ./model/dg/data/post/MDGPostFinalResultData.h
    • -6
    • +6
    ./model/dg/data/post/MDGPostSingleResultData.h
    • -6
    • +6
    ./model/hd/data/MHDAccelerometerData.h
    • -4
    • +4
    ./model/hd/data/MHDSyringePumpData.h
    • -6
    • +6
    ./model/hd/data/post/MHDPostFinalResultData.h
    • -3
    • +3
    ./model/hd/data/post/MHDPostSingleResultData.h
    • -2
    • +1
    ./view/settings/VDateTime.cpp
  11. … 2 more files in changeset.
12:57 pm

Behrouz NematiPour

DEN-12262: INT: FW Support (Reset Diagnostic Data)

- Reorganized the Diagnostics screen a little more.

Options
    • -3
    • +6
    ./gui/qml/components/DebugDataColumn.qml
    • -51
    • +57
    ./gui/qml/dialogs/DiagnosticsDialog.qml
  3. … 1 more file in changeset.
12:56 pm

Behrouz NematiPour

DEN-12262: INT: FW Support (Reset Diagnostic Data)

Options
    • -1
    • +1
    ./AlarmGenerator.cpp
    • -0
    • +1
    ./gui/GuiGlobals.cpp
    • -1
    • +2
    ./gui/qml/components/DebugDataColumn.qml
    • -106
    • +120
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -5
    • +8
    ./gui/qml/main.qml
    • -0
    • +101
    ./view/VGeneralEvent.cpp
    • -0
    • +84
    ./view/VGeneralEvent.h
    • -0
    • +1
    ./view/VView.h
    • -1
    • +1
    ./view/hd/alarm/VAlarmStatus.cpp
  10. … 3 more files in changeset.
Wednesday 09 Mar 2022
4:54 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -14
    • +20
    ./model/hd/alarm/MAlarmMapping.cpp
4:53 pm

Dara Navaei

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

Options
    • -1
    • +1
    ./Threads.cpp
    • -1
    • +1
    ./canbus/FrameInterface.cpp
    • -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/DeviceError.h
    • -1
    • +1
    ./device/DeviceModels.cpp
    • -1
    • +1
    ./device/DeviceModels.h
    • -2
    • +2
    ./gui/GuiGlobals.cpp
    • -1
    • +1
    ./gui/GuiGlobals.h
    • -2
    • +2
    ./gui/qml/AlarmItem.qml
    • -2
    • +2
    ./gui/qml/KeyboardItem.qml
    • -2
    • +2
    ./gui/qml/dialogs/DiagnosticsDialog.qml
  16. … 63 more files in changeset.
4:49 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -10
    • +10
    ./model/hd/alarm/MAlarmMapping.cpp
4:47 pm

Behrouz NematiPour

Merge branch 'DEN-12121-sw_dev-sprint-65' into staging

Options
    • -3
    • +5
    ./canbus/MessageGlobals.h
    • -0
    • +4
    ./canbus/MessageInterpreter.cpp
    • -1
    • +4
    ./gui/GuiGlobals.h
    • -2
    • +9
    ./gui/qml/main.qml
    • -0
    • +20
    ./model/MModel.h
    • -2
    • +2
    ./model/hd/alarm/MAlarmMapping.cpp
  7. … 1 more file in changeset.
4:46 pm

Behrouz NematiPour

Merge branch 'DEN-12182-ui_dev-sprint-65' into staging

Options
    • -0
    • +5
    ./model/MModel.h
  2. … 1 more file in changeset.
3:39 pm

Behrouz NematiPour

DEN-12262: INT: Code reviews wrap up & support

- Addressed all the code review comments in another branch in here to facilitate the code review process and make the code ready while the actual code owner were busy supporting system for demo.

- Added another condition to the Alarm top/right countdown to hide the timer when FW is not even in the Treatment mode by the HDOpMode.

Options
    • -1
    • +1
    ./gui/qml/AlarmItem.qml
    • -78
    • +88
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -0
    • +6
    ./model/dg/data/MDGAccelerometerData.cpp
    • -0
    • +6
    ./model/dg/data/MDGAccelerometerData.h
    • -6
    • +6
    ./model/dg/data/MDGConductivityData.h
    • -0
    • +6
    ./model/hd/data/MHDAccelerometerData.cpp
    • -0
    • +6
    ./model/hd/data/MHDAccelerometerData.h
    • -9
    • +9
    ./model/hd/data/MHDAirBubbleData.h
    • -9
    • +9
    ./model/hd/data/MHDAirTrapData.h
    • -16
    • +16
    ./model/hd/data/MHDBloodLeakData.h
    • -6
    • +6
    ./model/hd/data/treatment/MTreatmentBloodPrimeData.h
    • -6
    • +6
    ./model/hd/data/treatment/MTreatmentHeparinData.h
    • -6
    • +6
    ./model/hd/data/treatment/MTreatmentRecirculateData.h
    • -18
    • +18
    ./model/hd/data/treatment/MTreatmentRinsebackData.cpp
    • -12
    • +12
    ./model/hd/data/treatment/MTreatmentRinsebackData.h
  16. … 18 more files in changeset.
3:39 pm

Behrouz NematiPour

DEN-12262: INT: Code reviews wrap up & support

- Addressed all the code review comments in another branch in here to facilitate the code review process and make the code ready while the actual code owner were busy supporting system for demo.

- Added another condition to the Alarm top/right countdown to hide the timer when FW is not even in the Treatment mode by the HDOpMode.

Options
    • -1
    • +1
    ./gui/qml/AlarmItem.qml
    • -78
    • +88
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -0
    • +6
    ./model/dg/data/MDGAccelerometerData.cpp
    • -0
    • +6
    ./model/dg/data/MDGAccelerometerData.h
    • -6
    • +6
    ./model/dg/data/MDGConductivityData.h
    • -1
    • +1
    ./model/hd/alarm/MAlarmMapping.cpp
    • -0
    • +6
    ./model/hd/data/MHDAccelerometerData.cpp
    • -0
    • +6
    ./model/hd/data/MHDAccelerometerData.h
    • -9
    • +9
    ./model/hd/data/MHDAirBubbleData.h
    • -9
    • +9
    ./model/hd/data/MHDAirTrapData.h
    • -16
    • +16
    ./model/hd/data/MHDBloodLeakData.h
    • -6
    • +6
    ./model/hd/data/treatment/MTreatmentBloodPrimeData.h
    • -6
    • +6
    ./model/hd/data/treatment/MTreatmentHeparinData.h
    • -6
    • +6
    ./model/hd/data/treatment/MTreatmentRecirculateData.h
    • -18
    • +18
    ./model/hd/data/treatment/MTreatmentRinsebackData.cpp
  16. … 19 more files in changeset.
11:43 am

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -1
    • +1
    ./model/hd/alarm/MAlarmMapping.cpp