From a3947245a1ada81dbeada936faa5fc4736f7a9f0 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Thu, 21 Oct 2010 19:57:12 +0000
Subject: [PATCH] new : Add the first_name in the search box for cards

---
 html/ajax_card.php               |  1 +
 include/class_database.php       |  5 ++-
 include/template/card_result.php |  7 ++-
 sql/upgrade.sql                  | 76 +++++++++++++++++++++++++++++++-
 4 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/html/ajax_card.php b/html/ajax_card.php
index 8dbbae236..83fe43567 100644
--- a/html/ajax_card.php
+++ b/html/ajax_card.php
@@ -276,6 +276,7 @@ case 'fs':
     {
         $array[$i]['quick_code']=$a[$i]['quick_code'];
         $array[$i]['name']=h($a[$i]['vw_name']);
+        $array[$i]['first_name']=h($a[$i]['vw_first_name']);
         $array[$i]['description']=h($a[$i]['vw_description']);
         $array[$i]['javascript']=sprintf("set_value('%s','%s');",
                                          $inp,$array[$i]['quick_code']);
diff --git a/include/class_database.php b/include/class_database.php
index 1e76ace35..a86c62106 100644
--- a/include/class_database.php
+++ b/include/class_database.php
@@ -804,7 +804,10 @@ class Database
     }
     static function test_me()
     {}
-
+    function status()
+    {
+      return pg_transaction_status($this->db);
+    }
 }
 
 /* test::test_me(); */
diff --git a/include/template/card_result.php b/include/template/card_result.php
index 4140372ae..862983147 100644
--- a/include/template/card_result.php
+++ b/include/template/card_result.php
@@ -1,10 +1,10 @@
 <fieldset id="asearch" style="height:88%">
    <legend><? echo _('Résultats'); ?></legend>
 <div style="height:88%;overflow:auto;">
-<table width="100%">
+<table >
 <? for ($i=0;$i<sizeof($array);$i++) : ?>
 <tr>
-<td>
+<td style="padding-right:55">
 <a href="javascript:void(0)" class="one" onclick="<?=$array[$i]['javascript']?>">
 <?=$array[$i]['quick_code']?>
 </a>
@@ -12,6 +12,9 @@
 <td>
    <?=$array[$i]['name']?>
 </td>
+<td>
+   <?=$array[$i]['first_name']?>
+</td>
 <td>
 <?=$array[$i]['description']?>
 </td>
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index 344222eab..4f9639ef4 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -24,4 +24,78 @@ NEW.f_id:=n_fid;
 return NEW;
 end;
 $BODY$
-LANGUAGE plpgsql;
\ No newline at end of file
+LANGUAGE plpgsql;
+
+insert into attr_Def values (32,'Prénom','text',22);
+update attr_def set ad_text='Dépense  charge du grant (partie privé) ' where ad_id=31;
+
+
+-- add the first name
+
+DROP VIEW vw_fiche_attr;
+
+CREATE OR REPLACE VIEW vw_fiche_attr AS 
+ SELECT a.f_id, a.fd_id, a.av_text AS vw_name, b.av_text AS vw_sell, c.av_text AS vw_buy, d.av_text AS tva_code, tva_rate.tva_id, tva_rate.tva_rate, tva_rate.tva_label, e.av_text AS vw_addr, f.av_text AS vw_cp, j.av_text AS quick_code, h.av_text AS vw_description, i.av_text AS tva_num, k.av_text AS vw_first_name, fiche_def.frd_id
+   FROM ( SELECT fiche.f_id, fiche.fd_id, attr_value.av_text
+           FROM fiche
+      JOIN jnt_fic_att_value USING (f_id)
+   JOIN attr_value USING (jft_id)
+   JOIN attr_def USING (ad_id)
+  WHERE jnt_fic_att_value.ad_id = 1) a
+   LEFT JOIN ( SELECT fiche.f_id, attr_value.av_text
+           FROM fiche
+      JOIN jnt_fic_att_value USING (f_id)
+   JOIN attr_value USING (jft_id)
+   JOIN attr_def USING (ad_id)
+  WHERE jnt_fic_att_value.ad_id = 6) b ON a.f_id = b.f_id
+   LEFT JOIN ( SELECT fiche.f_id, attr_value.av_text
+      FROM fiche
+   JOIN jnt_fic_att_value USING (f_id)
+   JOIN attr_value USING (jft_id)
+   JOIN attr_def USING (ad_id)
+  WHERE jnt_fic_att_value.ad_id = 7) c ON a.f_id = c.f_id
+   LEFT JOIN ( SELECT fiche.f_id, attr_value.av_text
+   FROM fiche
+   JOIN jnt_fic_att_value USING (f_id)
+   JOIN attr_value USING (jft_id)
+   JOIN attr_def USING (ad_id)
+  WHERE jnt_fic_att_value.ad_id = 2) d ON a.f_id = d.f_id
+   LEFT JOIN ( SELECT fiche.f_id, attr_value.av_text
+   FROM fiche
+   JOIN jnt_fic_att_value USING (f_id)
+   JOIN attr_value USING (jft_id)
+   JOIN attr_def USING (ad_id)
+  WHERE jnt_fic_att_value.ad_id = 14) e ON a.f_id = e.f_id
+   LEFT JOIN ( SELECT fiche.f_id, attr_value.av_text
+   FROM fiche
+   JOIN jnt_fic_att_value USING (f_id)
+   JOIN attr_value USING (jft_id)
+   JOIN attr_def USING (ad_id)
+  WHERE jnt_fic_att_value.ad_id = 15) f ON a.f_id = f.f_id
+   LEFT JOIN ( SELECT fiche.f_id, attr_value.av_text
+   FROM fiche
+   JOIN jnt_fic_att_value USING (f_id)
+   JOIN attr_value USING (jft_id)
+   JOIN attr_def USING (ad_id)
+  WHERE jnt_fic_att_value.ad_id = 23) j ON a.f_id = j.f_id
+   LEFT JOIN ( SELECT fiche.f_id, attr_value.av_text
+   FROM fiche
+   JOIN jnt_fic_att_value USING (f_id)
+   JOIN attr_value USING (jft_id)
+   JOIN attr_def USING (ad_id)
+  WHERE jnt_fic_att_value.ad_id = 9) h ON a.f_id = h.f_id
+   LEFT JOIN ( SELECT fiche.f_id, attr_value.av_text
+   FROM fiche
+   JOIN jnt_fic_att_value USING (f_id)
+   JOIN attr_value USING (jft_id)
+   JOIN attr_def USING (ad_id)
+  WHERE jnt_fic_att_value.ad_id = 13) i ON a.f_id = i.f_id
+   LEFT JOIN ( SELECT fiche.f_id, attr_value.av_text
+   FROM fiche
+   JOIN jnt_fic_att_value USING (f_id)
+   JOIN attr_value USING (jft_id)
+   JOIN attr_def USING (ad_id)
+  WHERE jnt_fic_att_value.ad_id = 32) k ON a.f_id = k.f_id
+   LEFT JOIN tva_rate ON d.av_text = tva_rate.tva_id::text
+   JOIN fiche_def USING (fd_id);
+