summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-10 14:58:46 +0200
committerBjörn Geiger2011-10-10 14:58:46 +0200
commit46abe211524fabffc32cfda06484c1b502146d11 (patch)
tree1301c187577664b1e90092d7ec406dc9440fec85 /application
parentEdit Event geändert, noch nicht vollständig (diff)
parentbugfix (diff)
downloadpoolctrl-46abe211524fabffc32cfda06484c1b502146d11.tar.gz
poolctrl-46abe211524fabffc32cfda06484c1b502146d11.tar.xz
poolctrl-46abe211524fabffc32cfda06484c1b502146d11.zip
Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl
Diffstat (limited to 'application')
-rwxr-xr-xapplication/controllers/EventController.php13
-rwxr-xr-xapplication/models/EventMapper.php4
-rw-r--r--application/views/scripts/event/checkoverlapevents.phtml3
-rwxr-xr-xapplication/views/scripts/event/index.phtml28
4 files changed, 24 insertions, 24 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index d1b4ab7..ab001f5 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -640,15 +640,7 @@ class EventController extends Zend_Controller_Action
$events = $this->eventMapper->getDraggingEvents($eventID);
$others = $this->eventMapper->getNotDraggingEvents($eventID);
-
-
-
-
-
-
- // Fetch all events with same title as dragged one (fetch repeats)
-
-
+
// Calculate time shift
$diff=0;
foreach($events as $e) {
@@ -690,7 +682,6 @@ class EventController extends Zend_Controller_Action
$evid = $this->getRequest()->getParam('evid');
$evstart = $this->getRequest()->getParam('evstart');
$evend = $this->getRequest()->getParam('evend');
- //var_dump($evend);
if ($evid!="null") {
$this->eventMapper->find($evid,$event); //locate the event in the DB
@@ -827,8 +818,6 @@ class EventController extends Zend_Controller_Action
$evend = $this->getRequest()->getParam('evend');
$poolID = $this->getRequest()->getParam('poolID');
- //var_dump(date('Y-m-d H:i:s', strtotime(substr($evend, 0, 24))));
-
if ($evid!=null) {
$this->eventMapper->find($evid,$event); //locate the event in the DB
$oldStartTime = date('H:i', strtotime($event->getStart()));
diff --git a/application/models/EventMapper.php b/application/models/EventMapper.php
index 092ab63..b99ece4 100755
--- a/application/models/EventMapper.php
+++ b/application/models/EventMapper.php
@@ -412,6 +412,7 @@ class Application_Model_EventMapper
return $return;
}
+ // Fetch all events with same title as dragged one (fetch repeats)
public function getDraggingEvents($eventID) {
$db = Zend_Db_Table::getDefaultAdapter();
@@ -423,6 +424,7 @@ class Application_Model_EventMapper
}
+ // Fetch all notDragging events
public function getNotDraggingEvents($eventID) {
$db = Zend_Db_Table::getDefaultAdapter();
@@ -434,6 +436,4 @@ class Application_Model_EventMapper
}
- //$others[] = SELECT * FROM events WHERE id NOT IN (implode(',', $events_ids))
-
} \ No newline at end of file
diff --git a/application/views/scripts/event/checkoverlapevents.phtml b/application/views/scripts/event/checkoverlapevents.phtml
index 265da0b..e3e5138 100644
--- a/application/views/scripts/event/checkoverlapevents.phtml
+++ b/application/views/scripts/event/checkoverlapevents.phtml
@@ -1,11 +1,12 @@
<?php
// Output
-print_r($this->overlaps);
+//print_r($this->overlaps);
if(count($this->overlaps) == 0) {
echo '-1';
}
else {
// Echo contents of output, e.g. required values, such as title, date, etc.
+ echo json_encode($this->overlaps);
}
?> \ No newline at end of file
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index f5beb9e..07b3b37 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -208,8 +208,16 @@ var dayClick = false;
slotMinutes: 30,
defaultEventMinutes: 20,
- /*dayClick: function( date, allDay, jsEvent, view ) {
-
+ dayClick: function( date, allDay, jsEvent, view ) {
+ /*
+ var overlapevents = $.get("/event/checkoverlapevents/eventID/" + selectedEvent.id + "/date/" + date);
+ alert(overlapevents);
+ if (overlapevents) {
+ alert(overlapevents);
+ } else alert('no overlap events');
+ */
+
+ /*
selectedDate = date;
dayClick = true;
$('#calendar').fullCalendar( 'unselect' );
@@ -247,9 +255,9 @@ var dayClick = false;
$( "#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;
@@ -496,7 +504,9 @@ var dayClick = false;
}
},
- eventDragStop: function(event, jsEvent, ui, view) {
+ eventDragStop: function(event, jsEvent, ui, view, date) {
+ //var date = $('#calendar').fullCalendar('getDate');
+ //alert(date);
/*
if() {
isDroppable = false;
@@ -745,28 +755,28 @@ var dayClick = false;
<!-- delete wdhEvent -->
<div id="eventDeleteWdhDialog" style="display: none">
-<p>This is a Wdh-Event!</p>
+<p>This is a Repeat-Event!</p>
<p>Do you want to delete any event occurring this event or just the
selected one?</p>
</div>
<!-- resize wdhEvent -->
<div id="eventResizeWdhDialog" style="display: none">
-<p>This is a Wdh-Event!</p>
+<p>This is a Repeat-Event!</p>
<p>Do you want to resize any event occurring this event or just the
selected one?</p>
</div>
<!-- move wdhEvent -->
<div id="eventMoveWdhDialog" style="display: none">
-<p>This is a Wdh-Event!</p>
+<p>This is a Repeat-Event!</p>
<p>Do you want to move any event occurring this event or just the
selected one?</p>
</div>
<!-- edit wdhEvent -->
<div id="eventEditWdhDialog" style="display: none">
-<p>This is a Wdh-Event!</p>
+<p>This is a Repeat-Event!</p>
<p>Do you want to edit any event occurring this event or just the
selected one?</p>
</div>