[Noalyss-commit] [noalyss] 01/01: Task #1222 - Ajout du destinataire dans les tâches #1222 ajout destinataire + heure

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit d572ab04bada284d96b42d104fc80ddd2947002b
Author: Dany De Bontridder <address@hidden>
Date:   Mon Nov 9 22:38:51 2015 +0100

    Task #1222 - Ajout du destinataire dans les tâches
    #1222 ajout destinataire + heure
---
 include/class/class_calendar.php  |    7 +++++--
 include/class/class_follow_up.php |    4 ++--
 include/template/dashboard.php    |   11 +++++++----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/include/class/class_calendar.php b/include/class/class_calendar.php
index a685372..a675ca2 100644
--- a/include/class/class_calendar.php
+++ b/include/class/class_calendar.php
@@ -89,7 +89,10 @@ class Calendar
                         $this->action_div[$day].="<ol>";
                        for ($i=0;$i<count($aAction);$i++)
                        {
-                               
$this->action_div[$day].='<li>'.HtmlInput::detail_action($aAction[$i], 
$this->title[$day][$i]).'</li>';
+                               
$this->action_div[$day].='<li>'.HtmlInput::detail_action($aAction[$i],
+                                        $this->hour[$day][$i]." ".
+                                        $this->str_name[$day][$i]." ".
+                                        $this->title[$day][$i]).'</li>';
                        }
                        $this->action_div[$day].='</ol>';
                         $this->action_div[$day].=' <p style="text-align: 
center">';
@@ -105,7 +108,7 @@ class Calendar
                         $p_array[$day].="<ol>";
                        for ($i=0;$i<count($aAction);$i++)
                        {
-                               
$p_array[$day].='<li>'.hb($this->str_name[$day][$i]).'&rarr;'.HtmlInput::detail_action($aAction[$i],
 $this->hour[$day][$i]." ".$this->title[$day][$i]).'</li>';
+                               $p_array[$day].='<li>'.$this->hour[$day][$i]." 
".hb($this->str_name[$day][$i]).'&rarr;'.HtmlInput::detail_action($aAction[$i], 
$this->hour[$day][$i]." ".$this->title[$day][$i]).'</li>';
                        }
                        $p_array[$day].='</ol>';
                }
diff --git a/include/class/class_follow_up.php 
b/include/class/class_follow_up.php
index 68f8c76..04d5ef2 100644
--- a/include/class/class_follow_up.php
+++ b/include/class/class_follow_up.php
@@ -1106,7 +1106,7 @@ class Follow_Up
      */
     function get_today()
     {
-        $sql="select ag_ref,coalesce(vw_name,'Interne') as 
vw_name,ag_id,ag_title,ag_ref, dt_value,to_char(ag_remind_date,'DD.MM.YYYY') as 
ag_timestamp_fmt,ag_timestamp ".
+        $sql="select ag_ref,ag_hour,coalesce(vw_name,'Interne') as 
vw_name,ag_id,ag_title,ag_ref, dt_value,to_char(ag_remind_date,'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) 
@@ -1124,7 +1124,7 @@ class Follow_Up
      */
     function get_late()
     {
-        $sql="select ag_ref,coalesce(vw_name,'Interne') as 
vw_name,ag_id,ag_title,ag_ref, dt_value,to_char(ag_remind_date,'DD.MM.YYYY') as 
ag_timestamp_fmt,ag_timestamp ".
+        $sql="select ag_ref,ag_hour,coalesce(vw_name,'Interne') as 
vw_name,ag_id,ag_title,ag_ref, dt_value,to_char(ag_remind_date,'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) where ag_state not in  (1,4)
                                and ag_remind_date < now()  and 
".self::sql_security_filter($this->db,'R');
diff --git a/include/template/dashboard.php b/include/template/dashboard.php
index 3924956..de640f5 100644
--- a/include/template/dashboard.php
+++ b/include/template/dashboard.php
@@ -200,10 +200,12 @@ endif;
        for($i=0;$i<count($late_operation);$i++):
        ?>
        <li>
-               <?php echo 
HtmlInput::detail_action($late_operation[$i]['ag_id'],h($late_operation[$i]['ag_ref']))?>
        <span>
-       <?php echo smaller_date($late_operation[$i]['ag_timestamp_fmt'])?>
+       <?php echo smaller_date($late_operation[$i]['ag_timestamp_fmt']) , " ",
+                hb($late_operation[$i]['ag_hour']);
+                ?>
        </span>
+               <?php echo 
HtmlInput::detail_action($late_operation[$i]['ag_id'],h($late_operation[$i]['ag_ref']))?>
                <span  style="font-weight: bolder ">
                        <?php echo h($late_operation[$i]['vw_name'])?>
                </span>
@@ -234,10 +236,11 @@ endif;
        for($i=0;$i<count($last_operation);$i++):
        ?>
        <li>
-               <?php echo 
HtmlInput::detail_action($last_operation[$i]['ag_id'],h($last_operation[$i]['ag_ref']))?>
        <span>
-       <?php echo smaller_date($last_operation[$i]['ag_timestamp_fmt'])?>
+       <?php echo smaller_date($last_operation[$i]['ag_timestamp_fmt'])," ",
+                $last_operation[$i]['ag_hour']?>
        </span>
+               <?php echo 
HtmlInput::detail_action($last_operation[$i]['ag_id'],h($last_operation[$i]['ag_ref']))?>
                <span  style="font-weight: bolder ">
                        <?php echo h($last_operation[$i]['vw_name'])?>
                </span>