From bf5dc880daedd8777a157e5c1ac033d6d4292a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Fri, 25 Jan 2013 09:05:06 +0000 Subject: [PATCH] =?UTF-8?q?-=20Neue=20JQuery=20Version=20(draggable=20Unte?= =?UTF-8?q?rst=C3=BCtzung=20f=C3=BCr=20IE9,=20neues=20Autocomplete)=20-=20?= =?UTF-8?q?Coodle=20Anpassung=20neue=20JQuery=20Version=20und=20Bugfixes?= =?UTF-8?q?=20f=C3=BCr=20aktuelle=20Browserversionen=20-=20Freebusy=20Plug?= =?UTF-8?q?in=20f=C3=BCr=20SOGo=20Kalender?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cis/private/coodle/coodle_autocomplete.php | 21 +- cis/private/coodle/stammdaten.php | 6 +- cis/private/coodle/termin.php | 72 +- cis/private/coodle/uebersicht.php | 3 +- cis/public/freebusy_sogo.php | 62 ++ config/cis.config-default.inc.php | 5 + include/ical.class.php | 19 + include/js/CSS and JavaScript.txt | 13 +- include/js/jquery1.9.min.js | 942 +++++++++++++++++++++ locale/de-AT/coodle.php | 4 +- skin/jquery-ui-1.9.2.custom.min.css | 5 + 11 files changed, 1102 insertions(+), 50 deletions(-) create mode 100755 cis/public/freebusy_sogo.php create mode 100644 include/js/jquery1.9.min.js create mode 100755 skin/jquery-ui-1.9.2.custom.min.css 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').':

- - +