Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
68 lines
3.2 KiB
SQL
68 lines
3.2 KiB
SQL
-- # $Id$
|
|
-- # $HeadURL$
|
|
-- # $Author$
|
|
|
|
INSERT INTO exm.exercise (id, name, exercise_state_id, training_area_id, active_phase_id, begin_time, end_time, created) -- as there is no radio group in ex 35, we have to skip the column here
|
|
VALUES(35,
|
|
'Test Exercise 35', -- name
|
|
5, -- STOPPED, then transferred = true, otherwise OC Tablet does not start properly
|
|
6, -- TrainingArea 6: Bremen
|
|
-- no radio group
|
|
1, -- active phase
|
|
extract(epoch from (now() at time zone 'utc')::timestamp(0)) * 1000, -- today in miliseconds
|
|
extract(epoch from (now() at time zone 'utc')::timestamp(0) + interval '30 days' ) * 1000, -- today + 30 days in miliseconds
|
|
extract(epoch from (now() at time zone 'utc')::timestamp(0)) * 1000 -- today in miliseconds
|
|
);
|
|
|
|
INSERT INTO exm.exercise (id, name, exercise_state_id, training_area_id, radio_group_id, active_phase_id, begin_time, end_time, created, start_time)
|
|
VALUES(42,
|
|
'Test Exercise 42', -- name
|
|
2, -- STARTED
|
|
6, -- TrainingArea 6: Bremen
|
|
2, -- radio group 2
|
|
2, -- active phase
|
|
extract(epoch from (now() at time zone 'utc')::timestamp(0)) * 1000, -- today in miliseconds
|
|
extract(epoch from (now() at time zone 'utc')::timestamp(0) + interval '30 days' ) * 1000, -- today + 30 days in miliseconds
|
|
extract(epoch from (now() at time zone 'utc')::timestamp(0)) * 1000, -- today in miliseconds
|
|
extract(epoch from (now() at time zone 'utc')::timestamp(0)) * 1000 -- today in miliseconds
|
|
);
|
|
|
|
INSERT INTO exm.exercise_phase (id, name, description, begin_time, end_time, exercise_id)
|
|
VALUES(1,
|
|
'Test phase 1 (exercise 35)', -- name
|
|
'Test phase for exercise 35', -- description
|
|
extract(epoch from (now() at time zone 'utc')::timestamp(0)) * 1000, -- today in miliseconds
|
|
extract(epoch from (now() at time zone 'utc')::timestamp(0) + interval '30 days' ) * 1000, -- today + 30 days in miliseconds
|
|
35 -- Exercise 35
|
|
);
|
|
|
|
INSERT INTO exm.exercise_phase (id, name, description, begin_time, end_time, exercise_id)
|
|
VALUES(2,
|
|
'Test phase 1 (exercise 42)', -- name
|
|
'Test phase for exercise 42', -- description
|
|
extract(epoch from (now() at time zone 'utc')::timestamp(0)) * 1000, -- today in miliseconds
|
|
extract(epoch from (now() at time zone 'utc')::timestamp(0) + interval '30 days' ) * 1000, -- today + 30 days in miliseconds
|
|
42 -- Exercise 42
|
|
);
|
|
|
|
|
|
-- get hexdump of exercise imgae: 'cat 42.png | xxd -p'
|
|
INSERT INTO exm.exercise_image (exercise_id, image)
|
|
VALUES(42,
|
|
decode('
|
|
89504e470d0a1a0a0000000d49484452000000090000000608020000009e
|
|
a52392000000097048597300000b1300000b1301009a9c18000000384944
|
|
415408d76dcbbb0d003008434147f21a78ffb93c490a04ca87d7b8e05811
|
|
611b8024db92501177e9923207533ce1e3f8f3d6c3ad5f37f47a102104d2
|
|
89500000000049454e44ae426082
|
|
', 'hex')
|
|
);
|
|
|
|
|
|
ALTER SEQUENCE exm.exercise_id_seq RESTART WITH 101;
|
|
ALTER SEQUENCE exm.exercise_phase_id_seq RESTART WITH 3;
|
|
|
|
UPDATE exm.exercise SET send_to_wms = true;
|
|
|
|
UPDATE exm.exercise SET transferred = true WHERE id = 35;
|