adjustments

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-4695: Integration Testing

- Fixed broken names in SquishQt

    • -124
    • +0
    ./TreatmentAdjustmentPressures.qml
    • -0
    • +124
    ./TreatmentAdjustmentPressuresLimits.qml
  1. … 7 more files in changeset.
Removed extra empty lines

    • -1
    • +0
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
  1. … 37 more files in changeset.
DEN-5339: Integration Testing

- Debugging, Refactoring, Testing

    • -3
    • +4
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -3
    • +5
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -1
    • +2
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -0
    • +6
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  1. … 29 more files in changeset.
DEN-5337: Implementation

    • -1
    • +5
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -1
    • +5
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -1
    • +6
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
  1. … 16 more files in changeset.
Bamboo Commit: Updated the Copyright with the current year and replaced tabs with 4 spaces

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

  1. … 102 more files in changeset.
DEN-5139: Implementation [ Screen & navigations ] (2 of 2)

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

  1. … 2 more files in changeset.
DEN-5139: Implementation [ Screen & navigations ] (2 of 2)

    • -202
    • +34
    ./TreatmentAdjustmentPressures.qml
  1. … 6 more files in changeset.
DEN-5032: Implementation [ Screen & navigations ] (1 of 2)

    • -0
    • +290
    ./TreatmentAdjustmentPressures.qml
  1. … 12 more files in changeset.
Bamboo Commit: Updated the Copyright with the current year and replaced tabs with 4 spaces

    • -5
    • +5
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -2
    • +2
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -5
    • +5
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -5
    • +5
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  1. … 250 more files in changeset.
DEN-3884: Code Review 0

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

    • -10
    • +11
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -10
    • +11
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -10
    • +11
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -10
    • +11
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  1. … 67 more files in changeset.
Updated the Copyright with the current year and replaced tabs with 4 spaces

    • -10
    • +11
    ./TreatmentAdjustmentDuration.qml
    • -10
    • +11
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -10
    • +11
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -10
    • +11
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -10
    • +11
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  1. … 192 more files in changeset.
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.