lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add fast search form in menu for member module

Browse Source
This commit is contained in:
Laurent Destailleur 2008-12-08 15:07:11 +00:00
parent 66dafbd201
commit 51dc0dd01f
9 changed files with 207 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
htdocs/adherents/liste.php
View File

@ -32,18 +32,6 @@ require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php");
$langs->load("members"); $langs->load("members");
$langs->load("companies"); $langs->load("companies");
/*
* View
*/
llxHeader();
$form=new Form($db);
$membertypestatic=new AdherentType($db);
$sall=isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"]; $sall=isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"];
$sortorder=$_GET["sortorder"]; $sortorder=$_GET["sortorder"];
@ -59,6 +47,30 @@ $offset = $conf->liste_limit * $page ;
$pageprev = $page - 1; $pageprev = $page - 1;
$pagenext = $page + 1; $pagenext = $page + 1;
if ($_REQUEST["button_removefilter"])
{
$_GET["search_nom"]="";
$_REQUEST["search_nom"]="";
$_GET["search_prenom"]="";
$_REQUEST["search_prenom"]="";
$_GET["type"]="";
$_REQUEST["type"]="";
$_GET["search_email"]="";
$_REQUEST["search_email"]="";
$sall="";
}
/*
* View
*/
llxHeader();
$form=new Form($db);
$membertypestatic=new AdherentType($db);
$sql = "SELECT d.rowid, d.login, d.prenom, d.nom, d.societe, "; $sql = "SELECT d.rowid, d.login, d.prenom, d.nom, d.societe, ";
$sql.= " ".$db->pdate("d.datefin")." as datefin,"; $sql.= " ".$db->pdate("d.datefin")." as datefin,";
$sql.= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,"; $sql.= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,";
@ -151,6 +163,11 @@ if ($resql)
if (isset($_GET["filter"])) $param.="&filter=".$_GET["filter"]; if (isset($_GET["filter"])) $param.="&filter=".$_GET["filter"];
print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
if ($sall)
{
print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname").", ".$langs->trans("EMail").", ".$langs->trans("Address")." ".$langs->trans("or")." ".$langs->trans("Town")."): ".$sall;
}
print "<table class=\"noborder\" width=\"100%\">"; print "<table class=\"noborder\" width=\"100%\">";
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
@ -176,7 +193,7 @@ if ($resql)
print '<td class="liste_titre">'; print '<td class="liste_titre">';
$listetype=$membertypestatic->liste_array(); $listetype=$membertypestatic->liste_array();
$form->select_array("type", $listetype, $_REQUEST["type"], 1, 0, 0, 0, '', 0, 16); $form->select_array("type", $listetype, $_REQUEST["type"], 1, 0, 0, 0, '', 0, 12);
print '</td>'; print '</td>';
print '<td class="liste_titre">&nbsp;</td>'; print '<td class="liste_titre">&nbsp;</td>';
@ -188,6 +205,7 @@ if ($resql)
print '<td align="right" colspan="2" class="liste_titre">'; print '<td align="right" colspan="2" class="liste_titre">';
print '<input type="image" class="liste_titre" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" name="button_search" alt="'.$langs->trans("Search").'">'; print '<input type="image" class="liste_titre" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" name="button_search" alt="'.$langs->trans("Search").'">';
print '&nbsp; <input type="image" value="button_removefilter" class="liste_titre" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/searchclear.png" name="button_removefilter" alt="'.$langs->trans("RemoveFilter").'">';
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
@ -219,7 +237,7 @@ if ($resql)
print '<td nowrap="nowrap">'; print '<td nowrap="nowrap">';
$membertypestatic->id=$objp->type_id; $membertypestatic->id=$objp->type_id;
$membertypestatic->libelle=$objp->type; $membertypestatic->libelle=$objp->type;
print $membertypestatic->getNomUrl(1,16); print $membertypestatic->getNomUrl(1,12);
print '</td>'; print '</td>';
// Moral/Physique // Moral/Physique

24
htdocs/admin/ihm.php
View File

@ -28,11 +28,13 @@ require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php");
$langs->load("companies");
$langs->load("products");
$langs->load("admin"); $langs->load("admin");
$langs->load("other"); $langs->load("other");
$langs->load("companies");
$langs->load("products");
$langs->load("members");
if (!$user->admin) if (!$user->admin)
accessforbidden(); accessforbidden();
@ -40,10 +42,13 @@ if (! defined("MAIN_MOTD")) define("MAIN_MOTD","");
$dirtheme = "../theme"; $dirtheme = "../theme";
// Liste des zone de recherche permanantes support<72>es // List of supported permanent search area
$searchform=array("main_searchform_societe","main_searchform_contact","main_searchform_produitservice"); $searchform=array( "MAIN_SEARCHFORM_SOCIETE","MAIN_SEARCHFORM_CONTACT",
$searchformconst=array($conf->global->MAIN_SEARCHFORM_SOCIETE,$conf->global->MAIN_SEARCHFORM_CONTACT,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE); "MAIN_SEARCHFORM_PRODUITSERVICE","MAIN_SEARCHFORM_ADHERENT");
$searchformtitle=array($langs->trans("Companies"),$langs->trans("Contacts"),$langs->trans("ProductsAndServices")); $searchformconst=array($conf->global->MAIN_SEARCHFORM_SOCIETE,$conf->global->MAIN_SEARCHFORM_CONTACT,
$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE,$conf->global->MAIN_SEARCHFORM_ADHERENT);
$searchformtitle=array($langs->trans("Companies"),$langs->trans("Contacts"),
$langs->trans("ProductsAndServices"),$langs->trans("Members"));
if (isset($_POST["action"]) && $_POST["action"] == 'update') if (isset($_POST["action"]) && $_POST["action"] == 'update')
@ -61,9 +66,10 @@ if (isset($_POST["action"]) && $_POST["action"] == 'update')
dolibarr_set_const($db, "MAIN_THEME", $_POST["main_theme"]); dolibarr_set_const($db, "MAIN_THEME", $_POST["main_theme"]);
dolibarr_set_const($db, "MAIN_SEARCHFORM_CONTACT", $_POST["main_searchform_contact"]); dolibarr_set_const($db, "MAIN_SEARCHFORM_CONTACT", $_POST["MAIN_SEARCHFORM_CONTACT"]);
dolibarr_set_const($db, "MAIN_SEARCHFORM_SOCIETE", $_POST["main_searchform_societe"]); dolibarr_set_const($db, "MAIN_SEARCHFORM_SOCIETE", $_POST["MAIN_SEARCHFORM_SOCIETE"]);
dolibarr_set_const($db, "MAIN_SEARCHFORM_PRODUITSERVICE",$_POST["main_searchform_produitservice"]); dolibarr_set_const($db, "MAIN_SEARCHFORM_PRODUITSERVICE",$_POST["MAIN_SEARCHFORM_PRODUITSERVICE"]);
dolibarr_set_const($db, "MAIN_SEARCHFORM_ADHERENT",$_POST["MAIN_SEARCHFORM_ADHERENT"]);
dolibarr_set_const($db, "MAIN_MOTD", $_POST["main_motd"]); dolibarr_set_const($db, "MAIN_MOTD", $_POST["main_motd"]);
dolibarr_set_const($db, "MAIN_HOME", $_POST["main_home"]); dolibarr_set_const($db, "MAIN_HOME", $_POST["main_home"]);

4
htdocs/contact/index.php
View File

@ -211,13 +211,13 @@ if ($result)
print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
print '<table class="liste" width="100%">';
if ($sall) if ($sall)
{ {
print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname")." ".$langs->trans("or")." ".$langs->trans("EMail")."): ".$sall; print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname")." ".$langs->trans("or")." ".$langs->trans("EMail")."): ".$sall;
} }
print '<table class="liste" width="100%">';
$param="&type=$type&view=$view&search_nom=$search_nom&search_prenom=$search_prenom&search_societe=$search_societe&search_email=$search_email"; $param="&type=$type&view=$view&search_nom=$search_nom&search_prenom=$search_prenom&search_societe=$search_societe&search_email=$search_email";
if ($search_priv == '0' || $search_priv == '1') $param.="&search_priv=$search_priv"; if ($search_priv == '0' || $search_priv == '1') $param.="&search_priv=$search_priv";

2
htdocs/langs/en_US/members.lang
View File

@ -131,4 +131,4 @@ DescADHERENT_ETIQUETTE_TYPE=Labels format
DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
DescADHERENT_CARD_TEXT=Text printed on member cards DescADHERENT_CARD_TEXT=Text printed on member cards
DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
ShowTypeCard=Show type %s ShowTypeCard=Show type '%s'

2
htdocs/langs/es_ES/members.lang
View File

@ -133,4 +133,4 @@ DescADHERENT_ETIQUETTE_TYPE=Formato etiquetas
DescADHERENT_CARD_HEADER_TEXT=Texto a imprimir en la parte superior del carné de miembro DescADHERENT_CARD_HEADER_TEXT=Texto a imprimir en la parte superior del carné de miembro
DescADHERENT_CARD_TEXT=Texto a imprimir en el carné de miembro DescADHERENT_CARD_TEXT=Texto a imprimir en el carné de miembro
DescADHERENT_CARD_FOOTER_TEXT=Texto a imprimir en la parte inferior del carné de miembro DescADHERENT_CARD_FOOTER_TEXT=Texto a imprimir en la parte inferior del carné de miembro
ShowTypeCard=Ver tipo %s ShowTypeCard=Ver tipo '%s'

2
htdocs/langs/fr_FR/members.lang
View File

@ -131,4 +131,4 @@ DescADHERENT_ETIQUETTE_TYPE=Format
DescADHERENT_CARD_HEADER_TEXT=Texte imprimé sur le haut des cartes adhérents DescADHERENT_CARD_HEADER_TEXT=Texte imprimé sur le haut des cartes adhérents
DescADHERENT_CARD_TEXT=Texte imprimé sur les cartes adhérents DescADHERENT_CARD_TEXT=Texte imprimé sur les cartes adhérents
DescADHERENT_CARD_FOOTER_TEXT=Texte imprimé sur le bas des cartes adhérents DescADHERENT_CARD_FOOTER_TEXT=Texte imprimé sur le bas des cartes adhérents
ShowTypeCard=Voir type %s ShowTypeCard=Voir type '%s'

2
htdocs/lib/functions.lib.php
View File

@ -1765,7 +1765,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite)
* \param begin ("" par defaut) * \param begin ("" par defaut)
* \param options ("" par defaut) * \param options ("" par defaut)
* \param td options de l'attribut td ("" par defaut) * \param td options de l'attribut td ("" par defaut)
* \param sortfield nom du champ sur lequel est effectu<EFBFBD> le tri du tableau * \param sortfield nom du champ sur lequel est effectue le tri du tableau
* \param sortorder ordre du tri * \param sortorder ordre du tri
*/ */
function print_liste_field_titre($name, $file, $field, $begin="", $options="", $td="", $sortfield="", $sortorder="") function print_liste_field_titre($name, $file, $field, $begin="", $options="", $td="", $sortfield="", $sortorder="")

21
htdocs/main.inc.php
View File

@ -1029,22 +1029,29 @@ function left_menu($menu_array, $helppagename='', $form_search='')
if ($conf->societe->enabled && $conf->global->MAIN_SEARCHFORM_SOCIETE && $user->rights->societe->lire) if ($conf->societe->enabled && $conf->global->MAIN_SEARCHFORM_SOCIETE && $user->rights->societe->lire)
{ {
$langs->load("companies"); $langs->load("companies");
printSearchForm(DOL_URL_ROOT.'/societe.php',DOL_URL_ROOT.'/societe.php', printSearchForm(DOL_URL_ROOT.'/societe.php', DOL_URL_ROOT.'/societe.php',
img_object($langs->trans("List"),'company').' '.$langs->trans("Companies"),'soc','socname'); img_object($langs->trans("List"),'company').' '.$langs->trans("Companies"), 'soc', 'socname');
} }
if ($conf->societe->enabled && $conf->global->MAIN_SEARCHFORM_CONTACT && $user->rights->societe->lire) if ($conf->societe->enabled && $conf->global->MAIN_SEARCHFORM_CONTACT && $user->rights->societe->lire)
{ {
$langs->load("companies"); $langs->load("companies");
printSearchForm(DOL_URL_ROOT.'/contact/index.php',DOL_URL_ROOT.'/contact/index.php', printSearchForm(DOL_URL_ROOT.'/contact/index.php', DOL_URL_ROOT.'/contact/index.php',
img_object($langs->trans("List"),'contact').' '.$langs->trans("Contacts"),'contact','contactname','contact'); img_object($langs->trans("List"),'contact').' '.$langs->trans("Contacts"), 'contact', 'contactname');
} }
if (($conf->produit->enabled || $conf->service->enabled) && $conf->global->MAIN_SEARCHFORM_PRODUITSERVICE && $user->rights->produit->lire) if (($conf->produit->enabled || $conf->service->enabled) && $conf->global->MAIN_SEARCHFORM_PRODUITSERVICE && $user->rights->produit->lire)
{ {
$langs->load("products"); $langs->load("products");
printSearchForm(DOL_URL_ROOT.'/product/liste.php',DOL_URL_ROOT.'/product/index.php', printSearchForm(DOL_URL_ROOT.'/product/liste.php', DOL_URL_ROOT.'/product/index.php',
img_object($langs->trans("List"),'product').' '.$langs->trans("Products")."/".$langs->trans("Services"),'products','sall','product'); img_object($langs->trans("List"),'product').' '.$langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall');
}
if ($conf->adherent->enabled && $conf->global->MAIN_SEARCHFORM_ADHERENT && $user->rights->adherent->lire)
{
$langs->load("members");
printSearchForm(DOL_URL_ROOT.'/adherents/liste.php', DOL_URL_ROOT.'/adherents/liste.php',
img_object($langs->trans("List"),'user').' '.$langs->trans("Members"), 'member', 'sall');
} }
print '</div>'; print '</div>';
@ -1119,6 +1126,7 @@ function left_menu($menu_array, $helppagename='', $form_search='')
function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch='search',$htmlinputname) function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch='search',$htmlinputname)
{ {
global $langs; global $langs;
print "\n<!-- Begin SearchForm ".$htmlinputname." -->\n";
print '<form action="'.$urlaction.'" method="post">'; print '<form action="'.$urlaction.'" method="post">';
print '<div class="menu_titre">'; print '<div class="menu_titre">';
print '<a class="vsmenu" href="'.$urlobject.'">'; print '<a class="vsmenu" href="'.$urlobject.'">';
@ -1129,6 +1137,7 @@ function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch='search',$
print '<input type="text" class="flat" name="'.$htmlinputname.'" size="10">&nbsp;'; print '<input type="text" class="flat" name="'.$htmlinputname.'" size="10">&nbsp;';
print '<input type="submit" class="button" value="'.$langs->trans("Go").'">'; print '<input type="submit" class="button" value="'.$langs->trans("Go").'">';
print "</form>"; print "</form>";
print "\n<!-- End SearchForm -->\n";
} }

8
htdocs/societe.php
View File

@ -249,10 +249,10 @@ if ($result)
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Company"),"societe.php","s.nom","",$params,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Company"),"societe.php","s.nom","",$params,"",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Town"),"societe.php","s.ville","",$params,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Town"),"societe.php","s.ville","",$params,'',$sortfield,$sortorder);
print_liste_field_titre($form->textwithhelp($langs->trans("ProfId1Short"),$textprofid[1],1,0),"societe.php","s.siren","",$params,'',$sortfield,$sortorder); print_liste_field_titre($form->textwithhelp($langs->trans("ProfId1Short"),$textprofid[1],1,0),"societe.php","s.siren","",$params,'nowrap="nowrap"',$sortfield,$sortorder);
print_liste_field_titre($form->textwithhelp($langs->trans("ProfId2Short"),$textprofid[2],1,0),"societe.php","s.siret","",$params,'',$sortfield,$sortorder); print_liste_field_titre($form->textwithhelp($langs->trans("ProfId2Short"),$textprofid[2],1,0),"societe.php","s.siret","",$params,'nowrap="nowrap"',$sortfield,$sortorder);
print_liste_field_titre($form->textwithhelp($langs->trans("ProfId3Short"),$textprofid[3],1,0),"societe.php","s.ape","",$params,'',$sortfield,$sortorder); print_liste_field_titre($form->textwithhelp($langs->trans("ProfId3Short"),$textprofid[3],1,0),"societe.php","s.ape","",$params,'nowrap="nowrap"',$sortfield,$sortorder);
print_liste_field_titre($form->textwithhelp($langs->trans("ProfId4Short"),$textprofid[4],1,0),"societe.php","s.idprof4","",$params,'',$sortfield,$sortorder); print_liste_field_titre($form->textwithhelp($langs->trans("ProfId4Short"),$textprofid[4],1,0),"societe.php","s.idprof4","",$params,'nowrap="nowrap"',$sortfield,$sortorder);
print '<td class="liste_titre" colspan="2" align="center">&nbsp;</td>'; print '<td class="liste_titre" colspan="2" align="center">&nbsp;</td>';
print "</tr>\n"; print "</tr>\n";