Skip to content
Snippets Groups Projects
Commit ee94cf37 authored by Moritz Strohm's avatar Moritz Strohm
Browse files

fixed display of course dates with a free room name

parent 55f5d076
No related branches found
No related tags found
No related merge requests found
......@@ -442,7 +442,7 @@ class CourseDateAndRoomBookingExporter extends Exporter
) AS today";
}
if ($with_room_name) {
$fields_sql[] = "r.`name` AS room_name";
$fields_sql[] = "IF (r.`name` IS NOT NULL AND r.`name` <> '', r.`name`, `termine`.`raum`) AS room_name";
}
if ($with_booking_description) {
if (version_compare($GLOBALS['SOFTWARE_VERSION'], '4.5', '<')) {
......@@ -455,19 +455,29 @@ class CourseDateAndRoomBookingExporter extends Exporter
$course_dates_stmt_sql .= "FROM `termine` ";
if ($with_room_name || $with_booking_description) {
if ($this->building_ids) {
$course_dates_stmt_sql .= "INNER ";
$course_dates_stmt_sql .= "INNER JOIN ";
} else {
$course_dates_stmt_sql .= "LEFT ";
$course_dates_stmt_sql .= "LEFT JOIN ";
}
if (version_compare($GLOBALS['SOFTWARE_VERSION'], '4.5', '<')) {
$course_dates_stmt_sql .= "JOIN `resources_assign` rb
ON `termine`.`termin_id` = rb.`assign_user_id`
INNER JOIN `resources_objects` r
$course_dates_stmt_sql .= "`resources_assign` rb
ON `termine`.`termin_id` = rb.`assign_user_id` ";
if ($this->building_ids) {
$course_dates_stmt_sql .= "INNER JOIN ";
} else {
$course_dates_stmt_sql .= "LEFT JOIN ";
}
$course_dates_stmt_sql .= "`resources_objects` r
ON rb.`resource_id` = r.`resource_id` ";
} else {
$course_dates_stmt_sql .= "JOIN `resource_bookings` rb
ON `termine`.`termin_id` = rb.`range_id`
INNER JOIN `resources` r
$course_dates_stmt_sql .= "`resource_bookings` rb
ON `termine`.`termin_id` = rb.`range_id` ";
if ($this->building_ids) {
$course_dates_stmt_sql .= "INNER JOIN ";
} else {
$course_dates_stmt_sql .= "LEFT JOIN ";
}
$course_dates_stmt_sql .= "`resources` r
ON rb.`resource_id` = r.`id` ";
}
}
......
......@@ -267,7 +267,7 @@ class CourseDateExporter extends Exporter
) AS today";
}
if ($with_room_name) {
$fields_sql[] = "r.`name` AS room_name";
$fields_sql[] = "IF (r.`name` IS NOT NULL AND r.`name` <> '', r.`name`, `termine`.`raum`) AS room_name";
}
if ($with_booking_description) {
if (version_compare($GLOBALS['SOFTWARE_VERSION'], '4.5', '<')) {
......@@ -286,12 +286,12 @@ class CourseDateExporter extends Exporter
if (version_compare($GLOBALS['SOFTWARE_VERSION'], '4.5', '<')) {
$course_dates_stmt_sql .= "LEFT JOIN `resources_assign` rb
ON `termine`.`termin_id` = rb.`assign_user_id`
INNER JOIN `resources_objects` r
LEFT JOIN `resources_objects` r
ON rb.`resource_id` = r.`resource_id` ";
} else {
$course_dates_stmt_sql .= "LEFT JOIN `resource_bookings` rb
ON `termine`.`termin_id` = rb.`range_id`
INNER JOIN `resources` r
LEFT JOIN `resources` r
ON rb.`resource_id` = r.`id` ";
}
}
......
pluginname=Flexexport
pluginclassname=Flexexport
origin=data-quest
version=0.6.5
version=0.6.6
studipMinVersion=4.3
studipMaxVersion=4.9.99
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment