From 5b031473ffd3ae6c13f4e06a4c148ae09e1aec43 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 8 Dec 2020 20:06:33 +0100 Subject: [PATCH] Fix hide table if empty --- htdocs/projet/index.php | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 576bda7d09f..d0b4bb417f6 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -233,13 +233,14 @@ if ($resql) print '
'; print ''; print ''; - print ''; + print ''; + print ''; $num = $db->num_rows($resql); + if ($num) { $i = 0; - $var = true; while ($i < $num) { $obj = $db->fetch_object($resql); @@ -299,22 +300,16 @@ if ($resql) print ''; $i++; } + } else { + print ''; } - print "
'.$langs->trans("LatestModifiedProjects", $max).'
'.$langs->trans("LatestModifiedProjects", $max).'
'.$langs->trans("None").'

"; + print ""; } else dol_print_error($db); $companystatic = new Societe($db); // We need a clean new object for next loop because current one has some properties set. -// Open project per thirdparty -print '
'; -print ''; -print ''; -print_liste_field_titre("OpenedProjectsByThirdparties", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder); -print_liste_field_titre("NbOfProjects", $_SERVER["PHP_SELF"], "nb", "", "", '', $sortfield, $sortorder, 'right '); -print "\n"; - $sql = "SELECT COUNT(p.rowid) as nb, SUM(p.opp_amount)"; $sql .= ", s.rowid as socid, s.nom as name, s.name_alias"; $sql .= ", s.code_client, s.code_compta, s.client"; @@ -338,6 +333,18 @@ if ($resql) $i = 0; $othernb = 0; + if ($num) { + print '
'; + + // Open project per thirdparty + print '
'; + print '
'; + print ''; + print_liste_field_titre("OpenedProjectsByThirdparties", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder); + print_liste_field_titre("NbOfProjects", $_SERVER["PHP_SELF"], "nb", "", "", '', $sortfield, $sortorder, 'right '); + print "\n"; + } + while ($i < $num) { $obj = $db->fetch_object($resql); @@ -391,12 +398,15 @@ if ($resql) print "\n"; } + if ($num) { + print "
"; + print '
'; + } + $db->free($resql); } else { dol_print_error($db); } -print ""; -print ''; if (empty($conf->global->PROJECT_HIDE_PROJECT_LIST_ON_PROJECT_AREA)) {