[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 06/23: Follow-up : list , the name is a tip
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 06/23: Follow-up : list , the name is a tip |
Date: |
Tue, 24 Nov 2020 14:22:39 -0500 (EST) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 110d903ac740ecb0bf977447e8c12a8ab5b3110f
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Thu Nov 12 17:51:52 2020 +0100
Follow-up : list , the name is a tip
---
include/class/follow_up.class.php | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/include/class/follow_up.class.php
b/include/class/follow_up.class.php
index 0ce9e8f..9c78f71 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -640,7 +640,7 @@ class Follow_Up
//4
$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');
//5
- $table->add(_('Dest/Exp'), $url, 'order by name asc', 'order by name
desc', 'ea', 'ed');
+ $table->add(_('Dest/Exp'), $url, 'order by qcode asc', 'order by qcode
desc', 'ea', 'ed');
//6
$table->add(_('Titre'), $url, 'order by ag_title asc', 'order by
ag_title desc', 'ta', 'td');
//7
@@ -664,6 +664,7 @@ class Follow_Up
ag_title,dt_value,ag_ref, ag_priority,ag_state,
coalesce((select p_name from profile where
p_id=ag_dest),'Aucun groupe') as dest,
(select ad_value from fiche_Detail where f_id=ag.f_id_dest and
ad_id=1) as name,
+ (select ad_value from fiche_Detail where f_id=ag.f_id_dest and
ad_id=23) as qcode,
array_to_string((select array_agg(t1.t_tag) from action_tags
as a1 join tags as t1 on (a1.t_id=t1.t_id) where a1.ag_id=ag.ag_id ),',') as
tags,
array_to_string((select array_agg(t1.t_color) from action_tags
as a1 join tags as t1 on (a1.t_id=t1.t_id) where a1.ag_id=ag.ag_id ),',') as
tags_color
from action_gestion as ag
@@ -684,8 +685,10 @@ class Follow_Up
$a_row=Database::fetch_all($Res);
$r="";
+ $r.=HtmlInput::filter_table('mylist_tb', '1,2,3,4,5,6,7,8,9',1);
$r.='<p>'.$bar.'</p>';
- $r.='<table class="document">';
+
+ $r.='<table id="mylist_tb" class="document">';
$r.="<tr>";
$r.='<th name="ag_id_td" style="display:none"
>'.ICheckBox::toggle_checkbox('ag', 'list_ag_frm').'</th>';
$r.='<th style="width:5.57%">'.$table->get_header(0).'</th>';
@@ -716,7 +719,7 @@ class Follow_Up
//show the sub_action
foreach ($a_row as $row)
{
- $href='<A class="document"
HREF="'.$p_base.HtmlInput::get_to_string(array("closed_action",
"remind_date_end", "remind_date", "sag_ref", "only_internal", "state",
"gDossier", "qcode", "ag_dest_query", "action_query", "tdoc", "date_start",
"date_end", "hsstate", "searchtag", "ac"),
"").'&sa=detail&ag_id='.$row['ag_id'].'" title="detail">';
+ $href='<A class="document"
HREF="'.$p_base.HtmlInput::get_to_string(array("closed_action",
"remind_date_end", "remind_date", "sag_ref", "only_internal", "state",
"gDossier", "qcode", "ag_dest_query", "action_query", "tdoc", "date_start",
"date_end", "hsstate", "searchtag", "ac"),
"").'&sa=detail&ag_id='.$row['ag_id'].'" title="'.$row['name'].'">';
$i++;
$tr=($i%2==0)?'even':'odd';
if ($row['ag_priority']<2)
@@ -738,18 +741,13 @@ class Follow_Up
$r.="<td>".$href.smaller_date($row['my_remind']).'</a>'."</td>";
$r.="<td>".$href.$row['ag_ref'].'</a>'."</td>";
// Expediteur
- $fexp=new Fiche($this->db);
- $fexp->id=$row['f_id_dest'];
- $qcode_dest=$fexp->strAttribut(ATTR_DEF_QUICKCODE);
-
- $qexp=($qcode_dest==NOTFOUND)?"Interne":$qcode_dest;
- $jsexp=sprintf("javascript:showfiche('%s')", $qexp);
- if ($qexp!='Interne')
+ if ($row['qcode']!='')
{
- $r.="<td>$href".$qexp." : ".$fexp->getName().'</a></td>';
+ $jsexp=sprintf("javascript:showfiche('%s')", $row['qcode']);
+ $r.="<td>$href".$row['qcode'].'</a></td>';
}
else
- $r.="<td>$href Interne </a></td>";
+ $r.="<td></td>";
/*
* State
- [Noalyss-commit] [noalyss] branch master updated (8bd9ba4 -> a723604), Dany De Bontridder, 2020/11/24
- [Noalyss-commit] [noalyss] 02/23: translate en, Dany De Bontridder, 2020/11/24
- [Noalyss-commit] [noalyss] 03/23: rename upgrade18, Dany De Bontridder, 2020/11/24
- [Noalyss-commit] [noalyss] 01/23: Security administration : add a confirmation with generate random string and record it in audit, Dany De Bontridder, 2020/11/24
- [Noalyss-commit] [noalyss] 04/23: Security, Dany De Bontridder, 2020/11/24
- [Noalyss-commit] [noalyss] 05/23: Version 8.0, Dany De Bontridder, 2020/11/24
- [Noalyss-commit] [noalyss] 08/23: Security remove direct access to $_REQUEST, Dany De Bontridder, 2020/11/24
- [Noalyss-commit] [noalyss] 06/23: Follow-up : list , the name is a tip,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 15/23: fixup! Translate , make failed chrome because of HTML in javascript message, Dany De Bontridder, 2020/11/24
- [Noalyss-commit] [noalyss] 17/23: Typo, Dany De Bontridder, 2020/11/24
- [Noalyss-commit] [noalyss] 20/23: Fix: template doesn't delete LOB files, Dany De Bontridder, 2020/11/24
- [Noalyss-commit] [noalyss] 09/23: IText require , used for admin and password, Dany De Bontridder, 2020/11/24
- [Noalyss-commit] [noalyss] 07/23: ANCGL : export CSV add the date of payment, Dany De Bontridder, 2020/11/24
- [Noalyss-commit] [noalyss] 16/23: IText : protect against Quote and Double Quote, Dany De Bontridder, 2020/11/24
- [Noalyss-commit] [noalyss] 18/23: Merge branch 'dev8000', Dany De Bontridder, 2020/11/24
- [Noalyss-commit] [noalyss] 13/23: Translate , make failed chrome because of HTML in javascript message, Dany De Bontridder, 2020/11/24
- [Noalyss-commit] [noalyss] 21/23: CfgPlugin : improve trace, Dany De Bontridder, 2020/11/24
- [Noalyss-commit] [noalyss] 19/23: Bug Securimage : fix if session is expired then $code is undefined, Dany De Bontridder, 2020/11/24