iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improve needed angel types query

This commit is contained in:
msquare 2016-12-28 14:32:26 +01:00
parent 0603d0dd4e
commit 45200b503d
1 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
includes/model/Shifts_model.php
View File

@ -69,7 +69,9 @@ function Shifts_by_ShiftsFilter(ShiftsFilter $shiftsFilter) {
return $result; return $result;
} }
/*
function NeededAngeltypes_by_ShiftsFilter(ShiftsFilter $shiftsFilter) { function NeededAngeltypes_by_ShiftsFilter(ShiftsFilter $shiftsFilter) {
$time_start = microtime(true);
$SQL = "SELECT `NeededAngelTypes`.*, `Shifts`.`SID`, `AngelTypes`.`id`, `AngelTypes`.`name`, `AngelTypes`.`restricted`, `AngelTypes`.`no_self_signup` $SQL = "SELECT `NeededAngelTypes`.*, `Shifts`.`SID`, `AngelTypes`.`id`, `AngelTypes`.`name`, `AngelTypes`.`restricted`, `AngelTypes`.`no_self_signup`
FROM `Shifts` FROM `Shifts`
JOIN `NeededAngelTypes` ON `NeededAngelTypes`.`shift_id`=`Shifts`.`SID` JOIN `NeededAngelTypes` ON `NeededAngelTypes`.`shift_id`=`Shifts`.`SID`
@ -91,6 +93,45 @@ function NeededAngeltypes_by_ShiftsFilter(ShiftsFilter $shiftsFilter) {
if ($result === false) { if ($result === false) {
engelsystem_error("Unable to load needed angeltypes by filter."); engelsystem_error("Unable to load needed angeltypes by filter.");
} }
echo microtime(true)-$time_start;die();
return $result;
}
*/
function NeededAngeltypes_by_ShiftsFilter(ShiftsFilter $shiftsFilter) {
// $time_start = microtime(true);
$SQL = "CREATE TEMPORARY TABLE
shifts_view
AS
SELECT `Shifts`.`SID`, `Shifts`.`PSID`, `Shifts`.`RID`
FROM `Shifts`
WHERE `Shifts`.`RID` IN (" . implode(',', $shiftsFilter->getRooms()) . ")
AND `start` BETWEEN " . $shiftsFilter->getStartTime() . " AND " . $shiftsFilter->getEndTime() . "
;";
$result = sql_query($SQL);
if ($result === false) {
engelsystem_error("Unable to load needed angeltypes by filter.");
}
$SQL = "SELECT `NeededAngelTypes`.*, `shifts_view`.`SID`, `AngelTypes`.`id`, `AngelTypes`.`name`, `AngelTypes`.`restricted`, `AngelTypes`.`no_self_signup`
FROM `shifts_view`
JOIN `NeededAngelTypes` ON `NeededAngelTypes`.`shift_id`=`shifts_view`.`SID`
JOIN `AngelTypes` ON `AngelTypes`.`id`= `NeededAngelTypes`.`angel_type_id`
WHERE `shifts_view`.`PSID` IS NULL";
$result1 = sql_select($SQL);
if ($result === false) {
engelsystem_error("Unable to load needed angeltypes by filter.");
}
$SQL = "SELECT `NeededAngelTypes`.*, `shifts_view`.`SID`, `AngelTypes`.`id`, `AngelTypes`.`name`, `AngelTypes`.`restricted`, `AngelTypes`.`no_self_signup`
FROM `shifts_view`
JOIN `NeededAngelTypes` ON `NeededAngelTypes`.`room_id`=`shifts_view`.`RID`
JOIN `AngelTypes` ON `AngelTypes`.`id`= `NeededAngelTypes`.`angel_type_id`
WHERE NOT `shifts_view`.`PSID` IS NULL";
$result2 = sql_select($SQL);
if ($result === false) {
engelsystem_error("Unable to load needed angeltypes by filter.");
}
$result = array_merge($result1, $result2);
// echo microtime(true)-$time_start;die();
return $result; return $result;
} }