Site
/
initfest
11
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Rewrite the schedule generation script #31

Merged
user890104 merged 19 commits from schedule-rewrite into master 2016-10-24 00:52:04 +03:00
Conversation 0 Commits 19 Files Changed 5 +27 -11
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 69058e8fab - Show all commits

38
schedule/parse.php
View File

@ -18,10 +18,7 @@ function parseData($config, $data) {
) )
); );
// PATCH WHILE CLARION RETURNS WRONG DATA $microslots = [];
$data['slots'][188]['ends_at'] = strtotime('2016-11-06T13:15:00.000+02:00');
$moments = [];
$data['slots'] = array_filter($data['slots'], function($slot) { $data['slots'] = array_filter($data['slots'], function($slot) {
return isset($slot['starts_at'], $slot['ends_at'], $slot['hall_id'], $slot['event_id']); return isset($slot['starts_at'], $slot['ends_at'], $slot['hall_id'], $slot['event_id']);
@ -43,12 +40,12 @@ function parseData($config, $data) {
continue; continue;
} }
if (!in_array($slot['starts_at'], $moments)) { if (!in_array($slot['starts_at'], $microslots)) {
$moments[] = $slot['starts_at']; $microslots[] = $slot['starts_at'];
} }
if (!in_array($slot['ends_at'], $moments)) { if (!in_array($slot['ends_at'], $microslots)) {
$moments[] = $slot['ends_at']; $microslots[] = $slot['ends_at'];
} }
$events[$hall_id][$slot['starts_at']] = $slot; $events[$hall_id][$slot['starts_at']] = $slot;
@ -57,12 +54,12 @@ function parseData($config, $data) {
ksort($events[$hall_id]); ksort($events[$hall_id]);
} }
sort($moments); sort($microslots);
$times = []; $times = [];
foreach ($moments as $moment) { foreach ($microslots as $microslot) {
$times[$moment] = date('d.m H:i', $moment); $times[$microslot] = date('d.m H:i', $microslot);
} }
$intervals = []; $intervals = [];
@ -133,11 +130,19 @@ function parseData($config, $data) {
} }
$table .= '</tr></thead><tbody>'; $table .= '</tr></thead><tbody>';
$lastTs = 0;
foreach ($schedule as $slot_index => $events) { foreach ($schedule as $slot_index => $events) {
$columns = []; $columns = [];
$hasEvents = false; $hasEvents = false;
if (date('d.m', $intervals[$slot_index][0]) !== date('d.m', $lastTs)) {
$table .= '<tr><th colspan="' . (count($events) + 1) . '">' . date('d.m', $intervals[$slot_index][0]) . '</th></tr>';
}
$lastTs = $intervals[$slot_index][0];
$lastEventId = 0;
foreach ($events as $hall_index => $event) { foreach ($events as $hall_index => $event) {
if (is_null($event['event_id']) || !array_key_exists($event['event_id'], $data['events'])) { if (is_null($event['event_id']) || !array_key_exists($event['event_id'], $data['events'])) {
$columns[] = '<td>&nbsp;</td>'; $columns[] = '<td>&nbsp;</td>';
@ -147,8 +152,19 @@ function parseData($config, $data) {
if ($event['edge']) { if ($event['edge']) {
$hasEvents = true; $hasEvents = true;
} }
if ($lastEventId === $event['event_id']) {
$lastColumn = array_pop($columns);
$lastColumn = preg_replace_callback('/<td(?: colspan="(\d+)")?>/', function($matches) {
$colspan = array_key_exists(1, $matches) ? intval($matches[1]) + 1 : 2;
return '<td colspan="' . $colspan . '">';
}, $lastColumn);
$columns[] = $lastColumn;
continue;
}
$columns[] = '<td>' . $data['events'][$event['event_id']]['title'] . ' (' . $event['event_id'] . ')</td>'; $columns[] = '<td>' . $data['events'][$event['event_id']]['title'] . ' (' . $event['event_id'] . ')</td>';
$lastEventId = $event['event_id'];
} }
if (!$hasEvents) { if (!$hasEvents) {