application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-13966: Improvement: Export individual log files

DEN-14044: IMP:

- Adding the type GuiStringIndexMap=QMap<quint32, QString> to the signal/slot system.

    • -12
    • +12
    /sources/ApplicationController.cpp
DEN-13966: Improvement: Export individual log files

DEN-14044 - implemented the UI part and the C++ backend list property.

    • -0
    • +1
    /sources/gui/qml/components/ProgressBar.qml
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-13965-UI-BN-S81' into develop

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
Bamboo Commit: Updated MAlarmMapping.cpp

    • -5
    • +5
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-13965-UI-BN-S81' into develop

DEN-13965: UI/HD Generic User Confirmation [Integration Testing]

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

Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-13965-UI-BN-S81' into develop

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

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

Merge branch 'DEN-13965-UI-BN-S81' into develop

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
UI-DEN-13965_UI BN S81
UI-DEN-13965_UI BN S81
DEN-13965: UI/HD Generic User Confirmation [Message Mapping]]

- Fixed the save issue.

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -19
    • +19
    /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
Merge branch 'DEN-13965-UI-BN-S80' into develop

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
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-13965-UI-BN-S80' into develop

    • -0
    • +14
    /sources/canbus/MessageDispatcher.cpp
    • -1
    • +4
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +1
    /sources/view/hd/alarm/VAlarmStatus.cpp