Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing style errors.

Browse Source
This commit is contained in:
stickler-ci 2022-12-20 18:06:23 +00:00
parent 300c58dd38
commit 21e22ee990
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/adherents/class/adherentstats.class.php
View File

@ -186,7 +186,7 @@ class AdherentStats extends Stats
/**
* Return count of member by status group by adh type, total and average
*
* @return array Array with
* @return array Array with
*/
public function countMembersByTypeAndStatus()
{
@ -208,10 +208,10 @@ class AdherentStats extends Stats
$sql .= " AND t.statut = 1";
$sql .= " GROUP BY d.fk_adherent_type";
$sql .= " WITH ROLLUP;";
dol_syslog("box_members_by_type::select nb of members per type", LOG_DEBUG);
$result = $this->db->query($sql);
if ($result) {
$num = $this->db->num_rows($result);
$i = 0;
@ -233,5 +233,4 @@ class AdherentStats extends Stats
}
return $MembersCountArray;
}
}

4
htdocs/adherents/index.php
View File

@ -95,14 +95,14 @@ if ($conf->use_javascript_ajax) {
$boxgraph .='<table class="noborder nohover centpercent">';
$boxgraph .='<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
$boxgraph .='<tr><td class="center" colspan="2">';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherentstats.class.php';
$stats = new AdherentStats($db, 0, $userid);
// Show array
$sumMembers = $stats->countMembersByTypeAndStatus();
$total = $sumMembers['total']['members_draft'] + $sumMembers['total']['members_pending'] + $sumMembers['total']['members_uptodate'] + $sumMembers['total']['members_expired'] + $sumMembers['total']['members_excluded'] + $sumMembers['total']['members_resiliated'];
$dataseries = array();
$dataseries[] = array($langs->transnoentitiesnoconv("MembersStatusToValid"), $sumMembers['total']['members_draft']); // Draft, not yet validated
$dataseries[] = array($langs->transnoentitiesnoconv("WaitingSubscription"), $sumMembers['total']['members_pending']);

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

@ -91,13 +91,11 @@ class box_members_by_type extends ModeleBoxes
$this->info_box_head = array('text' => $langs->trans("BoxTitleMembersByType", $max));
if ($user->rights->adherent->lire) {
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherentstats.class.php';
$stats = new AdherentStats($this->db, $user->socid, $user->id);
// Show array
$sumMembers = $stats->countMembersByTypeAndStatus();
if ($sumMembers) {
$line = 0;
$this->info_box_contents[$line][] = array(
'td' => 'class=""',
@ -144,7 +142,7 @@ class box_members_by_type extends ModeleBoxes
$adhtype = new AdherentType($this->db);
$adhtype->id = $key;
if($key=='total'){
if ($key=='total') {
break;
}
$adhtype->label = $data['label'];