TreatmentStack.qml

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-3884: Code Review 0

  1. … 21 more files in changeset.
DEN-4443: Integration Testing

- Demo feedback was ok with disabling the Treatment Time as well so I add that too.

  1. … 1 more file in changeset.
DEN-4441: Implementation

- Implemented the SRSUI 256: Restrictions - Max Delivered

  1. … 6 more files in changeset.
DEN-4441: Implementation/Ultrafiltration

- Also did the :

- DEN-4442: Unit Testing

- DEN-4443: Integration Testing

- DEN-4444: Code Coverage

  1. … 30 more files in changeset.
DEN-4441: Implementation

- added functionalities.

- Qml

- Views

- ...

  1. … 24 more files in changeset.
Merge with Logging2of3

  1. … 24 more files in changeset.
Added handling of treatment parameter FW response

  1. … 11 more files in changeset.
Squashed commit of the following:

commit 5331f4838ac4d591fd26120f471f89c226863734

Author: Peter Lucia <plucia@diality.com>

Date: Thu Jul 30 12:52:48 2020 -0700

Began adding qml slots for when validation fails

commit 63c55a131a04f17a9306ff25988e686b1edbbc2a

Author: Peter Lucia <plucia@diality.com>

Date: Thu Jul 30 12:22:58 2020 -0700

Parsing FW validation response

commit b17f0bfe38526a16e02e7e5bcf295939e24fd659

Author: Peter Lucia <plucia@diality.com>

Date: Thu Jul 30 10:05:05 2020 -0700

Handling create treatment response message

commit a57d0fe761842df3e29136d78194b1d5b3ba18af

Author: Peter Lucia <plucia@diality.com>

Date: Wed Jul 29 13:22:44 2020 -0700

Fixed resetting of treatment parameters.

commit aab29013cf0691a7f61e4f531400f4943c6d3bf8

Author: Peter Lucia <plucia@diality.com>

Date: Wed Jul 29 11:24:10 2020 -0700

Improved UI side parameter selection validation.

commit edb0f66f1bc9c954ff1f51f375b0bdfd8b125859

Author: Peter Lucia <plucia@diality.com>

Date: Tue Jul 28 15:44:11 2020 -0700

Improved default parameter inactive / active colors

commit f2677a919a885333c8e34f8340593fbabc56f823

Author: Peter Lucia <plucia@diality.com>

Date: Tue Jul 28 15:11:38 2020 -0700

Ensuring treatment parameters indicate when they are adjusted or unset.

commit 5e83584957eab076c2ebe7d546362a461bbfbaa8

Author: Peter Lucia <plucia@diality.com>

Date: Tue Jul 28 09:55:23 2020 -0700

Added arterial and venous pressure limits

commit a1b67a61af501334847c8514360cf82348e2c65c

Author: Peter Lucia <plucia@diality.com>

Date: Mon Jul 27 17:56:55 2020 -0700

Using VCreateTreatment cpp / h class to determine new treatment ranges

commit 738cb12bc9b4400ab815b17c43228ad5e532db33

Author: Peter Lucia <plucia@diality.com>

Date: Mon Jul 27 15:43:56 2020 -0700

Loading create treatment ranges from the file system

Added macro to convert variable name to string

Added debug | release #define

commit fbc9f08ea3163b617bda7f393bf3285b8b4e8d41

Author: Peter Lucia <plucia@diality.com>

Date: Wed Jul 22 16:54:55 2020 -0700

Cleanup old comments

commit edf1640d8e797ac1820d09d1de2ef78ed4713746

Author: Peter Lucia <plucia@diality.com>

Date: Wed Jul 22 16:35:32 2020 -0700

Moved save new treatment out of application controller

commit 191a70deefd31a614508a22a586dbd244ab67eed

Author: Peter Lucia <plucia@diality.com>

Date: Fri Jul 17 17:53:09 2020 -0700

In progress update for create treatment

commit f03e0bc116bafb36ac119d4c2d07bd57e20a5c33

Author: Peter Lucia <plucia@diality.com>

Date: Fri Jul 17 16:19:45 2020 -0700

In progress update for create treatment

commit 387a0099948bff42f2e49557f8136610c3443938

Author: Peter Lucia <plucia@diality.com>

Date: Fri Jul 17 14:53:08 2020 -0700

Saving newly created treatment to the log file

commit 28920a32fc6f8fe437c69364d3c8f059f16f7cc7

Author: Peter Lucia <plucia@diality.com>

Date: Fri Jul 17 14:49:15 2020 -0700

In progress update - application controller will save a newly created treatment to disk

commit 137d8d36144a143c7205b9c4620a88cc340670f4

Author: Peter Lucia <plucia@diality.com>

Date: Fri Jul 17 14:05:07 2020 -0700

In progress update of create treatment

commit f9131f48b9bd8580a93ca959540ce4ac97f228c3

Author: Peter Lucia <plucia@diality.com>

Date: Fri Jul 17 11:59:13 2020 -0700

In progress update for create treatment

commit 4b498f8f90ff7b2c8a057a3ef509bd86e1ea681c

Author: Peter Lucia <plucia@diality.com>

Date: Thu Jul 16 17:17:08 2020 -0700

Added cpp backend logic, top bar refinements.

  1. … 45 more files in changeset.
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.

  1. … 71 more files in changeset.
SRSUI 669: Current Duration

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Merge master into Create Treatment branch

  1. … 5 more files in changeset.
Updated the Copyright with the current year and replaced tabs with 4 spaces

  1. … 198 more files in changeset.
Updated Create Treatment page

  1. … 5 more files in changeset.
DEN-3155 : Unit Testing

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 15 more files in changeset.
DEN-3149 : Treatment Ultrafiltration Adjustment

- The third Code Review by myself

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 23 more files in changeset.
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

  1. … 41 more files in changeset.
DEN-3154 : Implementation [ Messaging ]

- Added the Ultrafiltration Adjustment Confirm Request

- Improved the MVC and some twicks in qml.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 21 more files in changeset.
DEN-3149 : Treatment Ultrafiltration Adjustment

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

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 6 more files in changeset.
DEN-3149 : Treatment Ultrafiltration Adjustment

- Adjustment Models refactoring.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 25 more files in changeset.
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

  1. … 18 more files in changeset.
DEN-3149 : Treatment Ultrafiltration Adjustment

- BackUp push:

- Message 19 : UF Vol. Change Response

- Incomplete.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 14 more files in changeset.
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

  1. … 44 more files in changeset.
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

  1. … 22 more files in changeset.
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

  1. … 8 more files in changeset.
DEN-3149 : Treatment Ultrafiltration Adjustment

- Added Ultrafiltration Paused Screen

- Added Ultrafiltration navigation/signalling

- Added pause icon for the notification bar on Ultrafiltration paused.

- Added resume icon for the Ultrafiltration resume button.

- Modified the ModalDialog Notification text to take effect of the text change all the time (binding/assignment)

- Added Icon feature for the notification bar

- Exposed the click signals of the other ProgressBars of the ProgressBarEx/ProgressBar so it can be overwritten.( used in the Ultrafiltration section when touching that area it needs to act like a one object to navigate to Ultrafiltration adjustment start screen)

- Changed the Treatment Duration Adjustment current Remaining time to current Elapsed Time.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 15 more files in changeset.
DEN-3149 : Treatment Ultrafiltration Adjustment

- Added micro version to the application version

- Enhanced Back Button to have the back icon

- Enhanced TreatmentAdjustmentBase to have Back Button.

- Added TreatmentAsjustmtneUltrafiltrationStart dialog as the first entry screen of the Treatment Adjustment.

- Commented out the TreatmentFluid (SalineBolus, Heparin) test simulation animation.

- Modified TreatmentUltrafiltration section ranges and values. [FIXME]

- Changed the backPressed of the Back Button to backClicked to be consistent and updated related usages.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 14 more files in changeset.
DEN-3024 : Treatment Duration Adjustment

- TreatmentAdjustmentDuration Screen ( Incomplete )

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 11 more files in changeset.
DEN-2087 : UI Blood/Dialysate Flow Rate Adjustment

- Added Message handling for Treatment Ranges since the Blood/Dialysate requires that message to be handled and acked by UI Application.

- VTreatmentRanges and MTreatmentRanges added

- Fixed the message 23 for Treatment Adjustment Request which used U32 not F32.

- Prepared some screen to be able to adjust ranges.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 21 more files in changeset.
DEN-2087 : UI Blood/Dialysate Flow Rate Adjustment

- Added Denali Message 23 : Blood/dialysate rate Change

23, 0x100, 9, Req, Y, UI, HD, Blood/dialysate rate Change, (U32) Blood rate, (U32) Dialysate rate

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 12 more files in changeset.
DEN-2087_BloodDialysateFlowAdjustment

- Added TreatmentAdjustmentBase as the base screen for all the Treatment Adjustment screens.

- Removing unnecessary imports

- Added TickMarks component for Slider (ranges).

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 41 more files in changeset.