application

sources

Clone Tools

Stats

Commits this week: 3
Total Committers: 14
Last Commit: 09 Apr 21
Commits this week: 3

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
Friday 09 Apr 2021
10:12 pm

Behrouz NematiPour

DEN-7147: preTx: Code Review 0

Options
    • -4
    • +4
    ./gui/GuiGlobals.h
    • -3
    • +3
    ./gui/qml/compounds/InstructionView.qml
    • -1
    • +36
    ./model/settings/MSettings.cpp
    • -1
    • +1
    ./storage/FileHandler.cpp
    • -14
    • +1
    ./storage/Settings.cpp
    • -1
    • +0
    ./storage/Settings.h
  7. … 1 more file in changeset.
8:10 pm

Behrouz NematiPour

DEN-7823: Meetings & Support - General purpose

- Added Alarm No Minimize so user can't minimize some alarms regarding the Alarm message received.

- Spell & doc correct

- Used MSG26 (Tx ranges) for the ultrafiltration pre-treatment max value.

- Fixed the Dynamic Instructions location on the device.

Options
    • -0
    • +1
    ./gui/qml/AlarmItem.qml
    • -1
    • +1
    ./gui/qml/components/TimeCircle.qml
    • -2
    • +2
    ./gui/qml/compounds/InstructionView.qml
    • -0
    • +3
    ./gui/qml/dialogs/NotificationDialog.qml
    • -1
    • +1
    ./gui/qml/pages/pretreatment/PreTreatmentBase.qml
    • -1
    • +1
    ./gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml
    • -1
    • +1
    ./gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml
    • -1
    • +1
    ./storage/StorageGlobals.cpp
    • -1
    • +1
    ./view/hd/alarm/VAlarmStatus.cpp
    • -0
    • +2
    ./view/hd/alarm/VAlarmStatus.h
    • -2
    • +2
    ./view/hd/data/VPreTreatmentSelfTestNoCartridgeData.h
    • -13
    • +13
    ./view/hd/data/VPreTreatmentStatesData.cpp
    • -3
    • +3
    ./view/hd/data/VPreTreatmentStatesData.h
  14. … 1 more file in changeset.
Wednesday 07 Apr 2021
4:15 pm

Behrouz NematiPour

DEN-7147: Code Review 0

- DEN-7823: Meetings & Support - General Purpose - Kushen Pre-Treatment Images.

Options
    • -1
    • +5
    ./gui/qml/compounds/InstructionView.qml
    • -2
    • +2
    ./gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml
    • -4
    • +4
    ./gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml
  4. … 5 more files in changeset.
Friday 02 Apr 2021
2:38 am

Behrouz NematiPour

DEN-7832: Implementations [Saline and Heparin change request]

- Reverted back the ultrafiltration state removal. The UF requires the state in the response message since we don't have any specific ultrafiltration adjustment state message .

Options
    • -0
    • +4
    ./model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp
    • -0
    • +3
    ./model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h
    • -0
    • +2
    ./view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp
    • -0
    • +8
    ./view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.h
    • -1
    • +33
    ./view/hd/data/VHDTreatmentStatesData.cpp
    • -1
    • +5
    ./view/hd/data/VHDTreatmentStatesData.h
Thursday 01 Apr 2021
8:49 pm

Behrouz NematiPour

DEN-7832 Implementations [Saline and Heparin change request]

- updated the messages length

- disabled used on heparin complete state to resume the heparin

- fixed the issue caused the entire section stay touchable and send the request on saline and heparin.

- updated the wording of the heparin state messages.

- added a define to disable the UI Check-In

Options
    • -0
    • +2
    ./MainTimer.cpp
    • -0
    • +8
    ./canbus/MessageDispatcher.cpp
    • -1
    • +1
    ./canbus/MessageGlobals.h
    • -1
    • +3
    ./gui/qml/pages/treatment/sections/TreatmentFluid.qml
    • -18
    • +21
    ./gui/qml/pages/treatment/sections/TreatmentHeparin.qml
    • -5
    • +6
    ./gui/qml/pages/treatment/sections/TreatmentSaline.qml
    • -0
    • +2
    ./storage/Logger.h
  8. … 1 more file in changeset.
2:18 pm

Behrouz NematiPour

DEN-7832: Implementations [Saline and Heparin change request]

- Also removed the UF state from response.

Options
    • -1
    • +0
    ./ApplicationController.cpp
    • -10
    • +6
    ./gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml
    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentStack.qml
    • -1
    • +3
    ./gui/qml/pages/treatment/sections/TreatmentHeparin.qml
    • -1
    • +2
    ./gui/qml/pages/treatment/sections/TreatmentSaline.qml
    • -4
    • +0
    ./model/hd/adjustment/MTreatmentAdjustHeparinResponse.cpp
    • -3
    • +0
    ./model/hd/adjustment/MTreatmentAdjustHeparinResponse.h
    • -9
    • +5
    ./model/hd/adjustment/MTreatmentAdjustSalineResponse.cpp
    • -8
    • +5
    ./model/hd/adjustment/MTreatmentAdjustSalineResponse.h
    • -4
    • +0
    ./model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp
    • -3
    • +0
    ./model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h
    • -2
    • +2
    ./storage/StorageGlobals.cpp
    • -15
    • +14
    ./view/hd/adjustment/VTreatmentAdjustmentHeparin.cpp
    • -9
    • +2
    ./view/hd/adjustment/VTreatmentAdjustmentHeparin.h
    • -14
    • +19
    ./view/hd/adjustment/VTreatmentAdjustmentSaline.cpp
  16. … 6 more files in changeset.
12:14 am

Behrouz NematiPour

DEN-7147: Fixed a bug on arterial/venous pressures

- which was causing user to move low/high other than current default to be able to confirm for FW validation.

Options
    • -0
    • +2
    ./gui/qml/components/RangeSlider.qml
    • -4
    • +8
    ./gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
  3. … 1 more file in changeset.
Wednesday 31 Mar 2021
6:03 pm

Behrouz NematiPour

DEN-7147: Fixed a bug on Sub-StepIndicator on bottom of the instructions

- Which was causing that to not to show correct number of the steps and titles.

- removed #include "MModel.h" in all the possible cases and include the specific model since the MModel has too much include.

- Showing the Heparin setup in the CART_INSTALL state only if we have a heparin volume setup.

- created a common template function name enumString in Gui namespace to get the enum name as string.

Options
    • -8
    • +15
    ./ApplicationController.cpp
    • -6
    • +1
    ./ApplicationController.h
    • -1
    • +0
    ./gui/GuiGlobals.cpp
    • -0
    • +26
    ./gui/GuiGlobals.h
    • -4
    • +11
    ./gui/qml/components/StepIndicator.qml
    • -1
    • +1
    ./gui/qml/pages/pretreatment/PreTreatmentBase.qml
    • -2
    • +18
    ./gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml
    • -5
    • +5
    ./main.h
    • -0
    • +5
    ./model/MModel.h
    • -0
    • +2
    ./model/settings/MSettings.h
    • -1
    • +0
    ./storage/Settings.cpp
    • -1
    • +1
    ./view/VPowerOff.h
    • -7
    • +1
    ./view/VTreatmentCreate.cpp
    • -1
    • +2
    ./view/dg/data/VDGAccelerometerData.h
    • -1
    • +1
    ./view/dg/data/VDGDrainPumpData.h
  16. … 58 more files in changeset.
Tuesday 30 Mar 2021
5:00 pm

Behrouz NematiPour

DEN-7147: preTx: Code Review 0

- The little count down progress circles become bigger.

- The completed text on the bottom of some screens with check marks become settable by code.

- Duplicate group removed from instruction file

- "Recirculate ..." text has been removed from the priming screen

- Added syringe pump state

Options
    • -1
    • +2
    ./gui/qml/compounds/CheckListView.qml
    • -1
    • +1
    ./gui/qml/globals/Fonts.qml
    • -1
    • +1
    ./gui/qml/globals/Variables.qml
    • -4
    • +8
    ./gui/qml/pages/pretreatment/PreTreatmentBase.qml
    • -0
    • +1
    ./gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml
    • -10
    • +15
    ./gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml
    • -0
    • +1
    ./view/hd/data/VPreTreatmentStatesData.cpp
    • -0
    • +1
    ./view/hd/data/VPreTreatmentStatesData.h
    • -6
    • +11
    ./view/settings/VSettings.cpp
  10. … 2 more files in changeset.
Monday 29 Mar 2021
12:17 pm

Behrouz NematiPour

DEN-7137: preTx: Update Design Documents

- Filled all the screen with the dynamic instruction so be able to capture for SDD.

- Removed the idea of reset and clear the stack, since it is not working.

Options
    • -2
    • +2
    ./gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml
  2. … 1 more file in changeset.
8:16 am

Behrouz NematiPour

DEN-7377: preTx: Implementation [Dynamic Instruction Loading] ( 2 )

DEN-7457: Meetings & Support - General purpose

Options
    • -6
    • +59
    ./ApplicationController.cpp
    • -5
    • +28
    ./ApplicationController.h
    • -8
    • +0
    ./Threads.h
    • -0
    • +1
    ./gui/GuiGlobals.cpp
    • -0
    • +11
    ./gui/qml/components/StackItem.qml
    • -36
    • +47
    ./gui/qml/compounds/InstructionView.qml
    • -0
    • +4
    ./gui/qml/main.qml
    • -2
    • +5
    ./gui/qml/pages/MainStack.qml
    • -1
    • +15
    ./gui/qml/pages/pretreatment/PreTreatmentBase.qml
    • -2
    • +0
    ./gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml
    • -8
    • +0
    ./gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml
    • -12
    • +0
    ./gui/qml/pages/pretreatment/PreTreatmentMainStack.qml
    • -8
    • +2
    ./gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml
    • -4
    • +0
    ./gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml
    • -3
    • +1
    ./gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml
  16. … 37 more files in changeset.
Thursday 25 Mar 2021
1:37 am

Behrouz NematiPour

DEN-7408: Code improvement for navigation

- VTreatmentCreate is cleaned up. (still needs a lot of work)

Options
    • -8
    • +8
    ./gui/qml/components/ConfirmTreatmentTable.qml
    • -3
    • +4
    ./gui/qml/components/ConfirmTreatmentTableEntry.qml
    • -4
    • +11
    ./gui/qml/pages/MainHome.qml
    • -2
    • +10
    ./gui/qml/pages/MainStack.qml
    • -8
    • +5
    ./gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml
    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentStack.qml
    • -0
    • +577
    ./view/VTreatmentCreate (legacy).cpp
    • -0
    • +258
    ./view/VTreatmentCreate (legacy).h
    • -569
    • +47
    ./view/VTreatmentCreate.cpp
    • -79
    • +31
    ./view/VTreatmentCreate.h
  11. … 2 more files in changeset.
Wednesday 24 Mar 2021
6:23 pm

Behrouz NematiPour

DEN-7408: Code improvement for navigation

- added vCondition to the page function for the stack item to pass the state property value.

- added fault , service and initial placeholder pages.

Options
    • -1
    • +2
    ./gui/qml/components/PlaceHolderText.qml
    • -3
    • +12
    ./gui/qml/components/StackItem.qml
    • -0
    • +2
    ./gui/qml/pages/MainHome.qml
    • -20
    • +33
    ./gui/qml/pages/MainStack.qml
    • -2
    • +2
    ./gui/qml/pages/postTreatment/PostTreatmentEndStack.qml
    • -2
    • +2
    ./gui/qml/pages/postTreatment/PostTreatmentRecirculateStack.qml
    • -5
    • +5
    ./gui/qml/pages/postTreatment/PostTreatmentRinsebackStack.qml
    • -2
    • +2
    ./gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml
    • -3
    • +3
    ./gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml
    • -8
    • +8
    ./gui/qml/pages/pretreatment/PreTreatmentMainStack.qml
    • -11
    • +11
    ./gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml
    • -13
    • +12
    ./gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml
    • -1
    • +1
    ./gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml
    • -9
    • +9
    ./gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml
  15. … 1 more file in changeset.
Tuesday 23 Mar 2021
11:06 pm

Behrouz NematiPour

DEN-7461: Meetings & Support - Pre-Treatment Integration

- Integration modifications

- UF Modifications request

- Saline Modification request

- Updated the validation mAccepted to be 1=true and 0=false.

- Heparin Stopped stated modification request

Options
    • -1
    • +2
    ./gui/qml/components/Footer.qml
    • -1
    • +1
    ./gui/qml/components/TextRect.qml
    • -1
    • +2
    ./gui/qml/compounds/InstructionView.qml
    • -2
    • +2
    ./gui/qml/compounds/StepNavigationTitleBar.qml
    • -3
    • +6
    ./gui/qml/pages/MainStack.qml
    • -0
    • +3
    ./gui/qml/pages/ManagerStack.qml
    • -0
    • +3
    ./gui/qml/pages/SettingsStack.qml
    • -1
    • +3
    ./gui/qml/pages/pretreatment/PreTreatmentBase.qml
    • -5
    • +9
    ./gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml
    • -2
    • +7
    ./gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml
    • -0
    • +3
    ./gui/qml/pages/pretreatment/PreTreatmentMainStack.qml
    • -26
    • +48
    ./gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml
    • -0
    • +3
    ./gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml
    • -0
    • +3
    ./gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml
    • -1
    • +1
    ./gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml
  16. … 17 more files in changeset.
Monday 22 Mar 2021
10:41 pm

Behrouz NematiPour

DEN-7408: preTx: Implementation [Navigation] ( 3 )

- Added Rejection reason texts.

- Removed unused view.

- Fixed heparin ranges.

Options
    • -1
    • +0
    ./gui/GuiGlobals.cpp
    • -0
    • +3
    ./gui/qml/components/NotificationBar.qml
    • -2
    • +0
    ./gui/qml/main.qml
    • -4
    • +24
    ./gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml
    • -0
    • +10
    ./gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml
    • -2
    • +22
    ./gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml
    • -15
    • +0
    ./view/VTreatmentBegin.cpp
    • -44
    • +0
    ./view/VTreatmentBegin.h
    • -4
    • +4
    ./view/VTreatmentCreate.h
    • -1
    • +0
    ./view/VView.h
  11. … 4 more files in changeset.
7:28 pm

Behrouz NematiPour

DEN-7518: preTx: Implementation [Screens] ( 3 )

- The first round of the pre-treatment flow works.

Options
    • -10
    • +10
    ./canbus/MessageDispatcher.cpp
    • -1
    • +1
    ./canbus/MessageDispatcher.h
    • -3
    • +3
    ./canbus/MessageGlobals.h
    • -9
    • +9
    ./canbus/MessageInterpreter.cpp
    • -2
    • +10
    ./gui/GuiGlobals.cpp
    • -3
    • +3
    ./gui/GuiGlobals.h
    • -12
    • +33
    ./gui/qml/main.qml
    • -1
    • +1
    ./gui/qml/pages/MainStack.qml
    • -3
    • +6
    ./gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml
    • -3
    • +1
    ./gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml
    • -7
    • +7
    ./gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml
    • -2
    • +5
    ./gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml
    • -11
    • +10
    ./gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml
    • -8
    • +0
    ./gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
    • -13
    • +9
    ./gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml
  16. … 52 more files in changeset.
10:48 am

Behrouz NematiPour

DEN-7420: preTx: Implementation [Messaging] ( 3 )

Options
    • -41
    • +144
    ./canbus/MessageDispatcher.cpp
    • -6
    • +17
    ./canbus/MessageDispatcher.h
    • -19
    • +40
    ./canbus/MessageGlobals.h
    • -39
    • +52
    ./canbus/MessageInterpreter.cpp
    • -1
    • +1
    ./gui/GuiGlobals.cpp
    • -16
    • +38
    ./gui/GuiGlobals.h
    • -2
    • +2
    ./gui/qml/main.qml
    • -3
    • +3
    ./gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml
    • -11
    • +11
    ./gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml
    • -48
    • +136
    ./model/MModel.h
    • -41
    • +0
    ./model/MPowerOff.cpp
    • -72
    • +0
    ./model/MPowerOff.h
    • -27
    • +0
    ./model/MStartTreatmentResponse.cpp
    • -68
    • +0
    ./model/MStartTreatmentResponse.h
    • -104
    • +0
    ./model/MTreatmentParametersResp.cpp
  16. … 50 more files in changeset.
Thursday 18 Mar 2021
12:55 pm

Behrouz NematiPour

DEN-7518: preTx: Implementation [Screens] ( 3 )

Options
    • -3
    • +4
    ./gui/qml/compounds/InstructionView.qml
    • -2
    • +5
    ./gui/qml/globals/Variables.qml
    • -2
    • +0
    ./gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml
    • -23
    • +4
    ./gui/qml/pages/pretreatment/PreTreatmentMainStack.qml
    • -0
    • +121
    ./gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml
    • -0
    • +103
    ./gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml
    • -0
    • +85
    ./gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml
    • -1
    • +1
    ./gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml
    • -122
    • +0
    ./gui/qml/pages/pretreatment/prime/PreTreatmentPrimeStack.qml
    • -126
    • +0
    ./gui/qml/pages/pretreatment/prime/PreTreatmentUltrafiltration.qml
  11. … 2 more files in changeset.
1:50 am

Behrouz NematiPour

DEN-7139: preTx: Implementation [Screens] ( 2 )

Options
    • -1
    • +1
    ./gui/qml/components/Circle.qml
    • -0
    • +35
    ./gui/qml/components/Footer.qml
    • -0
    • +1
    ./gui/qml/components/ProgressCircle.qml
    • -1
    • +1
    ./gui/qml/components/StepIndicator.qml
    • -0
    • +68
    ./gui/qml/components/TimeCircle.qml
    • -5
    • +5
    ./gui/qml/compounds/CheckListView.qml
    • -20
    • +9
    ./gui/qml/compounds/InstructionView.qml
    • -79
    • +0
    ./gui/qml/compounds/PreTreatmentTitleBar.qml
    • -0
    • +68
    ./gui/qml/compounds/StepNavigationTitleBar.qml
    • -1
    • +2
    ./gui/qml/globals/Fonts.qml
    • -1
    • +8
    ./gui/qml/globals/Variables.qml
    • -2
    • +2
    ./gui/qml/pages/MainStack.qml
    • -10
    • +107
    ./gui/qml/pages/pretreatment/PreTreatmentBase.qml
    • -0
    • +78
    ./gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml
    • -0
    • +102
    ./gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml
  16. … 25 more files in changeset.
Tuesday 16 Mar 2021
2:45 am

Behrouz NematiPour

DEN-7138: preTx: Implementation [Screens] ( 1 )

7138 preTx: Implementation [Screens] ( 1 )

7143 preTx: Implementation [Navigation] ( 2 )

Options
    • -39
    • +0
    ./gui/qml/components/CheckListItem.qml
    • -70
    • +0
    ./gui/qml/components/PrimingTimer.qml
    • -3
    • +3
    ./gui/qml/components/WaitDone.qml
    • -0
    • +105
    ./gui/qml/compounds/CheckListView.qml
    • -8
    • +10
    ./gui/qml/compounds/InstructionView.qml
    • -2
    • +4
    ./gui/qml/globals/Fonts.qml
    • -0
    • +3
    ./gui/qml/globals/Variables.qml
    • -14
    • +7
    ./gui/qml/pages/pretreatment/PreTreatmentMainStack.qml
    • -0
    • +58
    ./gui/qml/pages/pretreatment/consumables/PreTreatmentConsumablesInstallation.qml
    • -3
    • +17
    ./gui/qml/pages/pretreatment/consumables/PreTreatmentConsumablesSelfTest.qml
    • -2
    • +2
    ./gui/qml/pages/pretreatment/consumables/PreTreatmentConsumablesStack.qml
    • -0
    • +55
    ./gui/qml/pages/pretreatment/disposables/PreTreatmentDisposablesCartridgeConnection.qml
    • -0
    • +55
    ./gui/qml/pages/pretreatment/disposables/PreTreatmentDisposablesCartridgeInstallation.qml
    • -0
    • +55
    ./gui/qml/pages/pretreatment/disposables/PreTreatmentDisposablesHeparinSyringe.qml
    • -0
    • +55
    ./gui/qml/pages/pretreatment/disposables/PreTreatmentDisposablesSalineBag.qml
  16. … 12 more files in changeset.
Monday 15 Mar 2021
1:31 am

Behrouz NematiPour

DEN-7190: UI Manager Page Displays Incorrect Signal Strength

- Fixed the signal strength bug.

Options
    • -2
    • +2
    ./canbus/MessageGlobals.h
    • -0
    • +5
    ./model/hd/data/MTreatmentFlowsData.cpp
Sunday 14 Mar 2021
5:16 pm

Behrouz NematiPour

DEN-7375: preTx: Implementation [Component][Instruction section type 1] ( 2 )

- The first working InstructionView implementation

Options
    • -4
    • +15
    ./gui/qml/components/StepBullet.qml
    • -1
    • +0
    ./gui/qml/components/StepIndicator.qml
    • -0
    • +157
    ./gui/qml/compounds/InstructionView.qml
    • -0
    • +3
    ./gui/qml/globals/Fonts.qml
    • -125
    • +13
    ./gui/qml/pages/pretreatment/sample/PreTreatmentWaterSample.qml
  6. … 5 more files in changeset.
Friday 12 Mar 2021
8:05 pm

Behrouz NematiPour

DEN-7374: preTx: Implementation [Component][Instruction section type 1] ( 1 )

- Adding title for the component.

- Fixed/ modified the step indicator component which was changing the step names and then it couldn't be used in other objects.

Options
    • -14
    • +17
    ./gui/qml/components/StepIndicator.qml
    • -18
    • +34
    ./gui/qml/pages/pretreatment/sample/PreTreatmentWaterSample.qml
1:39 pm

Behrouz NematiPour

DEN-7374: preTx: Implementation [Component][Instruction section type 1] ( 1 )

- The first draft Implementation

Options
    • -1
    • +1
    ./gui/qml/components/SettingsItem.qml
    • -4
    • +7
    ./gui/qml/components/StepBullet.qml
    • -9
    • +15
    ./gui/qml/components/StepIndicator.qml
    • -1
    • +1
    ./gui/qml/components/TouchArea.qml
    • -1
    • +1
    ./gui/qml/pages/pretreatment/PreTreatmentBase.qml
    • -2
    • +116
    ./gui/qml/pages/pretreatment/sample/PreTreatmentWaterSample.qml
    • -1
    • +1
    ./gui/qml/pages/treatment/sections/TreatmentTime.qml
  8. … 2 more files in changeset.
2:35 am

Behrouz NematiPour

DEN-7143: preTx: Implementation [Navigation] ( 2 )

- Added the pre-treatment Consumables states

- Made the Step bullet multi orientation state

- Made the Step indicator multi orientation state

- Added the component WaitDone which has a rotating circle for wait state and a check mark when set as done.

- Added the consumables stack and two screens [self test is done, installation needs work]

- Updated PreTreatmentMainStack to navigate for waterSample and consumables.

- Added the Water Sample fail screen

- Added the Water Sample result screen

- Added the Water Sample stack

- Added the Water Sample, Sample Screen

- Added the STATE property type for the State boolean types which will not initiated if the value has not been changed.

-

Options
    • -1
    • +1
    ./canbus/MessageGlobals.h
    • -1
    • +5
    ./gui/GuiGlobals.h
    • -2
    • +2
    ./gui/qml/components/BackButton.qml
    • -1
    • +1
    ./gui/qml/components/ConfirmButton.qml
    • -10
    • +53
    ./gui/qml/components/StepBullet.qml
    • -14
    • +23
    ./gui/qml/components/StepIndicator.qml
    • -55
    • +0
    ./gui/qml/components/TitleBarCreateTreatment.qml
    • -0
    • +60
    ./gui/qml/components/WaitDone.qml
    • -0
    • +79
    ./gui/qml/compounds/PreTreatmentTitleBar.qml
    • -2
    • +2
    ./gui/qml/main.qml
    • -7
    • +9
    ./gui/qml/pages/MainStack.qml
    • -1
    • +1
    ./gui/qml/pages/postTreatment/PostTreatmentBloodPrime.qml
    • -1
    • +1
    ./gui/qml/pages/postTreatment/end/PostTreatmentEnd.qml
    • -1
    • +1
    ./gui/qml/pages/postTreatment/end/PostTreatmentEndPause.qml
    • -1
    • +1
    ./gui/qml/pages/postTreatment/recirculate/PostTreatmentRecirculate.qml
  16. … 34 more files in changeset.
Monday 08 Mar 2021
8:55 pm

Behrouz NematiPour

DEN-7373: preTx: Implementation [Component][Steps Indicator Improvement]

- Modified the StepIndicator to work with index instead of text.

- Modified StepBullet as well for coloring and style.

- Fixed the Saline bolus multiple call in MModel.

Options
    • -10
    • +13
    ./gui/qml/components/StepBullet.qml
    • -17
    • +21
    ./gui/qml/components/StepIndicator.qml
    • -1
    • +1
    ./gui/qml/components/TitleBarCreateTreatment.qml
    • -1
    • +1
    ./gui/qml/pages/pretreatment/PreTreatmentBase.qml
    • -1
    • +1
    ./gui/qml/pages/pretreatment/PreTreatmentCreateStack.qml
    • -1
    • +1
    ./gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml
    • -1
    • +1
    ./gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
    • -1
    • +1
    ./gui/qml/pages/pretreatment/prime/PreTreatmentPrime.qml
    • -1
    • +1
    ./gui/qml/pages/pretreatment/prime/PreTreatmentUltrafiltration.qml
    • -1
    • +0
    ./model/MModel.h
  11. … 1 more file in changeset.
7:10 pm

Behrouz NematiPour

DEN-7373: preTx: Implementation [Component][Steps Indicator Improvement] ( ? )

- Improved the TouchRect as part of StepIndicator improvement.

Options
    • -2
    • +0
    ./gui/qml/components/BackButton.qml
    • -2
    • +1
    ./gui/qml/components/ConfirmButton.qml
    • -23
    • +13
    ./gui/qml/components/ExportButton.qml
    • -57
    • +29
    ./gui/qml/components/GridSelection.qml
    • -5
    • +6
    ./gui/qml/components/MainMenu.qml
    • -1
    • +1
    ./gui/qml/components/MuteButton.qml
    • -1
    • +3
    ./gui/qml/components/NotificationBar.qml
    • -72
    • +47
    ./gui/qml/components/TouchRect.qml
    • -19
    • +5
    ./gui/qml/components/USBButton.qml
    • -1
    • +1
    ./gui/qml/components/UpDownButton.qml
    • -25
    • +30
    ./gui/qml/dialogs/NotificationDialog.qml
    • -2
    • +2
    ./gui/qml/dialogs/PowerOff.qml
    • -4
    • +1
    ./gui/qml/globals/Colors.qml
    • -7
    • +3
    ./gui/qml/pages/MainHome.qml
    • -2
    • +1
    ./gui/qml/pages/SettingsHome.qml
  16. … 15 more files in changeset.
Thursday 04 Mar 2021
5:35 pm

Behrouz NematiPour

DEN-7140: Implementation [Messaging] ( 1 )

- Removed the test class MAbstractProgress.

Options
    • -1
    • +1
    ./model/hd/data/MPreTreatmentPrimeData.h
  2. … 1 more file in changeset.
3:57 pm

Behrouz NematiPour

DEN-7140: Implementation [Messaging] ( 1 )

- Added progress data Model/View which are:

ID_DGFilterFlush = 0x6000, // 96

ID_SelfTestNoCartridge = 0x6100, // 97

ID_SelfTestDry = 0x6300, // 99

ID_DisposablesPrime = 0x4300, // 67

Options
    • -2
    • +6
    ./canbus/MessageGlobals.h
    • -2
    • +7
    ./canbus/MessageInterpreter.cpp
    • -6
    • +12
    ./gui/GuiGlobals.cpp
    • -2
    • +7
    ./gui/GuiGlobals.h
    • -3
    • +11
    ./gui/qml/main.qml
    • -9
    • +9
    ./gui/qml/pages/pretreatment/prime/PreTreatmentPrime.qml
    • -5
    • +21
    ./model/MModel.h
    • -0
    • +45
    ./model/dg/data/MDGFilterFlushData.cpp
    • -0
    • +82
    ./model/dg/data/MDGFilterFlushData.h
    • -5
    • +5
    ./model/hd/data/MHDOperationModeData.cpp
    • -0
    • +45
    ./model/hd/data/MPreTreatmentPrimeData.cpp
    • -0
    • +79
    ./model/hd/data/MPreTreatmentPrimeData.h
    • -0
    • +45
    ./model/hd/data/MPreTreatmentSelfTestDryData.cpp
    • -0
    • +82
    ./model/hd/data/MPreTreatmentSelfTestDryData.h
    • -0
    • +45
    ./model/hd/data/MPreTreatmentSelfTestNoCartridgeData.cpp
  16. … 20 more files in changeset.
Monday 01 Mar 2021
11:04 pm

Behrouz NematiPour

DEN-7140: Implementation [Messaging] ( 1 )

- PreTreatmentStates message has been added

Options
    • -4
    • +3
    ./canbus/MessageGlobals.h
    • -4
    • +6
    ./canbus/MessageInterpreter.cpp
    • -2
    • +4
    ./gui/GuiGlobals.cpp
    • -4
    • +32
    ./gui/GuiGlobals.h
    • -5
    • +8
    ./gui/qml/main.qml
    • -0
    • +17
    ./gui/qml/pages/ManagerHome.qml
    • -9
    • +15
    ./model/MModel.h
    • -1
    • +1
    ./model/MPowerOff.h
    • -0
    • +69
    ./model/hd/data/MPreTreatmentStatesData.cpp
    • -0
    • +108
    ./model/hd/data/MPreTreatmentStatesData.h
    • -7
    • +9
    ./view/VView.h
    • -0
    • +137
    ./view/hd/data/VPreTreatmentStatesData.cpp
    • -0
    • +124
    ./view/hd/data/VPreTreatmentStatesData.h
  14. … 2 more files in changeset.