From 86c893f1ffee06586876b9bfc261da6a6470070d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 5 Sep 2008 00:09:38 +0000 Subject: [PATCH] Add pagination on social contributions list --- htdocs/compta/sociales/index.php | 55 +++++++++++++++++++------------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index 52e312e2f1d..e09386ce657 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2007 Laurent Destailleur + * Copyright (C) 2004-2008 Laurent Destailleur * * 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 @@ -45,6 +45,8 @@ if (! $sortorder) $sortorder="DESC"; $year=$_GET["year"]; $filtre=$_GET["filtre"]; +$limit = $conf->liste_limit; +$offset = $limit * $page ; //if (! $year) { $year=date("Y", time()); } @@ -56,26 +58,6 @@ $filtre=$_GET["filtre"]; llxHeader(); -print_fiche_titre($langs->trans("SocialContributions"),($year?"".img_previous()." ".$langs->trans("Year")." $year ".img_next()."":"")); -print "
\n"; - -if ($mesg) -{ - print $mesg."
"; -} - -print ""; - -print ""; -print_liste_field_titre($langs->trans("Ref"),"index.php","id","","","",$sortfield,$sortorder); -print_liste_field_titre($langs->trans("DateDue"),"index.php","de","","","",$sortfield,$sortorder); -print_liste_field_titre($langs->trans("Period"),"index.php","periode","","",'align="center"',$sortfield,$sortorder); -print_liste_field_titre($langs->trans("Type"),"index.php","type","","",'align="left"',$sortfield,$sortorder); -print_liste_field_titre($langs->trans("Label"),"index.php","s.libelle","","",'align="left"',$sortfield,$sortorder); -print_liste_field_titre($langs->trans("Amount"),"index.php","s.amount","","",'align="right"',$sortfield,$sortorder); -print_liste_field_titre($langs->trans("Status"),"index.php","s.paye","","",'align="center"',$sortfield,$sortorder); -print "\n"; - $sql = "SELECT s.rowid as id, s.fk_type as type, "; $sql.= " s.amount,".$db->pdate("s.date_ech")." as de, s.libelle, s.paye,".$db->pdate("s.periode")." as periode,"; @@ -107,6 +89,7 @@ if ($_GET["sortorder"]) { else { $sql .= " DESC"; } +$sql .= $db->plimit($limit+1,$offset); $chargesociale_static=new ChargeSociales($db); @@ -118,7 +101,35 @@ if ($resql) $i = 0; $var=true; - while ($i < $num) + if ($year) + { + print_fiche_titre($langs->trans("SocialContributions"),($year?"".img_previous()." ".$langs->trans("Year")." $year ".img_next()."":"")); + } + else + { + print_barre_liste($langs->trans("SocialContributions"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines); + } + print "
\n"; + + if ($mesg) + { + print $mesg."
"; + } + + print "
"; + + print ""; + print_liste_field_titre($langs->trans("Ref"),"index.php","id","","","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("DateDue"),"index.php","de","","","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Period"),"index.php","periode","","",'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Type"),"index.php","type","","",'align="left"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Label"),"index.php","s.libelle","","",'align="left"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Amount"),"index.php","s.amount","","",'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Status"),"index.php","s.paye","","",'align="center"',$sortfield,$sortorder); + print "\n"; + + + while ($i < min($num,$limit)) { $obj = $db->fetch_object($resql);