From f59417dd53332546abe278cf51cade4835ff7af7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 14 Nov 2005 20:13:25 +0000 Subject: [PATCH] =?UTF-8?q?Ajout=20lien=20dans=20menu=20contrat=20pour=20l?= =?UTF-8?q?ister=20les=20services=20expir=E9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/contrat/pre.inc.php | 1 + htdocs/contrat/services.php | 7 +++++-- htdocs/includes/menus/barre_left/eldy_backoffice.php | 2 +- htdocs/includes/menus/barre_left/eldy_frontoffice.php | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/htdocs/contrat/pre.inc.php b/htdocs/contrat/pre.inc.php index de1c5947ff5..c422265cbd7 100644 --- a/htdocs/contrat/pre.inc.php +++ b/htdocs/contrat/pre.inc.php @@ -44,6 +44,7 @@ function llxHeader($head = "", $urlp = "") $menu->add_submenu(DOL_URL_ROOT."/contrat/services.php", $langs->trans("MenuServices")); $menu->add_submenu(DOL_URL_ROOT."/contrat/services.php?mode=0", $langs->trans("MenuInactiveServices"), 2 , true); $menu->add_submenu(DOL_URL_ROOT."/contrat/services.php?mode=4", $langs->trans("MenuRunningServices"), 2 , true); + $menu->add_submenu(DOL_URL_ROOT."/contrat/services.php?mode=4&filter=expired", $langs->trans("MenuExpiredServices"), 2 , true); $menu->add_submenu(DOL_URL_ROOT."/contrat/services.php?mode=5", $langs->trans("MenuClosedServices"), 2 , true); left_menu($menu->liste); diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php index 6b15cc95321..bf0c0af55a7 100644 --- a/htdocs/contrat/services.php +++ b/htdocs/contrat/services.php @@ -44,6 +44,7 @@ $offset = $limit * $page ; if (! $sortfield) $sortfield="c.rowid"; if (! $sortorder) $sortorder="ASC"; +$filter=isset($_GET["filter"])?$_GET["filter"]:$_POST["filter"]; $search_nom=isset($_GET["search_nom"])?$_GET["search_nom"]:$_POST["search_nom"]; $search_contract=isset($_GET["search_contract"])?$_GET["search_contract"]:$_POST["search_contract"]; $search_service=isset($_GET["search_service"])?$_GET["search_service"]:$_POST["search_service"]; @@ -75,8 +76,7 @@ $sql.= " AND c.fk_soc = s.idp AND cd.fk_product = p.rowid"; if ($mode == "0") $sql.= " AND cd.statut = 0"; if ($mode == "4") $sql.= " AND cd.statut = 4"; if ($mode == "5") $sql.= " AND cd.statut = 5"; -// \todo filtre sur services expirés -//if ($mode == "expired") $sql.= " AND cd.statut = 1"; +if ($filter == "expired") $sql.= " AND date_fin_validite < sysdate()"; if ($search_nom) $sql.= " AND s.nom like '%".$search_nom."%'"; if ($search_contract) $sql.= " AND c.rowid = '".$search_contract."'"; if ($search_service) $sql.= " AND (p.ref like '%".$search_service."%' OR p.label like '%".$search_service."%')"; @@ -95,6 +95,7 @@ if ($resql) if ($search_nom) $param.='&search_nom='.urlencode($search_nom); if ($search_service) $param.='&search_service='.urlencode($search_service); if ($mode) $param.='&mode='.$mode; + if ($filter) $param.='&filter='.$filter; print_barre_liste($langs->trans("ListOfServices"), $page, "services.php", $param, $sortfield, $sortorder,'',$num); @@ -116,6 +117,8 @@ if ($resql) print '
'; print ''; print ''; + print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index 4aa1be12c1b..c6453241d7f 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -236,7 +236,7 @@ class MenuLeft { if ($leftmenu=="contracts") $newmenu->add_submenu(DOL_URL_ROOT."/contrat/services.php?leftmenu=contracts", $langs->trans("MenuServices"), 1 ,$user->rights->contrat->lire); if ($leftmenu=="contracts") $newmenu->add_submenu(DOL_URL_ROOT."/contrat/services.php?leftmenu=contracts&mode=0", $langs->trans("MenuInactiveServices"), 2 ,$user->rights->contrat->lire); if ($leftmenu=="contracts") $newmenu->add_submenu(DOL_URL_ROOT."/contrat/services.php?leftmenu=contracts&mode=4", $langs->trans("MenuRunningServices"), 2 ,$user->rights->contrat->lire); - //if ($leftmenu=="contracts") $newmenu->add_submenu(DOL_URL_ROOT."/contrat/services.php?leftmenu=contracts&mode=4", $langs->trans("MenuExpiredServices"), 2 ,$user->rights->contrat->lire); + if ($leftmenu=="contracts") $newmenu->add_submenu(DOL_URL_ROOT."/contrat/services.php?leftmenu=contracts&mode=4&filter=expired", $langs->trans("MenuExpiredServices"), 2 ,$user->rights->contrat->lire); if ($leftmenu=="contracts") $newmenu->add_submenu(DOL_URL_ROOT."/contrat/services.php?leftmenu=contracts&mode=5", $langs->trans("MenuClosedServices"), 2 ,$user->rights->contrat->lire); } diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php index b6aa9268c16..b8c4515aafd 100644 --- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php @@ -234,7 +234,7 @@ class MenuLeft { if ($leftmenu=="contracts") $newmenu->add_submenu(DOL_URL_ROOT."/contrat/services.php?leftmenu=contracts", $langs->trans("MenuServices"), 1 ,$user->rights->contrat->lire); if ($leftmenu=="contracts") $newmenu->add_submenu(DOL_URL_ROOT."/contrat/services.php?leftmenu=contracts&mode=0", $langs->trans("MenuInactiveServices"), 2 ,$user->rights->contrat->lire); if ($leftmenu=="contracts") $newmenu->add_submenu(DOL_URL_ROOT."/contrat/services.php?leftmenu=contracts&mode=4", $langs->trans("MenuRunningServices"), 2 ,$user->rights->contrat->lire); - //if ($leftmenu=="contracts") $newmenu->add_submenu(DOL_URL_ROOT."/contrat/services.php?leftmenu=contracts&mode=4", $langs->trans("MenuExpiredServices"), 2 ,$user->rights->contrat->lire); + if ($leftmenu=="contracts") $newmenu->add_submenu(DOL_URL_ROOT."/contrat/services.php?leftmenu=contracts&mode=4&filter=expired", $langs->trans("MenuExpiredServices"), 2 ,$user->rights->contrat->lire); if ($leftmenu=="contracts") $newmenu->add_submenu(DOL_URL_ROOT."/contrat/services.php?leftmenu=contracts&mode=5", $langs->trans("MenuClosedServices"), 2 ,$user->rights->contrat->lire); }