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

fix excluded member color in graph

Browse Source
This commit is contained in:
daraelmin 2021-03-27 13:39:15 +01:00
parent c8a455edf4
commit bad5aa6468
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/class/adherent.class.php
View File

@ -2279,7 +2279,7 @@ class Adherent extends CommonObject
$labelStatus = $langs->trans("MemberStatusResiliated"); $labelStatus = $langs->trans("MemberStatusResiliated");
$labelStatusShort = $langs->trans("MemberStatusResiliatedShort"); $labelStatusShort = $langs->trans("MemberStatusResiliatedShort");
} elseif ($status == -2) { } elseif ($status == -2) {
$statusType = 'status10'; $statusType = 'status8';
$labelStatus = $langs->trans("MemberStatusExcluded"); $labelStatus = $langs->trans("MemberStatusExcluded");
$labelStatusShort = $langs->trans("MemberStatusExcludedShort"); $labelStatusShort = $langs->trans("MemberStatusExcludedShort");
} }

2
htdocs/adherents/index.php
View File

@ -233,7 +233,7 @@ if ($conf->use_javascript_ajax) {
include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
$dolgraph = new DolGraph(); $dolgraph = new DolGraph();
$dolgraph->SetData($dataseries); $dolgraph->SetData($dataseries);
$dolgraph->SetDataColor(array($badgeStatus1, $badgeStatus4, '-'.$badgeStatus8, $badgeStatus6, '-'.$badgeStatus0)); $dolgraph->SetDataColor(array($badgeStatus1, $badgeStatus4, $badgeStatus8, $badgeStatus6, '-'.$badgeStatus0));
$dolgraph->setShowLegend(2); $dolgraph->setShowLegend(2);
$dolgraph->setShowPercent(1); $dolgraph->setShowPercent(1);
$dolgraph->SetType(array('pie')); $dolgraph->SetType(array('pie'));

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

@ -249,27 +249,27 @@ class box_members_by_type extends ModeleBoxes
); );
$this->info_box_contents[$line][] = array( $this->info_box_contents[$line][] = array(
'td' => 'class="liste_total right"', 'td' => 'class="liste_total right"',
'text' => $SommeA.' '.$staticmember->LibStatut(-1, 1, 0, 3), 'text' => $SumToValidate.' '.$staticmember->LibStatut(-1, 1, 0, 3),
'asis' => 1 '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' => $SommeB.' '.$staticmember->LibStatut(1, 1, 0, 3), 'text' => $SumValidated.' '.$staticmember->LibStatut(1, 1, 0, 3),
'asis' => 1 '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' => $SommeC.' '.$staticmember->LibStatut(1, 1, $now, 3), 'text' => $SumUpToDate.' '.$staticmember->LibStatut(1, 1, $now, 3),
'asis' => 1 '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(-2, 1, 0, 3), 'text' => $SumExcluded.' '.$staticmember->LibStatut(-2, 1, 0, 3),
'asis' => 1 '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' => $SumResiliated.' '.$staticmember->LibStatut(0, 1, 0, 3),
'asis' => 1 'asis' => 1
); );
} }