Revision: 2647
https://sourceforge.net/p/mrbs/code/2647/
Author: cimorrison
Date: 2013-01-17 13:45:00 +0000 (Thu, 17 Jan 2013)
Log Message:
-----------
Made the month view display linked bookings
Modified Paths:
--------------
mrbs/branches/linked_bookings/web/css/mrbs.css.php
mrbs/branches/linked_bookings/web/month.php
Modified: mrbs/branches/linked_bookings/web/css/mrbs.css.php
===================================================================
--- mrbs/branches/linked_bookings/web/css/mrbs.css.php 2013-01-17 13:15:05 UTC
(rev 2646)
+++ mrbs/branches/linked_bookings/web/css/mrbs.css.php 2013-01-17 13:45:00 UTC
(rev 2647)
@@ -222,6 +222,7 @@
img.link_symbol {float: right; z-index: 1000; margin-right: 16px}
img.link_symbol.series {margin-right: 2px}
img.repeat_symbol {float: right; z-index: 1000; padding: 3px 2px}
+.dwm_main#month_main img.link_symbol {margin-top: -2px; margin-right: 2px}
.dwm_main#month_main img.repeat_symbol {padding: 2px}
Modified: mrbs/branches/linked_bookings/web/month.php
===================================================================
--- mrbs/branches/linked_bookings/web/month.php 2013-01-17 13:15:05 UTC (rev
2646)
+++ mrbs/branches/linked_bookings/web/month.php 2013-01-17 13:45:00 UTC (rev
2647)
@@ -179,6 +179,9 @@
// row[1] = End time
// row[2] = Entry ID
// This data will be retrieved day-by-day fo the whole month
+
+$linked_entries = get_linked_entries($am7[1], $pm7[$days_in_month]);
+
for ($day_num = 1; $day_num<=$days_in_month; $day_num++)
{
$sql = "SELECT start_time, end_time, E.id, name, type,
@@ -213,9 +216,10 @@
{
echo "<br>DEBUG: Entry ".$row['id']." day $day_num\n";
}
- $d[$day_num]["id"][] = $row['id'];
- $d[$day_num]["color"][] = $row['type'];
- $d[$day_num]["is_repeat"][] = !empty($row['repeat_id']);
+ $d[$day_num]['id'][] = $row['id'];
+ $d[$day_num]['color'][] = $row['type'];
+ $d[$day_num]['is_repeat'][] = !empty($row['repeat_id']);
+ $d[$day_num]['n_linked'][] = $linked_entries[$row['id']];
// Handle private events
if (is_private_event($row['status'] & STATUS_PRIVATE))
@@ -236,13 +240,13 @@
if ($private & $is_private_field['entry.name'])
{
- $d[$day_num]["status"][] = $row['status'] | STATUS_PRIVATE; // Set
the private bit
- $d[$day_num]["shortdescrip"][] = '['.get_vocab('unavailable').']';
+ $d[$day_num]['status'][] = $row['status'] | STATUS_PRIVATE; // Set
the private bit
+ $d[$day_num]['shortdescrip'][] = '['.get_vocab('unavailable').']';
}
else
{
- $d[$day_num]["status"][] = $row['status'] & ~STATUS_PRIVATE; // Clear
the private bit
- $d[$day_num]["shortdescrip"][] = htmlspecialchars($row['name']);
+ $d[$day_num]['status'][] = $row['status'] & ~STATUS_PRIVATE; // Clear
the private bit
+ $d[$day_num]['shortdescrip'][] = htmlspecialchars($row['name']);
}
@@ -259,28 +263,28 @@
{
case "> < ": // Starts after midnight, ends before midnight
case "= < ": // Starts at midnight, ends before midnight
- $d[$day_num]["data"][] =
htmlspecialchars(utf8_strftime(hour_min_format(), $row['start_time'])) . "~" .
htmlspecialchars(utf8_strftime(hour_min_format(), $row['end_time']));
+ $d[$day_num]['data'][] =
htmlspecialchars(utf8_strftime(hour_min_format(), $row['start_time'])) . "~" .
htmlspecialchars(utf8_strftime(hour_min_format(), $row['end_time']));
break;
case "> = ": // Starts after midnight, ends at midnight
- $d[$day_num]["data"][] =
htmlspecialchars(utf8_strftime(hour_min_format(), $row['start_time'])) .
"~24:00";
+ $d[$day_num]['data'][] =
htmlspecialchars(utf8_strftime(hour_min_format(), $row['start_time'])) .
"~24:00";
break;
case "> > ": // Starts after midnight, continues tomorrow
- $d[$day_num]["data"][] =
htmlspecialchars(utf8_strftime(hour_min_format(), $row['start_time'])) .
"~====>";
+ $d[$day_num]['data'][] =
htmlspecialchars(utf8_strftime(hour_min_format(), $row['start_time'])) .
"~====>";
break;
case "= = ": // Starts at midnight, ends at midnight
- $d[$day_num]["data"][] = $all_day;
+ $d[$day_num]['data'][] = $all_day;
break;
case "= > ": // Starts at midnight, continues tomorrow
- $d[$day_num]["data"][] = $all_day . "====>";
+ $d[$day_num]['data'][] = $all_day . "====>";
break;
case "< < ": // Starts before today, ends before midnight
- $d[$day_num]["data"][] = "<====~" .
htmlspecialchars(utf8_strftime(hour_min_format(), $row['end_time']));
+ $d[$day_num]['data'][] = "<====~" .
htmlspecialchars(utf8_strftime(hour_min_format(), $row['end_time']));
break;
case "< = ": // Starts before today, ends at midnight
- $d[$day_num]["data"][] = "<====" . $all_day;
+ $d[$day_num]['data'][] = "<====" . $all_day;
break;
case "< > ": // Starts before today, continues tomorrow
- $d[$day_num]["data"][] = "<====" . $all_day . "====>";
+ $d[$day_num]['data'][] = "<====" . $all_day . "====>";
break;
}
}
@@ -292,28 +296,28 @@
{
case "> < ": // Starts after midnight, ends before midnight
case "= < ": // Starts at midnight, ends before midnight
- $d[$day_num]["data"][] = $start_str . "~" . $end_str;
+ $d[$day_num]['data'][] = $start_str . "~" . $end_str;
break;
case "> = ": // Starts after midnight, ends at midnight
- $d[$day_num]["data"][] = $start_str . "~24:00";
+ $d[$day_num]['data'][] = $start_str . "~24:00";
break;
case "> > ": // Starts after midnight, continues tomorrow
- $d[$day_num]["data"][] = $start_str . "~====>";
+ $d[$day_num]['data'][] = $start_str . "~====>";
break;
case "= = ": // Starts at midnight, ends at midnight
- $d[$day_num]["data"][] = $all_day;
+ $d[$day_num]['data'][] = $all_day;
break;
case "= > ": // Starts at midnight, continues tomorrow
- $d[$day_num]["data"][] = $all_day . "====>";
+ $d[$day_num]['data'][] = $all_day . "====>";
break;
case "< < ": // Starts before today, ends before midnight
- $d[$day_num]["data"][] = "<====~" . $end_str;
+ $d[$day_num]['data'][] = "<====~" . $end_str;
break;
case "< = ": // Starts before today, ends at midnight
- $d[$day_num]["data"][] = "<====" . $all_day;
+ $d[$day_num]['data'][] = "<====" . $all_day;
break;
case "< > ": // Starts before today, continues tomorrow
- $d[$day_num]["data"][] = "<====" . $all_day . "====>";
+ $d[$day_num]['data'][] = "<====" . $all_day . "====>";
break;
}
}
@@ -325,14 +329,14 @@
echo "<p>DEBUG: Array of month day data:</p><pre>\n";
for ($i = 1; $i <= $days_in_month; $i++)
{
- if (isset($d[$i]["id"]))
+ if (isset($d[$i]['id']))
{
- $n = count($d[$i]["id"]);
+ $n = count($d[$i]['id']);
echo "Day $i has $n entries:\n";
for ($j = 0; $j < $n; $j++)
{
- echo " ID: " . $d[$i]["id"][$j] .
- " Data: " . $d[$i]["data"][$j] . "\n";
+ echo " ID: " . $d[$i]['id'][$j] .
+ " Data: " . $d[$i]['data'][$j] . "\n";
}
}
}
@@ -489,6 +493,7 @@
}
echo "<a href=\"$booking_link\" title=\"$full_text\">";
echo ($d[$cday]['is_repeat'][$i]) ? "<img class=\"repeat_symbol\"
src=\"images/repeat.png\" alt=\"" . get_vocab("series") . "\" title=\"" .
get_vocab("series") . "\" width=\"10\" height=\"10\">" : '';
+ echo ($d[$cday]['n_linked'][$i] > 1) ? "<img class=\"link_symbol\"
src=\"images/link.png\" alt=\"" . get_vocab("linked_entry") . "\" title=\"" .
get_vocab("linked_entry") . "\" width=\"16\" height=\"16\">" : '';
echo "$display_text</a>\n";
echo "</div>\n";
}
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122712
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
