application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge DEN-8514_UI_DEV_Alarms_Active_List into DEN-8252_POST

    • -17
    • +48
    /sources/canbus/MessageInterpreter.cpp
    • -151
    • +153
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-8258, DEN-8257, DEN-8256: Updated UI POST tests, DH/DG final result tests, and in progress screen.

    • -0
    • +25
    /scripts/checksums.conf
    • -0
    • +83
    /scripts/files_check.py
    • -0
    • +58
    /sources/gui/qml/pages/post/PostInProgress.qml
    • -2
    • +116
    /sources/view/VUIPostSingleResultData.cpp
    • -2
    • +10
    /sources/view/VUIPostSingleResultData.h
RESOLVED

RESOLVED

From what I can tell the dg command is separated from the hd command which is good. Please let me know when your code is ready to be merged to staging and I will handle it. Also for the next featur...

From what I can tell the dg command is separated from the hd command which is good.
Please let me know when your code is ready to be merged to staging and I will handle it.
Also for the next feature you're working on please branch off of the latest staging.

DEN-8519: Implementations [MVC]

    • -0
    • +4
    /sources/view/hd/alarm/VAlarmActiveList.cpp
Update Alarm Mapping

    • -156
    • +147
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-8519: Implementations [MVC]

- Fixed the list if there are some 0 ids in the list.

    • -5
    • +5
    /sources/gui/qml/dialogs/AlarmListDialog.qml
    • -72
    • +42
    /sources/view/hd/alarm/VAlarmActiveList.cpp
UI-DEN-8514_UI DEV Alarms Active List
UI-DEN-8514_UI DEV Alarms Active List
DEN-8519: Implementations [MVC]

- made each row high a little taller and made it scrollable.

    • -1
    • +4
    /sources/gui/qml/compounds/TouchGrid.qml
    • -19
    • +42
    /sources/gui/qml/dialogs/AlarmListDialog.qml
DEN-8519: Implementations [MVC]

    • -6
    • +6
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +23
    /sources/gui/qml/dialogs/AlarmListDialog.qml
    • -6
    • +9
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -0
    • +136
    /sources/view/hd/alarm/VAlarmActiveList.cpp
    • -0
    • +91
    /sources/view/hd/alarm/VAlarmActiveList.h
I don't have dg_simulator. It would be a merge task later to merge this code into the staging, I think it's out of the code review scope.

I don't have dg_simulator.
It would be a merge task later to merge this code into the staging, I think it's out of the code review scope.

RESOLVED

RESOLVED

RESOLVED

RESOLVED

The dg simulator needs to be used for dg responses here still

The dg simulator needs to be used for dg responses here still

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED