[Phpcompta-dev] r4837 - phpcompta/trunk/include

[phpcompta-dev]

Author: danydb
Date: 2012-05-16 22:21:30 +0200 (Wed, 16 May 2012)
New Revision: 4837

Modified:
   phpcompta/trunk/include/class_follow_up.php
Log:
#581: Dans FOLLOW utilisez les groupes ?\195?\160 la place des personnes

Modified: phpcompta/trunk/include/class_follow_up.php
===================================================================
--- phpcompta/trunk/include/class_follow_up.php 2012-05-16 19:59:19 UTC (rev 
4836)
+++ phpcompta/trunk/include/class_follow_up.php 2012-05-16 20:21:30 UTC (rev 
4837)
@@ -236,13 +236,12 @@
         $ag_dest=new ISelect();
         $ag_dest->readonly=$readonly;
         $ag_dest->name="ag_dest";
-        $repo=new Database();
-        $aAg_dest=$repo->make_array("select  use_id as value, ".
-                                    "use_first_name||' 
'||use_name||'('||use_login||')' as label ".
-                                    " from ac_users natural join jnt_use_dos ".
-                                    " join priv_user on (jnt_id=priv_jnt) ".
-                                    "where use_active=1 and priv_priv='R' and 
dos_id= ".$_REQUEST['gDossier']);
-        $aAg_dest[]=array('value'=>0,'label'=>'phpcompta');
+               // select profile
+        $aAg_dest=$this->db->make_array("select  p_id as value, ".
+                                    "p_name as label ".
+                                    " from profile order by 2");
+
+        $aAg_dest[]=array('value'=>0,'label'=>'Public');
         $ag_dest->value=$aAg_dest;
         $ag_dest->selected=$this->ag_dest;
         $str_ag_dest=$ag_dest->input();
@@ -675,6 +674,8 @@
                $table->add('Date',$url,'order by ag_timestamp asc','order by 
ag_timestamp desc','da','dd');
                $table->add('Date Limite',$url,'order by ag_remind_date 
asc','order by ag_remind_date  desc','ra','rd');
                $table->add('Réf.',$url,'order by ag_ref asc','order by ag_ref 
desc','ra','rd');
+               $table->add('Groupe',$url,"order by coalesce((select p_name 
from profile where p_id=ag_dest::numeric),'Aucun groupe')",
+                                       "order by coalesce((select p_name from 
profile where p_id=ag_dest::numeric),'Aucun groupe') desc",'dea','ded');
                $table->add('Expéditeur',$url,'order by name asc','order by 
name desc','ea','ed');
                $table->add('Titre',$url,'order by ag_title asc','order by 
ag_title desc','ta','td');
                $table->add('Concerne',$url,'order by ag_ref_ag_id asc','order 
by ag_ref_ag_id desc','ca','cd');
@@ -688,8 +689,12 @@
             $p_filter_doc=" 1=1 ";
 
         $sql="
-             select ag_id,to_char(ag_timestamp,'DD.MM.YYYY') as 
my_date,to_char(ag_remind_date,'DD.MM.YYYY') as 
my_remind,ag_ref_ag_id,f_id_dest".
-             ",ag_title,dt_value,ag_ref, ag_priority,ag_state,
+             select ag_id,to_char(ag_timestamp,'DD.MM.YYYY') as my_date,
+                        to_char(ag_remind_date,'DD.MM.YYYY') as my_remind,
+                        ag_ref_ag_id,
+                        f_id_dest,
+             ag_title,dt_value,ag_ref, ag_priority,ag_state,
+                       coalesce((select p_name from profile where 
p_id=ag_dest::numeric),'Aucun groupe') as dest,
                                (select ad_value from fiche_Detail where 
f_id=action_gestion.f_id_dest and ad_id=1) as name
              from action_gestion
              join document_type on (ag_type=dt_id)
@@ -714,6 +719,7 @@
         $r.='<th>'.$table->get_header(2).'</th>';
         $r.='<th>'.$table->get_header(3).'</th>';
         $r.='<th>'.$table->get_header(4).'</th>';
+        $r.='<th>'.$table->get_header(5).'</th>';
         $r.='<th>type</th>';
                $r.=th('Etat');
                $r.=th('Priorité');
@@ -751,6 +757,7 @@
             $r.="<td>".$href.$row['my_date'].'</a>'."</td>";
             $r.="<td>".$href.$row['my_remind'].'</a>'."</td>";
                        $r.="<td>".$href.$row['ag_ref'].'</a>'."</td>";
+                       $r.="<td>".$href.h($row['dest']).'</a>'."</td>";
 
             // Expediteur
             $fexp=new Fiche($this->db);



---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu