sources

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-6612 UI_DVT: Pre-Treatment Ultrafiltration

- This story wasn't part of the current sprint S37 but while I worked on it to be able to push it to master ASAP, so put the story as the commit comment.

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

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

  1. … 3 more files in changeset.
Server coverage issue fixed

- This line was not covered on server although it was covered on local.

Tested locally and it is working.

Build failed on server because the fw common branch master was changed.

- commented out the removed enum from application.

    • -4
    • +4
    ./view/hd/data/VHDTreatmentStatesData.cpp
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-5838: Code Review 0

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

- code refactoring and clean up

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

- Code clean up

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

- 100.000% (4827/4827)

- added a unit test for the AlarmGenerator private method setBits.

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

- 99.979% (4826/4827)

DEN-5836: Code Coverage

- commented as manually tested the AlarmClearedCondition.

    • -1
    • +1
    ./gui/qml/dialogs/NotificationDialog.qml
  1. … 1 more file in changeset.
DEN-5836: Alarm:Code Coverage

- 99.110% (4790/4833)

    • -1
    • +2
    ./model/hd/alarm/MAlarmClearedCondition.h
  1. … 1 more file in changeset.
DEN-5836: Alarm:Code Coverage

- updated the alarm message table

- fixed the -q parameter

    • -59
    • +111
    ./model/hd/alarm/MAlarmStatusData.cpp
  1. … 1 more file in changeset.
DEN-5833: Implementation

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

    • -0
    • +75
    ./AlarmGenerator.cpp
  1. … 1 more file 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.

    • -0
    • +1
    ./gui/qml/components/NotificationBar.qml
    • -0
    • +1
    ./gui/qml/dialogs/NotificationDialog.qml
DEN-5754: Implementation

- cherry picked a fix from DEN-5830_AlarmDesign@51accb for the Treatment End message which has no payload.

- Also made the interpretMessage() for received messages to be more identical to the DEN-5830_AlarmDesign to hopefully help merging easier.

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
    ./gui/qml/pages/treatment/TreatmentBegin.qml
    • -6
    • +2
    ./view/hd/data/VTreatmentUltrafiltration.h
DEN-5833: Implementation

- Added a MACRO for convenience of empty payload messages handling.

DEN-5833: Implementation

- Fixed the bug that alarm ID zero which is the clear the alarm indication wasn't updating the properties, so caused to alarm_ID changed notification signal not to raise and GUI wasn't getting updated.

DEN-5754: Implementation

- Fixed a bug caused by a typo

    • -1
    • +1
    ./gui/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.

    • -1
    • +1
    ./gui/qml/components/NotificationBar.qml
    • -10
    • +14
    ./gui/qml/pages/treatment/TreatmentBegin.qml
    • -2
    • +17
    ./gui/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
    ./gui/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 unused flag of ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT

DEN-5754: Implementation

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

DEN-5833: Implementation

- The message 63 has been tested

  1. … 1 more file in changeset.