summaryrefslogtreecommitdiffstats
path: root/application/views/scripts
diff options
context:
space:
mode:
authorSebastian Wagner2011-10-18 12:31:38 +0200
committerSebastian Wagner2011-10-18 12:31:38 +0200
commitf177cd97d0c9156add00c7cbb8f12540c421e5d0 (patch)
treef31c40589c687f7703a564491c0cf205b3af5bee /application/views/scripts
parentweitere Korrektur (diff)
downloadpoolctrl-f177cd97d0c9156add00c7cbb8f12540c421e5d0.tar.gz
poolctrl-f177cd97d0c9156add00c7cbb8f12540c421e5d0.tar.xz
poolctrl-f177cd97d0c9156add00c7cbb8f12540c421e5d0.zip
bugfix
Diffstat (limited to 'application/views/scripts')
-rw-r--r--application/views/scripts/event/checkoverlapevents.phtml18
-rwxr-xr-xapplication/views/scripts/event/index.phtml3
2 files changed, 18 insertions, 3 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
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index b22391d..d4da032 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -432,10 +432,11 @@ var dayClick = false;
});
});
- $.get("/event/checkoverlapevents/eventID/" + event.id + "/date/" + event.start + "/repeat/" + event.repeat, function(checkoverlapeventsresult){
+ $.get("/event/checkoverlapevents/eventID/" + event.id + "/date/" + event.start, function(checkoverlapeventsresult){
var cell = document.getElementById("conflicts");
cell.removeChild(cell.firstChild);
$("#conflicts").append(checkoverlapeventsresult);
+ alert(checkoverlapeventsresult.withrepeat + ' ' + checkoverlapeventsresult.withoutrepeat);
if(checkoverlapeventsresult == -1) {
isDroppable = true;
overlapevents = null;