summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Wagner2011-10-17 16:18:41 +0200
committerSebastian Wagner2011-10-17 16:18:41 +0200
commit07849ce0f619cd80173ebb74e5e2f26355b4d539 (patch)
tree71f1488f29fc6f4769301933d9568c4b8f08972d
parentsome changes (diff)
downloadpoolctrl-07849ce0f619cd80173ebb74e5e2f26355b4d539.tar.gz
poolctrl-07849ce0f619cd80173ebb74e5e2f26355b4d539.tar.xz
poolctrl-07849ce0f619cd80173ebb74e5e2f26355b4d539.zip
some changes
-rw-r--r--application/views/scripts/event/checkoverlapevents.phtml4
-rwxr-xr-xapplication/views/scripts/event/index.phtml4
2 files changed, 5 insertions, 3 deletions
diff --git a/application/views/scripts/event/checkoverlapevents.phtml b/application/views/scripts/event/checkoverlapevents.phtml
index 30b433f..26b6274 100644
--- a/application/views/scripts/event/checkoverlapevents.phtml
+++ b/application/views/scripts/event/checkoverlapevents.phtml
@@ -6,9 +6,11 @@ if(count($this->overlaps) == 0) {
echo '<p>no overlapping events</p>';
}
else {
+ echo '<ul>';
foreach($this->overlaps as $o){
- echo '<p>' . 'EventID: ' . $o['eventID'] . ', Title: ' . $o['title'] . ', Start: ' . $o['start'] . ', End: ' . $o['end'] . '</p>';
+ 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);
}
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index f124986..3882ec9 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -523,11 +523,11 @@ var dayClick = false;
},
eventDragStop: function(event, jsEvent, ui, view, date) {
- /*
+ /*
//alert(date);
overlapevents = $.get("/event/checkoverlapevents/eventID/" + event.id + "/date/" + date, function(checkoverlapeventsresult){
$("#conflicts").append(checkoverlapeventsresult);});
- if(overlapevents) {
+ if(overlapevents != '<p>no overlapping events</p>') {
isDroppable = false;
} else {
isDroppable = true;