diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php index b2d856904fe..6e29f988ada 100644 --- a/htdocs/adherents/class/adherentstats.class.php +++ b/htdocs/adherents/class/adherentstats.class.php @@ -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; } - } diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index 29a21f03fc7..823ea6edfce 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -95,14 +95,14 @@ if ($conf->use_javascript_ajax) { $boxgraph .='
| '.$langs->trans("Statistics").' | |
|---|---|
| '; - + 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']); diff --git a/htdocs/core/boxes/box_members_by_type.php b/htdocs/core/boxes/box_members_by_type.php index ef64053b9be..70be7f7a61e 100644 --- a/htdocs/core/boxes/box_members_by_type.php +++ b/htdocs/core/boxes/box_members_by_type.php @@ -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']; |