summaryrefslogtreecommitdiffstats
path: root/application/views/scripts/event/checkoverlapselect.phtml
diff options
context:
space:
mode:
Diffstat (limited to 'application/views/scripts/event/checkoverlapselect.phtml')
-rw-r--r--application/views/scripts/event/checkoverlapselect.phtml16
1 files changed, 10 insertions, 6 deletions
diff --git a/application/views/scripts/event/checkoverlapselect.phtml b/application/views/scripts/event/checkoverlapselect.phtml
index fa87193..8cc8991 100644
--- a/application/views/scripts/event/checkoverlapselect.phtml
+++ b/application/views/scripts/event/checkoverlapselect.phtml
@@ -1,13 +1,17 @@
<?php
if(count($this->overlaps) == 0) {
- $output = -1;
+ $output = -1;
}
else {
- $output = '<ul id="conflictEvents">';
- foreach($this->overlaps as $o){
- $output .= '<li>' . 'EventID: ' . $o['eventID'] . ', Title: ' . $o['title'] . ', Start: ' . $o['start'] . ', End: ' . $o['end'] . '</li>';
- }
- $output .= '</ul>';
+ $output = '<ul id="conflictEvents">';
+ foreach($this->overlaps as $o){
+ if(isset($o['end'])) {
+ $output .= '<li>' . 'EventID: ' . $o['eventID'] . ', Title: ' . $o['title'] . ', Start: ' . $o['start'] . ', End: ' . $o['end'] . '</li>';
+ } else {
+ $output .= '<li>' . 'EventID: ' . $o['eventID'] . ', Title: ' . $o['title'] . ', Start: ' . $o['start'] . '</li>';
+ }
+ }
+ $output .= '</ul>';
}
echo json_encode($output);
?> \ No newline at end of file