From 089056f0244354c6695330daf5792fb6dcf5cab8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 5 Jul 2015 12:15:21 +0200
Subject: [PATCH] Filter on status on hierarchical view

---
 htdocs/user/hierarchy.php | 34 +++++++++++++++++++++++++++++-----
 htdocs/user/index.php     |  6 +++---
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 3c8aff5b1b2..2fc51e555ee 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -46,6 +46,8 @@ $userstatic=new User($db);
 $companystatic = new Societe($db);
 $search_statut=GETPOST('search_statut','int');
 
+if ($search_statut == '') $search_statut='1';
+
 
 
 /*
@@ -117,8 +119,25 @@ print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Dis
 */
 
 print '<table class="liste nohover" width="100%">';
-print '<tr class="liste_titre"><td>'.$langs->trans("HierarchicView").'</td><td></td><td align="right"><div id="iddivjstreecontrol"><a href="#">'.img_picto('','object_category').' '.$langs->trans("UndoExpandAll").'</a>';
-print ' | <a href="#">'.img_picto('','object_category-expanded').' '.$langs->trans("ExpandAll").'</a></div></td></tr>';
+print '<tr class="liste_titre">';
+print_liste_field_titre($langs->trans("HierarchicView"));
+print '<td align="right"><div id="iddivjstreecontrol"><a href="#">'.img_picto('','object_category').' '.$langs->trans("UndoExpandAll").'</a>';
+print ' | <a href="#">'.img_picto('','object_category-expanded').' '.$langs->trans("ExpandAll").'</a></div></td>';
+print_liste_field_titre($langs->trans("Status"),$_SERVER['PHP_SELF'],"",'',"",'align="right"');
+print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','','','','maxwidthsearch ');
+print '</tr>';
+
+print '<tr class="liste_titre">';
+print '<td>&nbsp;</td>';
+print '<td>&nbsp;</td>';
+// Status
+print '<td align="right">';
+print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
+print '</td>';
+print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+print '</td>';
+print '</tr>';
 
 $nbofentries=(count($data) - 1);
 
@@ -126,17 +145,22 @@ if ($nbofentries > 0)
 {
 	print '<tr '.$bc[false].'><td colspan="3">';
 	tree_recur($data,$data[0],0);
-	print '</td></tr>';
+	print '</td>';
+	print '<td></td>';
+	print '</tr>';
 }
 else
 {
 	print '<tr '.$bc[true].'>';
-	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('','treemenu/branchbottom.gif').'</td>';
+	print '<td colspan="3">';
+	print '<table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('','treemenu/branchbottom.gif').'</td>';
 	print '<td valign="middle">';
 	print $langs->trans("NoCategoryYet");
 	print '</td>';
 	print '<td>&nbsp;</td>';
-	print '</table></td>';
+	print '</table>';
+	print '</td>';
+	print '<td></td>';
 	print '</tr>';
 }
 
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index a6c845ee69f..75b996abe20 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -138,7 +138,7 @@ if ($result)
     print_liste_field_titre($langs->trans("DateCreation"),$_SERVER['PHP_SELF'],"u.datec",$param,"",'align="center"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("LastConnexion"),$_SERVER['PHP_SELF'],"u.datelastlogin",$param,"",'align="center"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("HierarchicalResponsible"),$_SERVER['PHP_SELF'],"u2.login",$param,"",'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Status"),$_SERVER['PHP_SELF'],"u.statut",$param,"",'align="center"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Status"),$_SERVER['PHP_SELF'],"u.statut",$param,"",'align="right"',$sortfield,$sortorder);
     print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
     print "</tr>\n";
 
@@ -153,7 +153,7 @@ if ($result)
     print '<td colspan="'.$colspan.'">&nbsp;</td>';
 
 	// Status
-    print '<td>';
+    print '<td align="right">';
     print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
     print '</td>';
 
@@ -256,7 +256,7 @@ if ($result)
 
         // Statut
 		$userstatic->statut=$obj->statut;
-		print '<td width="100" align="center">'.$userstatic->getLibStatut(5).'</td>';
+		print '<td align="right">'.$userstatic->getLibStatut(5).'</td>';
         print '<td>&nbsp;</td>';
         print "</tr>\n";
         $i++;