summaryrefslogtreecommitdiffstats
path: root/application/views/scripts/event/checkoverlapevents.phtml
diff options
context:
space:
mode:
Diffstat (limited to 'application/views/scripts/event/checkoverlapevents.phtml')
-rw-r--r--application/views/scripts/event/checkoverlapevents.phtml18
1 files changed, 16 insertions, 2 deletions
diff --git a/application/views/scripts/event/checkoverlapevents.phtml b/application/views/scripts/event/checkoverlapevents.phtml
index 66916aa..5ce631b 100644
--- a/application/views/scripts/event/checkoverlapevents.phtml
+++ b/application/views/scripts/event/checkoverlapevents.phtml
@@ -1,17 +1,31 @@
<?php
// Output
//print_r($this->overlaps);
+//$overlaps[] = array();
-if(count($this->overlaps) == 0) {
+if(count($this->overlapswithrepeat) == 0) {
echo -1;
}
else {
echo '<ul id="conflictEvents">';
- foreach($this->overlaps as $o){
+ foreach($this->overlapswithrepeat as $o){
echo '<li>' . 'EventID: ' . $o['eventID'] . ', Title: ' . $o['title'] . ', Start: ' . $o['start'] . ', End: ' . $o['end'] . '</li>';
}
echo '</ul>';
// Echo contents of output, e.g. required values, such as title, date, etc.
//echo json_encode($this->overlaps);
}
+
+if(count($this->overlapswithoutrepeat) == 0) {
+ echo -1;
+}
+else {
+ echo '<ul id="conflictEvents">';
+ foreach($this->overlapswithoutrepeat as $o){
+ echo '<li>' . 'EventID: ' . $o['eventID'] . ', Title: ' . $o['title'] . ', Start: ' . $o['start'] . ', End: ' . $o['end'] . '</li>';
+ }
+ echo '</ul>';
+ // Echo contents of output, e.g. required values, such as title, date, etc.
+ //echo json_encode($this->overlaps);
+}
?> \ No newline at end of file