Changeset:
e85ad0079008
https://sourceforge.net/p/mrbs/hg-code/ci/e85ad007900801ae6c4cbde8b5f85b07342626e7
Author:
Campbell Morrison <cimorri...@hg.code.sf.net>
Date:
Mon Mar 27 17:14:29 2017 +0100
Log message:
Added colspans
diffstat:
web/index.php | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 62 insertions(+), 6 deletions(-)
diffs (91 lines):
diff -r cd2db8c464ca -r e85ad0079008 web/index.php
--- a/web/index.php Mon Mar 27 08:07:34 2017 +0100
+++ b/web/index.php Mon Mar 27 17:14:29 2017 +0100
@@ -101,6 +101,21 @@
}
+function get_cell_html($content, $class, $n_slots=1)
+{
+ $html = '';
+
+ $html .= "<td class=\"$class\"";
+ if ($n_slots > 1)
+ {
+ $html .= " colspan=\"$n_slots\"";
+ }
+ $html .= ">$content</td>\n";
+
+ return $html;
+}
+
+
function get_table($map)
{
$html = '';
@@ -111,18 +126,59 @@
{
$html .= "<tr>\n";
$html .= "<td>$room_id</td>\n";
- foreach ($row as $data)
+ $last_id = null;
+
+ while (($data = current($row)) !== false)
{
- $html .= "<td>";
- if (count($data) == 1)
+ if (count($data) == 0)
{
- $html .= $data[0];
+ if (isset($last_id))
+ {
+ // The booking has come to an end, so write it out
+ $last_id = null;
+ $html .= get_cell_html($this_id, 'booked', $n_slots);
+ }
+ else
+ {
+ // This is an empty slot
+ $html .= get_cell_html('', 'new');
+ }
}
- elseif (count($data) > 1)
+ elseif (count($data) == 1)
{
+ $this_id = $data[0];
+ if (!isset($last_id))
+ {
+ // Start of a new booking
+ $last_id = $this_id;
+ $n_slots = 1;
+ }
+ elseif ($this_id == $last_id)
+ {
+ // Still in the same booking
+ $n_slots++;
+ }
+ else
+ {
+ // The booking has come to an end, so write it out
+ $last_id = null;
+ $html .= get_cell_html($this_id, 'booked', $n_slots);
+ prev($row);
+ }
+ }
+ else
+ {
+ // This can happen if you get two bookings in the same slot,
+ // which will happen if the resolution is changed or the slots are
shifted
trigger_error("To do");
}
- $html .= "</td>\n";
+ $data = next($row);
+ if (($data === false) && isset($last_id))
+ {
+ // We're at the end of the row and there's a booking to write out
+ $html .= get_cell_html($this_id, 'booked', $n_slots);
+ break;
+ }
}
$html .= "</tr>\n";
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Mrbs-commits mailing list
Mrbs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
