--- /tmp/dsg/dolibarr/htdocs/adherents/stats/github_byproperties.php
+++ /tmp/dsg/dolibarr/htdocs/adherents/stats/client_byproperties.php
@@ -33,9 +33,10 @@
 

 

 // Security check

-if ($user->socid > 0) {

-	$action = '';

-	$socid = $user->socid;

+if ($user->socid > 0)

+{

+    $action = '';

+    $socid = $user->socid;

 }

 $result = restrictedArea($user, 'adherent', '', '', 'cotisation');

 

@@ -61,119 +62,87 @@
 

 dol_mkdir($dir);

 

+$tab = 'byproperties';

+

 $data = array();

-

-$sql = "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions,";

-$sql .= " MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate,";

-$sql .= " d.morphy as code";

+$sql .= "SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, d.morphy as code";

 $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";

 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";

 $sql .= " WHERE d.entity IN (".getEntity('adherent').")";

-$sql .= " AND d.statut != -1"; // Not draft

+$sql .= " AND d.statut = 1";

 $sql .= " GROUP BY d.morphy";

+

 $foundphy = $foundmor = 0;

 

 // Define $data array

 dol_syslog("Count member", LOG_DEBUG);

 $resql = $db->query($sql);

-if ($resql) {

+if ($resql)

+{

 	$num = $db->num_rows($resql);

 	$i = 0;

-	while ($i < $num) {

+	while ($i < $num)

+	{

 		$obj = $db->fetch_object($resql);

 

 		if ($obj->code == 'phy') $foundphy++;

 		if ($obj->code == 'mor') $foundmor++;

 

-		$data[$obj->code] = array('label'=>$obj->code, 'nb'=>$obj->nb, 'nbsubscriptions'=>$obj->nbsubscriptions, 'lastdate'=>$db->jdate($obj->lastdate), 'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate));

+		$data[] = array('label'=>$obj->code, 'nb'=>$obj->nb, 'lastdate'=>$db->jdate($obj->lastdate), 'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate));

 

 		$i++;

 	}

 	$db->free($resql);

-} else {

-	dol_print_error($db);

 }

-

-$sql = "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions,";

-$sql .= " MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate,";

-$sql .= " d.morphy as code";

-$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";

-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";

-$sql .= " WHERE d.entity IN (".getEntity('adherent').")";

-$sql .= " AND d.statut >= 1"; // Active (not draft=-1, not resiliated=0)

-$sql .= " GROUP BY d.morphy";

-$foundphy = $foundmor = 0;

-

-// Define $data array

-dol_syslog("Count member still active", LOG_DEBUG);

-$resql = $db->query($sql);

-if ($resql) {

-	$num = $db->num_rows($resql);

-	$i = 0;

-	while ($i < $num) {

-		$obj = $db->fetch_object($resql);

-

-		if ($obj->code == 'phy') $foundphy++;

-		if ($obj->code == 'mor') $foundmor++;

-

-		$data[$obj->code]['nbactive'] = $obj->nb;

-

-		$i++;

-	}

-	$db->free($resql);

-} else {

+else

+{

 	dol_print_error($db);

 }

 

 

 $head = member_stats_prepare_head($adh);

 

-print dol_get_fiche_head($head, 'statsbyproperties', $langs->trans("Statistics"), -1, 'user');

+dol_fiche_head($head, 'statsbyproperties', $langs->trans("Statistics"), -1, 'user');

 

 

 // Print title

-if (!count($data)) {

-	print '<span class="opacitymedium">'.$langs->trans("NoValidatedMemberYet").'</span><br>';

+if (!count($data))

+{

+	print $langs->trans("NoValidatedMemberYet").'<br>';

 	print '<br>';

-} else {

-	print '<span class="opacitymedium">'.$langs->trans("MembersByNature").'</span><br>';

+}

+else

+{

+	print $langs->trans("MembersByNature").'<br>';

 	print '<br>';

 }

 

 // Print array

-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table

 print '<table class="liste centpercent">';

 print '<tr class="liste_titre">';

-print '<td>'.$langs->trans("MemberNature").'</td>';

-print '<td class="right">'.$langs->trans("NbOfMembers").' <span class="opacitymedium">('.$langs->trans("AllTime").')</span></td>';

-print '<td class="right">'.$langs->trans("NbOfActiveMembers").'</td>';

+print '<td>'.$langs->trans("Nature").'</td>';

+print '<td class="right">'.$langs->trans("NbOfMembers").'</td>';

 print '<td class="center">'.$langs->trans("LastMemberDate").'</td>';

-print '<td class="right">'.$langs->trans("NbOfSubscriptions").'</td>';

 print '<td class="center">'.$langs->trans("LatestSubscriptionDate").'</td>';

 print '</tr>';

 

-if (!$foundphy) $data[] = array('label'=>'phy', 'nb'=>'0', 'nbactive'=>'0', 'lastdate'=>'', 'lastsubscriptiondate'=>'');

-if (!$foundmor) $data[] = array('label'=>'mor', 'nb'=>'0', 'nbactive'=>'0', 'lastdate'=>'', 'lastsubscriptiondate'=>'');

+if (!$foundphy) $data[] = array('label'=>'phy', 'nb'=>'0', 'lastdate'=>'', 'lastsubscriptiondate'=>'');

+if (!$foundmor) $data[] = array('label'=>'mor', 'nb'=>'0', 'lastdate'=>'', 'lastsubscriptiondate'=>'');

 

-foreach ($data as $val) {

-	$nb = $val['nb'];

-	$nbsubscriptions = $val['nbsubscriptions'];

-	$nbactive = $val['nbactive'];

-

+foreach ($data as $val)

+{

 	print '<tr class="oddeven">';

 	print '<td>'.$memberstatic->getmorphylib($val['label']).'</td>';

-	print '<td class="right">'.$nb.'</td>';

-	print '<td class="right">'.$nbactive.'</td>';

+	print '<td class="right">'.$val['nb'].'</td>';

 	print '<td class="center">'.dol_print_date($val['lastdate'], 'dayhour').'</td>';

-	print '<td class="right">'.$nbsubscriptions.'</td>';

 	print '<td class="center">'.dol_print_date($val['lastsubscriptiondate'], 'dayhour').'</td>';

 	print '</tr>';

 }

 

 print '</table>';

-print '</div>';

 

-print dol_get_fiche_end();

+

+dol_fiche_end();

 

 // End of page

 llxFooter();

--- /tmp/dsg/dolibarr/htdocs/adherents/stats/github_geo.php
+++ /tmp/dsg/dolibarr/htdocs/adherents/stats/client_geo.php
@@ -34,9 +34,10 @@
 

 

 // Security check

-if ($user->socid > 0) {

-	$action = '';

-	$socid = $user->socid;

+if ($user->socid > 0)

+{

+    $action = '';

+    $socid = $user->socid;

 }

 $result = restrictedArea($user, 'adherent', '', '', 'cotisation');

 

@@ -45,7 +46,7 @@
 $endyear = $year;

 

 // Load translation files required by the page

-$langs->loadLangs(array("companies", "members", "banks"));

+$langs->loadLangs(array("companies", "members"));

 

 

 /*

@@ -67,239 +68,258 @@
 

 dol_mkdir($dir);

 

-if ($mode) {

-	// Define sql

-	if ($mode == 'memberbycountry') {

-		$label = $langs->trans("Country");

-		$tab = 'statscountry';

-

-		$data = array();

-		$sql .= "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, c.code, c.label";

-		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";

-		$sql .= " WHERE d.entity IN (".getEntity('adherent').")";

-		$sql .= " AND d.statut != -1";

-		$sql .= " GROUP BY c.label, c.code";

-		//print $sql;

-	}

-

-	if ($mode == 'memberbystate') {

-		$label = $langs->trans("Country");

-		$label2 = $langs->trans("State");

-		$tab = 'statsstate';

-

-		$data = array();

-		$sql .= "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, co.code, co.label, c.nom as label2"; //

-		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";

-		$sql .= " WHERE d.entity IN (".getEntity('adherent').")";

-		$sql .= " AND d.statut != -1";

-		$sql .= " GROUP BY co.label, co.code, c.nom";

-		//print $sql;

-	}

-	if ($mode == 'memberbyregion') { //

-		$label = $langs->trans("Country");

-		$label2 = $langs->trans("Region"); //département

-		$tab = 'statsregion'; //onglet

-

-		$data = array(); //tableau de donnée

-		$sql .= "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, co.code, co.label, r.nom as label2";

-		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";

-		$sql .= " WHERE d.entity IN (".getEntity('adherent').")";

-		$sql .= " AND d.statut != -1";

-		$sql .= " GROUP BY co.label, co.code, r.nom"; //+

-		//print $sql;

-	}

-	if ($mode == 'memberbytown') {

-		$label = $langs->trans("Country");

-		$label2 = $langs->trans("Town");

-		$tab = 'statstown';

-

-		$data = array();

-		$sql .= "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, c.code, c.label, d.town as label2";

-		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";

-		$sql .= " WHERE d.entity IN (".getEntity('adherent').")";

-		$sql .= " AND d.statut != -1";

-		$sql .= " GROUP BY c.label, c.code, d.town";

-		//print $sql;

-	}

-

-	$langsen = new Translate('', $conf);

-	$langsen->setDefaultLang('en_US');

-	$langsen->load("dict");

-	//print $langsen->trans("Country"."FI");exit;

-

-	// Define $data array

-	dol_syslog("Count member", LOG_DEBUG);

-	$resql = $db->query($sql);

-	if ($resql) {

-		$num = $db->num_rows($resql);

-		$i = 0;

-		while ($i < $num) {

-			$obj = $db->fetch_object($resql);

-			if ($mode == 'memberbycountry') {

-				$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"))),

+if ($mode)

+{

+    // Define sql

+    if ($mode == 'memberbycountry')

+    {

+        $label = $langs->trans("Country");

+        $tab = 'statscountry';

+

+        $data = array();

+        $sql .= "SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, c.code, c.label";

+        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";

+        $sql .= " WHERE d.entity IN (".getEntity('adherent').")";

+        $sql .= " AND d.statut = 1";

+        $sql .= " GROUP BY c.label, c.code";

+        //print $sql;

+    }

+

+	if ($mode == 'memberbystate')

+    {

+        $label = $langs->trans("Country");

+        $label2 = $langs->trans("State");

+        $tab = 'statsstate';

+

+        $data = array();

+        $sql .= "SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, co.code, co.label, c.nom as label2"; //

+        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";

+        $sql .= " WHERE d.entity IN (".getEntity('adherent').")";

+        $sql .= " AND d.statut = 1";

+        $sql .= " GROUP BY co.label, co.code, c.nom";

+        //print $sql;

+    }

+    if ($mode == 'memberbyregion') //

+    {

+        $label = $langs->trans("Country");

+        $label2 = $langs->trans("Region"); //département

+        $tab = 'statsregion'; //onglet

+

+        $data = array(); //tableau de donnée

+        $sql .= "SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, co.code, co.label, r.nom as label2";

+        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";

+        $sql .= " WHERE d.entity IN (".getEntity('adherent').")";

+        $sql .= " AND d.statut = 1";

+        $sql .= " GROUP BY co.label, co.code, r.nom"; //+

+        //print $sql;

+    }

+    if ($mode == 'memberbytown')

+    {

+        $label = $langs->trans("Country");

+        $label2 = $langs->trans("Town");

+        $tab = 'statstown';

+

+        $data = array();

+        $sql .= "SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, c.code, c.label, d.town as label2";

+        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";

+        $sql .= " WHERE d.entity IN (".getEntity('adherent').")";

+        $sql .= " AND d.statut = 1";

+        $sql .= " GROUP BY c.label, c.code, d.town";

+        //print $sql;

+    }

+

+    $langsen = new Translate('', $conf);

+    $langsen->setDefaultLang('en_US');

+    $langsen->load("dict");

+    //print $langsen->trans("Country"."FI");exit;

+

+    // Define $data array

+    dol_syslog("Count member", LOG_DEBUG);

+    $resql = $db->query($sql);

+    if ($resql)

+    {

+        $num = $db->num_rows($resql);

+        $i = 0;

+        while ($i < $num)

+        {

+            $obj = $db->fetch_object($resql);

+            if ($mode == 'memberbycountry')

+            {

+                $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"))),

 							'code'=>$obj->code,

 							'nb'=>$obj->nb,

 							'lastdate'=>$db->jdate($obj->lastdate),

-							'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)

-				);

-			}

-			if ($mode == 'memberbyregion') { //+

-				$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")),

+                            'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)

+                );

+            }

+            if ($mode == 'memberbyregion') //+

+            {

+                $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'=>$db->jdate($obj->lastdate),

-					'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)

-				);

-			}

-			if ($mode == 'memberbystate') {

-				$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")),

+                    'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)

+                );

+	        }

+            if ($mode == 'memberbystate')

+            {

+                $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'=>$db->jdate($obj->lastdate),

-							'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)

-				);

-			}

-			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'=>$db->jdate($obj->lastdate),

-							'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)

-				);

-			}

-

-			$i++;

-		}

-		$db->free($resql);

-	} else {

-		dol_print_error($db);

-	}

+                            'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)

+                );

+            }

+            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'=>$db->jdate($obj->lastdate),

+                            'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)

+                );

+            }

+

+            $i++;

+        }

+        $db->free($resql);

+    }

+    else

+    {

+        dol_print_error($db);

+    }

 }

 

 

 $head = member_stats_prepare_head($adh);

 

-print dol_get_fiche_head($head, $tab, $langs->trans("Statistics"), -1, 'user');

+dol_fiche_head($head, $tab, $langs->trans("Statistics"), -1, 'user');

 

 

 // Print title

-if ($mode && !count($data)) {

-	print $langs->trans("NoValidatedMemberYet").'<br>';

-	print '<br>';

-} else {

-	if ($mode == 'memberbycountry') print '<span class="opacitymedium">'.$langs->trans("MembersByCountryDesc").'</span><br>';

-	elseif ($mode == 'memberbystate') print '<span class="opacitymedium">'.$langs->trans("MembersByStateDesc").'</span><br>';

-	elseif ($mode == 'memberbytown') print '<span class="opacitymedium">'.$langs->trans("MembersByTownDesc").'</span><br>';

-	elseif ($mode == 'memberbyregion') print '<span class="opacitymedium">'.$langs->trans("MembersByRegion").'</span><br>'; //+

-	else {

-		print '<span class="opacitymedium">'.$langs->trans("MembersStatisticsDesc").'</span><br>';

-		print '<br>';

-		print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbycountry">'.$langs->trans("MembersStatisticsByCountries").'</a><br>';

-		print '<br>';

-		print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbystate">'.$langs->trans("MembersStatisticsByState").'</a><br>';

-		print '<br>';

-		print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbytown">'.$langs->trans("MembersStatisticsByTown").'</a><br>';

-		print '<br>'; //+

+if ($mode && !count($data))

+{

+    print $langs->trans("NoValidatedMemberYet").'<br>';

+    print '<br>';

+}

+else

+{

+    if ($mode == 'memberbycountry') print $langs->trans("MembersByCountryDesc").'<br>';

+    elseif ($mode == 'memberbystate') print $langs->trans("MembersByStateDesc").'<br>';

+    elseif ($mode == 'memberbytown') print $langs->trans("MembersByTownDesc").'<br>';

+    elseif ($mode == 'memberbyregion') print $langs->trans("MembersByRegion").'<br>'; //+

+    else

+    {

+        print $langs->trans("MembersStatisticsDesc").'<br>';

+        print '<br>';

+        print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbycountry">'.$langs->trans("MembersStatisticsByCountries").'</a><br>';

+        print '<br>';

+        print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbystate">'.$langs->trans("MembersStatisticsByState").'</a><br>';

+        print '<br>';

+        print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbytown">'.$langs->trans("MembersStatisticsByTown").'</a><br>';

+        print '<br>'; //+

 		print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbyregion">'.$langs->trans("MembersStatisticsByRegion").'</a><br>'; //+

-	}

-	print '<br>';

+    }

+    print '<br>';

 }

 

 

 // Show graphics

-if (count($arrayjs) && $mode == 'memberbycountry') {

-	$color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';

-	if (is_readable($color_file)) include_once $color_file;

-

-	// Assume we've already included the proper headers so just call our script inline

-	// More doc: https://developers.google.com/chart/interactive/docs/gallery/geomap?hl=fr-FR

-	print "\n<script type='text/javascript'>\n";

-	print "google.load('visualization', '1', {'packages': ['geomap']});\n";

-	print "google.setOnLoadCallback(drawMap);\n";

-	print "function drawMap() {\n\tvar data = new google.visualization.DataTable();\n";

-

-	// Get the total number of rows

-	print "\tdata.addRows(".count($data).");\n";

-	print "\tdata.addColumn('string', 'Country');\n";

-	print "\tdata.addColumn('number', 'Number');\n";

-

-	// loop and dump

-	$i = 0;

-	foreach ($data as $val) {

-		$valcountry = strtoupper($val['code']); // Should be ISO-3166 code (faster)

-		//$valcountry=ucfirst($val['label_en']);

-		if ($valcountry == 'Great Britain') { $valcountry = 'United Kingdom'; }    // fix case of uk (when we use labels)

-		print "\tdata.setValue(".$i.", 0, \"".$valcountry."\");\n";

-		print "\tdata.setValue(".$i.", 1, ".$val['nb'].");\n";

-		// Google's Geomap only supports up to 400 entries

-		if ($i >= 400) { break; }

-		$i++;

-	}

-

-	print "\tvar options = {};\n";

-	print "\toptions['dataMode'] = 'regions';\n";

-	print "\toptions['showZoomOut'] = false;\n";

-	//print "\toptions['zoomOutLabel'] = '".dol_escape_js($langs->transnoentitiesnoconv("Numbers"))."';\n";

-	print "\toptions['width'] = ".$graphwidth.";\n";

-	print "\toptions['height'] = ".$graphheight.";\n";

-	print "\toptions['colors'] = [0x".colorArrayToHex($theme_datacolor[1], 'BBBBBB').", 0x".colorArrayToHex($theme_datacolor[0], '444444')."];\n";

-	print "\tvar container = document.getElementById('".$mode."');\n";

-	print "\tvar geomap = new google.visualization.GeoMap(container);\n";

-	print "\tgeomap.draw(data, options);\n";

-	print "};\n";

-	print "</script>\n";

-

-	// print the div tag that will contain the map

-	print '<div class="center" id="'.$mode.'"></div>'."\n";

-	print '<br>';

-}

-

-if ($mode) {

-	// Print array

-	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table

-	print '<table class="liste centpercent">';

-	print '<tr class="liste_titre">';

-	print '<td>'.$label.'</td>';

-	if ($label2) print '<td class="center">'.$label2.'</td>';

-	print '<td class="right">'.$langs->trans("NbOfMembers").' <span class="opacitymedium">('.$langs->trans("AllTime").')</span></td>';

-	print '<td class="center">'.$langs->trans("LastMemberDate").'</td>';

-	print '<td class="center">'.$langs->trans("LatestSubscriptionDate").'</td>';

-	print '</tr>';

-

-	foreach ($data as $val) {

-		$year = $val['year'];

-		print '<tr class="oddeven">';

-		print '<td>'.$val['label'].'</td>';

-		if ($label2) print '<td class="center">'.$val['label2'].'</td>';

-		print '<td class="right">'.$val['nb'].'</td>';

-		print '<td class="center">'.dol_print_date($val['lastdate'], 'dayhour').'</td>';

-		print '<td class="center">'.dol_print_date($val['lastsubscriptiondate'], 'dayhour').'</td>';

-		print '</tr>';

-	}

-

-	print '</table>';

-	print '</div>';

-}

-

-

-print dol_get_fiche_end();

+if (count($arrayjs) && $mode == 'memberbycountry')

+{

+    $color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';

+    if (is_readable($color_file)) include_once $color_file;

+

+    // Assume we've already included the proper headers so just call our script inline

+    // More doc: https://developers.google.com/chart/interactive/docs/gallery/geomap?hl=fr-FR

+    print "\n<script type='text/javascript'>\n";

+    print "google.load('visualization', '1', {'packages': ['geomap']});\n";

+    print "google.setOnLoadCallback(drawMap);\n";

+    print "function drawMap() {\n\tvar data = new google.visualization.DataTable();\n";

+

+    // Get the total number of rows

+    print "\tdata.addRows(".count($data).");\n";

+    print "\tdata.addColumn('string', 'Country');\n";

+    print "\tdata.addColumn('number', 'Number');\n";

+

+    // loop and dump

+    $i = 0;

+    foreach ($data as $val)

+    {

+        $valcountry = strtoupper($val['code']); // Should be ISO-3166 code (faster)

+        //$valcountry=ucfirst($val['label_en']);

+        if ($valcountry == 'Great Britain') { $valcountry = 'United Kingdom'; }    // fix case of uk (when we use labels)

+        print "\tdata.setValue(".$i.", 0, \"".$valcountry."\");\n";

+        print "\tdata.setValue(".$i.", 1, ".$val['nb'].");\n";

+        // Google's Geomap only supports up to 400 entries

+        if ($i >= 400) { break; }

+        $i++;

+    }

+

+    print "\tvar options = {};\n";

+    print "\toptions['dataMode'] = 'regions';\n";

+    print "\toptions['showZoomOut'] = false;\n";

+    //print "\toptions['zoomOutLabel'] = '".dol_escape_js($langs->transnoentitiesnoconv("Numbers"))."';\n";

+    print "\toptions['width'] = ".$graphwidth.";\n";

+    print "\toptions['height'] = ".$graphheight.";\n";

+    print "\toptions['colors'] = [0x".colorArrayToHex($theme_datacolor[1], 'BBBBBB').", 0x".colorArrayToHex($theme_datacolor[0], '444444')."];\n";

+    print "\tvar container = document.getElementById('".$mode."');\n";

+    print "\tvar geomap = new google.visualization.GeoMap(container);\n";

+    print "\tgeomap.draw(data, options);\n";

+    print "};\n";

+    print "</script>\n";

+

+    // print the div tag that will contain the map

+    print '<div class="center" id="'.$mode.'"></div>'."\n";

+    print '<br>';

+}

+

+if ($mode)

+{

+    // Print array / Affiche le tableau

+    print '<table class="liste centpercent">';

+    print '<tr class="liste_titre">';

+    print '<td>'.$label.'</td>';

+    if ($label2) print '<td class="center">'.$label2.'</td>';

+    print '<td class="right">'.$langs->trans("NbOfMembers").'</td>';

+    print '<td class="center">'.$langs->trans("LastMemberDate").'</td>';

+    print '<td class="center">'.$langs->trans("LatestSubscriptionDate").'</td>';

+    print '</tr>';

+

+    foreach ($data as $val)

+    {

+        $year = $val['year'];

+        print '<tr class="oddeven">';

+        print '<td>'.$val['label'].'</td>';

+        if ($label2) print '<td class="center">'.$val['label2'].'</td>';

+        print '<td class="right">'.$val['nb'].'</td>';

+        print '<td class="center">'.dol_print_date($val['lastdate'], 'dayhour').'</td>';

+        print '<td class="center">'.dol_print_date($val['lastsubscriptiondate'], 'dayhour').'</td>';

+        print '</tr>';

+    }

+

+    print '</table>';

+}

+

+

+dol_fiche_end();

 

 // End of page

 llxFooter();

--- /tmp/dsg/dolibarr/htdocs/adherents/stats/github_index.php
+++ /tmp/dsg/dolibarr/htdocs/adherents/stats/client_index.php
@@ -35,9 +35,10 @@
 $socid = GETPOST('socid', 'int'); if ($socid < 0) $socid = 0;

 

 // Security check

-if ($user->socid > 0) {

-	$action = '';

-	$socid = $user->socid;

+if ($user->socid > 0)

+{

+    $action = '';

+    $socid = $user->socid;

 }

 $result = restrictedArea($user, 'adherent', '', '', 'cotisation');

 

@@ -78,25 +79,27 @@
 

 $px1 = new DolGraph();

 $mesg = $px1->isGraphKo();

-if (!$mesg) {

-	$px1->SetData($data);

-	$i = $startyear;

-	while ($i <= $endyear) {

-		$legend[] = $i;

-		$i++;

-	}

-	$px1->SetLegend($legend);

-	$px1->SetMaxValue($px1->GetCeilMaxValue());

-	$px1->SetMinValue(min(0, $px1->GetFloorMinValue()));

-	$px1->SetWidth($WIDTH);

-	$px1->SetHeight($HEIGHT);

-	$px1->SetYLabel($langs->trans("NbOfSubscriptions"));

-	$px1->SetShading(3);

-	$px1->SetHorizTickIncrement(1);

-	$px1->mode = 'depth';

-	$px1->SetTitle($langs->trans("NbOfSubscriptions"));

-

-	$px1->draw($filenamenb, $fileurlnb);

+if (!$mesg)

+{

+    $px1->SetData($data);

+    $i = $startyear;

+    while ($i <= $endyear)

+    {

+        $legend[] = $i;

+        $i++;

+    }

+    $px1->SetLegend($legend);

+    $px1->SetMaxValue($px1->GetCeilMaxValue());

+    $px1->SetMinValue(min(0, $px1->GetFloorMinValue()));

+    $px1->SetWidth($WIDTH);

+    $px1->SetHeight($HEIGHT);

+    $px1->SetYLabel($langs->trans("NbOfSubscriptions"));

+    $px1->SetShading(3);

+    $px1->SetHorizTickIncrement(1);

+    $px1->mode = 'depth';

+    $px1->SetTitle($langs->trans("NbOfSubscriptions"));

+

+    $px1->draw($filenamenb, $fileurlnb);

 }

 

 // Build graphic amount of object

@@ -109,31 +112,33 @@
 

 $px2 = new DolGraph();

 $mesg = $px2->isGraphKo();

-if (!$mesg) {

-	$px2->SetData($data);

-	$i = $startyear;

-	while ($i <= $endyear) {

-		$legend[] = $i;

-		$i++;

-	}

-	$px2->SetLegend($legend);

-	$px2->SetMaxValue($px2->GetCeilMaxValue());

-	$px2->SetMinValue(min(0, $px2->GetFloorMinValue()));

-	$px2->SetWidth($WIDTH);

-	$px2->SetHeight($HEIGHT);

-	$px2->SetYLabel($langs->trans("AmountOfSubscriptions"));

-	$px2->SetShading(3);

-	$px2->SetHorizTickIncrement(1);

-	$px2->mode = 'depth';

-	$px2->SetTitle($langs->trans("AmountOfSubscriptions"));

-

-	$px2->draw($filenameamount, $fileurlamount);

+if (!$mesg)

+{

+    $px2->SetData($data);

+    $i = $startyear;

+    while ($i <= $endyear)

+    {

+        $legend[] = $i;

+        $i++;

+    }

+    $px2->SetLegend($legend);

+    $px2->SetMaxValue($px2->GetCeilMaxValue());

+    $px2->SetMinValue(min(0, $px2->GetFloorMinValue()));

+    $px2->SetWidth($WIDTH);

+    $px2->SetHeight($HEIGHT);

+    $px2->SetYLabel($langs->trans("AmountOfSubscriptions"));

+    $px2->SetShading(3);

+    $px2->SetHorizTickIncrement(1);

+    $px2->mode = 'depth';

+    $px2->SetTitle($langs->trans("AmountOfSubscriptions"));

+

+    $px2->draw($filenameamount, $fileurlamount);

 }

 

 

 $head = member_stats_prepare_head($adh);

 

-print dol_get_fiche_head($head, 'statssubscription', $langs->trans("Statistics"), -1, 'user');

+dol_fiche_head($head, 'statssubscription', $langs->trans("Statistics"), -1, 'user');

 

 

 print '<div class="fichecenter"><div class="fichethirdleft">';

@@ -170,32 +175,34 @@
 print '</tr>';

 

 $oldyear = 0;

-foreach ($data as $val) {

-	$year = $val['year'];

-	while ($oldyear > $year + 1) {	// If we have empty year

-		$oldyear--;

-		print '<tr class="oddeven" height="24">';

-		print '<td class="center">';

-		//print '<a href="month.php?year='.$oldyear.'&amp;mode='.$mode.'">';

-		print $oldyear;

-		//print '</a>';

-		print '</td>';

-		print '<td class="right">0</td>';

-		print '<td class="right">0</td>';

-		print '<td class="right">0</td>';

-		print '</tr>';

-	}

-	print '<tr class="oddeven" height="24">';

-	print '<td class="center">';

-	//print '<a href="month.php?year='.$year.'">';

-	print $year;

-	//print '</a>';

-	print '</td>';

-	print '<td class="right">'.$val['nb'].'</td>';

-	print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';

-	print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';

-	print '</tr>';

-	$oldyear = $year;

+foreach ($data as $val)

+{

+    $year = $val['year'];

+    while ($oldyear > $year + 1)

+    {	// If we have empty year

+        $oldyear--;

+        print '<tr class="oddeven" height="24">';

+        print '<td class="center">';

+        print '<a href="month.php?year='.$oldyear.'&amp;mode='.$mode.'">';

+        print $oldyear;

+        print '</a>';

+        print '</td>';

+        print '<td class="right">0</td>';

+        print '<td class="right">0</td>';

+        print '<td class="right">0</td>';

+        print '</tr>';

+    }

+    print '<tr class="oddeven" height="24">';

+    print '<td class="center">';

+    //print '<a href="month.php?year='.$year.'">';

+    print $year;

+    //print '</a>';

+    print '</td>';

+    print '<td class="right">'.$val['nb'].'</td>';

+    print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';

+    print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';

+    print '</tr>';

+    $oldyear = $year;

 }

 

 print '</table>';

@@ -207,10 +214,11 @@
 

 // Show graphs

 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';

-if ($mesg) { print $mesg; } else {

-	print $px1->show();

-	print "<br>\n";

-	print $px2->show();

+if ($mesg) { print $mesg; }

+else {

+    print $px1->show();

+    print "<br>\n";

+    print $px2->show();

 }

 print '</td></tr></table>';

 

@@ -219,7 +227,7 @@
 print '<div style="clear:both"></div>';

 

 

-print dol_get_fiche_end();

+dol_fiche_end();

 

 // End of page

 llxFooter();