summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Wagner2011-10-17 21:17:33 +0200
committerSebastian Wagner2011-10-17 21:17:33 +0200
commit7f5d0621b57257a50151c634a8b5ea6557614314 (patch)
treebba983dd6ef3e033d17c9d20e1e49020dddcf644
parentcollision-detection implemented (diff)
downloadpoolctrl-7f5d0621b57257a50151c634a8b5ea6557614314.tar.gz
poolctrl-7f5d0621b57257a50151c634a8b5ea6557614314.tar.xz
poolctrl-7f5d0621b57257a50151c634a8b5ea6557614314.zip
some changes
-rwxr-xr-xapplication/controllers/EventController.php7
-rwxr-xr-xapplication/models/EventMapper.php13
-rwxr-xr-xapplication/views/scripts/event/index.phtml69
3 files changed, 61 insertions, 28 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index cfdb240..db271ed 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -664,8 +664,13 @@ class EventController extends Zend_Controller_Action
$eventID = $this->getRequest()->getParam('eventID');
$date = intval(strtotime(substr($this->getRequest()->getParam('date'), 0, 24)));
-
+ $repeat = $this->getRequest()->getParam('repeat');
+
+ if($repeat) {
$events = $this->eventMapper->getDraggingEvents($eventID);
+ } else {
+ $events = $this->eventMapper->getDraggingEvent($eventID);
+ }
$others = $this->eventMapper->getNotDraggingEvents($eventID);
// Calculate time shift
diff --git a/application/models/EventMapper.php b/application/models/EventMapper.php
index 1b6d0fe..0ac7485 100755
--- a/application/models/EventMapper.php
+++ b/application/models/EventMapper.php
@@ -423,6 +423,19 @@ class Application_Model_EventMapper
return $return;
}
+
+ public function getDraggingEvent($eventID) {
+
+ $db = Zend_Db_Table::getDefaultAdapter();
+ $select = $this->getDbTable()->select()
+ ->from(array('pce' => 'poolctrl_event'))
+ ->where('pce.eventID = ?', $eventID);
+ $stmt = $db->query($select);
+ $return = $stmt->fetchAll();
+
+ return $return;
+
+ }
// Fetch all notDragging events
public function getNotDraggingEvents($eventID) {
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index b551e14..b22391d 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -410,8 +410,29 @@ var dayClick = false;
},
eventDrop: function( event, dayDelta, minuteDelta, allDay, revertFunc ) {
+
+ //initialize eventNotDroppableDialog Dialog
+ $(function() {
+ $( "#eventNotDroppableDialog" ).dialog({
+ autoOpen: false,
+ width: 810,
+ modal: true,
+ title: 'Dropping of ' + event.title + ' is not possible!',
+ buttons: {
+ "OK": function() {
+ $(this).dialog("close");
+ revertFunc();
+ }
+ },
+ open: function () {
+ $("#accordion").accordion({clearStyle: true, collapsible: true, active: 1, autoHeight: true });
+ $(".ui-dialog-titlebar-close").hide();
+ $(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error");
+ }
+ });
+ });
- $.get("/event/checkoverlapevents/eventID/" + event.id + "/date/" + event.start, function(checkoverlapeventsresult){
+ $.get("/event/checkoverlapevents/eventID/" + event.id + "/date/" + event.start + "/repeat/" + event.repeat, function(checkoverlapeventsresult){
var cell = document.getElementById("conflicts");
cell.removeChild(cell.firstChild);
$("#conflicts").append(checkoverlapeventsresult);
@@ -422,7 +443,7 @@ var dayClick = false;
isDroppable = false;
}
- if(event.repeat == 0 && isDroppable && event.immediate == 0 && $.get("/event/checkright/rightShortcut/er")) {
+ if(event.repeat == 0 && event.immediate == 0 && $.get("/event/checkright/rightShortcut/er")) {
$(function() {
$( "#defaultDialog" ).dialog({
autoOpen: false,
@@ -434,10 +455,14 @@ var dayClick = false;
$(this).dialog("close");
revertFunc();
},
- "OK": function() {
+ "OK": function() {
+ if(isDroppable) {
$(this).dialog("close");
$.post("/event/eventmove/evid/" + event.id + "/evstart/" + event.start + "/evend/" + event.end);
- event.repeat = 0;
+ } else {
+ $(this).dialog("close");
+ $( "#eventNotDroppableDialog" ).dialog('open');
+ }
}
},
open: function () {
@@ -448,7 +473,7 @@ var dayClick = false;
});
$( "#defaultDialog" ).dialog('open');
$(this).qtip("destroy");
- } else if (isDroppable && event.immediate == 0 && $.get("/event/checkright/rightShortcut/er")) {
+ } else if (event.immediate == 0 && $.get("/event/checkright/rightShortcut/er")) {
$(function() {
$( "#eventMoveWdhDialog" ).dialog({
autoOpen: false,
@@ -461,13 +486,23 @@ var dayClick = false;
revertFunc();
},
"Move just this Event": function() {
+ if(isDroppable) {
$(this).dialog("close");
$.post("/event/eventmove/evid/" + event.id + "/evstart/" + event.start + "/evend/" + event.end);
event.repeat = 0;
+ } else {
+ $(this).dialog("close");
+ $( "#eventNotDroppableDialog" ).dialog('open');
+ }
},
- "Move all Events": function() {
+ "Move all Events": function() {
+ if(isDroppable) {
$(this).dialog("close");
self.location="/event/eventmoveall/eventTitle/" + event.title + "/evmindelta/" + minuteDelta + "/evdaydelta/" + dayDelta + "/poolID/" + $("#poolselectbox option:selected").val();
+ } else {
+ $(this).dialog("close");
+ $( "#eventNotDroppableDialog" ).dialog('open');
+ }
}
},
open: function () {
@@ -478,7 +513,7 @@ var dayClick = false;
});
$( "#eventMoveWdhDialog" ).dialog('open');
$(this).qtip("destroy");
- } else if (isDroppable && $.get("/event/checkright/rightShortcut/er")){
+ } else if ($.get("/event/checkright/rightShortcut/er")){
$(function() {
$( "#eventImmediateButtonDialog" ).dialog({
autoOpen: false,
@@ -500,26 +535,6 @@ var dayClick = false;
});
$("#eventImmediateButtonDialog").dialog('open');
} else if (isDroppable == false && $.get("/event/checkright/rightShortcut/er")) {
- //initialize eventNotDroppableDialog Dialog
- $(function() {
- $( "#eventNotDroppableDialog" ).dialog({
- autoOpen: false,
- width: 810,
- modal: true,
- title: 'Dropping of ' + event.title + ' is not possible!',
- buttons: {
- "OK": function() {
- $(this).dialog("close");
- revertFunc();
- }
- },
- open: function () {
- $("#accordion").accordion({clearStyle: true, collapsible: true, active: 1, autoHeight: true });
- $(".ui-dialog-titlebar-close").hide();
- $(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error");
- }
- });
- });
$( "#eventNotDroppableDialog" ).dialog('open');
} else {
revertFunc();