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

Merge pull request #21348 from FHenry/15_fix_graph_ficheinter_status

Browse Source 
FIX: 15 fix graph ficheinter status
This commit is contained in:
Laurent Destailleur 2022-06-23 11:44:18 +02:00 committed by GitHub
commit d93e60bbd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
htdocs/fichinter/index.php
View File

@ -89,7 +89,6 @@ $sql .= " GROUP BY f.fk_statut";
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) { if ($resql) {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
$i = 0;
$total = 0; $total = 0;
$totalinprocess = 0; $totalinprocess = 0;
@ -97,38 +96,28 @@ if ($resql) {
$vals = array(); $vals = array();
$bool = false; $bool = false;
// -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not) // -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not)
while ($i < $num) { if ($num>0) {
$row = $db->fetch_row($resql); while ($row = $db->fetch_row($resql)) {
if ($row) { if (!isset($vals[$row[1]])) {
//if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1)) $vals[$row[1]] = 0;
{
$bool = (!empty($row[2]) ?true:false);
if (!isset($vals[$row[1].$bool])) {
$vals[$row[1].$bool] = 0;
} }
$vals[$row[1].$bool] += $row[0]; $vals[$row[1]] += $row[0];
$totalinprocess += $row[0]; $totalinprocess += $row[0];
}
$total += $row[0]; $total += $row[0];
} }
$i++;
} }
$db->free($resql); $db->free($resql);
include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php'; include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
print '<div class="div-table-responsive-no-min">'; print '<div class="div-table-responsive-no-min">';
print '<table class="noborder nohover centpercent">'; print '<table class="noborder nohover centpercent">';
print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Interventions").'</th></tr>'."\n"; print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Interventions").'</th></tr>'."\n";
$listofstatus = array(0, 1, 3); $listofstatus = array(Fichinter::STATUS_DRAFT, Fichinter::STATUS_VALIDATED);
$bool = false; if (!empty($conf->global->FICHINTER_CLASSIFY_BILLED)) $listofstatus[] = Fichinter::STATUS_BILLED;
foreach ($listofstatus as $status) { foreach ($listofstatus as $status) {
$dataseries[] = array($fichinterstatic->LibStatut($status, $bool, 1), (isset($vals[$status.$bool]) ? (int) $vals[$status.$bool] : 0)); $dataseries[] = array($fichinterstatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
if ($status == 3 && !$bool) {
$bool = true;
} else {
$bool = false;
}
if ($status == Fichinter::STATUS_DRAFT) { if ($status == Fichinter::STATUS_DRAFT) {
$colorseries[$status] = '-'.$badgeStatus0; $colorseries[$status] = '-'.$badgeStatus0;
@ -139,10 +128,8 @@ if ($resql) {
if ($status == Fichinter::STATUS_BILLED) { if ($status == Fichinter::STATUS_BILLED) {
$colorseries[$status] = $badgeStatus4; $colorseries[$status] = $badgeStatus4;
} }
if ($status == Fichinter::STATUS_CLOSED) {
$colorseries[$status] = $badgeStatus6;
}
} }
if ($conf->use_javascript_ajax) { if ($conf->use_javascript_ajax) {
print '<tr class="impair"><td class="center" colspan="2">'; print '<tr class="impair"><td class="center" colspan="2">';
@ -159,21 +146,15 @@ if ($resql) {
print '</td></tr>'; print '</td></tr>';
} }
$bool = false;
foreach ($listofstatus as $status) { foreach ($listofstatus as $status) {
if (!$conf->use_javascript_ajax) { if (!$conf->use_javascript_ajax) {
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td>'.$fichinterstatic->LibStatut($status, $bool, 0).'</td>'; print '<td>'.$fichinterstatic->LibStatut($status, $bool, 0).'</td>';
print '<td class="right"><a href="list.php?search_status='.$status.'">'.(isset($vals[$status.$bool]) ? $vals[$status.$bool] : 0).' '; print '<td class="right"><a href="list.php?search_status='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).' ';
print $fichinterstatic->LibStatut($status, $bool, 3); print $fichinterstatic->LibStatut($status, 3);
print '</a>'; print '</a>';
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
if ($status == 3 && !$bool) {
$bool = true;
} else {
$bool = false;
}
} }
} }
//if ($totalinprocess != $total) //if ($totalinprocess != $total)