summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-09-08 15:44:24 +0200
committerBjörn Geiger2011-09-08 15:44:24 +0200
commit06c9edcd3d6f27617ed051f2e22924185c9093dd (patch)
tree9582c000506c4f9d8fe87d2cbe0376787f572063
parentverschiedenes (diff)
parentselection and addEvent fix (diff)
downloadpoolctrl-06c9edcd3d6f27617ed051f2e22924185c9093dd.tar.gz
poolctrl-06c9edcd3d6f27617ed051f2e22924185c9093dd.tar.xz
poolctrl-06c9edcd3d6f27617ed051f2e22924185c9093dd.zip
Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl
-rw-r--r--application/controllers/EventController.php10
-rw-r--r--application/views/scripts/event/index.phtml5
2 files changed, 11 insertions, 4 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 5bf02a0..d431b49 100644
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -226,10 +226,14 @@ class EventController extends Zend_Controller_Action
}
$add = $this->getRequest()->getParam("add");
if($this->getRequest()->getParam('start')) {
- $start = date ('m/d/Y H:i', strtotime(substr($this->getRequest()->getParam('start'), 0, 24)));
+ $start = date ('m/d/Y H:i', strtotime($this->getRequest()->getParam('start')));
+ } else if($this->getRequest()->getParam('evstart')) {
+ $start = date ('m/d/Y H:i', strtotime(substr($this->getRequest()->getParam('evstart'), 0, 24)));
} else {$start = 'mm/dd/yyyy H:min';}
if($this->getRequest()->getParam('end')) {
- $end = date ('m/d/Y H:i', strtotime(substr($this->getRequest()->getParam('end'), 0, 24)));
+ $end = date ('m/d/Y H:i', strtotime($this->getRequest()->getParam('end')));
+ } else if($this->getRequest()->getParam('evend')) {
+ $end = date ('m/d/Y H:i', strtotime(substr($this->getRequest()->getParam('evend'), 0, 24)));
} else {$end = 'mm/dd/yyyy H:min';}
if (!isset($add)){
$defaultEventCategory = $this->config['event']['category']['default'];
@@ -284,7 +288,7 @@ class EventController extends Zend_Controller_Action
$filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=10&filtervalue=" . $weekday . "&filtervalue2=" . $weekday;
$filterentriesApiResult3 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery3);
$filterentriesXMLString3 = $filterentriesApiResult3['http-body'];
- $filterentriesXML3 = new SimpleXMLEle/ment($filterentriesXMLString3);
+ $filterentriesXML3 = new SimpleXMLElement($filterentriesXMLString3);
$filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id);
} else {
$startDate = date('Y-m-d', strtotime($event->getStart()));
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index b71011e..2ca3194 100644
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -101,6 +101,7 @@ var lastview;
eventClick: function( event, jsEvent, view ) {
$('#calendar').dblclick(function() { self.location = "/event/edit/eventID/" + event.id;});
+ $('#calendar').unbind(event);
$(document).keydown(function (e) {
if (e.keyCode == 8 || e.keyCode == 46) {
@@ -133,7 +134,9 @@ var lastview;
if (!confirm("Are you sure to add an Event from " + startDate + " to " + endDate + " ?")) {
$('#calendar').fullCalendar( 'unselect' );
}else {
- self.location="/event/add/start/" + startDate + "/end/" + endDate;
+ //var startDate = $.fullCalendar.formatDate(startDate, 'MM/dd/yyyy hh:mm');
+ //var endDate = $.fullCalendar.formatDate(endDate, 'MM/dd/yyyy hh:mm');
+ self.location="/event/add/evstart/" + startDate + "/evend/" + endDate;
}
},