Rename variables, add vertical merging of slots
This commit is contained in:
parent
e18f6d1eb7
commit
a807406eb0
|
@ -27,40 +27,40 @@ function parseData($config, $data) {
|
||||||
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']);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Collect the events for each hall, sort them in order of starting
|
// Collect the slots for each hall, sort them in order of starting
|
||||||
$events = [];
|
$slots = [];
|
||||||
$microslots = [];
|
$timestamps = [];
|
||||||
|
|
||||||
foreach ($data['halls'] as $hall_id => $hall) {
|
foreach ($data['halls'] as $hall_id => $hall) {
|
||||||
$events[$hall_id] = [];
|
$slots[$hall_id] = [];
|
||||||
|
|
||||||
foreach ($data['slots'] as $slot_id => $slot) {
|
foreach ($data['slots'] as $slot_id => $slot) {
|
||||||
if ($slot['hall_id'] !== $hall_id) {
|
if ($slot['hall_id'] !== $hall_id) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!in_array($slot['starts_at'], $microslots)) {
|
if (!in_array($slot['starts_at'], $timestamps)) {
|
||||||
$microslots[] = $slot['starts_at'];
|
$timestamps[] = $slot['starts_at'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!in_array($slot['ends_at'], $microslots)) {
|
if (!in_array($slot['ends_at'], $timestamps)) {
|
||||||
$microslots[] = $slot['ends_at'];
|
$timestamps[] = $slot['ends_at'];
|
||||||
}
|
}
|
||||||
|
|
||||||
$events[$hall_id][$slot['starts_at']] = $slot;
|
$slots[$hall_id][$slot['starts_at']] = $slot;
|
||||||
}
|
}
|
||||||
|
|
||||||
ksort($events[$hall_id]);
|
ksort($slots[$hall_id]);
|
||||||
}
|
}
|
||||||
|
|
||||||
sort($microslots);
|
sort($timestamps);
|
||||||
|
|
||||||
// Find all microslots (the smallest time unit)
|
// Find all microslots (the smallest time unit)
|
||||||
$intervals = [];
|
$microslots = [];
|
||||||
$lastTs = 0;
|
$lastTs = 0;
|
||||||
$first = true;
|
$first = true;
|
||||||
|
|
||||||
foreach ($microslots as $ts) {
|
foreach ($timestamps as $ts) {
|
||||||
if ($first) {
|
if ($first) {
|
||||||
$lastTs = $ts;
|
$lastTs = $ts;
|
||||||
$first = false;
|
$first = false;
|
||||||
|
@ -72,24 +72,25 @@ function parseData($config, $data) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
$intervals[] = [$lastTs, $ts];
|
$microslots[] = [$lastTs, $ts];
|
||||||
$lastTs = $ts;
|
$lastTs = $ts;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fill in the event ID for each time slot in each hall
|
// Fill in the event ID for each time slot in each hall
|
||||||
$slot_list = [];
|
$events = [];
|
||||||
|
|
||||||
foreach ($data['halls'] as $hall_id => $hall) {
|
foreach ($data['halls'] as $hall_id => $hall) {
|
||||||
$hall_data = [];
|
$hall_data = [];
|
||||||
|
|
||||||
foreach ($intervals as $timestamps) {
|
foreach ($microslots as $timestamps) {
|
||||||
$found = false;
|
$found = false;
|
||||||
|
|
||||||
foreach ($data['slots'] as $slot_id => $slot) {
|
foreach ($data['slots'] as $slot_id => $slot) {
|
||||||
if (
|
if (
|
||||||
$slot['hall_id'] === $hall_id &&
|
$slot['hall_id'] === $hall_id &&
|
||||||
$slot['starts_at'] <= $timestamps[0] &&
|
$slot['starts_at'] <= $timestamps[0] &&
|
||||||
$slot['ends_at'] >= $timestamps[1]
|
$slot['ends_at'] >= $timestamps[1] &&
|
||||||
|
array_key_exists($slot['event_id'], $data['events'])
|
||||||
) {
|
) {
|
||||||
$found = true;
|
$found = true;
|
||||||
$hall_data[] = [
|
$hall_data[] = [
|
||||||
|
@ -105,12 +106,86 @@ function parseData($config, $data) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$slot_list[] = $hall_data;
|
$events[] = $hall_data;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Transpose the matrix
|
// Transpose the matrix
|
||||||
// rows->halls, cols->timeslots ===> rows->timeslots, cols->halls
|
// rows->halls, cols->timeslots ===> rows->timeslots, cols->halls
|
||||||
$slot_list = array_map(null, ...$slot_list);
|
$events = array_map(null, ...$events);
|
||||||
|
|
||||||
|
// Filter empty slots
|
||||||
|
$count = count($events);
|
||||||
|
for ($i = 0; $i < $count; ++$i) {
|
||||||
|
$hall_count = count($events[$i]);
|
||||||
|
$hasEvents = false;
|
||||||
|
|
||||||
|
for ($j = 0; $j < $hall_count; ++$j) {
|
||||||
|
if (!is_null($events[$i][$j]) && $events[$i][$j]['edge']) {
|
||||||
|
$hasEvents = true;
|
||||||
|
continue 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$hasEvents) {
|
||||||
|
unset($events[$i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Merge events longer than one slot
|
||||||
|
$prevEventId = [];
|
||||||
|
$prevEventSlot = [];
|
||||||
|
$prevSlotIndex = 0;
|
||||||
|
$first = true;
|
||||||
|
|
||||||
|
foreach ($events as $slot_index => &$events_data) {
|
||||||
|
if ($first) {
|
||||||
|
$prevEventId = array_map(function($event_info) {
|
||||||
|
return is_null($event_info) ? null : $event_info['event_id'];
|
||||||
|
}, $events_data);
|
||||||
|
$prevEventSlot = array_fill(0, count($events_data), null);
|
||||||
|
$prevSlotIndex = $slot_index;
|
||||||
|
$first = false;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($events_data as $hall_index => &$event_info) {
|
||||||
|
if (is_null($event_info)) {
|
||||||
|
$prevEventId[$hall_index] = null;
|
||||||
|
$prevEventSlot[$hall_index] = null;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($event_info['event_id'] !== $prevEventId[$hall_index]) {
|
||||||
|
$prevEventId[$hall_index] = $event_info['event_id'];
|
||||||
|
$prevEventSlot[$hall_index] = null;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// We have a long event
|
||||||
|
if (is_null($prevEventSlot[$hall_index])) {
|
||||||
|
$prevEventSlot[$hall_index] = $prevSlotIndex;
|
||||||
|
}
|
||||||
|
|
||||||
|
$master_slot = &$events[$prevEventSlot[$hall_index]][$hall_index];
|
||||||
|
|
||||||
|
if (!array_key_exists('rowspan', $master_slot)) {
|
||||||
|
$master_slot['rowspan'] = 2;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
++$master_slot['rowspan'];
|
||||||
|
}
|
||||||
|
|
||||||
|
unset($master_slot);
|
||||||
|
|
||||||
|
$event_info = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
unset($event_info);
|
||||||
|
|
||||||
|
$prevSlotIndex = $slot_index;
|
||||||
|
}
|
||||||
|
|
||||||
|
unset($events_data);
|
||||||
|
|
||||||
// Build the HTML
|
// Build the HTML
|
||||||
$schedule = '<table border="1"><thead><tr><th></th>';
|
$schedule = '<table border="1"><thead><tr><th></th>';
|
||||||
|
@ -122,29 +197,28 @@ function parseData($config, $data) {
|
||||||
$schedule .= '</tr></thead><tbody>';
|
$schedule .= '</tr></thead><tbody>';
|
||||||
$lastTs = 0;
|
$lastTs = 0;
|
||||||
|
|
||||||
foreach ($slot_list as $slot_index => $events) {
|
foreach ($events as $slot_index => $events_data) {
|
||||||
$columns = [];
|
$columns = [];
|
||||||
$hasEvents = false;
|
|
||||||
|
|
||||||
if (date('d.m', $intervals[$slot_index][0]) !== date('d.m', $lastTs)) {
|
if (date('d.m', $microslots[$slot_index][0]) !== date('d.m', $lastTs)) {
|
||||||
$schedule .= '<tr><th colspan="' . (count($events) + 1) . '">' . strftime('%d %B - %A', $intervals[$slot_index][0]) . '</th></tr>';
|
$schedule .= '<tr><th colspan="' . (count($events_data) + 1) . '">' . strftime('%d %B - %A', $microslots[$slot_index][0]) . '</th></tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
$lastTs = $intervals[$slot_index][0];
|
$lastTs = $microslots[$slot_index][0];
|
||||||
$lastEventId = 0;
|
$lastEventId = 0;
|
||||||
$colspan = 1;
|
$colspan = 1;
|
||||||
|
|
||||||
foreach ($events as $hall_index => $hall_data) {
|
foreach ($events_data as $hall_index => $event_info) {
|
||||||
if (is_null($hall_data['event_id']) || !array_key_exists($hall_data['event_id'], $data['events'])) {
|
if ($event_info === false) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (is_null($event_info['event_id'])) {
|
||||||
$columns[] = '<td> </td>';
|
$columns[] = '<td> </td>';
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($hall_data['edge']) {
|
$eid = &$event_info['event_id'];
|
||||||
$hasEvents = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
$eid = &$hall_data['event_id'];
|
|
||||||
$event = &$data['events'][$eid];
|
$event = &$data['events'][$eid];
|
||||||
|
|
||||||
$title = mb_substr($event['title'], 0, $config['cut_len']) . (mb_strlen($event['title']) > $config['cut_len'] ? '...' : '');
|
$title = mb_substr($event['title'], 0, $config['cut_len']) . (mb_strlen($event['title']) > $config['cut_len'] ? '...' : '');
|
||||||
|
@ -190,16 +264,13 @@ function parseData($config, $data) {
|
||||||
$colspan = 1;
|
$colspan = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
$columns[] = '<td' . $style . ($colspan > 1 ? ' colspan="' . $colspan . '"' : '') . '>' . $content . '</td>';
|
$rowspan = array_key_exists('rowspan', $event_info) ? (' rowspan="' . $event_info['rowspan'] . '"') : '';
|
||||||
|
$columns[] = '<td' . $style . ($colspan > 1 ? ' colspan="' . $colspan . '"' : $rowspan) . '>' . $content . '</td>';
|
||||||
$lastEventId = $eid;
|
$lastEventId = $eid;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$hasEvents) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
$schedule .= '<tr><td>';
|
$schedule .= '<tr><td>';
|
||||||
$schedule .= strftime('%H:%M', $intervals[$slot_index][0]) . ' - ' . strftime('%H:%M', $intervals[$slot_index][1]);
|
$schedule .= strftime('%H:%M', $microslots[$slot_index][0]) . ' - ' . strftime('%H:%M', $microslots[$slot_index][1]);
|
||||||
$schedule .= '</td>';
|
$schedule .= '</td>';
|
||||||
$schedule .= implode('', $columns);
|
$schedule .= implode('', $columns);
|
||||||
$schedule .= '</tr>';
|
$schedule .= '</tr>';
|
||||||
|
|
Loading…
Reference in New Issue