From 71c258dc1be03d07339a8d3cc39d5ef2100daf03 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Mon, 31 Oct 2011 11:18:52 +0100 Subject: some bug fixes --- application/views/scripts/event/index.phtml | 140 +++++++++------------------- 1 file changed, 45 insertions(+), 95 deletions(-) (limited to 'application/views') diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml index 4443730..d939039 100755 --- a/application/views/scripts/event/index.phtml +++ b/application/views/scripts/event/index.phtml @@ -35,33 +35,32 @@ var poolIDtmp; // dayClick var dayClick = false; - -// change border color of an event - function eventSelected(event) { - if (eventColor.ev != null){ - event.selected = false; - selectedEvent = null; - eventColor.ev.borderColor = eventColor.color; - } - event.selected = true; - selectedEvent = event; - eventColor.ev = event; - eventColor.color = event.borderColor; - event.borderColor = 'black'; - $('#calendar').fullCalendar("rerenderEvents"); - if($.get("/event/checkright/rightShortcut/er")){ - $('#eventReportButton').show(); - - } else { - $('#eventReportButton').hide(); - - } - if($.get("/event/checkright/rightShortcut/ee")) { - $('#editEvent').show(); - } else { - $('#editEvent').hide(); - } - } +//change border color of an event +function eventSelected(event) { + if (eventColor.ev != null){ + event.selected = false; + selectedEvent = null; + eventColor.ev.borderColor = eventColor.color; + } + event.selected = true; + selectedEvent = event; + eventColor.ev = event; + eventColor.color = event.borderColor; + event.borderColor = 'black'; + $('#calendar').fullCalendar("rerenderEvents"); + if($.get("/event/checkright/rightShortcut/er")){ + $('#eventReportButton').show(); + + } else { + $('#eventReportButton').hide(); + + } + if($.get("/event/checkright/rightShortcut/ee")) { + $('#editEvent').show(); + } else { + $('#editEvent').hide(); + } +} // change view to addEvent function addEvent() { @@ -177,27 +176,12 @@ var dayClick = false; }); $( "#eventDeleteWdhDialog" ).dialog('open');} } - //copy selected event by key ctrl(17) AND c(67) - /* else if (e.ctrlKey && e.keyCode == 67 && selectedEvent.selected == true) { - cpEvent = selectedEvent; - //cpEventStart = $.fullCalendar.formatDate(selectedEvent.start, 'hh:mm'); - //cpEventEnd = $.fullCalendar.formatDate(selectedEvent.end, 'hh:mm'); - cpEventDuration = cpEvent.minuteDelta; - alert(cpEventDuration); - //cut selected event by key ctrl(17) AND x(88) - } else if (e.ctrlKey && e.keyCode == 88 && selectedEvent.selected == true) { - - //paste selected event by key ctrl(17) AND v(86) - } else if (e.ctrlKey && e.keyCode == 86 && selectedEvent.selected == true && cpEvent != null && selectedDate != null) { - alert(cpEvent.title + " paste to " + selectedDate); - self.location="/event/add/evstart/" + selectedDate + "/evend" + - $('#calendar').fullCalendar( 'removeEvents', selectedEvent.id ); - $('#calendar').fullCalendar( 'rerenderEvents' ); - }*/ - }); -// initialize fullCalendar +/* + * initialize fullCalendar and all calendar-functions + */ + function iniCalendar() { var calendar = $('#calendar').fullCalendar({ @@ -223,50 +207,7 @@ var dayClick = false; loading: function(bool) { if (bool) $('#progress').show(); else $('#progress').hide(); }, - /* - dayClick: function( date, allDay, jsEvent, view ) { - - selectedDate = date; - dayClick = true; - $('#calendar').fullCalendar( 'unselect' ); - - if($("#poolselectbox option:selected").val() == 'default') { - $( "#noPoolSelectedDialog" ).dialog('open'); - } else if ($.get("/event/checkright/rightShortcut/ec") && evClick == false) { - $(function() { - $( "#eventAddDialog" ).dialog({ - autoOpen: false, - width: 600, - modal: true, - title: "Add Event from " + date, - buttons: { - "Cancel": function() { - dayClick = false; - $(this).dialog("close"); - $('#calendar').fullCalendar( 'unselect' ); - }, - "OK": function() { - $(this).dialog("close"); - self.location="/event/add/evstart/" + date + "/poolID/" + $("#poolselectbox option:selected").val(); - } - }, - open: function () { - $(".ui-dialog-titlebar-close").hide(); - //$(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error"); - } - }); - }); - $( "#eventAddDialog" ).dialog('open'); - } else if (evClick == false) { - dayClick = false; - $('#calendar').fullCalendar( 'unselect' ); - $( "#errorRightsDialog" ).dialog('open'); - } - else $('#calendar').fullCalendar( 'unselect' ); - - //self.location="/event/add/evstart/" + date + "/poolID/" + $("#poolselectbox option:selected").val(); - },*/ - + eventMouseover: function( event, jsEvent, view ) { evClick = true; }, @@ -798,6 +739,11 @@ var dayClick = false; } } }); + + + /* + * Button definitions + */ // EventType Buttons $('.fc-header-center').append('Lecture'); @@ -933,7 +879,11 @@ var dayClick = false; } -// initialize errorRights Dialog +/* + * Initialisation of Dialogs + */ + +// errorRights Dialog $(function() { $( "#errorRightsDialog" ).dialog({ autoOpen: false, @@ -952,7 +902,7 @@ var dayClick = false; }); }); -// initialize noPoolSelected Dialog +// noPoolSelected Dialog $(function() { $( "#noPoolSelectedDialog" ).dialog({ autoOpen: false, @@ -971,7 +921,7 @@ var dayClick = false; }); }); -// initialize errorEditImmediate Dialog +// errorEditImmediate Dialog $(function() { $( "#errorEditImmediate" ).dialog({ autoOpen: false, @@ -990,7 +940,7 @@ var dayClick = false; }); }); -//initialize errorTime Dialog +// errorTime Dialog $(function() { $( "#errorTimeDialog" ).dialog({ autoOpen: false, @@ -1009,7 +959,7 @@ var dayClick = false; }); }); -//initialize formularOverlappingDialog Dialog +// formularOverlappingDialog Dialog $(function() { $( "#formularOverlappingDialog" ).dialog({ autoOpen: false, -- cgit v1.2.3-55-g7522