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

add excluded memer on graph

Browse Source
This commit is contained in:
daraelmin 2021-03-27 13:14:59 +01:00
parent 44cb9dca67
commit c8a455edf4
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
htdocs/core/boxes/box_members_by_type.php
View File

@ -93,12 +93,14 @@ class box_members_by_type extends ModeleBoxes
$MembersToValidate = array(); $MembersToValidate = array();
$MembersValidated = array(); $MembersValidated = array();
$MemberUpToDate = array(); $MemberUpToDate = array();
$MembersExcluded = array();
$MembersResiliated = array(); $MembersResiliated = array();
$SommeA = 0; $SumToValidate = 0;
$SommeB = 0; $SumValidated = 0;
$SommeC = 0; $SumUpToDate = 0;
$SommeD = 0; $SumResiliated = 0;
$SumExcluded = 0;
$AdherentType = array(); $AdherentType = array();
@ -132,6 +134,9 @@ class box_members_by_type extends ModeleBoxes
if ($objp->statut == 1) { if ($objp->statut == 1) {
$MembersValidated[$objp->rowid] = $objp->somme; $MembersValidated[$objp->rowid] = $objp->somme;
} }
if ($objp->statut == -2) {
$MembersExcluded[$objp->rowid] = $objp->somme;
}
if ($objp->statut == 0) { if ($objp->statut == 0) {
$MembersResiliated[$objp->rowid] = $objp->somme; $MembersResiliated[$objp->rowid] = $objp->somme;
} }
@ -181,16 +186,23 @@ class box_members_by_type extends ModeleBoxes
'td' => 'class="right"', 'td' => 'class="right"',
'text' => $langs->trans("UpToDate"), 'text' => $langs->trans("UpToDate"),
); );
$this->info_box_contents[$line][] = array(
'td' => 'class="right"',
'text' => $langs->trans("MembersStatusExcluded"),
);
$this->info_box_contents[$line][] = array( $this->info_box_contents[$line][] = array(
'td' => 'class="right"', 'td' => 'class="right"',
'text' => $langs->trans("MembersStatusResiliated"), 'text' => $langs->trans("MembersStatusResiliated"),
); );
$line++; $line++;
foreach ($AdherentType as $key => $adhtype) { foreach ($AdherentType as $key => $adhtype) {
$SommeA += isset($MembersToValidate[$key]) ? $MembersToValidate[$key] : 0;
$SommeB += isset($MembersValidated[$key]) ? $MembersValidated[$key] - (isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0) : 0; $SumToValidate += isset($MembersToValidate[$key]) ? $MembersToValidate[$key] : 0;
$SommeC += isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0; $SumValidated += isset($MembersValidated[$key]) ? $MembersValidated[$key] - (isset($MembersUpToDate[$key]) ? $MembersUpToDate[$key] : 0) : 0;
$SommeD += isset($MembersResiliated[$key]) ? $MembersResiliated[$key] : 0; $SumUpToDate += isset($MembersUpToDate[$key]) ? $MembersUpToDate[$key] : 0;
$SumExcluded += isset($MembersExcluded[$key]) ? $MembersExcluded [$key] : 0;
$SumResiliated += isset($MembersResiliated[$key]) ? $MembersResiliated[$key] : 0;
$this->info_box_contents[$line][] = array( $this->info_box_contents[$line][] = array(
'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"', 'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
'text' => $adhtype->getNomUrl(1, dol_size(32)), 'text' => $adhtype->getNomUrl(1, dol_size(32)),
@ -211,6 +223,11 @@ class box_members_by_type extends ModeleBoxes
'text' => (isset($MemberUpToDate[$key]) && $MemberUpToDate[$key] > 0 ? $MemberUpToDate[$key] : '') . ' ' . $staticmember->LibStatut(1, 1, $now, 3), 'text' => (isset($MemberUpToDate[$key]) && $MemberUpToDate[$key] > 0 ? $MemberUpToDate[$key] : '') . ' ' . $staticmember->LibStatut(1, 1, $now, 3),
'asis' => 1, 'asis' => 1,
); );
$this->info_box_contents[$line][] = array(
'td' => 'class="right"',
'text' => (isset($MembersExcluded[$key]) && $MembersExcluded[$key] > 0 ? $MembersExcluded[$key] : '') . ' ' . $staticmember->LibStatut(-2, 1, $now, 3),
'asis' => 1,
);
$this->info_box_contents[$line][] = array( $this->info_box_contents[$line][] = array(
'td' => 'class="right"', 'td' => 'class="right"',
'text' => (isset($MembersResiliated[$key]) && $MembersResiliated[$key] > 0 ? $MembersResiliated[$key] : '') . ' ' . $staticmember->LibStatut(0, 1, 0, 3), 'text' => (isset($MembersResiliated[$key]) && $MembersResiliated[$key] > 0 ? $MembersResiliated[$key] : '') . ' ' . $staticmember->LibStatut(0, 1, 0, 3),
@ -245,6 +262,11 @@ class box_members_by_type extends ModeleBoxes
'text' => $SommeC.' '.$staticmember->LibStatut(1, 1, $now, 3), 'text' => $SommeC.' '.$staticmember->LibStatut(1, 1, $now, 3),
'asis' => 1 'asis' => 1
); );
$this->info_box_contents[$line][] = array(
'td' => 'class="liste_total right"',
'text' => $SommeD.' '.$staticmember->LibStatut(-2, 1, 0, 3),
'asis' => 1
);
$this->info_box_contents[$line][] = array( $this->info_box_contents[$line][] = array(
'td' => 'class="liste_total right"', 'td' => 'class="liste_total right"',
'text' => $SommeD.' '.$staticmember->LibStatut(0, 1, 0, 3), 'text' => $SommeD.' '.$staticmember->LibStatut(0, 1, 0, 3),