From e304c8ea0a572442b1ed25a5b7c6ae47c0359bd3 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Sat, 14 Sep 2013 08:44:37 +0000
Subject: [PATCH] Ajout du navigateur : amelioration, dans fenetre interieure

---
 html/ajax_misc.php                            |  3 ++
 html/js/scripts.js                            | 37 ++++++++++++++++
 .../{navigator.inc.php => ajax_navigator.php} | 10 +++--
 include/pref.inc.php                          |  4 +-
 sql/upgrade.sql                               | 42 ++++++++++---------
 5 files changed, 70 insertions(+), 26 deletions(-)
 rename include/{navigator.inc.php => ajax_navigator.php} (92%)

diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index d34fff071..24f2e3b54 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -574,6 +574,9 @@ EOF;
 	case 'minrow':
 		require_once 'ajax_min_row.php';
 		break;
+        case 'navigator':
+                require_once 'ajax_navigator.php';
+                break;
 	default:
 		var_dump($_GET);
 }
diff --git a/html/js/scripts.js b/html/js/scripts.js
index 5cee7cd07..e59e0a055 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -1795,4 +1795,41 @@ function info_message (p_message)
 function info_hide()
 {
 		$('info_div').style.display="none";
+}
+/**
+ * Show the navigator in a internal window
+ * @returns {undefined}
+ */
+function ask_navigator() {
+    try {
+        waiting_box();
+        removeDiv('navi_div')
+       var p_dossier=$('gDossier').value;
+        var queryString="gDossier="+p_dossier+"&op=navigator";
+	var action = new Ajax.Request(
+				  "ajax_misc.php" ,
+				  {
+				      method:'get', parameters:queryString,
+				      onFailure:ajax_misc_failure,
+				      onSuccess:function(req){
+						remove_waiting_box();
+                                                add_div({id:'navi_div',style:'top:2em;left:2em;width:90%',cssclass:'inner_box'});
+						$('navi_div').innerHTML=req.responseText;
+                                                try
+                                                {
+                                                    req.responseText.evalScripts();
+                                                    sorttable.makeSortable($("navi_tb"));
+                                                }
+                                                catch(e)
+                                                {
+                                                    alert("answer_box Impossible executer script de la reponse\n"+e.message);
+                                                }
+
+				      }
+				  }
+				  );
+    } catch (e) {
+        info_message(e.getMessage);
+    }
+    
 }
\ No newline at end of file
diff --git a/include/navigator.inc.php b/include/ajax_navigator.php
similarity index 92%
rename from include/navigator.inc.php
rename to include/ajax_navigator.php
index d7a14e11d..d5b7b9a9b 100644
--- a/include/navigator.inc.php
+++ b/include/ajax_navigator.php
@@ -21,7 +21,7 @@
 
 // Copyright Author Dany De Bontridder dany@alchimerys.be
 if ( ! defined ('ALLOWED')) die('Appel direct ne sont pas permis');
-
+echo HtmlInput::title_box("Navigateur", "navi_div");
 $sql="
     select code, me_code,me_description,coalesce(me_description_etendue,me_description) as me_description_etendue,v1menu,v2menu,v3menu,p_type_display
     from 
@@ -33,16 +33,15 @@ $a_menu=$cn->get_array($sql,array($_SESSION['g_user']));
 
 ?>
 <div class="content">
-    <h1>Navigateur</h1>
     <p>
         Vous permet d'accèder rapidement au menu qui vous intéresse, utiliser le filtre pour trouver plus rapidement
     </p>
     <p style='margin-left: 5%'>
     Filtre : <?php
-    echo HtmlInput::filter_table("navi_tb", "1", '1');
+    echo HtmlInput::filter_table("navi_tb", "1,2", '1');
     ?>
     </p>
-    <table id="navi_tb" class="sortable" style="width:90%;margin-left: 5%;border-spacing:0em 1.25em;border-collapse: separate">
+    <table id="navi_tb" class="sortable" style="width:90%;margin-left: 5%;border-spacing:0em 0.50em;border-collapse: separate">
         <tr>
             <th class='sorttable_sorted'>
                 Code AD 
@@ -88,3 +87,6 @@ for ($i=0;$i<$nMax;$i++):
 
     
 </div>
+<script charset="UTF8" lang="javascript">
+    $('lk_navi_tb').focus();
+</script>
\ No newline at end of file
diff --git a/include/pref.inc.php b/include/pref.inc.php
index 7cdb4e73c..7eb199f52 100644
--- a/include/pref.inc.php
+++ b/include/pref.inc.php
@@ -208,11 +208,11 @@ if (isset($_POST['val']))
 	}
 	echo '</select>';
 	echo '</fieldset>';
-
+        
 
 	echo HtmlInput::submit("val", _("Valider"));
 	echo '</form>';
-
+        
 
 
 
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index 38e06317d..b73aec26a 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -101,26 +101,28 @@ update menu_ref set me_description='Liste du Suivi' where me_code='FOLLOW';
  * Vue montrant toutes les possibilités
  */
 CREATE OR REPLACE VIEW v_menu_description AS 
-with t_menu as ( SELECT mr.me_menu,pm.me_code, pm.me_code_dep, pm.p_type_display, pu.user_name, mr.me_file, mr.me_javascript, mr.me_description,mr.me_description_etendue
-   FROM profile_menu pm
-   JOIN profile_user pu ON pu.p_id = pm.p_id
+ WITH t_menu AS (
+         SELECT mr.me_menu, pm.me_code, pm.me_code_dep, pm.p_type_display, pu.user_name, mr.me_file, mr.me_javascript, mr.me_description, mr.me_description_etendue
+           FROM profile_menu pm
+      JOIN profile_user pu ON pu.p_id = pm.p_id
    JOIN profile p ON p.p_id = pm.p_id
-   JOIN menu_ref mr USING (me_code))
- select distinct coalesce(v3.me_code||'/','')||coalesce(v2.me_code,'')||
-case when v2.me_code is null then coalesce(v1.me_code,'')
-when v2.me_code is not null then
-coalesce('/'||v1.me_code,'')
-end as code
-, v1.me_code
-,v1.me_description,v1.me_description_etendue,v1.me_file,V1.USER_NAME,
-'> '||v1.me_menu as v1menu, 
-case when coalesce(v3.me_menu,'') <> '' then ' > '||v2.me_menu else v2.me_menu end as v2menu,
-v3.me_menu as v3menu,
-v3.p_type_display
- from t_menu as v1 
- left join t_menu as v2 on (v1.me_code_dep=v2.me_code) 
- left join t_menu as v3 on (v2.me_code_dep=v3.me_code) 
- where v1.p_type_display not in ('P') and (coalesce(v1.me_file,'') <>'' or coalesce(v1.me_javascript,'')<>'');
- 
+   JOIN menu_ref mr USING (me_code)
+        )
+ SELECT DISTINCT (COALESCE(v3.me_code || '/'::text, ''::text) || COALESCE(v2.me_code, ''::text)) || 
+        CASE
+            WHEN v2.me_code IS NULL THEN COALESCE(v1.me_code, ''::text)
+            WHEN v2.me_code IS NOT NULL THEN COALESCE('/'::text || v1.me_code, ''::text)
+            ELSE NULL::text
+        END AS code, v1.me_code, v1.me_description, v1.me_description_etendue, v1.me_file, v1.user_name, '> '::text || v1.me_menu AS v1menu, 
+        CASE
+            WHEN COALESCE(v3.me_menu, ''::text) <> ''::text THEN ' > '::text || v2.me_menu
+            ELSE v2.me_menu
+        END AS v2menu, v3.me_menu AS v3menu, v3.p_type_display
+   FROM t_menu v1
+   LEFT JOIN t_menu v2 ON v1.me_code_dep = v2.me_code
+   LEFT JOIN t_menu v3 ON v2.me_code_dep = v3.me_code
+  WHERE v1.p_type_display <> 'P'::text AND (COALESCE(v1.me_file, ''::text) <> ''::text OR COALESCE(v1.me_javascript, ''::text) <> ''::text);
+
 COMMENT ON VIEW v_menu_description
   IS 'Description des menus';
+