application / sources / gui / qml / pages / treatment

adjustments

Clone Tools

Stats

Commits this week: 0
Total Committers: 6
Last Commit: 20 Nov
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
Friday 16 Oct 2020
8:39 pm

Behrouz NematiPour

5284: Implementation

Story related fixes:

- Used FW enum for Saline Bolus in Common repo

- txPaused modified the way FW understands and transmits.

Extra fixes:

- Changed the Ultrafiltration ref/meas vol to 3 decimal.

- Application version wasn't correctly shown

- Added a #define for the mouse event spy since on target it's not usually happening and is not useful neither on target nor on desktop for now.

- Fixed the author typo

Options
    • -1
    • +1
    ./TreatmentAdjustmentDuration.qml
  2. … 102 more files in changeset.
Tuesday 13 Oct 2020
10:32 am

Behrouz NematiPour

DEN-5139: Implementation [ Screen & navigations ] (2 of 2)

- The venous color and title and default component color fixed.

Options
    • -5
    • +7
    ./TreatmentAdjustmentPressures.qml
  2. … 2 more files in changeset.
Monday 12 Oct 2020
2:23 pm

Behrouz NematiPour

DEN-5139: Implementation [ Screen & navigations ] (2 of 2)

Options
    • -1
    • +1
    ./TreatmentAdjustmentFlow.qml
    • -202
    • +34
    ./TreatmentAdjustmentPressures.qml
  3. … 6 more files in changeset.
Tuesday 29 Sep 2020
9:52 pm

Behrouz NematiPour

DEN-5032: Implementation [ Screen & navigations ] (1 of 2)

Options
    • -0
    • +290
    ./TreatmentAdjustmentPressures.qml
  2. … 12 more files in changeset.
Monday 31 Aug 2020
2:05 pm

Dara Navaei

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

Options
    • -3
    • +3
    ./TreatmentAdjustmentBase.qml
    • -3
    • +3
    ./TreatmentAdjustmentDuration.qml
    • -5
    • +5
    ./TreatmentAdjustmentFlow.qml
    • -5
    • +5
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -2
    • +2
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -5
    • +5
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -5
    • +5
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  8. … 250 more files in changeset.
Thursday 20 Aug 2020
3:48 pm

Behrouz NematiPour

DEN-3884: Code Review 0

Options
    • -4
    • +4
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
  2. … 21 more files in changeset.
Thursday 30 Jul 2020
2:08 am

Behrouz NematiPour

Resolve the merge conflicts of master into logging (#1 pass)

- This the first pass of the merging otherwise the code cannot be merged and committed.

- Next need to look at the code completely and see what has been merged and resolved automatically by git.

Options
    • -10
    • +11
    ./TreatmentAdjustmentFlow.qml
    • -10
    • +11
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -10
    • +11
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -10
    • +11
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -10
    • +11
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  6. … 67 more files in changeset.
Tuesday 07 Jul 2020
12:22 pm

Dara Navaei

Updated the Copyright with the current year and replaced tabs with 4 spaces

Options
    • -10
    • +11
    ./TreatmentAdjustmentBase.qml
    • -10
    • +11
    ./TreatmentAdjustmentDuration.qml
    • -10
    • +11
    ./TreatmentAdjustmentFlow.qml
    • -10
    • +11
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -10
    • +11
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -10
    • +11
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -10
    • +11
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  8. … 192 more files in changeset.
Monday 29 Jun 2020
10:06 pm

Behrouz NematiPour

DEN-3880 : Implementation

- Added Alarm Triggered Model

- Added Alarm Cleared Model

- Added Treatment State Model

- "UI," as Event Source to the Initialized and Some Other Event Messages for better logging

- Updated Ack messages and made them nicer for logging.

- Added DGCheckIn as a message to be logged.

- Stored Unit texts as a read only property in Variables qml file which had multiple definition multiple places.

- Changed the toString of models to use comma instead of parenthesis to be easily used in Excel as a CSV file format.

- Found a bug in TreatmentAdjustmentUltrafiltrationConfirm Screen slot which had volume defined as int that actually is a float value and causes the float to be truncated also the volume should be traslated int the VTreatmentAdjustmentUltrafiltratinConfirm to mL from Liter. Although HD wasn't using that value and was not complaining about it.

- Changed the current pew-set Volume value in the TreatmentAdjustmentUltrafiltrationEdit screen to be the current max value which is actually going to be changed by user.

- Changed to use the reference Volume to be used as the current collected volume in the Ultrafiltration section of the main treatment screen and the other Ultrafiltration adjustment screen that using it (Start. Paused, Edit).

- Added toString to the request models to be used for logging.

- Refactored the Message Interpreter response methods to be unique like the other improved latest methods (get<Method>s removed) [Reordered, Document cleanup, and so].

- Updated the manual in the MModel header for creating a model in regards to refactoring above.

- Updated Response Models in regards to the refactoring above.

- Made each byte space separator in Flags class in Types class for cleaner logging (will be used empty string in Alarm Status for logging).

- Changed the logging folder to be log folder (not event, error) and changed the log file extension for events/data to be .log and for errors to be .err.

- log file format modified to be CSV.

- Removed a not used fromByteArrayState method of mtreatmentadjustmentultrafiltrationconfirmresponse , mtreatmentadjustmentultrafiltrationeditresponse.

________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -5
    • +4
    ./TreatmentAdjustmentFlow.qml
    • -10
    • +6
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -5
    • +5
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -4
    • +2
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -4
    • +2
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  6. … 58 more files in changeset.
Thursday 25 Jun 2020
5:55 pm

Peter Lucia <plucia@diality.com>

Updates to support unit testing

Options
    • -1
    • +1
    ./TreatmentAdjustmentBase.qml
  2. … 10 more files in changeset.
9:22 am

Peter Lucia <plucia@diality.com>

Merged master into UI Alarms.

Options
    • -4
    • +24
    ./TreatmentAdjustmentBase.qml
  2. … 25 more files in changeset.
Friday 19 Jun 2020
8:10 pm

Behrouz NematiPour

DEN-3155 : Unit Testing

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +1
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
  2. … 2 more files in changeset.
Thursday 18 Jun 2020
11:18 pm

Behrouz NematiPour

DEN-3155 : Unit Testing

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -0
    • +1
    ./TreatmentAdjustmentBase.qml
    • -0
    • +2
    ./TreatmentAdjustmentDuration.qml
    • -0
    • +1
    ./TreatmentAdjustmentFlow.qml
    • -4
    • +6
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -1
    • +2
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -0
    • +1
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -0
    • +2
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  8. … 9 more files in changeset.
Monday 15 Jun 2020
1:09 pm

Behrouz NematiPour

DEN-3158 : Code Review 0

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +1
    ./TreatmentAdjustmentBase.qml
    • -3
    • +3
    ./TreatmentAdjustmentFlow.qml
  3. … 1 more file in changeset.
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
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
  2. … 1 more file in changeset.
1:04 am

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- The third Code Review by myself

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +1
    ./TreatmentAdjustmentDuration.qml
  2. … 23 more files in changeset.
Monday 08 Jun 2020
9:08 pm

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- The first my myself.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -2
    • +2
    ./TreatmentAdjustmentBase.qml
    • -2
    • +2
    ./TreatmentAdjustmentFlow.qml
    • -6
    • +7
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -4
    • +6
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -4
    • +6
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -1
    • +4
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  7. … 25 more files in changeset.
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
    ./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
    • -6
    • +7
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
  2. … 2 more files in changeset.
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
    • -11
    • +0
    ./TreatmentAdjustmentDuration.qml
    • -9
    • +18
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -18
    • +30
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -7
    • +11
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -7
    • +12
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  6. … 37 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
    • -1
    • +14
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
  2. … 21 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
    • -4
    • +5
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
  2. … 6 more files in changeset.
Thursday 28 May 2020
8:42 pm

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- Adjustment Models refactoring.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -4
    • +6
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
  2. … 25 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
    • +7
    ./TreatmentAdjustmentBase.qml
    • -10
    • +23
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -9
    • +7
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -4
    • +3
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -0
    • +1
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  6. … 14 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
    ./TreatmentAdjustmentBase.qml
    • -1
    • +1
    ./TreatmentAdjustmentDuration.qml
    • -1
    • +1
    ./TreatmentAdjustmentFlow.qml
    • -8
    • +18
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -6
    • +4
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -6
    • +4
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  7. … 10 more files in changeset.
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
    • -2
    • +2
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
  2. … 14 more files in changeset.
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
    • -7
    • +7
    ./TreatmentAdjustmentDuration.qml
    • -9
    • +24
    ./TreatmentAdjustmentFlow.qml
  3. … 43 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
    • -4
    • +4
    ./TreatmentAdjustmentDuration.qml
    • -5
    • +5
    ./TreatmentAdjustmentFlow.qml
    • -7
    • +10
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
  4. … 13 more files in changeset.
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
    • -0
    • +111
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -4
    • +13
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
  3. … 21 more files in changeset.
Friday 15 May 2020
12:46 pm

Behrouz NematiPour

DEN-3149 : Treatment Ultrafiltration Adjustment

- Added TreatmentAdjustmentUltrafiltrationEdit.qml

- Updated the z order in ProgressEx

- Added the Ultrafiltration Edit screen navigation

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -0
    • +91
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -2
    • +2
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -2
    • +2
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  4. … 6 more files in changeset.