From 040265d7e2844cc4b5c6e54da270ae168c1358eb Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Sun, 23 Oct 2011 16:14:17 +0200 Subject: running icons added --- application/controllers/EventController.php | 21 +++++++++----- application/views/scripts/event/index.phtml | 44 +++++++++++++++++------------ 2 files changed, 40 insertions(+), 25 deletions(-) diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php index f19f850..dcf15dc 100755 --- a/application/controllers/EventController.php +++ b/application/controllers/EventController.php @@ -1007,23 +1007,29 @@ class EventController extends Zend_Controller_Action } } - /*public function eventmovecfAction() { + public function eventmovecfAction() { if(!$this->acl->checkRight('eo')) { $this->_redirect('/'); } $this->_helper->layout->disableLayout(); $this->_helper->viewRenderer->setNoRender(); - $event = new Application_Model_Event(); - $cfevents = $this->getRequest()->getParam('cfevents'); $evmindelta = $this->getRequest()->getParam('evmindelta'); $evdaydelta = $this->getRequest()->getParam('evdaydelta'); $poolID = $this->getRequest()->getParam('poolID'); + + $eventsArray = (array) $cfevents; + + //$event = new Application_Model_Event($cfevents); + + var_dump($eventsArray); + + //print_r($cfevents['eventID']); - if ($eventTitle!=null) { + /*if ($cfevents!=null) { - $events = $this->eventMapper->findBy(array("title" => $eventTitle)); + $events = $this->eventMapper->findBy(array("eventID" => $cfevents['eventID'])); if ($events[0]->getPbs_membershipID() != $this->userIDsNamespace['membershipID']) { if (!$this->acl->checkRight('edo')) { $this->_redirect('/'); @@ -1083,8 +1089,8 @@ class EventController extends Zend_Controller_Action } else { $this->_redirect('/event/'); return; - } - }*/ + }*/ + } public function eventresizeAction() { if(!$this->acl->checkRight('eo')) { @@ -1253,6 +1259,7 @@ class EventController extends Zend_Controller_Action 'repeat' => $event->getRepeat(), 'opacity' => 1, 'immediate' => $event->getImmediate(), + 'running' => $event->getRunning(), ) ); } diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml index 68d8f9a..6cfb733 100755 --- a/application/views/scripts/event/index.phtml +++ b/application/views/scripts/event/index.phtml @@ -135,7 +135,7 @@ var dayClick = false; $( "#eventDeleteDialog" ).dialog('open'); // dialog for deleting selected wdhEvent - }else { + } else { $(function() { $( "#eventDeleteWdhDialog" ).dialog({ autoOpen: false, @@ -320,7 +320,7 @@ var dayClick = false; } }, open: function () { - $("#accordion").accordion({clearStyle: true, collapsible: true, active: 1, autoHeight: true }); + $("#accordion").accordion({clearStyle: true, collapsible: true, active: false, autoHeight: true }); $(".ui-dialog-titlebar-close").hide(); $(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error"); } @@ -386,7 +386,7 @@ var dayClick = false; // get conflicts var returndata = jQuery.parseJSON(data); // get conflict free events - var cfevents = data['cfevents']; + var cfevents = returndata.cfevents; //initialize eventNotDroppableDialog Dialog $(function() { @@ -398,7 +398,7 @@ var dayClick = false; buttons: { "Resolve Conflicts": function() { $(this).dialog("close"); - self.location="/event/eventresizeall/eventTitle/" + event.title + "/evmindelta/" + minuteDelta + "/poolID/" + $("#poolselectbox option:selected").val() + "/cfevents/" + cfevents; + self.location="/event/eventmovecf/evmindelta/" + minuteDelta + "/evdaydelta/" + dayDelta + "/poolID/" + $("#poolselectbox option:selected").val() + "/cfevents/" + cfevents; }, "OK": function() { $(this).dialog("close"); @@ -512,7 +512,7 @@ var dayClick = false; // get conflicts var returndata = jQuery.parseJSON(data); // get conflict free events with repeat - var cfevents = data['cfevents']; + var cfevents = returndata.cfevents; //initialize eventNotDroppableDialog Dialog $(function() { @@ -524,7 +524,7 @@ var dayClick = false; buttons: { "Resolve Conflicts": function() { $(this).dialog("close"); - self.location="/event/eventmovecf/evmindelta/" + minuteDelta + "/evdaydelta/" + dayDelta + "/poolID/" + $("#poolselectbox option:selected").val() + "/cfevents/" + cfevents; + $.post("/event/eventmovecf/evmindelta/" + minuteDelta + "/evdaydelta/" + dayDelta + "/poolID/" + $("#poolselectbox option:selected").val() + "/cfevents/" + cfevents); }, "OK": function() { $(this).dialog("close"); @@ -651,9 +651,27 @@ var dayClick = false; }, eventRender: function(event, element, view) { - - // disable resizing if the event is a boot- or shutdown-event + // add running icons and handle editing of events + if(event.running == 0) { + // event will take place soon + $('.fc-event-time').css('background','url(/media/img/down.png) top right no-repeat'); + //event.editable = false; + } else if(event.running == 1) { + // event is running + $('.fc-event-time').css('background','url(/media/img/play.gif) top right no-repeat'); + //event.editable = false; + } else if(event.running == 2) { + // event successfully + $('.fc-event-time').css('background','url(/media/img/default.png) top right no-repeat'); + //event.editable = false; + } else if(event.running == 3) { + // event failed + $('.fc-event-time').css('background','url(/media/img/delete.png) top right no-repeat'); + //event.editable = false; + } + + // disable resizing if the event is a boot- or shutdown-event if(event.category == 'Boot' || event.category == 'Shutdown') { element.resizable(false); // calendar resizing element.resizable("destroy"); // jqeury resizing @@ -682,16 +700,6 @@ var dayClick = false; element.find('.fc-event-title').append("
Type: " + event.category + "
Note: " + event.note + "
Participants: " + event.participants); } }, - - viewDisplay: function(view) { - - if (view.name == 'agendaWeek') - { - } - if (view.name == 'agendaDay') - { - } - } }); -- cgit v1.2.3-55-g7522