application

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-5758: Code Analysis

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.

    • -2
    • +2
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5757: Code Coverage

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

    • -3
    • +17
    /sources/canbus/MessageDispatcher.cpp
    • -42
    • +47
    /sources/canbus/MessageInterpreter.cpp
    • -12
    • +55
    /sources/gui/qml/globals/Colors.qml
    • -8
    • +9
    /sources/gui/qml/globals/Variables.qml
Server coverage issue fixed

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

Tested locally and it is working.

    • -1
    • +3
    /sources/view/hd/alarm/VAlarmStatus.cpp
Build failed on server because the fw common branch master was changed.

- commented out the removed enum from application.

    • -2
    • +2
    /sources/model/hd/alarm/MAlarmStatusData.cpp
Merge branch 'DEN-5830_AlarmDesign'

DEN-5753: Update Design Documents

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

DEN-5754: Implementation

- Removed not used SliderDoubleCreateTreatment.qml component.

DEN-5838: Code Review 0

    • -1
    • +0
    /sources/model/hd/alarm/MAlarmStatusData.cpp
DEN-5754: Implementation

- code refactoring and clean up

    • -0
    • +55
    /sources/gui/qml/components/TitleBarCreateTreatment.qml
    • -0
    • +660
    /sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
    • -0
    • +124
    /sources/gui/qml/pages/pretreatment/create/PreTreatmentPrime.qml
    • -144
    • +0
    /sources/gui/qml/pages/treatment/TreatmentBegin.qml
    • -140
    • +0
    /sources/gui/qml/pages/treatment/TreatmentPrime.qml
    • -11
    • +12
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
DEN-5754: Implementation

- Code clean up

    • -2
    • +1
    /sources/gui/qml/components/GridSelection.qml
    • -0
    • +66
    /sources/gui/qml/components/StepBullet.qml
    • -0
    • +86
    /sources/gui/qml/components/StepIndicator.qml
    • -0
    • +5
    /sources/gui/qml/globals/Variables.qml
    • -10
    • +10
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
DEN-5837: Code Analysis

DEN-5836: Code Coverage

- 100.000% (4827/4827)

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

DEN-5836: Code Coverage

- 99.979% (4826/4827)

    • -40
    • +41
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +2
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5836: Code Coverage

- commented as manually tested the AlarmClearedCondition.

    • -1
    • +2
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +0
    /sources/gui/qml/components/TimeText.qml
    • -0
    • +2
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5836: Alarm:Code Coverage

- 99.110% (4790/4833)

    • -1
    • +1
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5836: Alarm:Code Coverage

- updated the alarm message table

- fixed the -q parameter

    • -59
    • +111
    /sources/model/hd/alarm/MAlarmStatusData.cpp
    • -9
    • +8
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5833: Implementation

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

    • -0
    • +75
    /sources/AlarmGenerator.cpp
    • -0
    • +55
    /sources/AlarmGenerator.h
    • -8
    • +9
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5833: Implementation

- Cleaned up the unit tests

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.

    • -1
    • +1
    /sources/gui/qml/components/MuteButton.qml
    • -1
    • +4
    /sources/gui/qml/components/TouchRect.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.

    • -7
    • +20
    /sources/canbus/MessageInterpreter.cpp
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.

    • -4
    • +6
    /sources/gui/qml/globals/Variables.qml
DEN-5833: Implementation

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

    • -1
    • +9
    /sources/canbus/MessageInterpreter.cpp
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.

    • -6
    • +6
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5754: Implementation

- Fixed a bug caused by a typo

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
    /sources/gui/qml/globals/Variables.qml
    • -10
    • +14
    /sources/gui/qml/pages/treatment/TreatmentBegin.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.