From e01ea0955657b832006c01c17d98c04a7228795b Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Wed, 12 Aug 2015 23:31:11 +0200 Subject: [PATCH] =?UTF-8?q?Task=20#1127=20-=20Ajout=20=C3=A9venement=20dep?= =?UTF-8?q?uis=20tableau=20de=20bord=20ou=20agenda=20Zoom=20on=20last=20ac?= =?UTF-8?q?tions=20and=20allows=20to=20go=20directly=20to=20FOLLOW?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html/ajax_misc.php | 5 ++- html/js/gestion.js | 24 ++++++++++++++ html/style-classic.css | 9 +++++ include/ajax_gestion.php | 36 ++++++++++++++++++++ include/template/action_show.php | 57 ++++++++++++++++++++++++++++++++ 5 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 include/ajax_gestion.php create mode 100644 include/template/action_show.php diff --git a/html/ajax_misc.php b/html/ajax_misc.php index 30485043b..ec952b526 100644 --- a/html/ajax_misc.php +++ b/html/ajax_misc.php @@ -720,7 +720,10 @@ EOF; case 'modele_modify': require_once NOALYSS_INCLUDE.'/ajax_admin.php'; break; - + // From dashboard, display detail about last operation + case 'action_show': + require_once NOALYSS_INCLUDE.'/ajax_gestion.php'; + break; default: var_dump($_GET); } diff --git a/html/js/gestion.js b/html/js/gestion.js index 4fcfc2a07..27b0da271 100644 --- a/html/js/gestion.js +++ b/html/js/gestion.js @@ -265,3 +265,27 @@ function successRemoveStock(request,json) alert("success_box"+e.message); } } +/** + * @brief display details of the last actions in management + * called from dashboard + * @param p_dossier : dossier id + */ +function action_show(p_dossier) +{ + try { + waiting_box(); + var action = new Ajax.Request('ajax_misc.php', + { + method:'get', + parameters : {gDossier:p_dossier,'op':'action_show'}, + onSuccess : function(p_xml, p_text) { + remove_waiting_box(); + add_div({id: 'action_list_div', style:"top:1%;width:90%;margin-left:5%" , cssclass: 'inner_box'}); + $('action_list_div').innerHTML=p_xml.responseText; + } + }); + } catch (e) + { + alert('action_show '+e.message); + } +} \ No newline at end of file diff --git a/html/style-classic.css b/html/style-classic.css index 97610f10e..bf47e6f9d 100644 --- a/html/style-classic.css +++ b/html/style-classic.css @@ -1951,3 +1951,12 @@ ul.aligned-block li { background: snow; margin-top: 50px; } +td.cut { + max-width: 25%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +td.box { + border-left: #9999ff solid 1px; +} \ No newline at end of file diff --git a/include/ajax_gestion.php b/include/ajax_gestion.php new file mode 100644 index 000000000..f5be0a840 --- /dev/null +++ b/include/ajax_gestion.php @@ -0,0 +1,36 @@ +get_last(25); + $len_array=count($array); + require_once NOALYSS_INCLUDE.'/template/action_show.php'; +} \ No newline at end of file diff --git a/include/template/action_show.php b/include/template/action_show.php new file mode 100644 index 000000000..a4ddb5ef4 --- /dev/null +++ b/include/template/action_show.php @@ -0,0 +1,57 @@ + +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + * + */ + + +/** + * @file + * @brief display the last action + * inherited parameter : $cn database connection, $array + */ +require_once NOALYSS_INCLUDE.'/class_default_menu.php'; +$a_default=new Default_Menu(); + +echo HtmlInput::title_box(_('Suivi'), 'action_list_div'); +?> + + + + + + + + + +
+ + + + + + + +
+

+ +

\ No newline at end of file