adjustments

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-13962: UI: Update pressure limits to match treatment params and UI screen

- removed the QML duplicate definitions of arterial/venous

- added monitoring values and used them in monitoring components of arterial/venous.

    • -16
    • +16
    ./TreatmentAdjustmentPressuresLimits.qml
  1. … 17 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 27 more files in changeset.
Merge branch 'DEN-13965-UI-BN-S80' into staging

  1. … 12 more files in changeset.
DEN-13939: IMP: Fixed the merge issue

- Not sure why git didn't get the changes on the ModalDialog's Norification changes to NotificationSmall, and caused the issue on the property IconVisible.

  1. … 7 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 95 more files in changeset.
DEN-13743: IMP: Mostly worked on Alarm Dialog/Bar

- Changed the Alarm Dialog (Title decreased by 4, Description increased by 4) / Bar (increased by 6) font size,

- Adjusted the AlarmDialog Timer position and layout.

- Removed the mouseArea from the WaitDone component.

- Added titel/description fontPixedSize for the NotificationDialog and NotificationBar

- Clear the reasontext on home screen when is not visible anymore.

- Clear the reasontext on SettingsDG when is not visible anymore.

- Used NotificationBarSmall instead of NotificationBar in:

- ModalDialog

- MainHome

- TreatmentAdjustmentBase

- TreatmentFlowBase

  1. … 15 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -6
    • +6
    ./TreatmentAdjustmentPressuresLimits.qml
    • -6
    • +6
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -6
    • +6
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -6
    • +6
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -6
    • +6
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  1. … 577 more files in changeset.
DEN-8918: BtC: Implementation [Screens]

  1. … 13 more files in changeset.
DEN-8490: Update the End Treatment Screens with the new Instruction base

- Also added the milliseconds to the logs

    • -1
    • +1
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
  1. … 39 more files in changeset.
DEN-7461: Meetings & Support - Pre-Treatment Integration

- Integration modifications

- UF Modifications request

- Saline Modification request

- Updated the validation mAccepted to be 1=true and 0=false.

- Heparin Stopped stated modification request

    • -1
    • +1
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
  1. … 31 more files in changeset.
DEN-7373: preTx: Implementation [Component][Steps Indicator Improvement] ( ? )

- Improved the TouchRect as part of StepIndicator improvement.

    • -3
    • +2
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -3
    • +1
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -5
    • +1
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -3
    • +1
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  1. … 26 more files in changeset.
6636: ptTx_Rinseback: Implementation

- Added the PostTreatmentRinseback.qml

- Added the PostTreatmentRecirculate.qml

- Improved the StackItem.qml

- Added Rinseback/Recirculate Navigation

- Removed Diagnostics screen since it's not one screen anymore and is too old.

-

    • -1
    • +1
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -1
    • +1
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  1. … 22 more files in changeset.
DEN-6022: The ultrafiltration inconsistency

- Had a conversation with Syseng(Nic) and Fweng(Sean) and decided to have the fix somehow more understandable but there is no actual fix and if that happens it would be the FW bug.

- The modification is that the main progress bar will always has VTreatmentUltratiltration.minimum as minimum (current;y always zero) and VTreatmentUltratiltration.maximum as maximum.

- The UI always expects to get the vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min (adjustable min and slider min) greater than vTreatmentUltrafiltration.ultrafiltration_RefUFVol (current uf volume delivered and current value on the progress bar) and so close to eachother.

- Removed the precision from VTreatmentUltrafiltration and moved into the Variables.

    • -1
    • +1
    ./TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -27
    • +17
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
    • -2
    • +1
    ./TreatmentAdjustmentUltrafiltrationPaused.qml
    • -2
    • +1
    ./TreatmentAdjustmentUltrafiltrationStart.qml
  1. … 4 more files in changeset.
DEN-5744: Code Review 0

- Fixed some typo

    • -5
    • +5
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
DEN-5739: Implementation

- Saline progressBar not moving fixed.

- Ultrafiltration suspected bug has been fixed but commented out since no one complained.

- The Heparin screen created as the skeleton.

    • -0
    • +11
    ./TreatmentAdjustmentUltrafiltrationEdit.qml
  1. … 5 more files in changeset.
DEN-5636: Implementation [PressureRangeSlider improvement]

    • -4
    • +14
    ./TreatmentAdjustmentPressuresLimits.qml
  1. … 4 more files in changeset.
DEN-5034: Implementation [ Messaging ] (2 of 2)

- Added adjustment Request Response in the UI

- Added Logging console out which is more descriptive only for debugging.

- Added multiple different min/max limit/ranges for pressures adjustments.

- Added auto calculate the adjustable low/high limit margin.

- Added a CONSTANT property #define

    • -38
    • +6
    ./TreatmentAdjustmentPressuresLimits.qml
  1. … 11 more files in changeset.
DEN-5033: Implementation [ Messaging ] (1 of 2)

- improving and testing the Arterial/Venous pressure values

- using the doAdjustment of the venousPressureMinimum : vTreatmentAdjustmentPressuresLimits.venousLimitMin

in the QML.

    • -12
    • +0
    ./TreatmentAdjustmentPressuresLimits.qml
  1. … 9 more files in changeset.
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.