summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-09-08 13:45:54 +0200
committerBjörn Geiger2011-09-08 13:45:54 +0200
commitcb95fb8268f2a7ec9a905837c0d2cb81b68cb34d (patch)
tree1dc660dad2f118b35dd26dcaac9260e90231e0d1
parentkleine korrekturen (diff)
parentdelete events by key (diff)
downloadpoolctrl-cb95fb8268f2a7ec9a905837c0d2cb81b68cb34d.tar.gz
poolctrl-cb95fb8268f2a7ec9a905837c0d2cb81b68cb34d.tar.xz
poolctrl-cb95fb8268f2a7ec9a905837c0d2cb81b68cb34d.zip
Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl
-rw-r--r--application/controllers/EventController.php4
-rw-r--r--application/views/scripts/event/index.phtml83
2 files changed, 43 insertions, 44 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 5a5e92e..629a9ec 100644
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -355,6 +355,10 @@ class EventController extends Zend_Controller_Action
return;
}
}
+
+ public function refreshCal() {
+ $this->_redirect('/event/');
+ }
public function editAction()
{
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index 5a210b3..6618c52 100644
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -86,11 +86,10 @@ var lastview;
events: "/event/eventlist/poolID/" + getPoolID(),
-
-
+
dayClick: function( date, allDay, jsEvent, view ) {
- //self.location="/event/add/";
+
},
eventMouseover: function( event, jsEvent, view ) {
@@ -100,14 +99,26 @@ var lastview;
},
eventClick: function( event, jsEvent, view ) {
-
- alert('Event: ' + event.title +
- '\nStart: ' + event.start +
- '\nEnd: ' + event.end +
- '\nNote: ' + event.note +
- '\nCategory: ' + event.category +
- '\nParticipants: ' + event.participants);
- //$(this).css('color', 'red');
+
+ $(document).keydown(function (e) {
+ if (e.keyCode == 8 || e.keyCode == 46) {
+ if (confirm("Are you sure to delete " + event.title + " ?")) {
+ self.location="/event/delete/eventID/" + event.id;
+ $('#calendar').fullCalendar( 'removeEvents', event.id );
+ $('#calendar').fullCalendar( 'rerenderEvents' );
+ }else{ self.location = "/event/"; }
+ }
+ });
+ /*
+ if(event.color == 'red') {
+ event.color = 'rgb(112,0,0)';
+ }else if(event.color == 'green') {
+ event.color = 'rgb(0,90,0)';
+ }else if(event.color == 'yellow') {
+ event.color = '';
+ }else if(event.color == 'blue') {
+ event.color = 'rgb(0,0,112)';
+ }*/
},
select: function( startDate, endDate, allDay, jsEvent, view ) {
@@ -115,9 +126,7 @@ var lastview;
if (!confirm("Are you sure to add an Event from " + startDate + " to " + endDate + " ?")) {
$('#calendar').fullCalendar( 'unselect' );
}else {
- //self.location="/event/add/";
self.location="/event/add/evstart/" + startDate + "/evend/" + endDate;
- //$.post("/event/add/evstart" + startDate + "/evend" + endDate);
}
},
@@ -141,16 +150,6 @@ var lastview;
},
eventDrop: function( event, dayDelta, minuteDelta, allDay, revertFunc ) {
- /*
- * -------------------------
- * allDay is not implemented
- * -------------------------
- if (allDay) {
- alert("Event is now all-day");
- }else{
- alert("Event has a time-of-day");
- }
- */
if (!confirm(event.title + " was moved to " + event.start + "\n\n" + "Are you sure about this change?")) {
revertFunc();
@@ -160,11 +159,13 @@ var lastview;
},
- eventElementHandlers: function (event, eventElement) {
- var view = this;
+ /*eventElementHandlers: function (event, eventElement) {
+ var view = this;
+ alert('eventhandler');
eventElement
.click(function (ev)
{
+ alert('eventhandler');
if (!eventElement.hasClass('ui-draggable-dragging') &&
!eventElement.hasClass('ui-resizable-resizing'))
{
@@ -185,31 +186,25 @@ var lastview;
view.trigger('eventMouseout', this, event, ev);
}
);
- },
+ },*/
eventRender: function(event, element, view) {
-
- element.bind('dblclick', function() {
- alert('double click!');
- });
+ element.qtip({
+ content:
+ 'Title: ' + event.title + '<br/>' +
+ 'Type: ' + event.category + '<br/>' +
+ 'Note: ' + event.note + '<br/>' +
+ 'Participants: ' + event.participants,
+ show: 'mouseover',
+ hide: 'mouseout'
+ });
+
if (view.name == 'agendaWeek') {
- element.qtip({
- content:
- 'Title: ' + event.title + '<br/>' +
- 'Type: ' + event.category + '<br/>' +
- 'Note: ' + event.note + '<br/>' +
- 'Participants: ' + event.participants
- });
+
}
if (view.name == 'agendaDay') {
- element.qtip({
- content:
- 'Title: ' + event.title + '<br/>' +
- 'Type: ' + event.category + '<br/>' +
- 'Note: ' + event.note + '<br/>' +
- 'Participants: ' + event.participants
- });
+
element.find('.fc-event-title').append("<br/> Type: " + event.category + "<br/> Note: " + event.note + "<br/> Participants: " + event.participants);
}
},