summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Wagner2011-10-26 11:32:42 +0200
committerSebastian Wagner2011-10-26 11:32:42 +0200
commit5f224aae1728860755200bfc192d07859c9e2e19 (patch)
tree544b0912a1e67304c3ee906f15e856d5eaf94675
parentdrop/resize conflict free implemented (diff)
downloadpoolctrl-5f224aae1728860755200bfc192d07859c9e2e19.tar.gz
poolctrl-5f224aae1728860755200bfc192d07859c9e2e19.tar.xz
poolctrl-5f224aae1728860755200bfc192d07859c9e2e19.zip
some bugfixes
-rwxr-xr-xapplication/views/scripts/event/index.phtml62
1 files changed, 54 insertions, 8 deletions
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index a1a6828..9b23a55 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -122,7 +122,7 @@ var dayClick = false;
},
"OK": function() {
$(this).dialog("close");
- self.location="/event/delete/eventID/" + selectedEvent.id;
+ $.post("/event/delete/eventID/" + selectedEvent.id);
$('#calendar').fullCalendar( 'removeEvents', selectedEvent.id );
$('#calendar').fullCalendar( 'rerenderEvents' );
}
@@ -149,7 +149,7 @@ var dayClick = false;
},
"Delete just this Event": function() {
$(this).dialog("close");
- self.location="/event/delete/eventID/" + selectedEvent.id;
+ $.post("/event/delete/eventID/" + selectedEvent.id);
$('#calendar').fullCalendar( 'removeEvents', selectedEvent.id );
$('#calendar').fullCalendar( 'rerenderEvents' );
},
@@ -412,7 +412,7 @@ var dayClick = false;
buttons: {
"Resize Conflict-Free Events": function() {
$(this).dialog("close");
- $.post("/event/eventresizecf/evmindelta/" + minuteDelta + "/evdaydelta/" + dayDelta + "/poolID/" + $("#poolselectbox option:selected").val() + "/cfevents/" + cfeventsString);
+ self.location="/event/eventresizecf/evmindelta/" + minuteDelta + "/evdaydelta/" + dayDelta + "/poolID/" + $("#poolselectbox option:selected").val() + "/cfevents/" + cfeventsString;
},
"OK": function() {
$(this).dialog("close");
@@ -425,6 +425,26 @@ var dayClick = false;
$(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error");
}
});
+ });
+
+ //initialize eventNotDroppable Dialog2
+ $(function() {
+ $( "#eventNotDroppableDialog2" ).dialog({
+ autoOpen: false,
+ width: 820,
+ modal: true,
+ title: 'Dropping of ' + event.title + ' is not possible!',
+ buttons: {
+ "OK": function() {
+ $(this).dialog("close");
+ revertFunc();
+ }
+ },
+ open: function () {
+ $(".ui-dialog-titlebar-close").hide();
+ $(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error");
+ }
+ });
});
if($.get("/event/checkright/rightShortcut/er")) {
@@ -448,7 +468,7 @@ var dayClick = false;
$(this).dialog("close");
cell.removeChild(cell.firstChild);
$("#conflicts").append(returndata.withoutrepeat);
- $( "#eventNotDroppableDialog" ).dialog('open');
+ $( "#eventNotDroppableDialog2" ).dialog('open');
}
}
},
@@ -482,7 +502,7 @@ var dayClick = false;
cfcell.removeChild(cfcell.firstChild);
$("#cfevents").append(returndata.cfplotwithoutrepeat);
$("#conflicts").append(returndata.withoutrepeat);
- $( "#eventNotDroppableDialog" ).dialog('open');
+ $( "#eventNotDroppableDialog2" ).dialog('open');
}
},
"Resize all Events": function() {
@@ -532,7 +552,7 @@ var dayClick = false;
var cfevents = returndata.cfevents;
var cfeventsString = $.toJSON(cfevents);
- //initialize eventNotDroppableDialog Dialog
+ //initialize eventNotDroppable Dialog
$(function() {
$( "#eventNotDroppableDialog" ).dialog({
autoOpen: false,
@@ -556,6 +576,26 @@ var dayClick = false;
}
});
});
+
+ //initialize eventNotDroppable Dialog2
+ $(function() {
+ $( "#eventNotDroppableDialog2" ).dialog({
+ autoOpen: false,
+ width: 820,
+ modal: true,
+ title: 'Dropping of ' + event.title + ' is not possible!',
+ buttons: {
+ "OK": function() {
+ $(this).dialog("close");
+ revertFunc();
+ }
+ },
+ open: function () {
+ $(".ui-dialog-titlebar-close").hide();
+ $(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error");
+ }
+ });
+ });
if((event.repeat == 0 || event.repeat == 2) && event.immediate == 0 && $.get("/event/checkright/rightShortcut/er")) {
$(function() {
@@ -583,7 +623,7 @@ var dayClick = false;
$(this).dialog("close");
cell.removeChild(cell.firstChild);
$("#conflicts").append(returndata.withoutrepeat);
- $( "#eventNotDroppableDialog" ).dialog('open');
+ $( "#eventNotDroppableDialog2" ).dialog('open');
}
}
},
@@ -621,7 +661,7 @@ var dayClick = false;
$(this).dialog("close");
cell.removeChild(cell.firstChild);
$("#conflicts").append(returndata.withoutrepeat);
- $( "#eventNotDroppableDialog" ).dialog('open');
+ $( "#eventNotDroppableDialog2" ).dialog('open');
}
},
"Move all Events": function() {
@@ -1030,6 +1070,12 @@ selected one?</p>
</div>
</div>
+<!-- eventNotDroppableDialog2 -->
+<div id="eventNotDroppableDialog2" style="display: none">
+<p>You can´t drop this Event here! There exists at least one collision between two events.</p>
+<p>Please choose another position</p>
+</div>
+
<!-- errorEditImmediate -->
<div id="errorEditImmediate" style="display: none">
<p>You can´t edit an Immediate-Event!</p>