admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Task #1222 - Ajout du destinataire dans les tâches

Browse source 
#1222 ajout destinataire + heure
This commit is contained in:
Dany De Bontridder 2015-11-09 22:38:51 +01:00
parent 8fc8123cea
commit d572ab04ba
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/class/class_calendar.php
View file

@ -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>';
}

4
include/class/class_follow_up.php
View file

@ -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');

11
include/template/dashboard.php
View file

@ -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>