@@ -30,6 +30,7 @@ class PlanController extends PluginController {
SELECT IFNULL(resource_booking_intervals.`begin`, resource_bookings.`begin`) AS `begin`,
IFNULL(resource_booking_intervals.`end`, resource_bookings.`end`) AS `end`,
resource_bookings.description AS name,
'ResourceBooking' as class,
'0' AS is_ex_termin,
'' AS `dozenten`,
resources.name AS `room`
...
...
@@ -48,6 +49,7 @@ class PlanController extends PluginController {
SELECT IFNULL(resource_booking_intervals.`begin`, resource_bookings.`begin`) AS `begin`,
IFNULL(resource_booking_intervals.`end`, resource_bookings.`end`) AS `end`,
resource_bookings.description AS name,
'ResourceBooking' as class,
'0' AS is_ex_termin,
auth_user_md5.user_id AS `dozenten`,
resources.name AS `room`
...
...
@@ -71,6 +73,7 @@ class PlanController extends PluginController {
termine.`date` AS `begin`,
termine.`end_time` AS `end`,
seminare.name AS name,
'CourseDate' as class,
'0' AS is_ex_termin,
IFNULL (GROUP_CONCAT(termin_related_persons.user_id ORDER BY seminar_user.position ASC SEPARATOR ','), GROUP_CONCAT(seminar_user.user_id ORDER BY seminar_user.position ASC SEPARATOR ',')) AS `dozenten`,
termine.raum AS `room`
...
...
@@ -89,6 +92,7 @@ class PlanController extends PluginController {
ex_termine.`date` AS `begin`,
ex_termine.`end_time` AS `end`,
seminare.name AS name,
'CourseExDate' as class,
'1' AS is_ex_termin,
GROUP_CONCAT(seminar_user.user_id ORDER BY seminar_user.position ASC SEPARATOR ',') AS `dozenten`,
ex_termine.raum AS `room`
...
...
@@ -128,7 +132,10 @@ class PlanController extends PluginController {
)
UNION /* ex_termine */
(
SELECT ex_termine.`date` AS `begin`, ex_termine.`end_time` AS `end`, seminare.name AS name, 'CourseExDate' as class,
SELECT ex_termine.`date` AS `begin`,
ex_termine.`end_time` AS `end`,
seminare.name AS name,
'CourseExDate' as class,
'1' AS is_ex_termin,
GROUP_CONCAT(seminar_user.user_id ORDER BY seminar_user.position ASC SEPARATOR ',') AS `dozenten`,
