diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php index ff3b2156c8a..d9f8d740893 100644 --- a/htdocs/adherents/stats/index.php +++ b/htdocs/adherents/stats/index.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/adherents/stats/bycountry.php + * \file htdocs/adherents/stats/index.php * \ingroup member * \brief Page des stats * \version $Id$ @@ -61,6 +61,7 @@ llxHeader('','','','',0,0,array('http://www.google.com/jsapi')); $title=$langs->trans("Statistics"); if ($mode == 'memberbycountry') $title=$langs->trans("MembersStatisticsByCountries"); if ($mode == 'memberbystate') $title=$langs->trans("MembersStatisticsByState"); +if ($mode == 'memberbytown') $title=$langs->trans("MembersStatisticsByTown"); print_fiche_titre($title, $mesg); @@ -94,6 +95,19 @@ if ($mode) $sql.=" GROUP BY p.libelle, p.code, c.nom"; //print $sql; } + if ($mode == 'memberbytown') + { + $label=$langs->trans("Country"); + $label2=$langs->trans("Town"); + + $data = array(); + $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, p.code, p.libelle as label, d.ville as label2"; + $sql.=" FROM ".MAIN_DB_PREFIX."adherent as d"; + $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p on d.pays = p.rowid"; + $sql.=" WHERE d.statut = 1"; + $sql.=" GROUP BY p.libelle, p.code, d.ville"; + //print $sql; + } $langsen=new Translate('',$conf); $langsen->setDefaultLang('en_US'); @@ -128,6 +142,15 @@ if ($mode) 'lastdate'=>$obj->lastdate ); } + if ($mode == 'memberbytown') + { + $data[]=array('label'=>(($obj->code && $langs->trans("Country".$obj->code)!="Country".$obj->code)?$langs->trans("Country".$obj->code):($obj->label?$obj->label:$langs->trans("Unknown"))), + 'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code)!="Country".$obj->code)?$langsen->transnoentitiesnoconv("Country".$obj->code):($obj->label?$obj->label:$langs->trans("Unknown"))), + 'label2'=>($obj->label2?$obj->label2:$langs->trans("Unknown")), + 'nb'=>$obj->nb, + 'lastdate'=>$obj->lastdate + ); + } $i++; } @@ -149,6 +172,7 @@ else { if ($mode == 'memberbycountry') print $langs->trans("MembersByCountryDesc").'
'; else if ($mode == 'memberbystate') print $langs->trans("MembersByStateDesc").'
'; + else if ($mode == 'memberbytown') print $langs->trans("MembersByTownDesc").'
'; else { print $langs->trans("MembersStatisticsDesc").'
'; @@ -156,6 +180,8 @@ else print ''.$langs->trans("MembersStatisticsByCountries").'
'; print '
'; print ''.$langs->trans("MembersStatisticsByState").'
'; + print '
'; + print ''.$langs->trans("MembersStatisticsByTown").'
'; } print '
'; } diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang index 980f81ecbc9..3a478e16217 100644 --- a/htdocs/langs/en_US/members.lang +++ b/htdocs/langs/en_US/members.lang @@ -168,10 +168,12 @@ LastSubscriptionDate=Last subscription date LastSubscriptionAmount=Last subscription amount MembersStatisticsByCountries=Members statistics by country MembersStatisticsByState=Members statistics by state/province +MembersStatisticsByTowne=Members statistics by town NbOfMembers=Number of members NoValidatedMemberYet=No validated members found MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. MembersByStateDesc=This screen show you statistics on members by state/provinces/canton. +MembersByTownDesc=This screen show you statistics on members by town. MembersStatisticsDesc=Choose statistics you want to read... MenuMembersStats=Statistics LastMemberDate=Last member date \ No newline at end of file diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang index af359e2598d..a14a82d42e6 100644 --- a/htdocs/langs/fr_FR/members.lang +++ b/htdocs/langs/fr_FR/members.lang @@ -169,10 +169,12 @@ LastSubscriptionDate=Date de la dernière cotisation LastSubscriptionAmount=Montant de la dernière cotisation MembersStatisticsByCountries=Statistiques des membres par pays MembersStatisticsByState=Statistiques des membres par département/province/canton +MembersStatisticsByTown=Statistiques des membres par ville NbOfMembers=Nombre de membres NoValidatedMemberYet=Aucun membre validé trouvé MembersByCountryDesc=Cet écran vous présente une vue statistique du nombre d'adhérent par pays. Le graphique utilise toutefois le service en ligne de graphique de Google et n'est opérationnel uniquement si une connexion internet est disponible. MembersByStateDesc=Cet écran vous présente une vue statistique du nombre d'adhérent par département/province/canton. +MembersByTownDesc=Cet écran vous présente une vue statistique du nombre d'adhérent par ville. MembersStatisticsDesc=Choisissez les statistiques que vous désirez consulter... MenuMembersStats=Statistiques LastMemberDate=Date dernier adhérent