application

Clone Tools

Stats

Commits this week: 0
Total Committers: 14
Last Commit: 23 Jun 20
Commits this week: 0

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
Tuesday 23 Jun 2020
5:18 pm

Behrouz NematiPour

DEN-3158 : Code Review 0

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +1
    /denali.pro.user
    • -1
    • +1
    /sources/model/mtreatmentadjustultrafiltrationstateresponse.h
    • -1
    • +1
    /unittests/tst_canbus.cpp
    • -3
    • +0
    /unittests/tst_messaging.h
    • -8
    • +8
    /unittests/tst_models.cpp
    • -2
    • +2
    /unittests/tst_views.cpp
2:18 pm

Behrouz NematiPour

DEN-3157 : Code Coverage

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +1
    /sources/model/mtreatmentadjustrequests.h
    • -12
    • +6
    /sources/view/vtreatmentadjustmentultrafiltrationstate.cpp
    • -0
    • +31
    /unittests/tst_views.cpp
    • -0
    • +2
    /unittests/tst_views.h
Monday 22 Jun 2020
9:13 pm

Behrouz NematiPour

DEN-3157 : Code Coverage

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -5
    • +5
    /denali.pro.user
    • -2
    • +2
    /sources/canbus/frameinterface.cpp
    • -7
    • +7
    /sources/canbus/messageinterpreter.cpp
    • -2
    • +2
    /sources/gui/qml/pages/SettingsHome.qml
    • -0
    • +7
    /sources/model/mloadcellreadings.h
    • -0
    • +7
    /sources/model/mtemperaturesensors.h
    • -1
    • +1
    /sources/model/mtreatmentadjustultrafiltrationstateresponse.h
    • -3
    • +7
    /sources/view/vtreatmentadjustmentultrafiltrationstate.cpp
    • -0
    • +10
    /unittests/tst_canbus.cpp
    • -0
    • +2
    /unittests/tst_canbus.h
    • -1
    • +26
    /unittests/tst_messaging.cpp
    • -1
    • +4
    /unittests/tst_messaging.h
    • -5
    • +312
    /unittests/tst_models.cpp
    • -0
    • +16
    /unittests/tst_models.h
12:44 pm

Behrouz NematiPour

DEN-3157 : Code Coverage

- DEN-3158 : Code Review 0

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -2
    • +0
    /sources/gui/qml/components/UltrafiltrationButton.qml
    • -0
    • +222
    /unittests/tst_messaging.cpp
    • -1
    • +28
    /unittests/tst_messaging.h
    • -3
    • +3
    /unittests/tst_models.cpp
    • -1
    • +0
    /unittests/tst_models.h
4:36 am

Behrouz NematiPour

DEN-3156 Integration Testing

- 90.849% (1916/2109)

________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +1
    /denali.pro.user
    • -1
    • +1
    /sources/canbus/messageinterpreter.h
    • -2
    • +4
    /sources/gui/qml/pages/SettingsHome.qml
    • -1
    • +4
    /sources/view/vtreatmentadjustmentultrafiltrationconfirm.h
    • -0
    • +2
    /sources/view/vtreatmentultrafiltration.h
Friday 19 Jun 2020
8:10 pm

Behrouz NematiPour

DEN-3155 : Unit Testing

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -2
    • +1
    /sources/canbus/messageinterpreter.cpp
    • -1
    • +1
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml
    • -1
    • +5
    /sources/view/vtreatmentadjustmentresponsebase.cpp
Thursday 18 Jun 2020
11:18 pm

Behrouz NematiPour

DEN-3155 : Unit Testing

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -6
    • +6
    /main.cpp
    • -1
    • +1
    /sources/canbus/messageglobals.h
    • -1
    • +0
    /sources/gui/qml/components/MainMenu.qml
    • -0
    • +2
    /sources/gui/qml/components/ModalDialog.qml
    • -4
    • +7
    /sources/gui/qml/components/UltrafiltrationButton.qml
    • -0
    • +2
    /sources/gui/qml/dialogs/AutoHideInfo.qml
    • -0
    • +2
    /sources/gui/qml/dialogs/PowerOff.qml
    • -2
    • +2
    /sources/gui/qml/main.qml
    • -0
    • +2
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
    • -0
    • +1
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml
    • -0
    • +2
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml
    • -0
    • +1
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml
    • -4
    • +6
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -1
    • +2
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
    • -0
    • +1
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml
    • -0
    • +2
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
Monday 15 Jun 2020
1:09 pm

Behrouz NematiPour

DEN-3158 : Code Review 0

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -2
    • +2
    /sources/gui/qml/components/TouchRect.qml
    • -1
    • +1
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml
    • -3
    • +3
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml
Sunday 14 Jun 2020
7:35 pm

Behrouz NematiPour

DEN-3158 : Code Review 0

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +1
    /sources/canbus/messageglobals.h
    • -8
    • +8
    /sources/canbus/messageinterpreter.cpp
    • -2
    • +2
    /sources/canbus/messageinterpreter.h
    • -1
    • +1
    /sources/gui/guiglobals.h
Friday 12 Jun 2020
1:08 pm

Behrouz NematiPour

DEN-3628 : EMC Test Support

- Adding Temperature sensors values on the settings diagnostic page.

- Applied Code Review comments.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -2
    • +5
    /denali.pro
    • -1
    • +1
    /sources/applicationcontroller.cpp
    • -1
    • +1
    /sources/applicationcontroller.h
    • -2
    • +2
    /sources/canbus/messagedispatcher.cpp
    • -1
    • +1
    /sources/canbus/messagedispatcher.h
    • -0
    • +1
    /sources/canbus/messageglobals.h
    • -1
    • +33
    /sources/canbus/messageinterpreter.cpp
    • -0
    • +3
    /sources/canbus/messageinterpreter.h
    • -1
    • +1
    /sources/gui/guicontroller.cpp
    • -1
    • +1
    /sources/gui/guicontroller.h
    • -0
    • +1
    /sources/gui/guiglobals.cpp
    • -0
    • +2
    /sources/gui/guiglobals.h
    • -0
    • +2
    /sources/gui/qml/main.qml
    • -0
    • +39
    /sources/gui/qml/pages/SettingsHome.qml
    • -0
    • +5
    /sources/model/mmodel.h
  16. … 9 more files in changeset.
Wednesday 10 Jun 2020
7:53 pm

Behrouz NematiPour

Merge branch 'DEN-3628_EMCTestSupport' into DEN-3149_TreatmentUltrafiltrationAdjustment

Options
7:53 pm

Behrouz NematiPour

DEN-3628 : EMC Test Support

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -0
    • +4
    /denali.pro
    • -1
    • +1
    /denali.pro.user
    • -0
    • +2
    /sources/canbus/messageglobals.h
    • -8
    • +75
    /sources/canbus/messageinterpreter.cpp
    • -0
    • +6
    /sources/canbus/messageinterpreter.h
    • -3
    • +5
    /sources/gui/guiglobals.cpp
    • -0
    • +4
    /sources/gui/guiglobals.h
    • -12
    • +18
    /sources/gui/qml/main.qml
    • -14
    • +100
    /sources/gui/qml/pages/SettingsHome.qml
    • -3
    • +0
    /sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml
    • -0
    • +53
    /sources/model/mloadcellreadings.cpp
    • -0
    • +54
    /sources/model/mloadcellreadings.h
    • -0
    • +12
    /sources/model/mmodel.h
    • -0
    • +27
    /sources/view/vloadcellreadings.cpp
    • -0
    • +38
    /sources/view/vloadcellreadings.h
    • -3
    • +8
    /sources/view/vview.h
Tuesday 09 Jun 2020
7:51 pm

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- Updated regarding the demo notes

- Fixed some codes to pass the existing unit tests (other than Ultrafiltration which have to work on it anyway (it's regarding mL=>L))

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -2
    • +2
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -10
    • +8
    /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
1:07 am

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -4
    • +0
    /Todos
    • -1
    • +1
    /denali.pro
    • -1
    • +1
    /denali.pro.user
    • -0
    • +4
    /todos
1:04 am

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- The third Code Review by myself

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -6
    • +6
    /denali.pro
    • -1
    • +1
    /sources/canbus/messageinterpreter.cpp
    • -3
    • +3
    /sources/gui/guiglobals.cpp
    • -16
    • +16
    /sources/gui/qml/main.qml
    • -26
    • +26
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
    • -1
    • +1
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml
    • -2
    • +2
    /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
    • -3
    • +0
    /sources/model/mtreatmentadjustultrafiltrationconfirmresponse.h
    • -3
    • +0
    /sources/model/mtreatmentadjustultrafiltrationeditresponse.h
    • -4
    • +4
    /sources/model/mtreatmentadjustultrafiltrationstateresponse.cpp
    • -3
    • +3
    /sources/model/mtreatmentadjustultrafiltrationstateresponse.h
    • -46
    • +0
    /sources/view/vtreatmentadjustmentultrafiltration.cpp
    • -56
    • +0
    /sources/view/vtreatmentadjustmentultrafiltration.h
    • -0
    • +52
    /sources/view/vtreatmentadjustmentultrafiltrationconfirm.cpp
    • -0
    • +54
    /sources/view/vtreatmentadjustmentultrafiltrationconfirm.h
  16. … 9 more files in changeset.
12:12 am

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- The second Code Review by myself

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +1
    /denali.pro.user
    • -11
    • +2
    /sources/applicationcontroller.cpp
    • -14
    • +3
    /sources/applicationcontroller.h
    • -13
    • +3
    /sources/canbus/messagedispatcher.cpp
    • -13
    • +3
    /sources/canbus/messagedispatcher.h
    • -0
    • +1
    /sources/gui/guicontroller.cpp
    • -12
    • +3
    /sources/gui/guicontroller.h
    • -2
    • +43
    /sources/main.h
    • -21
    • +37
    /sources/model/mmodel.h
    • -5
    • +2
    /sources/view/vtreatmentadjustmentduration.cpp
    • -5
    • +2
    /sources/view/vtreatmentadjustmentflows.cpp
    • -5
    • +2
    /sources/view/vtreatmentadjustmentultrafiltration.cpp
    • -5
    • +2
    /sources/view/vtreatmentultrafiltrationconfirm.cpp
    • -5
    • +2
    /sources/view/vtreatmentultrafiltrationstate.cpp
Monday 08 Jun 2020
9:08 pm

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- The first my myself.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -4
    • +0
    /Todos
    • -2
    • +3
    /denali.pro
    • -2
    • +15
    /denali.pro.user
    • -10
    • +12
    /sources/applicationcontroller.h
    • -4
    • +0
    /sources/gui/guiglobals.h
    • -1
    • +1
    /sources/gui/qml/components/TouchRect.qml
    • -1
    • +0
    /sources/gui/qml/main.qml
    • -0
    • +1
    /sources/gui/qml/pages/treatment/TreatmentStart.qml
    • -2
    • +2
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml
    • -2
    • +2
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml
    • -6
    • +7
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -4
    • +6
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
    • -4
    • +6
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml
    • -1
    • +4
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
    • -18
    • +0
    /sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml
  16. … 16 more files in changeset.
12:45 pm

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- Fixed a typo

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +1
    /sources/gui/qml/components/UltrafiltrationButton.qml
Thursday 04 Jun 2020
7:40 pm

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- The resolution added to the Ultrafiltration Volume adjustment.

There is a discrepancy between PRS items which needs to be clarified. But for now 0.100 mL resolution has been selected.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +3
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
6:48 pm

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- Revert back the Ultrafiltration rate to the mL.

- Added a QT_DEBUG define for the Ultrafiltration volume because usually we are not connected to the pump and measVol would return 0 but RefVol is the calculated vol and should always have a value.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +1
    /denali.pro.user
    • -6
    • +7
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -0
    • +4
    /sources/view/vtreatmentultrafiltration.cpp
6:22 pm

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- Adding the last Ultrafiltration message transaction to confirm the values.

- Added the modification of the Ultrafiltration Volume unit change.

- Modified the components to support real/float variables to support Ultrafiltration volume with Liter as unit and 3 digit precision.

- So much refactoring

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -2
    • +4
    /denali.pro
    • -2
    • +2
    /sources/applicationcontroller.cpp
    • -3
    • +3
    /sources/applicationcontroller.h
    • -5
    • +5
    /sources/canbus/messagedispatcher.cpp
    • -7
    • +7
    /sources/canbus/messagedispatcher.h
    • -3
    • +5
    /sources/canbus/messageglobals.h
    • -30
    • +57
    /sources/canbus/messageinterpreter.cpp
    • -4
    • +8
    /sources/canbus/messageinterpreter.h
    • -2
    • +2
    /sources/gui/guicontroller.h
    • -3
    • +6
    /sources/gui/guiglobals.h
    • -0
    • +3
    /sources/gui/qml/components/ProgressBar.qml
    • -1
    • +1
    /sources/gui/qml/components/ProgressBarEx.qml
    • -2
    • +6
    /sources/gui/qml/components/ProgressRect.qml
    • -1
    • +4
    /sources/gui/qml/components/RangeBar.qml
    • -2
    • +3
    /sources/gui/qml/components/RangeMarker.qml
  16. … 27 more files in changeset.
Monday 01 Jun 2020
7:31 pm

Behrouz NematiPour

DEN-3154 : Implementation [ Messaging ]

- Added the Ultrafiltration Adjustment Confirm Request

- Improved the MVC and some twicks in qml.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -0
    • +4
    /denali.pro
    • -1
    • +1
    /denali.pro.user
    • -59
    • +10
    /sources/applicationcontroller.cpp
    • -6
    • +10
    /sources/applicationcontroller.h
    • -0
    • +80
    /sources/canbus/messagedispatcher.cpp
    • -0
    • +14
    /sources/canbus/messagedispatcher.h
    • -0
    • +2
    /sources/canbus/messageglobals.h
    • -2
    • +7
    /sources/canbus/messageinterpreter.cpp
    • -13
    • +10
    /sources/gui/guicontroller.h
    • -0
    • +2
    /sources/gui/guiglobals.cpp
    • -0
    • +3
    /sources/gui/guiglobals.h
    • -1
    • +1
    /sources/gui/qml/components/TouchRect.qml
    • -2
    • +4
    /sources/gui/qml/components/UltrafiltrationButton.qml
    • -1
    • +1
    /sources/gui/qml/globals/Colors.qml
    • -0
    • +2
    /sources/gui/qml/main.qml
  16. … 7 more files in changeset.
Friday 29 May 2020
7:23 pm

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- Updated the MVC/Messaging with the updated Ultrafiltration Adjustment message.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +0
    /sources/canbus/messageinterpreter.h
    • -6
    • +6
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
    • -4
    • +5
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -4
    • +4
    /sources/model/mtreatmentadjustultrafiltrationresponse.cpp
    • -4
    • +4
    /sources/model/mtreatmentadjustultrafiltrationresponse.h
    • -1
    • +1
    /sources/view/vtreatmentadjustmentultrafiltration.cpp
    • -2
    • +2
    /sources/view/vtreatmentadjustmentultrafiltration.h
Thursday 28 May 2020
8:42 pm

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- Adjustment Models refactoring.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -2
    • +2
    /denali.pro
    • -1
    • +1
    /denali.pro.user
    • -20
    • +26
    /sources/applicationcontroller.cpp
    • -5
    • +4
    /sources/applicationcontroller.h
    • -0
    • +1
    /sources/canbus/messageglobals.h
    • -3
    • +7
    /sources/canbus/messageinterpreter.cpp
    • -23
    • +9
    /sources/gui/guicontroller.h
    • -4
    • +0
    /sources/gui/guiglobals.h
    • -1
    • +5
    /sources/gui/qml/components/UltrafiltrationButton.qml
    • -1
    • +3
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
    • -4
    • +6
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -63
    • +103
    /sources/model/mmodel.h
    • -2
    • +8
    /sources/model/mtreatmentadjustultrafiltrationresponse.cpp
    • -0
    • +2
    /sources/model/mtreatmentadjustultrafiltrationresponse.h
    • -0
    • +38
    /sources/model/mtreatmentadjustultrafiltrationstateresponse.cpp
  16. … 11 more files in changeset.
11:28 am

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- Treatment Ultrafiltration Edit => Confirm Screen.

- Added Error notification for the ultrafiltration state/adjustment response on related dialogs.

- Modified the Image/Wave/Clock to have the positioning out of the component.

- Added/Separated the pause notification on the Treatment Adjustment Base Component so the code handling would be easier to handle the pause notification and the error message handling on the dialog.

- Added overloaded text method for the ultrafiltration state although it has no rejection reason.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -0
    • +8
    /Todos
    • -0
    • +3
    /denali.pro
    • -1
    • +1
    /denali.pro.user
    • -5
    • +0
    /sources/gui/qml/components/ImageClock.qml
    • -6
    • +0
    /sources/gui/qml/components/ImageWave.qml
    • -3
    • +32
    /sources/gui/qml/components/UltrafiltrationButton.qml
    • -0
    • +1
    /sources/gui/qml/globals/Colors.qml
    • -4
    • +18
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
    • -0
    • +7
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml
    • -10
    • +23
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -9
    • +7
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
    • -4
    • +3
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml
    • -0
    • +1
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
    • -1
    • +2
    /sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml
    • -1
    • +2
    /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
  16. … 4 more files in changeset.
Tuesday 26 May 2020
8:31 pm

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- Added selected Ultrafiltration Volume value label in the Ultrafiltration Edit dialog

- Changed notification object exposure logic in TouchArea and ModalDialog.

- Used measuredVolume but passed refVol in C++ to make one place changed,.

- Changed connection call to property binding for the TreatmentUltrafiltration section pause notification.

- Changed the MAdjustUltrafiltrationReq model from U32(quint32) to F32(float).

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +1
    /denali.pro.user
    • -2
    • +1
    /sources/canbus/messagedispatcher.cpp
    • -3
    • +1
    /sources/gui/qml/components/ModalDialog.qml
    • -2
    • +2
    /sources/gui/qml/components/ProgressBarEx.qml
    • -8
    • +6
    /sources/gui/qml/components/TouchArea.qml
    • -0
    • +1
    /sources/gui/qml/globals/Fonts.qml
    • -1
    • +1
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml
    • -1
    • +1
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml
    • -1
    • +1
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml
    • -8
    • +18
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
    • -6
    • +4
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml
    • -6
    • +4
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
    • -22
    • +12
    /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
    • -1
    • +1
    /sources/model/mmodel.h
    • -1
    • +1
    /sources/view/vtreatmentadjustmentultrafiltration.h
    • -1
    • +6
    /sources/view/vtreatmentultrafiltration.cpp
Thursday 21 May 2020
10:57 pm

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- BackUp push:

- Message 19 : UF Vol. Change Response

- Incomplete.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +1
    /denali.pro.user
    • -0
    • +10
    /sources/applicationcontroller.cpp
    • -0
    • +1
    /sources/applicationcontroller.h
    • -1
    • +4
    /sources/canbus/messagedispatcher.cpp
    • -1
    • +2
    /sources/canbus/messagedispatcher.h
    • -0
    • +4
    /sources/canbus/messageglobals.h
    • -0
    • +36
    /sources/canbus/messageinterpreter.cpp
    • -0
    • +3
    /sources/canbus/messageinterpreter.h
    • -0
    • +7
    /sources/gui/guicontroller.h
    • -0
    • +2
    /sources/gui/guiglobals.h
    • -2
    • +18
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
    • -2
    • +2
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
    • -15
    • +21
    /sources/model/mmodel.h
    • -2
    • +2
    /sources/view/vtreatmentadjustmentultrafiltration.cpp
    • -2
    • +4
    /sources/view/vtreatmentadjustmentultrafiltration.h
4:25 pm

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- Added :

. Treatment Adjustment Ultrafiltration Response Model (mtreatmentadjustultrafiltrationresponse)

. Treatment Adjustment Ultrafiltration Response View (vtreatmentadjustmentultrafiltration)

. Treatment Ultrafiltration State Change Request Model (mtreatmentultrafiltrationstate)

. Treatment Ultrafiltration State Change Request View (vtreatmentultrafiltrationstate)

- Added Ultrafiltration Pause / Resume Messaging

- Modified NotificationBar to be able to use it in the Ultrafiltration Section when Ultrafiltration is paused.

- Modified TouchArea to make the TreatmentStart Screen clean. (Removed the Component List logic and layered out the components manually since each section is different and can't apply one rule for all)

- Updated the Ultrafiltration navigation stack regarding the MVC/Messaging responses.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -0
    • +8
    /denali.pro
    • -1
    • +1
    /denali.pro.user
    • -8
    • +18
    /sources/applicationcontroller.cpp
    • -4
    • +6
    /sources/applicationcontroller.h
    • -2
    • +2
    /sources/canbus/messagedispatcher.cpp
    • -0
    • +1
    /sources/canbus/messagedispatcher.h
    • -0
    • +3
    /sources/canbus/messageglobals.h
    • -1
    • +36
    /sources/canbus/messageinterpreter.cpp
    • -0
    • +3
    /sources/canbus/messageinterpreter.h
    • -10
    • +0
    /sources/gui/guicontroller.cpp
    • -4
    • +13
    /sources/gui/guicontroller.h
    • -0
    • +2
    /sources/gui/guiglobals.cpp
    • -1
    • +12
    /sources/gui/guiglobals.h
    • -8
    • +0
    /sources/gui/guiview.cpp
    • -13
    • +0
    /sources/gui/guiview.h
  16. … 30 more files in changeset.
Tuesday 19 May 2020
2:09 pm

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- Separeted VTreatmentAdjustmentsResponse into 3 classes and used this class as parent of the two others and this class keeps the Accepted Boolean and the rejection reason.

- The other two keep the actual logic of the Adjustment values/properties.

- Moved the View includes from VView.h into the guiglobals.cpp since when including the vview.h the definition guard didn't let the inheritance work.

- Removed the VTreatmentAdjustmentsResponce from the list of the registered views into QML.

- made the TRIGGER_SLOT and PROPERTY_SLOT as protected so the children can use them.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -0
    • +4
    /denali.pro
    • -1
    • +1
    /denali.pro.user
    • -1
    • +12
    /sources/gui/guiglobals.cpp
    • -27
    • +34
    /sources/gui/qml/main.qml
    • -4
    • +4
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml
    • -5
    • +5
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml
    • -7
    • +10
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
    • -2
    • +2
    /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
    • -0
    • +2
    /sources/main.h
    • -0
    • +31
    /sources/view/vtreatmentadjustmentduration.cpp
    • -0
    • +44
    /sources/view/vtreatmentadjustmentduration.h
    • -0
    • +32
    /sources/view/vtreatmentadjustmentflows.cpp
    • -0
    • +44
    /sources/view/vtreatmentadjustmentflows.h
    • -27
    • +6
    /sources/view/vtreatmentadjustmentsresponse.cpp
    • -18
    • +1
    /sources/view/vtreatmentadjustmentsresponse.h
    • -16
    • +17
    /sources/view/vview.h
Monday 18 May 2020
3:19 pm

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- Added Ultrafiltration button component for the Ultrafiltration Adjustment options

- Added two Clock(+.-) and Wave(+.-) icons for the Ultrafiltration Adjustment options

- Created special components (ImageWave.qml and ImageClock.qml) for each image to encapsulate all the image properties in one component.

- Added Ultrafiltration Adjustment Confirm dialog

- Added Ultrafiltration Adjustment Confirm dialog Navigation.

- Renamed LogoD.qml to ImageLogoD.qml to be consistent with the other Image Components.

- Inverted the slider handler object back and border color to be consistent with the UX design.

- Created the ImageLogoDDarkTransparent.qml for the MainMenu Diality Icon.

- Added disabled property to the TouchRect components.

- Aligned the Slider with the Ultrafiltration ProgressBar.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +1
    /denali.pro.user
    • -1
    • +10
    /denali.qrc
    • binary
    /resources/images/Clock-Minus.png
    • binary
    /resources/images/Clock-Plus.png
    • binary
    /resources/images/Wave-Minus.png
    • binary
    /resources/images/Wave-Plus.png
    • -0
    • +46
    /sources/gui/qml/components/ImageClock.qml
    • -0
    • +39
    /sources/gui/qml/components/ImageLogoD.qml
    • -0
    • +35
    /sources/gui/qml/components/ImageLogoDDarkTransparent.qml
    • -0
    • +47
    /sources/gui/qml/components/ImageWave.qml
    • -38
    • +0
    /sources/gui/qml/components/LogoD.qml
    • -4
    • +1
    /sources/gui/qml/components/MainMenu.qml
    • -8
    • +10
    /sources/gui/qml/components/ProgressBar.qml
    • -2
    • +2
    /sources/gui/qml/components/Slider.qml
    • -0
    • +2
    /sources/gui/qml/components/TouchRect.qml
  16. … 8 more files in changeset.