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

Fix hide table if empty

Browse Source
This commit is contained in:
Laurent Destailleur 2020-12-08 20:06:33 +01:00
parent bb6f23d81b
commit 5b031473ff
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
htdocs/projet/index.php
View File

@ -233,13 +233,14 @@ if ($resql)
print '<div class="div-table-responsive-no-min">'; print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">'; print '<table class="noborder centpercent">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<th colspan="4">'.$langs->trans("LatestModifiedProjects", $max).'</th></tr>'; print '<th colspan="4">'.$langs->trans("LatestModifiedProjects", $max).'</th>';
print '</tr>';
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
if ($num) if ($num)
{ {
$i = 0; $i = 0;
$var = true;
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
@ -299,22 +300,16 @@ if ($resql)
print '</tr>'; print '</tr>';
$i++; $i++;
} }
} else {
print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
} }
print "</table></div><br>"; print "</table></div>";
} else dol_print_error($db); } 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. $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 '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print_liste_field_titre("OpenedProjectsByThirdparties", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder);
print_liste_field_titre("NbOfProjects", $_SERVER["PHP_SELF"], "nb", "", "", '', $sortfield, $sortorder, 'right ');
print "</tr>\n";
$sql = "SELECT COUNT(p.rowid) as nb, SUM(p.opp_amount)"; $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.rowid as socid, s.nom as name, s.name_alias";
$sql .= ", s.code_client, s.code_compta, s.client"; $sql .= ", s.code_client, s.code_compta, s.client";
@ -338,6 +333,18 @@ if ($resql)
$i = 0; $i = 0;
$othernb = 0; $othernb = 0;
if ($num) {
print '<br>';
// Open project per thirdparty
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print_liste_field_titre("OpenedProjectsByThirdparties", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder);
print_liste_field_titre("NbOfProjects", $_SERVER["PHP_SELF"], "nb", "", "", '', $sortfield, $sortorder, 'right ');
print "</tr>\n";
}
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
@ -391,12 +398,15 @@ if ($resql)
print "</tr>\n"; print "</tr>\n";
} }
if ($num) {
print "</table>";
print '</div>';
}
$db->free($resql); $db->free($resql);
} else { } else {
dol_print_error($db); dol_print_error($db);
} }
print "</table>";
print '</div>';
if (empty($conf->global->PROJECT_HIDE_PROJECT_LIST_ON_PROJECT_AREA)) if (empty($conf->global->PROJECT_HIDE_PROJECT_LIST_ON_PROJECT_AREA))
{ {