summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorSebastian Wagner2011-10-17 16:08:44 +0200
committerSebastian Wagner2011-10-17 16:08:44 +0200
commitae80bbc4d9aa23a0fe15c5f9d06280811c775762 (patch)
tree03839a7cfa1aea3e731e0073f13ee5eb6c4bd9ef /application
parentls progress update (diff)
downloadpoolctrl-ae80bbc4d9aa23a0fe15c5f9d06280811c775762.tar.gz
poolctrl-ae80bbc4d9aa23a0fe15c5f9d06280811c775762.tar.xz
poolctrl-ae80bbc4d9aa23a0fe15c5f9d06280811c775762.zip
some changes
Diffstat (limited to 'application')
-rw-r--r--application/views/scripts/event/checkoverlapevents.phtml7
-rwxr-xr-xapplication/views/scripts/event/index.phtml23
2 files changed, 12 insertions, 18 deletions
diff --git a/application/views/scripts/event/checkoverlapevents.phtml b/application/views/scripts/event/checkoverlapevents.phtml
index e3e5138..30b433f 100644
--- a/application/views/scripts/event/checkoverlapevents.phtml
+++ b/application/views/scripts/event/checkoverlapevents.phtml
@@ -3,10 +3,13 @@
//print_r($this->overlaps);
if(count($this->overlaps) == 0) {
- echo '-1';
+ echo '<p>no overlapping events</p>';
}
else {
+ foreach($this->overlaps as $o){
+ echo '<p>' . 'EventID: ' . $o['eventID'] . ', Title: ' . $o['title'] . ', Start: ' . $o['start'] . ', End: ' . $o['end'] . '</p>';
+ }
// Echo contents of output, e.g. required values, such as title, date, etc.
- echo json_encode($this->overlaps);
+ //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 2a6757c..f124986 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -209,14 +209,6 @@ var dayClick = false;
defaultEventMinutes: 10,
dayClick: function( date, allDay, jsEvent, view ) {
- /*
- var overlapevents = $.get("/event/checkoverlapevents/eventID/" + selectedEvent.id + "/date/" + date);
- alert(overlapevents);
- if (overlapevents) {
- alert(overlapevents);
- } else alert('no overlap events');
- */
-
/*
selectedDate = date;
dayClick = true;
@@ -505,14 +497,14 @@ var dayClick = false;
buttons: {
"OK": function() {
$(this).dialog("close");
- $(this).qtip("destroy");
+ $(this).qtip("destroy");
revertFunc();
}
},
open: function () {
$("#accordion").accordion({collapsible: true, active: 1, autoHeight: true });
$(".ui-dialog-titlebar-close").hide();
- $(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error");
+ $(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error");
}
});
});
@@ -521,7 +513,7 @@ var dayClick = false;
revertFunc();
$(this).qtip("destroy");
}
- $(this).qtip("destroy");
+ $(this).qtip("destroy");
},
eventDragStart: function( event, jsEvent, ui, view ) {
@@ -531,9 +523,10 @@ var dayClick = false;
},
eventDragStop: function(event, jsEvent, ui, view, date) {
- /*
+ /*
//alert(date);
- overlapevents = $.get("/event/checkoverlapevents/eventID/" + event.id + "/date/" + date);
+ overlapevents = $.get("/event/checkoverlapevents/eventID/" + event.id + "/date/" + date, function(checkoverlapeventsresult){
+ $("#conflicts").append(checkoverlapeventsresult);});
if(overlapevents) {
isDroppable = false;
} else {
@@ -848,9 +841,7 @@ selected one?</p>
<p>Please choose another position</p>
<div id="accordion">
<h3><a href="#">Show conflicts</a></h3>
- <div>
- <p id="conflicts">
- </p>
+ <div id="conflicts">
</div>
</div>
</div>