[Noalyss-commit] [noalyss] 01/01: #1222 ajout destinataire + heure

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 6cc3758ca04a1258ae0a3518d1ec2fc59a4d26f5
Author: Dany De Bontridder <address@hidden>
Date:   Mon Nov 9 22:46:41 2015 +0100

    #1222 ajout destinataire + heure
---
 include/class/class_follow_up.php |    2 +-
 include/template/action_show.php  |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/include/class/class_follow_up.php 
b/include/class/class_follow_up.php
index 04d5ef2..8dc084c 100644
--- a/include/class/class_follow_up.php
+++ b/include/class/class_follow_up.php
@@ -1089,7 +1089,7 @@ class Follow_Up
     function get_last($p_limit)
     {
         
-        $sql="select coalesce(vw_name,'Interne') as 
vw_name,quick_code,ag_id,ag_title,ag_ref, 
dt_value,to_char(ag_timestamp,'DD.MM.YYYY') as ag_timestamp_fmt,ag_timestamp ".
+        $sql="select coalesce(vw_name,'Interne') as 
vw_name,ag_hour,quick_code,ag_id,ag_title,ag_ref, 
dt_value,to_char(ag_timestamp,'DD.MM.YYYY') as ag_timestamp_fmt,ag_timestamp ".
                 " from action_gestion join document_type ".
                 " on (ag_type=dt_id) "
                 . "left join vw_fiche_attr on (f_id=f_id_dest) "
diff --git a/include/template/action_show.php b/include/template/action_show.php
index 5286cee..108ce68 100644
--- a/include/template/action_show.php
+++ b/include/template/action_show.php
@@ -37,6 +37,7 @@ echo HtmlInput::title_box(_('Suivi'), 'action_list_div');
         <tr class=" <?php echo ($i%2==0)?'even':'odd'?>">
             <td class="box">
                 <?php echo smaller_date($array[$i]['ag_timestamp_fmt']) ;?>
+                <?php echo " ".$array[$i]['ag_hour'] ;?>
             </td>
             <td class="box">
                 <?php echo HtmlInput::detail_action($array[$i]['ag_id'], 
$array[$i]['ag_ref'], 1)  ?>