application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
UI-DEN-13965: UI-DEN-13965-3

- Handling the case a new alarm is received, while a confirm is requested, UI should send a cancel to HD and close the dialog and have user to re-issue the confirm if needed.

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-13965: UI/HD Generic User Confirmation [Integration Testing]

- Fixing the issue UI was not able to send the message to the HD.

DEN-13965: UI/HD Generic User Confirmation [Message Mapping]]

- having issue changing the caption by isRejected, disabled for now.

DEN-13965: UI/HD Generic User Confirmation [Message Mapping]]

- Did some fixes for the auto close when rejected or when power-off.

- Some fixes to display and differ from confirm and power-off

    • -2
    • +2
    /sources/gui/qml/components/Footer.qml
    • -8
    • +22
    /sources/gui/qml/dialogs/PowerOff.qml
    • -48
    • +90
    /sources/view/confirm/VConfirm.cpp
DEN-13965: UI/HD Generic User Confirmation [Message Mapping]]

- Fixed the save issue.

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-13965: UI/HD Generic User Confirmation [Message Mapping]]

- Fixed the issue with the kyeValue of different categories overwriting by adding the category as the top level.

- I still have issue in saving for the settings, which writes duplicate.

    • -3
    • +6
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -54
    • +37
    /sources/model/settings/MSettings.cpp
    • -17
    • +36
    /sources/model/settings/MSettings.h
    • -29
    • +25
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-13965: UI/HD Generic User Confirmation [Message Mapping]]

- Code preparation for the implementation.

    • -7
    • +7
    /sources/view/hd/alarm/VAlarmStatus.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +1
    /sources/gui/qml/components/Footer.qml
    • -1
    • +1
    /sources/gui/qml/components/TouchRect.qml
    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
  1. … 14 more files in changeset.
Merge branch 'DEN-13965-UI-BN-S80' into staging

    • -0
    • +14
    /sources/canbus/MessageDispatcher.cpp
    • -1
    • +4
    /sources/canbus/MessageInterpreter.cpp
    • -4
    • +23
    /sources/gui/qml/globals/Variables.qml
    • -0
    • +1
    /sources/view/hd/alarm/VAlarmStatus.cpp
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
    • +1
    /sources/gui/qml/components/ModalDialog.qml
    • -3
    • +1
    /sources/gui/qml/pages/TreatmentFlowBase.qml
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-13939: IMP: Implementation of the the message [0xBB00]

    • -0
    • +14
    /sources/canbus/MessageDispatcher.cpp
    • -1
    • +2
    /sources/canbus/MessageInterpreter.cpp
DEN-13939: IMP: Implementation of the the message [0xBA00]

Messaging:

- Modified the message 0xBB00 required length from 3xU32 to 2xU32

- Renamed the VConfrimDialog to VConfirm, since the view class is not the actual dialog implementation.

- Merged the vPowerOff view to the VConfrim, and removed the VPowerOff view classes.

Alarm Integration:

- AlarmItem: add the hasAlarm to theAlarmMinimize as well to prevent the AlarmBar being visible when there is no active alarm.

- VAlarmStatus: fixed the issue with the hasAlarm property which was causing the AlarmDialog being visible while there was not active alarm.

Confirm Dialog:

- Used the PowerItem.qml and the PowerOff Dialog for Generic Confirm, and improved the code to be repurposed.

- Footer: updated the Footer component to be able to re-layout the touchrects without an open/close cycle.

- TouchRect: exposed the the buttons text.

    • -8
    • +20
    /sources/gui/qml/components/Footer.qml
    • -0
    • +1
    /sources/gui/qml/components/TouchRect.qml
    • -22
    • +47
    /sources/gui/qml/dialogs/PowerOff.qml
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
  1. … 5 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

    • -15
    • +24
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    /sources/bluetooth/BluetoothInterface.cpp
  1. … 81 more files in changeset.
Merge branch 'DEN-13198-UI_BN_75' into staging

    • -18
    • +55
    /sources/ApplicationController.cpp
    • -17
    • +17
    /sources/canbus/MessageDispatcher.cpp
    • -19
    • +13
    /sources/canbus/MessageInterpreter.cpp
    • -57
    • +42
    /sources/device/DeviceController.cpp
  1. … 31 more files in changeset.
DEN-13939: IMP: Implementation of the the message [0xBA00]

- The Model/View are implemented and exposed to QML.

    • -0
    • +2
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +49
    /sources/model/confirm/MDuetConfirmHDi.cpp
    • -0
    • +85
    /sources/model/confirm/MDuetConfirmHDi.h
    • -2
    • +5
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -0
    • +46
    /sources/view/confirm/VConfirmDialog.cpp
    • -0
    • +56
    /sources/view/confirm/VConfirmDialog.h
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
  1. … 86 more files in changeset.
Merge branch 'Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging' into staging

DEN-12640: UI: Pressure readings on blood prime / rinseback

- Added bottom line separators.

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-12640: UI: Pressure readings on blood prime / rinseback

- The In-Line Blood Pressure monitor (ILBPM) has been added to the Rinseback and blood prime screen.

- It has been requested to place the ILBPM, at same place on all three screens (Main Treatment is the third one), but on the rinseback screen we don't have space for that. So it has been moved to top/left (it was buttom/left) and swapped with the FLOWS section.

- It needs to be negotiated with the team to make sure everyone agrees.

    • -4
    • +23
    /sources/gui/qml/globals/Variables.qml
    • -46
    • +36
    /sources/gui/qml/pages/treatment/TreatmentHome.qml
DEN-13726: Change Request: Require user to go through Rinseback setup before enabling START RINSEBACK button

DEN-13845: CRV: Merge issue of DEN-12716-UI_BN_S70 into staging

- Due to some enum changes, UI couldn't build

- An idea implemented to detect the enum changes by compiler. The implementation may be able to improve.

    • -293
    • +305
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-13844: DEN-13774: VITALS numpad appears during rinseback if BP interval is on

- It was only working on the HDOpMode to be in-treatment, but needed to get the HDTreatmentState as well to make sure it is in Dialysis state too.

    • -14
    • +0
    /sources/gui/qml/pages/MainStack.qml
    • -29
    • +29
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
    • -4
    • +7
    /sources/model/hd/alarm/MAlarmMapping.cpp
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
    • +1
    /sources/gui/qml/components/ModalDialog.qml
    • -1
    • +1
    /sources/gui/qml/components/TimeText.qml
    • -4
    • +0
    /sources/gui/qml/components/WaitDone.qml
    • -3
    • +1
    /sources/gui/qml/pages/TreatmentFlowBase.qml
    • -0
    • +4
    /sources/gui/qml/pages/settings/SettingsDG.qml
    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-13756: DEMO Request: Add additional instructions for HD Door Open Alarm resolution

- On the AlarmBar the title should be displayed.

DEN-13736: Disinfection demo

- Some changes has been made to UI to able to navigate to the home while on disinfection.

- CloudSync disabled by default.

    • -298
    • +298
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -3
    • +14
    /sources/view/hd/data/VHDOperationModeData.h
DEN-13743: IMP: Device Registration - CloudSync POST test - Device Serial/Version req/rsp

- Added the disable functionality ( main.h SINGLETON_... macros ) for the Singleton classes, which are basically controllers, to stop their thread event loop, so they literally stop working.

- Connected the disable functionality of the controllers like, CloudSync, Bluetooth (Maybe later Logger), to the POST result.

- Improved the ./run.sh script and same on the ApplicationPOST class.

- Set the minimum of the HD/DG serial length to 1 byte, since it is not exactly at 15 or 20 char length.

- Removed the "CS" from the UI log of sending out the messages to CS, which the source is UI, not the CS and this is confusing.

- Removed the "Settings/DG Cleaning" scheduling section.

- Changed the POST version/serial request from UI to all to be identified in the log from "Versionreq" to "POSTInfReq".

- Added a new UI POST Alarm in AlarmDefs.h, ALARM_ID_UI_POST_FAILURE_CLOUDSYNC = 295, ///< UI POST CloudSync failure

- Fixed a potential bug on SD-Card not ready service logging.

    • -0
    • +5
    /sources/bluetooth/BluetoothInterface.cpp
    • -2
    • +2
    /sources/gui/qml/pages/settings/SettingsDG.qml
    • -2
    • +3
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -1
    • +0
    /sources/model/hd/alarm/MAlarmTriggered.cpp
DEN-13645: IMP: DEN9297: Disinfection implementation [ Disinfection Messages ] [0x9A]

- After my initial code review and looking into other messages, UI should never define a bool in any request message, and it has to be quint32 and an enum Options passing to that.

- Therefore the code has been fixed and cleaned up.