UI-DEN-5830_Alarm Design

Activity

UI-DEN-5830-2 45

Keyboard shortcuts  
  • Summarize the review outcomes (optional)
     
    #permalink

    Details

    Warning: no files are visible, they have all been filtered.
    Participant Role Time Spent Comments Latest Comment
    Author 1h 52m 15 I will work on that later in prTx-UF story and it has onl...
    pmontazemi  (deleted user)
    Reviewer completed
    Reviewer - Complete 16m 5 Our process calls for only 1 UNRESOLVED and 1 RESOLVED re...
    plucia  (deleted user)
    Reviewer completed
    Reviewer - Complete 1h 36m 25 RESOLVED
    Total   3h 44m 45  
    #permalink

    Objectives

    Summary:
    ----- Applicarion -----

    • Updated the old Alarm model structure to used the notify in the Message Interpreter.
    • Updated the Alarm Trigger, Clear, Status to inherit from MAbstract to be able to the above.
    • Added a macro to make the request messages handling easier.
    • 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.
    • 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
    • Added User Action message response model.
    • Implementation of message 64: 'Alarm User Action'
    • Cleaned up the VAlarmStatus class.
    • increased the Notification Bar height a little bit more.
    • Fixed the bug of silence logic which was reverse
    • Fixed the bug that the 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 the state which now implies it is silent (1) or not (0).
    • 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
    • Added the message 63: 'alarm condition cleared, req/rsp'
    • Fixed the bug that alarm ID zero which is clear the alarm indication wasn't updating the properties, so caused to alarm_ID changed the notification signal not to raise and GUI wasn't getting updated.
    • Added a MACRO for convenience of empty payload messages handling.
    • Cleaned up the unit tests
    • Added a UI "AlarmGenerator" class to handle the HD_COMM_TIMEOUT and later the BLE Cuff alarm (PRS 395).
    • updated the alarm message table
    • commented as manually tested the AlarmClearedCondition.
    • added a unit test for the AlarmGenerator private method setBits.


    ----- TestSuit -----

    • Completing the Alarm Status
    • Removing the Alarm Color which has been covered in the AlarmStatus in a bigger area.
    • Code Cleanup
    • Simulator:
      • minor .ui changes
      • Create a single object of the HD_Simulator and setting it in the DynamicLoader parent class of the plugins.
      • The last piece of making the Simulator plugin base.
      • Improvement: separator.
      • Changed the RealTimeWidget parent name to DynamicLoader.
      • Made DynamicLoader abstract class.
      • Added Create Treatment plugin.
      • Added the Alarm plugin
      • modified the plugins to use a unique Loader class name and then define the unique name in the _init_.py file.
      • using the os lib to get the current plugin path and load the unique interface.ui in the RealTmeWidget parent class.
      • Added check CANBus in the simulator.


    ===== detailed by commits =====
    ----- Application -----
    commit: f1e100 - DEN-5833: Implementation

    • Updated the old Alarm model structure to used the notify in the Message Interpreter.
    • Updated the Alarm Trigger, Clear, Status to inherit from MAbstract to be able to the above.
    • Added a macro to make the request messages handling easier.


    commit: 45ce6e - 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.
    • 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


    commit: e1eed3 - DEN-5833: Implementation

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


    commit: eb23f8 - DEN-5833: Implementation

    • Added User Action message response model.


    commit: d619b1 - DEN-5833: Implementation

    • Implementation of the message 64: 'Alarm User Action'
    • Cleaned up the VAlarmStatus class.


    commit: 43cdee - 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's actions instead of one for all with 4 parameters because it's easier and more convenient to use this way.
    • increased the Notification Bar height a little bit more.


    commit: 71784f - DEN-5833: Implementation

    • Fixed the bug of silence logic which was reverse
    • Fixed the bug that the 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 the state which now implies it is silent (1) or not (0).


    commit: f325fa - DEN-5833: Implementation

    • fix a naming bug.


    commit: 1d43ff - 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


    commit: 3e5cdc - DEN-5833: Implementation

    • Added the message 63: 'alarm condition cleared, req/rsp'


    commit: 0e001d - DEN-5833: Implementation

    • The message 63 has been tested


    commit: 5b17a1 - DEN-5833: Implementation

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


    commit: 9aedf - DEN-5833: Implementation

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


    commit: 51accb - DEN-5833: Implementation

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


    commit: cd7694 - DEN-5833: Implementation

    • added a touch expanding area for the TouchArea so regardless of its visual size it can have an expanded touchable area.
    • the touch expanding for the mute button set to 25 so it can have a bigger touch area than its size which is little.


    commit: 0d3114 - DEN-5833: Implementation

    • Cleaned up the unit tests


    commit: 190921 - DEN-5833: Implementation

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


    commit: b42479 - DEN-5836: Code Coverage

    • updated the alarm message table
    • fixed the -q parameter


    commit: 7ffe64 - DEN-5836: Code Coverage

    • 99.110% (4790/4833)


    commit: 741b1c - DEN-5836: Code Coverage

    • commented as manually tested the AlarmClearedCondition.


    commit: 4d3220 - DEN-5836: Code Coverage

    • 99.979% (4826/4827)


    commit: 911882 - DEN-5836: Code Coverage

    • 100.000% (4827/4827)
    • added a unit test for the AlarmGenerator private method setBits.



    ----- TestSuit -----

    commit : 8e2d609 - DEN-5836: Code Coverage

    • 99.979% (4826/4827)


    commit : f29743f - DEN-5835: Integration Testing

    • removed the commented-out part of the test code for Priming.


    commit : bb99af6 - DEN-5835: Integration Testing

    • Completing the Alarm Status
    • Removing the Alarm Color which has been covered in the AlarmStatus in a bigger area.


    commit : ab2ebd8 - DEN-5836: Code Coverage

    • 99.297% (4799/4833)


    commit : ef497ba - DEN-5836: Code Coverage

    • Make the tests work with the application just to be able to start the testing.
    • Currently, the coverage is at 98.634% (4767/4833)


    commit : 6f1082f - DEN-5833: Implementation

    • Added a Condition to test the message 63 Condition cleared
    • Code Cleanup


    commit : d04cee8 - DEN-5833: Implementation

    • minor .ui changes


    commit : f921975 - DEN-5754: Implementation

    • Create a single object of the HD_Simulator and setting it in the DynamicLoader parent class of the plugins.


    commit : cbf0e77 - DEN-5833: Implementation

    • reversed the alarm status flags bits order.


    commit : 15118be - DEN-5754: Implementation

    • The last piece of making the Simulator plugin base.
    • Improvement: separator.


    commit : 9206e36 - DEN-5754: Implementation

    • Changed the RealTimeWidget parent name to DynamicLoader.
    • Made DynamicLoader abstract class.
    • Added Create Treatment plugin.


    commit : 69b2aac - DEN-5833: Implementation

    • Added the Alarm plugin
    • modified the plugins to use a unique Loader class name and then define the unique name int the _init_.py file.
    • using the os lib to get the current plugin path and load the unique interface.ui in the RealTmeWidget parent class.
    • Added check CANBus in the simulator.

    Branches in review

    #permalink

    Issues Raised From Comments

    Key Summary State Assignee
    #permalink

    General Comments

    There are no general comments on this review.
    /resources/images/AlarmBell.png Added
    Open in IDE #permalink
    /resources/images/AlarmBellSilent.png Added
    Open in IDE #permalink
    /resources/images/audio.png Added
    Open in IDE #permalink
    /resources/images/chevron-down.png Added
    Open in IDE #permalink
    /resources/images/chevron-up.png Added
    Open in IDE #permalink
    /resources/images/doted-list.png Added
    Open in IDE #permalink
    /resources/images/list.png Added
    Open in IDE #permalink
    /resources/images/mute.png Added
    Open in IDE #permalink
    /sources/canbus/MessageDispatcher.cpp Changed
    Open in IDE #permalink
    /sources/canbus/MessageDispatcher.h Changed
    Open in IDE #permalink
    /sources/canbus/MessageGlobals.h Changed
    Open in IDE #permalink
    /sources/canbus/MessageInterpreter.cpp Changed 6
    Open in IDE #permalink
    /sources/canbus/MessageInterpreter.h Changed
    /sources/gui/qml/components/ImageLogoD.qml Changed
    /sources/gui/.../components/ModalDialog.qml Changed
    /sources/gui/qml/components/MuteButton.qml Added
    /sources/.../components/NotificationBar.qml Changed
    /sources/gui/qml/components/TimeText.qml Changed
    /sources/gui/qml/components/TouchRect.qml Changed
    /sources/gui/.../components/UpDownButton.qml Added
    Open in IDE #permalink
    /sources/gui/.../dialogs/AlarmListDialog.qml Added 3
    Open in IDE #permalink
    /sources/.../dialogs/NotificationDialog.qml Changed 3
    /sources/gui/qml/globals/Colors.qml Changed
    Open in IDE #permalink
    /sources/gui/qml/globals/Variables.qml Changed
    Open in IDE #permalink
    /sources/gui/qml/main.qml Changed
    Open in IDE #permalink
    /sources/gui/GuiController.cpp Changed
    /sources/gui/GuiGlobals.h Changed
    Open in IDE #permalink
    /sources/.../adjustment/MTreatmentAdjustRequests.h Changed
    Open in IDE #permalink
    /sources/model/hd/alarm/MAlarmCleared.cpp Changed
    /sources/model/hd/alarm/MAlarmCleared.h Changed
    /sources/.../alarm/MAlarmClearedCondition.cpp Added
    /sources/.../alarm/MAlarmClearedCondition.h Added
    /sources/model/.../alarm/MAlarmStatusData.cpp Changed 3
    /sources/model/hd/alarm/MAlarmStatusData.h Changed
    /sources/model/.../alarm/MAlarmTriggered.cpp Changed
    /sources/model/hd/alarm/MAlarmTriggered.h Changed
    /sources/model/MModel.h Changed 3
    Open in IDE #permalink
    /sources/view/hd/alarm/VAlarmStatus.cpp Changed 3
    /sources/view/hd/alarm/VAlarmStatus.h Changed
    /sources/AlarmGenerator.cpp Added
    /sources/AlarmGenerator.h Added
    /unittests/tst_canbus.cpp Changed
    /unittests/tst_canbus.h Changed
    /unittests/tst_messaging.cpp Changed
    /unittests/tst_messaging.h Changed 3
    /unittests/tst_models.cpp Changed
    /cppcheck.err Changed
    /cppcheck.log Changed
    /cr_objectives.sh Added 3
    /denali.pro Changed
    Open in IDE #permalink
    /denali.pro.user Changed
    Open in IDE #permalink
    /denali.qrc Changed
    Open in IDE #permalink
    /en_US.udic Changed
    /shared/scripts/names.py Changed 3
    /simulator/plugins/alarms/interface.ui Added
    /simulator/plugins/alarms/loader.py Added
    /simulator/.../createtreatment/interface.ui Added
    /simulator/.../createtreatment/loader.py Added
    /simulator/plugins/heparin/interface.ui Changed
    /simulator/plugins/heparin/loader.py Changed
    /simulator/.../inlinebloodpressures/interface.ui Changed
    /simulator/.../inlinebloodpressures/loader.py Changed
    /simulator/.../salinebolus/interface.ui Changed
    /simulator/plugins/salinebolus/loader.py Changed
    /simulator/.../treatmentranges/interface.ui Changed
    /simulator/.../treatmentranges/loader.py Changed
    /simulator/.../treatmentstates/interface.ui Changed
    /simulator/.../treatmentstates/loader.py Changed
    /simulator/.../ultrafiltration/interface.ui Changed
    /simulator/.../ultrafiltration/loader.py Changed
    /simulator/plugins/__init__.py Changed
    Open in IDE #permalink
    /simulator/simulator/dynamicloader.py Added
    /simulator/simulator/interface.ui Added
    Open in IDE #permalink
    /simulator/simulator/loader.py Added
    /simulator/simulator/runtimewidget.py Added
    Open in IDE #permalink
    /simulator/run.py Changed
    /simulator/runtimewidget.py Deleted
    Open in IDE #permalink
    /simulator/simulator.ui Deleted
    Open in IDE #permalink
    /tst_AlarmStatusData/verificationPoints/VP1 Deleted 3
    Open in IDE #permalink
    /tst_AlarmStatusData/test.py Changed 3
    /tst_Alarm_Colors/config.xml Deleted
    Open in IDE #permalink
    /tst_Alarm_Colors/test.py Deleted
    Open in IDE #permalink
    /tst_ConfirmPrimingBegin/test.py Changed 6
    /tst_CreateTreatment/test.py Changed 3
    /tst_HDOperationModeData/test.py Changed
    /tst_Treatment_Adjustment_Heparin/test.py Changed
    Open in IDE #permalink
    /tst_Treatment_Adjustment_Ultrafiltration/test.py Changed
    Open in IDE #permalink
    /suite.conf Changed

    Review updated: Reload | Ignore | Collapse

    You cannot reload the review while writing a comment.

    Log time