[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 93/119: Follow-up new column "Status"
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 93/119: Follow-up new column "Status" |
Date: |
Mon, 26 Oct 2020 18:27:33 -0400 (EDT) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit f7d4b380bf5d0a265db52e38ea8308c0c2cbf6ea
Author: Dany De Bontridder <danydb@noalyss.eu>
AuthorDate: Mon Oct 12 18:38:58 2020 +0200
Follow-up new column "Status"
---
include/class/follow_up.class.php | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/include/class/follow_up.class.php
b/include/class/follow_up.class.php
index e24b46e..3c77cbb 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -614,14 +614,15 @@ class Follow_Up
$url=$p_base.$arg;
$table=new Sort_Table();
- $table->add('Date Doc.', $url, 'order by ag_timestamp asc', 'order by
ag_timestamp desc', 'da', 'dd');
- $table->add('Date Comm.', $url, 'order by last_comment', 'order by
last_comment desc', 'dca', 'dcd');
- $table->add('Date Limite', $url, 'order by ag_remind_date asc', 'order
by ag_remind_date desc', 'ra', 'rd');
- $table->add('Etiquette', $url, 'order by tags asc', 'order by tags
desc', 'taa', 'tad');
- $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),'Aucun groupe')", "order by coalesce((select p_name
from profile where p_id=ag_dest),'Aucun groupe') desc", 'dea', 'ded');
- $table->add('Dest/Exp', $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(_('Date Doc.'), $url, 'order by ag_timestamp asc', 'order
by ag_timestamp desc', 'da', 'dd');
+ $table->add(_('Date Comm.'), $url, 'order by last_comment', 'order by
last_comment desc', 'dca', 'dcd');
+ $table->add(_('Date Limite'), $url, 'order by ag_remind_date asc',
'order by ag_remind_date desc', 'ra', 'rd');
+ $table->add(_('Etiquette'), $url, 'order by tags asc', 'order by tags
desc', 'taa', 'tad');
+ $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),'Aucun groupe')", "order by coalesce((select p_name
from profile where p_id=ag_dest),'Aucun groupe') desc", 'dea', 'ded');
+ $table->add(_('Dest/Exp'), $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(_('Etat'), $url, 'order by s_value asc', 'order by s_value
desc', 'ea', 'ed');
$ord=(!isset($_GET['ord']))?"dcd":$_GET['ord'];
$sort=$table->get_sql_order($ord);
@@ -673,6 +674,7 @@ class Follow_Up
$r.='<th>'.$table->get_header(6).'</th>';
$r.='<th>'.$table->get_header(7).'</th>';
$r.=th('Priorité');
+ $r.='<th>'.$table->get_header(8).'</th>';
$r.="</tr>";
@@ -728,7 +730,6 @@ class Follow_Up
else
$r.="<td>$href Interne </a></td>";
- $ref="";
$r.='<td>'.$href.
@@ -740,18 +741,18 @@ class Follow_Up
switch ($row['ag_priority'])
{
case 1:
- $priority='Haute';
+ $priority=_('Haute');
break;
case 2:
- $priority="Moyenne";
+ $priority=_("Moyenne");
break;
case 3:
- $priority="Important";
+ $priority=_("Important");
break;
}
$r.=td($priority);
- $r.="<td>".$ref."</td>";
+ $r.="<td>".$row['s_value']."</td>";
$r.="</tr>";
}
- [Noalyss-commit] [noalyss] 55/119: not used anymore javascript:void(0), (continued)
- [Noalyss-commit] [noalyss] 55/119: not used anymore javascript:void(0), Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 58/119: Missing file, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 62/119: FOLLOWUP : generate doc. add new tag, DOCUMENT_ID, TITLE, DESCRIPTION, LABELOP, COMMENT, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 72/119: Tag Limit column size , replace input_switch by check_box, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 61/119: Search Card Paginate, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 64/119: InPlace_Switch : do not echo , return a string instead, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 68/119: Add new type of attribute : check, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 81/119: Search card :typo, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 90/119: select_box cosmetic font, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 92/119: Follow-Up create doc new Tags COMMENTS, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 93/119: Follow-up new column "Status",
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 98/119: Follow up add followup action, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 103/119: Improve : Quick filter on history, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 84/119: Merge extension-crm, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 96/119: Cosmetic, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 100/119: Notice, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 101/119: Grand livre waiting box, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 107/119: Follow-Up : comment optional, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 108/119: fix SQL bug, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 113/119: Bug : create card failed, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 112/119: Cosmetic Follow Up add waiting box for search, Dany De Bontridder, 2020/10/26