[Phpcompta-dev] r4390 - in phpcompta/trunk: html/js include

[phpcompta-dev]

Author: danydb
Date: 2011-11-18 11:55:55 +0100 (Fri, 18 Nov 2011)
New Revision: 4390

Modified:
   phpcompta/trunk/html/js/anc_script.js
   phpcompta/trunk/include/ajax_anc_search.php
   phpcompta/trunk/include/anc_pa.inc.php
Log:
#168 recherche anc

Modified: phpcompta/trunk/html/js/anc_script.js
===================================================================
--- phpcompta/trunk/html/js/anc_script.js       2011-11-18 10:29:04 UTC (rev 
4389)
+++ phpcompta/trunk/html/js/anc_script.js       2011-11-18 10:55:55 UTC (rev 
4390)
@@ -181,10 +181,10 @@
 function search_ca (p_dossier,p_target,p_source)
 {
     var pa_id=g(p_source).value;
-    var url="gDossier="+p_dossier+"&c1="+p_target+"&c2="+pa_id;
     waiting_box();
     removeDiv('search_anc');
     var qs="op=openancsearch&gDossier="+p_dossier+"&ctl=searchanc";
+    qs+="&c2="+pa_id+"&c1="+p_target;
 
     var action=new Ajax.Request ( 'ajax_misc.php',
     {
@@ -213,7 +213,7 @@
 }
 function search_anc_form(obj)
 {
-    var qs="op=resultancsearch&ctl=searchanc&gDossier="+obj.gDossier;
+    var qs="op=resultancsearch&ctl=searchanc&";
     qs+=obj.serialize(false);
     waiting_box();
     var action=new Ajax.Request ( 'ajax_misc.php',

Modified: phpcompta/trunk/include/ajax_anc_search.php
===================================================================
--- phpcompta/trunk/include/ajax_anc_search.php 2011-11-18 10:29:04 UTC (rev 
4389)
+++ phpcompta/trunk/include/ajax_anc_search.php 2011-11-18 10:55:55 UTC (rev 
4390)
@@ -37,16 +37,16 @@
 require_once ('class_anc_account.php');
 require_once ('class_anc_plan.php');
 require_once('function_javascript.php');
-var_dump($_GET);
+
 echo HtmlInput::title_box("Recherche activité", $ctl);
 
 //------------- FORM ----------------------------------
 echo '<FORM METHOD="GET" onsubmit="search_anc_form(this);return false">';
 echo '<span>'._('Recherche').':';
 
-$texte=new IText();
-$texte->value=HtmlInput::default_value('label',"", $_GET);
-echo $texte->input('label');
+$texte=new IText('plabel');
+$texte->value=HtmlInput::default_value('plabel',"", $_GET);
+echo $texte->input();
 echo '</span>';
 echo dossier::hidden();
 $hid=new IHidden();
@@ -66,9 +66,9 @@
 
     $sql="select po_name , po_description from poste_analytique ".
          "where pa_id=$1 and ".
-         " upper (po_name) like upper('%'||$2||'%') order by po_name";
-    $res=$cn->exec_sql($sql,array($_REQUEST['c2'],$_REQUEST['label']));
-    $array=Database::fetch_all($res);
+         " (po_name ~* $2 or po_description ~* $3) order by po_name";
+    
$array=$cn->get_array($sql,array($_REQUEST['c2'],$_REQUEST['plabel'],$_REQUEST['plabel']));
+
     if (empty($array) == true)
     {
         echo "D&eacute;sol&eacute; aucun poste trouv&eacute;";
@@ -81,9 +81,9 @@
     echo '<table>';
     foreach ($array as $line)
     {
-        $button->javascript=sprintf("$('%s').value='%s'",
+        $button->javascript=sprintf("$('%s').value='%s';removeDiv('%s')",
                                     $_REQUEST['c1'],
-                                    $line['po_name']);
+                                    $line['po_name'],$ctl);
         echo '<tr>'.
         '<td>'.
         $button->input().

Modified: phpcompta/trunk/include/anc_pa.inc.php
===================================================================
--- phpcompta/trunk/include/anc_pa.inc.php      2011-11-18 10:29:04 UTC (rev 
4389)
+++ phpcompta/trunk/include/anc_pa.inc.php      2011-11-18 10:55:55 UTC (rev 
4390)
@@ -189,7 +189,7 @@
         $new->get();
         $array=$new->get_poste_analytique(" order by po_name");
         $ret.='<div class="redcontent">';
-        $ret.='<table style="width:100%;border:solid blue 2px 
;border-style:outset;">';
+        $ret.='<table class="table_large">';
         $ret.="<tr>";
         $ret.="<th> Nom </td>";
         $ret.="<th> Montant </td>";