Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-3628 : EMC Test Support

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 13 more files in changeset.
Added create custom treatment foundation

    • -8
    • +85
    ./pages/treatment/TreatmentCreate.qml
Alarm UI improvements

    • -51
    • +65
    ./components/NotificationBar.qml
  1. … 1 more file in changeset.
Moved request silence connection to initConnections() When pressing OK, the alarm bar will flash instead of the alarm window.

  1. … 2 more files in changeset.
Displaying indication of when alarm silence function is deactivated.

Added indication when alarm silence function is active.

  1. … 3 more files in changeset.
Moved settings item height and width to global variables.

Removed callback function -> Using signals instead.

  1. … 1 more file in changeset.
Raising alarm when HD communication times out Added Settings base page with Sound and Diagnostic pages. Alarm design updates

    • -0
    • +72
    ./components/SettingsItem.qml
    • -0
    • +114
    ./dialogs/Alarm.qml
    • -113
    • +0
    ./dialogs/NotificationDialog.qml
    • -0
    • +175
    ./pages/Diagnostics.qml
  1. … 14 more files 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

DEN-3149 : Treatment Ultrafiltration Adjustment

- The third Code Review by myself

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -26
    • +26
    ./pages/treatment/TreatmentStack.qml
  1. … 20 more files in changeset.
DEN-3149 : Treatment Ultrafiltration Adjustment

- The first my myself.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

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

- Fixed a typo

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -1
    • +1
    ./components/UltrafiltrationButton.qml
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

Continuation of alarms.

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

  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

    • -5
    • +2
    ./components/UltrafiltrationButton.qml
    • -23
    • +40
    ./pages/treatment/TreatmentStack.qml
  1. … 27 more files in changeset.
Added Notification Dialog

    • -0
    • +111
    ./dialogs/NotificationDialog.qml
Cleaned up main.qml

Added Notification Dialog for Alarms and support for alarm dismiss actions by the user.

  1. … 5 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

    • -2
    • +4
    ./components/UltrafiltrationButton.qml
  1. … 15 more files in changeset.
Merge branch 'DEN-2795_UIHeparinBolus(UITreatmentScreenAssets)'

DEN-3528 : The Ultrafiltration Unit shall be changed to Liter(L) form (mL)

- The Ultrafiltration Unit on the In-Treatment Screen has been changed to Liter (L)

- The simulation of the fluid has been removed.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

DEN-3149 : Treatment Ultrafiltration Adjustment

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

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

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

- Adjustment Models refactoring.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -1
    • +5
    ./components/UltrafiltrationButton.qml
  1. … 23 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

    • -3
    • +32
    ./components/UltrafiltrationButton.qml
    • -4
    • +18
    ./pages/treatment/TreatmentStack.qml
  1. … 7 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

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

- BackUp push:

- Message 19 : UF Vol. Change Response

- Incomplete.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -2
    • +18
    ./pages/treatment/TreatmentStack.qml
  1. … 13 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

    • -13
    • +31
    ./pages/treatment/TreatmentStack.qml
    • -5
    • +18
    ./pages/treatment/TreatmentStart.qml
  1. … 31 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

  1. … 11 more files in changeset.