adjustments

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

    • -10
    • +6
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -5
    • +5
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -4
    • +2
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -4
    • +2
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  1. … 58 more files in changeset.
Updates to support unit testing

  1. … 10 more files in changeset.
Merged master into UI Alarms.

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

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -1
    • +1
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
  1. … 2 more files in changeset.
DEN-3155 : Unit Testing

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -4
    • +6
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -1
    • +2
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -0
    • +1
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -0
    • +2
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  1. … 9 more files in changeset.
DEN-3158 : Code Review 0

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

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

    • -2
    • +2
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
  1. … 1 more file 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

- The first my myself.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -6
    • +7
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -4
    • +6
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -4
    • +6
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -1
    • +4
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  1. … 25 more files in changeset.
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

    • -1
    • +3
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
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

    • -6
    • +7
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
  1. … 2 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

    • -9
    • +18
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -18
    • +30
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -7
    • +11
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -7
    • +12
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  1. … 37 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
    • +14
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
  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

    • -4
    • +5
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
  1. … 6 more files in changeset.
DEN-3149 : Treatment Ultrafiltration Adjustment

- Adjustment Models refactoring.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -4
    • +6
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
  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

    • -10
    • +23
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -9
    • +7
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -4
    • +3
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -0
    • +1
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  1. … 14 more files in changeset.
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

    • -8
    • +18
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -6
    • +4
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -6
    • +4
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  1. … 10 more files in changeset.
DEN-3149 : Treatment Ultrafiltration Adjustment

- BackUp push:

- Message 19 : UF Vol. Change Response

- Incomplete.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -2
    • +2
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
  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. … 43 more files in changeset.
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

    • -7
    • +10
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
  1. … 13 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

    • -0
    • +111
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -4
    • +13
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
  1. … 21 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

    • -0
    • +91
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -2
    • +2
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -2
    • +2
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  1. … 6 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

    • -0
    • +113
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -0
    • +4
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  1. … 13 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

    • -0
    • +98
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  1. … 13 more files in changeset.
DEN-3024 : TreatmentDurationAdjustment

- Registered TreatmentState as an unhandled message.

- Modified duration resolution regarding the PRS346 to 15

- Added stepSnap (snap to step marks) to Slider/TickMarks to support the slider values of the Treatment Duration.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 5 more files in changeset.
DEN-3024_TreatmentDurationAdjustment

- Adding comment for command line arguments

- Updating Slider handler position in real-time when minimum/maximum changes

- Added another type of properties as a trigger to always trig the UI even the value is the same as before. And also removed the false/true of the end of each PROPERTY #define from all the view classes and updated the GUI's QML codes accordingly.

- Removed the Heparin cumulative Delivery.

-

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 18 more files in changeset.
The first implementation of Treatment Duration Adjustment

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -28
    • +23
    ./TreatmentAdjustmentDuration.qml
  1. … 23 more files in changeset.
DEN-3024 : Treatment Duration Adjustment

- TreatmentAdjustmentDuration Screen ( Incomplete )

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -0
    • +87
    ./TreatmentAdjustmentDuration.qml
  1. … 9 more files in changeset.
DEN-2087 : UI Blood/Dialysate Flow Rate Adjustment

- Fixed the Blood/Dialysate Adjustment bug on Adjustment dialog

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

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

- Added first implementation of the NotificationBar.

- Added Blood/Dialysate Adjustment Request Denali Message

- Removed Alerts from settings home since it has been added in NotificationBar.

- VTreatmentAdjustmentsResponse view class

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 25 more files in changeset.