diff --git a/include/class/class_calendar.php b/include/class/class_calendar.php
index a68537280..a675ca208 100644
--- a/include/class/class_calendar.php
+++ b/include/class/class_calendar.php
@@ -89,7 +89,10 @@ class Calendar
$this->action_div[$day].="
";
for ($i=0;$iaction_div[$day].='- '.HtmlInput::detail_action($aAction[$i], $this->title[$day][$i]).'
';
+ $this->action_div[$day].='- '.HtmlInput::detail_action($aAction[$i],
+ $this->hour[$day][$i]." ".
+ $this->str_name[$day][$i]." ".
+ $this->title[$day][$i]).'
';
}
$this->action_div[$day].='
';
$this->action_div[$day].=' ';
@@ -105,7 +108,7 @@ class Calendar
$p_array[$day].="
";
for ($i=0;$i'.hb($this->str_name[$day][$i]).'→'.HtmlInput::detail_action($aAction[$i], $this->hour[$day][$i]." ".$this->title[$day][$i]).'';
+ $p_array[$day].='- '.$this->hour[$day][$i]." ".hb($this->str_name[$day][$i]).'→'.HtmlInput::detail_action($aAction[$i], $this->hour[$day][$i]." ".$this->title[$day][$i]).'
';
}
$p_array[$day].='
';
}
diff --git a/include/class/class_follow_up.php b/include/class/class_follow_up.php
index 68f8c76ac..04d5ef20b 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 392495642..de640f5b7 100644
--- a/include/template/dashboard.php
+++ b/include/template/dashboard.php
@@ -200,10 +200,12 @@ endif;
for($i=0;$i
-
-
+
+
@@ -234,10 +236,11 @@ endif;
for($i=0;$i
-
-
+
+