From 16c7ef5c6a8358497f2bc84652713f18da67c2ca Mon Sep 17 00:00:00 2001
From: Martin Tatzber <tatzberm@techikum-wien.at>
Date: Wed, 11 Sep 2013 08:44:01 +0000
Subject: [PATCH] Firmenverwaltung: autocomplete-Felder mit neuer
 jQuery-Version

---
 vilesci/stammdaten/firma_details.php          | 38 +++++++++++++----
 vilesci/stammdaten/firma_detailwork.php       | 41 +++++++++++++++----
 .../stammdaten/firma_zusammen_uebersicht.php  | 10 +++--
 .../stammdaten/stammdaten_autocomplete.php    | 29 +++++++++----
 4 files changed, 94 insertions(+), 24 deletions(-)

diff --git a/vilesci/stammdaten/firma_details.php b/vilesci/stammdaten/firma_details.php
index b58aa16d1..e2c83d215 100644
--- a/vilesci/stammdaten/firma_details.php
+++ b/vilesci/stammdaten/firma_details.php
@@ -147,15 +147,18 @@ if(isset($_GET['deletetag']))
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
 	<link rel="stylesheet" href="../../skin/styles/jquery.css" type="text/css">
-	<link rel="stylesheet" href="../../skin/styles/jquery-ui.css" type="text/css">
+<!--	<link rel="stylesheet" href="../../skin/styles/jquery-ui.css" type="text/css"> -->
 	
 	<script src="../../include/js/mailcheck.js" type="text/javascript"></script>
 	<script src="../../include/js/datecheck.js" type="text/javascript"></script>
-	<script src="../../include/js/jquery.js" type="text/javascript"></script>
-	<script src="../../include/js/jquery-ui.js" type="text/javascript"></script>
-	<script src="../../include/js/jquery.autocomplete.min.js" type="text/javascript"></script>	
+<!--	<script src="../../include/js/jquery.js" type="text/javascript"></script> -->
+<!--	<script src="../../include/js/jquery-ui.js" type="text/javascript"></script> -->
+<!--	<script src="../../include/js/jquery.autocomplete.min.js" type="text/javascript"></script> -->
 	
-	<script type="text/javascript" language="JavaScript1.2">
+	<script type="text/javascript" src="../../include/js/jquery1.9.min.js"></script>
+        <link rel="stylesheet" type="text/css" href="../../skin/jquery-ui-1.9.2.custom.min.css"/>
+
+<script type="text/javascript" language="JavaScript1.2">
 		function confdel()
 		{
 			if(confirm("Diesen Datensatz wirklich loeschen?"))
@@ -326,7 +329,7 @@ function getFirmadetail($firma_id, $adresstyp_arr, $user, $neu)
 		$htmlstr.="</tr>";
 		$htmlstr.="<tr>";
 		$htmlstr.="<td title='Trennung mehrerer Tags durch ;'>Tags:</td><td><input type='text' id='tags' name='tags' size='32'>";
-		$htmlstr.="<script type='text/javascript' language='JavaScript1.2'>
+		/* $htmlstr.="<script type='text/javascript' language='JavaScript1.2'>
 					$('#tags').autocomplete('stammdaten_autocomplete.php', 
 					{
 						minChars:1,
@@ -336,7 +339,28 @@ function getFirmadetail($firma_id, $adresstyp_arr, $user, $neu)
 						multipleSeparator: '; ',
 						extraParams:{'work':'tags'}
 					});
-				</script>";
+				</script>"; */
+		$htmlstr.="<script type='text/javascript'>
+                            $(document).ready(function()
+                            {
+                                $('#tags').autocomplete({
+                                    source: 'stammdaten_autocomplete.php?work=tags', 
+                                    minLength:1,
+                                    response: function(event, ui)
+                                    {
+                                        for(i in ui.content)
+                                        {
+                                            ui.content[i].value=ui.content[i].tag;
+                                            ui.content[i].label=ui.content[i].tag;
+                                        }
+                                    },
+                                    select: function(event, ui)
+                                    {
+                                        ui.item.value=ui.item.tag;
+                                    }
+				});
+                            });
+                           </script>";
 		$htmlstr.="</td>";
 		$htmlstr.="<td>&nbsp;</td>";	
 		$htmlstr.="<td colspan='9'>";
diff --git a/vilesci/stammdaten/firma_detailwork.php b/vilesci/stammdaten/firma_detailwork.php
index d1f08dddf..3ffb3b7ac 100644
--- a/vilesci/stammdaten/firma_detailwork.php
+++ b/vilesci/stammdaten/firma_detailwork.php
@@ -225,13 +225,16 @@ if(isset($_GET['type']) && $_GET['type']=='getortcontent' && isset($_GET['plz'])
 
 <link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
 <link rel="stylesheet" href="../../skin/styles/jquery.css" type="text/css">
-<link rel="stylesheet" href="../../skin/styles/jquery-ui.css" type="text/css">
+<!-- <link rel="stylesheet" href="../../skin/styles/jquery-ui.css" type="text/css"> -->
 
 <script src="../../include/js/mailcheck.js" type="text/javascript"></script>
 <script src="../../include/js/datecheck.js" type="text/javascript"></script>
-<script src="../../include/js/jquery.js" type="text/javascript"></script>
-<script src="../../include/js/jquery-ui.js" type="text/javascript"></script>
-<script src="../../include/js/jquery.autocomplete.min.js" type="text/javascript"></script>
+<!-- <script src="../../include/js/jquery.js" type="text/javascript"></script> -->
+<!-- <script src="../../include/js/jquery-ui.js" type="text/javascript"></script> -->
+<!-- <script src="../../include/js/jquery.autocomplete.min.js" type="text/javascript"></script> -->
+
+<script type="text/javascript" src="../../include/js/jquery1.9.min.js"></script>
+<link rel="stylesheet" type="text/css" href="../../skin/jquery-ui-1.9.2.custom.min.css"/>
 
 <script type="text/javascript" language="JavaScript1.2">
 	// **************************************
@@ -1077,7 +1080,7 @@ function eingabePersonenfunktionen($firma_id,$standort_id,$personfunktionstandor
 	$htmlstr.="<td>&nbsp;</td></tr>";
 	$htmlstr.="<tr><td>Person: </td>";		
 	$htmlstr.="<td><input type='text' id='person_id' name='person_id' value='".$standort_obj->person_id."' size='20' maxlength='20' />\n";
-	$htmlstr.="<script type='text/javascript' language='JavaScript1.2'>
+/*	$htmlstr.="<script type='text/javascript' language='JavaScript1.2'>
 						function formatItem(row) 
 						{
 						    return row[0] + ' <li>' + row[1] + '</li> ';
@@ -1092,10 +1095,34 @@ function eingabePersonenfunktionen($firma_id,$standort_id,$personfunktionstandor
 						});
 
 				</script>
+	"; */
+	$htmlstr.="<script type='text/javascript'>
+            $(document).ready(function()
+            {
+                $('#person_id').autocomplete({
+                    source: 'stammdaten_autocomplete.php?work=person',
+                    minLength:2,
+                    response: function(event,ui)
+                    {
+                        //Value und Label fuer die Anzeige setzen
+                        for(i in ui.content)
+                        {
+                            ui.content[i].value=ui.content[i].uid;
+                            ui.content[i].label=ui.content[i].anrede+' '+ui.content[i].titelpre+ui.content[i].vorname+' '+ui.content[i].nachname+ui.content[i].funktion_kurzbz;
+                        }
+                    },
+                    select: function(event, ui)
+                    {
+                        ui.item.value=ui.item.uid;
+                    }
+                });
+            });
+            </script>
 	";
-	//$htmlstr.'<div id="contentPad">';
+
+        //$htmlstr.'<div id="contentPad">';
 	//$htmlstr.='<span class="formInfo"><a href="ansprechpartner_person_tt.htm?width=475" class="jTip" id="one" name="Personensuche">?</a></div></span></td>';
-	$htmlstr.="<td>&nbsp;</td>";	
+	$htmlstr.="<td>&nbsp;</td>";
 	$person=($standort_obj->person_anrede?$standort_obj->person_anrede.' ':'').($standort_obj->titelpre?$standort_obj->titelpre.' ':'').($standort_obj->vorname?$standort_obj->vorname.' ':'').($standort_obj->nachname?$standort_obj->nachname.' ':'');
 	$htmlstr.=($person?'<td colspan="2"></td><td id="person" colspan="9" align="right">'.$person.'</td></tr>':'')."</table></td>";		
 	$htmlstr.="</tr>\n";
diff --git a/vilesci/stammdaten/firma_zusammen_uebersicht.php b/vilesci/stammdaten/firma_zusammen_uebersicht.php
index 762521fd4..4a70141cd 100644
--- a/vilesci/stammdaten/firma_zusammen_uebersicht.php
+++ b/vilesci/stammdaten/firma_zusammen_uebersicht.php
@@ -70,9 +70,13 @@ if ($firma->getFirmenTypen())
 	<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
 	<link rel="stylesheet" href="../../include/js/tablesort/table.css" type="text/css">
 	<script src="../../include/js/tablesort/table.js" type="text/javascript"></script>
-	<script src="../../include/js/jquery.js" type="text/javascript"></script>
-	<script src="../../include/js/jquery-ui.js" type="text/javascript"></script>
-	<script src="../../include/js/jquery.autocomplete.min.js" type="text/javascript"></script>
+<!--        <script src="../../include/js/jquery.js" type="text/javascript"></script> -->
+<!--	<script src="../../include/js/jquery-ui.js" type="text/javascript"></script> -->
+<!--	<script src="../../include/js/jquery.autocomplete.min.js" type="text/javascript"></script> -->
+        
+	<script type="text/javascript" src="../../include/js/jquery1.9.min.js"></script>
+        <link rel="stylesheet" type="text/css" href="../../skin/jquery-ui-1.9.2.custom.min.css"/>
+        
 	<style type="text/css">
 	<!--
 	
diff --git a/vilesci/stammdaten/stammdaten_autocomplete.php b/vilesci/stammdaten/stammdaten_autocomplete.php
index c47b818e2..f867f9ec0 100644
--- a/vilesci/stammdaten/stammdaten_autocomplete.php
+++ b/vilesci/stammdaten/stammdaten_autocomplete.php
@@ -269,7 +269,7 @@ cellSeparator (default value: "|")
 			break;
 
 		case 'tags':
-			$tag=trim((isset($_REQUEST['q']) ? $_REQUEST['q']:''));
+			$tag=trim((isset($_REQUEST['term']) ? $_REQUEST['term']:''));
 			
 		 	$pWhere=" upper(tag) like upper('%".addslashes($tag)."%')";
 			
@@ -286,14 +286,20 @@ cellSeparator (default value: "|")
 			
 			if(is_array($result))
 			{
-				for ($i=0;$i<count($result);$i++)
-					echo html_entity_decode($result[$i]->tag)."\n";			
+                            $json=array();
+                            for ($i=0;$i<count($result);$i++)
+                            {
+                                $item['tag']=$result[$i]->tag;
+                                $json[]=$item;
+                                //echo html_entity_decode($result[$i]->tag)."\n";
+                            }
+                            echo json_encode($json);
 			}
 			break;
 			
 		// Person - FH Technikum suche
 		case 'person':
-		 	$person_id=trim((isset($_REQUEST['q']) ? $_REQUEST['q']:''));
+		 	$person_id=trim((isset($_REQUEST['term']) ? $_REQUEST['term']:''));
 			if (is_null($person_id) || $person_id=='')
 				exit('person_id wurde nicht übergeben!');
 			
@@ -352,15 +358,24 @@ cellSeparator (default value: "|")
 			if (!$oRresult=$db->SQL($pArt,$pDistinct,$pFields,$pTable,$pWhere,$pOrder,$pLimit,$pSql))
 				exit(' |'.$db->errormsg."\n");
 
-				
+			$json=array();
 			for ($i=0;$i<count($oRresult);$i++)
 			{
-				echo html_entity_decode($oRresult[$i]->person_id).'|'
+                            $item['anrede']=trim($oRresult[$i]->anrede);
+                            $item['titelpre']=$oRresult[$i]->titelpre?html_entity_decode($oRresult[$i]->titelpre).' ':'';
+                            $item['vorname']=html_entity_decode($oRresult[$i]->vorname);
+                            $item['nachname']=html_entity_decode($oRresult[$i]->nachname);
+                            $item['funktion_kurzbz']=$oRresult[$i]->funktion_kurzbz?html_entity_decode($oRresult[$i]->funktion_kurzbz).' ':'';
+                            $item['aktiv']=$oRresult[$i]->aktiv==true || $oRresult[$i]->aktiv=='t'?true:false;
+                            $item['uid']=$oRresult[$i]->uid;
+                            $json[]=$item;
+/*				echo html_entity_decode($oRresult[$i]->person_id).'|'
 									.trim($oRresult[$i]->anrede).'&nbsp;'.($oRresult[$i]->titelpre?html_entity_decode($oRresult[$i]->titelpre).'&nbsp;':'')
 									.html_entity_decode($oRresult[$i]->vorname).' '.html_entity_decode($oRresult[$i]->nachname).($oRresult[$i]->funktion_kurzbz?html_entity_decode($oRresult[$i]->funktion_kurzbz).'&nbsp;':'') 
 									.($oRresult[$i]->aktiv==true || $oRresult[$i]->aktiv=='t'?'&nbsp;<img src="../../skin/images/tick.png" alt="aktiv" />':'&nbsp;<img src="../../skin/images/cross.png" alt="nicht aktiv" />')
-					."\n";
+					."\n"; */
 			}
+                        echo json_encode($json);
 			break;
 			
 		// Lektor,Student - FHTW Suche im LV-Plan