- The first my myself.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

· /Todos	(-4, +0)	| History	| Source	| Diff
· /denali.pro	(-2, +3)	| History	| Source	| Diff
· /denali.pro.user	(-2, +15)	| History	| Source	| Diff
· /sources/applicationcontroller.h	(-10, +12)	| History	| Source	| Diff
· /sources/gui/guiglobals.h	(-4, +0)	| History	| Source	| Diff
· /sources/gui/qml/components/TouchRect.qml	(-1, +1)	| History	| Source	| Diff
· /sources/gui/qml/main.qml	(-1, +0)	| History	| Source	| Diff
· /sources/gui/qml/pages/treatment/TreatmentStart.qml	(-0, +1)	| History	| Source	| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml	(-2, +2)	| History	| Source	| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml	(-2, +2)	| History	| Source	| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml	(-6, +7)	| History	| Source	| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml	(-4, +6)	| History	| Source	| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml	(-4, +6)	| History	| Source	| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml	(-1, +4)	| History	| Source	| Diff
· /sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml	(-18, +0)	| History	| Source	| Diff
… 16 more files in changeset.

]]> Thu, 28 May 2020 20:42:42 -0700 Behrouz NematiPour https://devapps.diality.us/changelog/application?cs=03de7d132838c54a23862809357c42102b6dab99 https://devapps.diality.us/changelog/application?cs=03de7d132838c54a23862809357c42102b6dab99 Behrouz NematiPour committed 03de7d1 on branch master, 2020_EOY_DEMO and 261 more in application DEN-3149 : Treatment Ultrafiltration Adjustment

- Adjustment Models refactoring.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

· /denali.pro	(-2, +2)	| History	| Source	| Diff
· /denali.pro.user	(-1, +1)	| History	| Source	| Diff
· /sources/applicationcontroller.cpp	(-20, +26)	| History	| Source	| Diff
· /sources/applicationcontroller.h	(-5, +4)	| History	| Source	| Diff
· /sources/canbus/messageglobals.h	(-0, +1)	| History	| Source	| Diff
· /sources/canbus/messageinterpreter.cpp	(-3, +7)	| History	| Source	| Diff
· /sources/gui/guicontroller.h	(-23, +9)	| History	| Source	| Diff
· /sources/gui/guiglobals.h	(-4, +0)	| History	| Source	| Diff
· /sources/gui/qml/components/UltrafiltrationButton.qml	(-1, +5)	| History	| Source	| Diff
· /sources/gui/qml/pages/treatment/TreatmentStack.qml	(-1, +3)	| History	| Source	| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml	(-4, +6)	| History	| Source	| Diff
· /sources/model/mmodel.h	(-63, +103)	| History	| Source	| Diff
· /sources/model/mtreatmentadjustultrafiltrationresponse.cpp	(-2, +8)	| History	| Source	| Diff
· /sources/model/mtreatmentadjustultrafiltrationresponse.h	(-0, +2)	| History	| Source	| Diff
· /sources/model/mtreatmentadjustultrafiltrationstateresponse.cpp	(-0, +38)	| History	| Source
… 11 more files in changeset.

]]> Thu, 21 May 2020 16:25:03 -0700 Behrouz NematiPour https://devapps.diality.us/changelog/application?cs=a159e12630645a9a35fb0a5585cc7b639cfe6aa6 https://devapps.diality.us/changelog/application?cs=a159e12630645a9a35fb0a5585cc7b639cfe6aa6 Behrouz NematiPour committed a159e12 on branch master, 2020_EOY_DEMO and 261 more in application 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

· /denali.pro	(-0, +8)	| History	| Source	| Diff
· /denali.pro.user	(-1, +1)	| History	| Source	| Diff
· /sources/applicationcontroller.cpp	(-8, +18)	| History	| Source	| Diff
· /sources/applicationcontroller.h	(-4, +6)	| History	| Source	| Diff
· /sources/canbus/messagedispatcher.cpp	(-2, +2)	| History	| Source	| Diff
· /sources/canbus/messagedispatcher.h	(-0, +1)	| History	| Source	| Diff
· /sources/canbus/messageglobals.h	(-0, +3)	| History	| Source	| Diff
· /sources/canbus/messageinterpreter.cpp	(-1, +36)	| History	| Source	| Diff
· /sources/canbus/messageinterpreter.h	(-0, +3)	| History	| Source	| Diff
· /sources/gui/guicontroller.cpp	(-10, +0)	| History	| Source	| Diff
· /sources/gui/guicontroller.h	(-4, +13)	| History	| Source	| Diff
· /sources/gui/guiglobals.cpp	(-0, +2)	| History	| Source	| Diff
· /sources/gui/guiglobals.h	(-1, +12)	| History	| Source	| Diff
· /sources/gui/guiview.cpp	(-8, +0)	| History	| Source	| Diff
· /sources/gui/guiview.h	(-13, +0)	| History	| Source	| Diff
… 30 more files in changeset.

]]> Tue, 19 May 2020 14:09:09 -0700 Behrouz NematiPour https://devapps.diality.us/changelog/application?cs=016578b44e879b89bd42dda7763ed50e67d7e64c https://devapps.diality.us/changelog/application?cs=016578b44e879b89bd42dda7763ed50e67d7e64c Behrouz NematiPour committed 016578b on branch master, 2020_EOY_DEMO and 261 more in application 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

· /denali.pro	(-0, +4)	| History	| Source	| Diff
· /denali.pro.user	(-1, +1)	| History	| Source	| Diff
· /sources/gui/guiglobals.cpp	(-1, +12)	| History	| Source	| Diff
· /sources/gui/qml/main.qml	(-27, +34)	| History	| Source	| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml	(-4, +4)	| History	| Source	| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml	(-5, +5)	| History	| Source	| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml	(-7, +10)	| History	| Source	| Diff
· /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml	(-2, +2)	| History	| Source	| Diff
· /sources/main.h	(-0, +2)	| History	| Source	| Diff
· /sources/view/vtreatmentadjustmentduration.cpp	(-0, +31)	| History	| Source
· /sources/view/vtreatmentadjustmentduration.h	(-0, +44)	| History	| Source
· /sources/view/vtreatmentadjustmentflows.cpp	(-0, +32)	| History	| Source
· /sources/view/vtreatmentadjustmentflows.h	(-0, +44)	| History	| Source
· /sources/view/vtreatmentadjustmentsresponse.cpp	(-27, +6)	| History	| Source	| Diff
· /sources/view/vtreatmentadjustmentsresponse.h	(-18, +1)	| History	| Source	| Diff
· /sources/view/vview.h	(-16, +17)	| History	| Source	| Diff

]]>