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

Fix: Statistics graph

Browse Source
This commit is contained in:
Laurent Destailleur 2011-05-09 19:43:26 +00:00
parent 1ab91249f8
commit 75cfa08db7
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/adherents/stats/index.php
View File

@ -95,6 +95,11 @@ if ($mode)
//print $sql; //print $sql;
} }
$langsen=new Translate('',$conf);
$langsen->setDefaultLang('en_US');
$langsen->load("dict");
//print $langsen->trans("Country"."FI");exit;
// Define $data array // Define $data array
dol_syslog("Count member sql=".$sql); dol_syslog("Count member sql=".$sql);
$resql=$db->query($sql); $resql=$db->query($sql);
@ -108,6 +113,7 @@ if ($mode)
if ($mode == 'memberbycountry') 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"))), $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, 'code'=>$obj->code,
'nb'=>$obj->nb, 'nb'=>$obj->nb,
'lastdate'=>$obj->lastdate 'lastdate'=>$obj->lastdate
@ -116,6 +122,7 @@ if ($mode)
if ($mode == 'memberbystate') 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"))), $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")), 'label2'=>($obj->label2?$obj->label2:$langs->trans("Unknown")),
'nb'=>$obj->nb, 'nb'=>$obj->nb,
'lastdate'=>$obj->lastdate 'lastdate'=>$obj->lastdate
@ -172,9 +179,11 @@ if ($mode == 'memberbycountry')
$i=0; $i=0;
foreach($data as $val) foreach($data as $val)
{ {
// fix case of uk //$valcountry=ucfirst($val['code']);
if ($val['label'] == 'Great Britain') { $val['label'] = 'United Kingdom'; } $valcountry=ucfirst($val['label_en']);
print "\tdata.setValue(".$i.", 0, \"".ucfirst($val['label'])."\");\n"; // fix case of uk
if ($valcountry == 'Great Britain') { $valcountry = 'United Kingdom'; }
print "\tdata.setValue(".$i.", 0, \"".$valcountry."\");\n";
print "\tdata.setValue(".$i.", 1, ".$val['nb'].");\n"; print "\tdata.setValue(".$i.", 1, ".$val['nb'].");\n";
// Google's Geomap only supports up to 400 entries // Google's Geomap only supports up to 400 entries
if ($i >= 400){ break; } if ($i >= 400){ break; }
@ -182,7 +191,9 @@ if ($mode == 'memberbycountry')
} }
print "\tvar options = {};\n"; print "\tvar options = {};\n";
print "\toptions['dataMode'] = 'regions';\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['width'] = ".$graphwidth.";\n";
print "\toptions['height'] = ".$graphheight.";\n"; print "\toptions['height'] = ".$graphheight.";\n";
print "\tvar container = document.getElementById('".$mode."');\n"; print "\tvar container = document.getElementById('".$mode."');\n";