Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-5759: Code Review 0

- Added a TODO for the DoubleSlider component to add a validation and active feature to be able to use it for PreTreatmentCreate.

DEN-5759: prTx: Code Review 0

DEN-5757: Code Coverage

Merge branch 'master' into DEN-5751_Pre-TreatmentUltrafiltration

  1. … 9 more files in changeset.
DEN-5753: Update Design Documents

- Fixed comments in some files of the Pre-Treatment Create.

  1. … 1 more file in changeset.
DEN-5754: Implementation

- Removed not used SliderDoubleCreateTreatment.qml component.

  1. … 1 more file in changeset.
DEN-5754: Implementation

- code refactoring and clean up

    • -0
    • +55
    ./qml/components/TitleBarCreateTreatment.qml
    • -0
    • +55
    ./qml/pages/pretreatment/create/PreTreatmentBase.qml
    • -0
    • +88
    ./qml/pages/pretreatment/create/PreTreatmentConfirm.qml
    • -0
    • +660
    ./qml/pages/pretreatment/create/PreTreatmentCreate.qml
    • -0
    • +124
    ./qml/pages/pretreatment/create/PreTreatmentPrime.qml
    • -144
    • +0
    ./qml/pages/treatment/TreatmentBegin.qml
    • -108
    • +0
    ./qml/pages/treatment/TreatmentConfirm.qml
    • -670
    • +0
    ./qml/pages/treatment/TreatmentCreate.qml
    • -140
    • +0
    ./qml/pages/treatment/TreatmentPrime.qml
    • -11
    • +12
    ./qml/pages/treatment/TreatmentStack.qml
  1. … 2 more files in changeset.
DEN-5754: Implementation

- Code clean up

    • -71
    • +0
    ./qml/components/CircleWithText.qml
    • -0
    • +66
    ./qml/components/StepBullet.qml
    • -0
    • +86
    ./qml/components/StepIndicator.qml
    • -5
    • +5
    ./qml/pages/treatment/TreatmentBegin.qml
    • -10
    • +10
    ./qml/pages/treatment/TreatmentConfirm.qml
    • -8
    • +9
    ./qml/pages/treatment/TreatmentCreate.qml
    • -9
    • +9
    ./qml/pages/treatment/TreatmentPrime.qml
    • -10
    • +10
    ./qml/pages/treatment/TreatmentStack.qml
  1. … 2 more files in changeset.
DEN-5836: Code Coverage

- commented as manually tested the AlarmClearedCondition.

  1. … 5 more files in changeset.
DEN-5836: Alarm:Code Coverage

- 99.110% (4790/4833)

  1. … 5 more files in changeset.
DEN-5833: Implementation

- Added a UI "AlarmGenerator" class to handle the HD_COMM_TIMEOUT and later the BLE Cuff alarm (PRS 395).

  1. … 4 more files in changeset.
DEN-5833: Implementation

- added a touch expanding area for the TouchArea so regardless of its visual size it can have expanded touchable area.

- the touch expanding for the mute button set to 25 so it can have a bigger touch area that its size which is little.

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.

    • -2
    • +2
    ./qml/pages/treatment/TreatmentBegin.qml
  1. … 1 more file in changeset.
DEN-5754: Implementation

- Fixed a bug caused by a typo

    • -1
    • +1
    ./qml/pages/treatment/TreatmentStack.qml
DEN-5754: Implementation

- linked the pre-treatment ultrafiltration adjustment with the in-treatment ultrafiltration section and the adjustment flow.

- added the rejection reason text to the pTx uf adj screen.

    • -10
    • +14
    ./qml/pages/treatment/TreatmentBegin.qml
    • -2
    • +17
    ./qml/pages/treatment/TreatmentStack.qml
DEN-5754: Implementation

- Fixed the message id of the ID_ConfirmTreatmentReq from 58 to 59

- Enabled the priming button for now since there is no FW implementation.

    • -1
    • +2
    ./qml/pages/treatment/TreatmentPrime.qml
DEN-5833: Implementation

- Moved version and sd-card icon to to not to cover others.

DEN-5754: Implementation

- Removed the semi-colon at the end of the imports.

DEN-5833: Implementation

- The message 63 has been tested

  1. … 3 more files in changeset.
DEN-5833: Implementation

- Added the message 63 (req/rsp)

  1. … 12 more files in changeset.
DEN-5833: Implementation

- moved version and SD-Card icon to top which were covering the alarm bar.

- added list icon on the notification bar

- implemented the basics of the alarm list dialog.

- tweaked the Notification default coloring

-

    • -4
    • +28
    ./qml/components/NotificationBar.qml
    • -0
    • +100
    ./qml/dialogs/AlarmListDialog.qml
  1. … 6 more files in changeset.
DEN-5833: Implementation

- Fixed the bug of silence logic which was reverse

- Fixed the bug that length of the silence message payload was incorrectly set to 4 instead of 1.

- changed the name of the MAlarmSilenceReq member variable to silence instead of state which now implies it is silent (1) or not (0).

  1. … 3 more files in changeset.
DEN-5833: Implementation

- made the mute button click optional and currently enabled.

- made minimize on silent on the Notification Dialog optional and is disabled currently.

- made separate slots for each user actions instead of one for all with 4 parameter cause I think it's easier and more convenient to use this way.

- increased the Notification Bar height a little bit more.

  1. … 2 more files in changeset.
DEN-5833: Implementation

- Implementation of the message 64: 'Alarm User Action'

- Cleaned up the VAlarmStatus class.

  1. … 4 more files in changeset.
DEN-5833: Implementation

- Added User Action message response model.

  1. … 5 more files in changeset.
DEN-5833: Implementation

- Fixed a bouncing bug of the message when sent for the first time with silenced flag on to show the alarm not maximized.

    • -1
    • +12
    ./qml/dialogs/NotificationDialog.qml
  1. … 1 more file in changeset.
DEN-5833: Implementation

- Added 3 Alarm buttons

- created Mute Button

- created Up and Down Button (minimize/maximize)

- used FW alarm status flag enum (Alarm_State_Flag_Bit_Positions) instead of the UI version and removed UI one.

Code cleaned up

- modified and cleaned up Notification Dialog and Bar.

- modified Time Text component to be able to show sections with one zero only.

- cleaned up main.qml

    • -0
    • +60
    ./qml/components/MuteButton.qml
    • -37
    • +27
    ./qml/components/NotificationBar.qml
    • -0
    • +37
    ./qml/components/UpDownButton.qml
    • -40
    • +87
    ./qml/dialogs/NotificationDialog.qml
  1. … 12 more files in changeset.
DEN-5754: Implementation

- Added the new MVC for initial UF Volume adjustment messages (79/80).

    • -4
    • +5
    ./qml/pages/treatment/TreatmentBegin.qml
    • -2
    • +2
    ./qml/pages/treatment/TreatmentPrime.qml
  1. … 14 more files in changeset.
DEN-5754: Implementation

- reviewed the pre-treatment screens and modified

- added the double range slider for Arterial and Venous

- modified the treatmentBegin(ultrafiltration)

- so many other tweaks.

    • -1
    • +1
    ./qml/components/ConfirmTreatmentTable.qml
    • -1
    • +1
    ./qml/components/SliderCreateTreatment.qml
    • -60
    • +77
    ./qml/pages/treatment/TreatmentBegin.qml
    • -1
    • +0
    ./qml/pages/treatment/TreatmentConfirm.qml
    • -131
    • +167
    ./qml/pages/treatment/TreatmentCreate.qml
    • -102
    • +78
    ./qml/pages/treatment/TreatmentPrime.qml
    • -1
    • +1
    ./qml/pages/treatment/TreatmentStack.qml
  1. … 5 more files in changeset.
DEN-5744: Code Review 0

- Fixed some typo