diff --git a/cis/private/coodle/coodle_autocomplete.php b/cis/private/coodle/coodle_autocomplete.php
index 1bde7ab23..3fbb51f48 100755
--- a/cis/private/coodle/coodle_autocomplete.php
+++ b/cis/private/coodle/coodle_autocomplete.php
@@ -25,11 +25,15 @@ if(!isset($_REQUEST['work']))
die('Parameter Work missing');
$work = $_REQUEST['work'];
-$q = $_REQUEST['q'];
+if(isset($_REQUEST['term']))
+ $q = $_REQUEST['term'];
+else
+ $q = $_REQUEST['q'];
switch($work)
{
case 'ressource':
+ $result =array();
$ort = new ort();
if(!$ort->filter($q))
@@ -38,7 +42,13 @@ switch($work)
foreach($ort->result as $row)
{
if($row->aktiv)
- echo html_entity_decode($row->ort_kurzbz.'|Ort|'.$row->bezeichnung."\n");
+ {
+ //echo html_entity_decode($row->ort_kurzbz.'|Ort|'.$row->bezeichnung."\n");
+ $item['uid']=$row->ort_kurzbz;
+ $item['typ']='Ort';
+ $item['bezeichnung']=$row->bezeichnung;
+ $result[]=$item;
+ }
}
$benutzer = new benutzer();
@@ -48,8 +58,13 @@ switch($work)
foreach($benutzer->result as $row)
{
- echo html_entity_decode($row->uid.'|Person|'.$row->nachname.' '.$row->vorname."\n");
+ //echo html_entity_decode($row->uid.'|Person|'.$row->nachname.' '.$row->vorname."\n");
+ $item['uid']=$row->uid;
+ $item['typ']='Person';
+ $item['bezeichnung']=$row->nachname.' '.$row->vorname;
+ $result[]=$item;
}
+ echo json_encode($result);
break;
default:
die('Invalid Work Parameter');
diff --git a/cis/private/coodle/stammdaten.php b/cis/private/coodle/stammdaten.php
index 90049176c..6e01dbb21 100755
--- a/cis/private/coodle/stammdaten.php
+++ b/cis/private/coodle/stammdaten.php
@@ -45,10 +45,8 @@ echo '
-
-
-
-
+
+
+
-
+
'.$p->t('coodle/coodle').' - '.$p->t('coodle/termine').'
@@ -314,8 +314,9 @@ echo '
$(this).draggable(
{
zIndex: 999,
- revert: true, // will cause the event to go back to its
- revertDuration: 0 // original position after the drag
+ revert: true, // will cause the event to go back to its
+ revertDuration: 0, // original position after the drag
+ scroll: false // behebt ruckeln im IE7
});
});
@@ -505,6 +506,14 @@ echo '
}
});
}
+ },
+ dayClick: function(date, allDay, jsEvent, view)
+ {
+ if(view.name=="month")
+ {
+ $("#calendar").fullCalendar("changeView", "agendaWeek");
+ $("#calendar").fullCalendar("gotoDate", date);
+ }
}
});
});
@@ -544,44 +553,31 @@ echo '
'.$p->t('coodle/ressource').':
-
-
+