summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsebastian wagner2011-10-18 14:35:46 +0200
committersebastian wagner2011-10-18 14:35:46 +0200
commit4293cc30e24818033039050620c57d118acc2fde (patch)
treefb2acdac4f134801e26e09d78ab2b6155fdc5366
parentminor (diff)
downloadpoolctrl-4293cc30e24818033039050620c57d118acc2fde.tar.gz
poolctrl-4293cc30e24818033039050620c57d118acc2fde.tar.xz
poolctrl-4293cc30e24818033039050620c57d118acc2fde.zip
overlapping implemented
-rwxr-xr-xapplication/views/scripts/event/index.phtml40
1 files changed, 15 insertions, 25 deletions
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index b0d4ab4..f2c8a4b 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -209,8 +209,6 @@ var dayClick = false;
defaultEventMinutes: 10,
dayClick: function( date, allDay, jsEvent, view ) {
- //console.log(date);
- //alert(date);
/*
selectedDate = date;
dayClick = true;
@@ -255,8 +253,6 @@ var dayClick = false;
eventMouseover: function( event, jsEvent, view ) {
evClick = true;
- //overlappStart = event.start;
- //overlppEnd = event.end;
},
eventMouseout: function( event, jsEvent, view ) {
@@ -415,7 +411,7 @@ var dayClick = false;
$(function() {
$( "#eventNotDroppableDialog" ).dialog({
autoOpen: false,
- width: 810,
+ width: 820,
modal: true,
title: 'Dropping of ' + event.title + ' is not possible!',
buttons: {
@@ -433,17 +429,10 @@ var dayClick = false;
});
$.get("/event/checkoverlapevents/eventID/" + event.id + "/date/" + event.start, function(data){
+ // delete old conflicts
var cell = document.getElementById("conflicts");
- cell.removeChild(cell.firstChild);
- //$("#conflicts").append(data);
+
var returndata = jQuery.parseJSON(data);
- //alert(returndata.withrepeat + ' ' + returndata.withoutrepeat);
- /*if(checkoverlapeventsresult == -1) {
- isDroppable = true;
- overlapevents = null;
- } else {
- isDroppable = false;
- }*/
if(event.repeat == 0 && event.immediate == 0 && $.get("/event/checkright/rightShortcut/er")) {
$(function() {
@@ -463,6 +452,8 @@ var dayClick = false;
$.post("/event/eventmove/evid/" + event.id + "/evstart/" + event.start + "/evend/" + event.end);
} else {
$(this).dialog("close");
+ cell.removeChild(cell.firstChild);
+ $("#conflicts").append(returndata.withoutrepeat);
$( "#eventNotDroppableDialog" ).dialog('open');
}
}
@@ -474,7 +465,6 @@ var dayClick = false;
});
});
$( "#defaultDialog" ).dialog('open');
- $(this).qtip("destroy");
} else if (event.immediate == 0 && $.get("/event/checkright/rightShortcut/er")) {
$(function() {
$( "#eventMoveWdhDialog" ).dialog({
@@ -488,22 +478,26 @@ var dayClick = false;
revertFunc();
},
"Move just this Event": function() {
- if(isDroppable) {
- $(this).dialog("close");
+ if(returndata.withoutrepeat == -1) {
+ $(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');
+ cell.removeChild(cell.firstChild);
+ $("#conflicts").append(returndata.withoutrepeat);
+ $( "#eventNotDroppableDialog" ).dialog('open');
}
},
"Move all Events": function() {
- if(isDroppable) {
+ if(returndata.witrepeat == -1) {
$(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');
+ cell.removeChild(cell.firstChild);
+ $("#conflicts").append(returndata.withrepeat);
+ $( "#eventNotDroppableDialog" ).dialog('open');
}
}
},
@@ -514,8 +508,7 @@ var dayClick = false;
});
});
$( "#eventMoveWdhDialog" ).dialog('open');
- $(this).qtip("destroy");
- } else if ($.get("/event/checkright/rightShortcut/er")){
+ } else if (event.immediate == 1 && $.get("/event/checkright/rightShortcut/er")){
$(function() {
$( "#eventImmediateButtonDialog" ).dialog({
autoOpen: false,
@@ -525,7 +518,6 @@ var dayClick = false;
buttons: {
"OK": function() {
$(this).dialog("close");
- $(this).qtip("destroy");
revertFunc();
}
},
@@ -536,8 +528,6 @@ var dayClick = false;
});
});
$("#eventImmediateButtonDialog").dialog('open');
- } else if (isDroppable == false && $.get("/event/checkright/rightShortcut/er")) {
- $( "#eventNotDroppableDialog" ).dialog('open');
} else {
revertFunc();
$(this).qtip("destroy");