[Noalyss-commit] [noalyss] 317/323: Dashboard : cannot zoom event from follow-up

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit f32a4d8595aba53e70fe02010e925d6b30bbd229
Author: Dany De Bontridder <address@hidden>
Date:   Mon Mar 12 18:36:40 2018 +0100

    Dashboard : cannot zoom event from follow-up
---
 html/js/gestion.js               |  2 ++
 html/js/sorttable.js             |  4 +---
 include/ajax/ajax_gestion.php    |  2 +-
 include/template/action_show.php | 12 ++++++++++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/html/js/gestion.js b/html/js/gestion.js
index 47ab8f5..de1e19b 100644
--- a/html/js/gestion.js
+++ b/html/js/gestion.js
@@ -283,6 +283,8 @@ function action_show(p_dossier)
                         remove_waiting_box();
                         add_div({id: 'action_list_div', 
style:"top:1%;width:90%;left:5%" , cssclass: 'inner_box'});
                         $('action_list_div').innerHTML=p_xml.responseText;
+                        var 
table_followup=document.getElementById('event_followup');
+                        if ( table_followup) {                         
sorttable.makeSortable(table_followup); }
             }
         });
     } catch (e)
diff --git a/html/js/sorttable.js b/html/js/sorttable.js
index 8f4f83f..fd33a8a 100644
--- a/html/js/sorttable.js
+++ b/html/js/sorttable.js
@@ -21,9 +21,7 @@
  Show the default order
  example:
  <th class=" sorttable_sorted_reverse">
- ....<span id="sorttable_sortrevind">&nbsp;&blacktriangle;</span>
- <th class=" sorttable_sorted">
- ....<span id="sorttable_sortfwdind">&nbsp;&nbsp;&#x25BE;</span>
+  <th class=" sorttable_sorted">
  
  Sort on date
  <td sorttable_customkey="<?=$row_bank['b_date']?>"> // format YYYYMMDD
diff --git a/include/ajax/ajax_gestion.php b/include/ajax/ajax_gestion.php
index f563a98..814e383 100644
--- a/include/ajax/ajax_gestion.php
+++ b/include/ajax/ajax_gestion.php
@@ -36,7 +36,7 @@ if ($op=='action_show')
      */
     require_once NOALYSS_INCLUDE.'/class/follow_up.class.php';
     $gestion=new Follow_Up($cn);
-    $array=$gestion->get_last(25);
+    $array=$gestion->get_last(35);
     $len_array=count($array);
     require_once NOALYSS_TEMPLATE.'/action_show.php';
     return;
diff --git a/include/template/action_show.php b/include/template/action_show.php
index a3eef78..6971c70 100644
--- a/include/template/action_show.php
+++ b/include/template/action_show.php
@@ -29,13 +29,21 @@ require_once 
NOALYSS_INCLUDE.'/class/default_menu.class.php';
 $a_default=new Default_Menu();
 
 echo HtmlInput::title_box(_('Suivi'), 'action_list_div');
+
+echo _("Recherche"),HtmlInput::filter_table("event_followup", '0,1,2,3', 1);
 ?>
-<table style="width: 100%">
+<table id="event_followup" class="sortable"    style="width: 100%">
+    <tr>
+        <th class="sorttable_sorted_reverse"><?=_("Date création")?></th>
+        <th><?=_("Référence")?></th>
+        <th><?=_("Destinataire")?></th>
+        <th><?=_("Titre")?></th>
+    </tr>
     <?php
     for ($i=0;$i < $len_array;$i++) :
     ?>
         <tr class=" <?php echo ($i%2==0)?'even':'odd'?>">
-            <td class="box">
+            <td sorttable_customkey="<?=$array[$i]['ag_timestamp']?>" 
class="box">
                 <?php echo smaller_date($array[$i]['ag_timestamp_fmt']) ;?>
                 <?php echo " ".$array[$i]['ag_hour'] ;?>
             </td>