Skip to content

Commit

Permalink
Fixed issue #8770: Wrong labels in statiscs chart
Browse files Browse the repository at this point in the history
  • Loading branch information
@c-schmitz
c-schmitz committed Feb 27, 2014
1 parent 2920a68 commit 52fd3db
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions application/helpers/admin/statistics_helper.php
View file
Expand Up @@ -71,8 +71,8 @@ function createChart($iQuestionID, $iSurveyID, $type=null, $lbl, $gdata, $grawda
if (count($lbl)>72)
{
$DataSet = array(1=>array(1=>1));
if ($cache->IsInCache("graph".$language.$iSurveyID,$DataSet) && Yii::app()->getConfig('debug')<2) {
$cachefilename=basename($cache->GetFileFromCache("graph".$language.$iSurveyID,$DataSet));
if ($cache->IsInCache("graph".$iSurveyID.$language.$iQuestionID,$DataSet) && Yii::app()->getConfig('debug')<2) {
$cachefilename=basename($cache->GetFileFromCache("graph".$iSurveyID.$language.$iQuestionID,$DataSet));
}
else
{
Expand All @@ -81,17 +81,17 @@ function createChart($iQuestionID, $iSurveyID, $type=null, $lbl, $gdata, $grawda
$graph->setFontProperties($rootdir.DIRECTORY_SEPARATOR.'fonts'.DIRECTORY_SEPARATOR.$chartfontfile,$chartfontsize);
$graph->setFontProperties($rootdir.DIRECTORY_SEPARATOR.'fonts'.DIRECTORY_SEPARATOR.$chartfontfile,$chartfontsize);
$graph->drawTitle(0,0,$clang->gT('Sorry, but this question has too many answer options to be shown properly in a graph.','unescaped'),30,30,30,690,200);
$cache->WriteToCache("graph".$language.$iSurveyID,$DataSet,$graph);
$cachefilename=basename($cache->GetFileFromCache("graph".$language.$iSurveyID,$DataSet));
$cache->WriteToCache("graph".$iSurveyID.$language.$iQuestionID,$DataSet,$graph);
$cachefilename=basename($cache->GetFileFromCache("graph".$iSurveyID.$language.$iQuestionID,$DataSet));
unset($graph);
}
return $cachefilename;
}
if (array_sum($gdata ) == 0)
{
$DataSet = array(1=>array(1=>1));
if ($cache->IsInCache("graph".$language.$iSurveyID,$DataSet) && Yii::app()->getConfig('debug')<2) {
$cachefilename=basename($cache->GetFileFromCache("graph".$language.$iSurveyID,$DataSet));
if ($cache->IsInCache("graph".$iSurveyID.$language.$iQuestionID,$DataSet) && Yii::app()->getConfig('debug')<2) {
$cachefilename=basename($cache->GetFileFromCache("graph".$iSurveyID.$language.$iQuestionID,$DataSet));
}
else
{
Expand All @@ -100,8 +100,8 @@ function createChart($iQuestionID, $iSurveyID, $type=null, $lbl, $gdata, $grawda
$graph->setFontProperties($rootdir.DIRECTORY_SEPARATOR.'fonts'.DIRECTORY_SEPARATOR.$chartfontfile,$chartfontsize);
$graph->setFontProperties($rootdir.DIRECTORY_SEPARATOR.'fonts'.DIRECTORY_SEPARATOR.$chartfontfile,$chartfontsize);
$graph->drawTitle(0,0,$clang->gT('Sorry, but this question has no responses yet so a graph cannot be shown.','unescaped'),30,30,30,690,200);
$cache->WriteToCache("graph".$language.$iSurveyID,$DataSet,$graph);
$cachefilename=basename($cache->GetFileFromCache("graph".$language.$iSurveyID,$DataSet));
$cache->WriteToCache("graph".$iSurveyID.$language.$iQuestionID,$DataSet,$graph);
$cachefilename=basename($cache->GetFileFromCache("graph".$iSurveyID.$language.$iQuestionID,$DataSet));
unset($graph);
}
return $cachefilename;
Expand Down Expand Up @@ -189,8 +189,8 @@ function createChart($iQuestionID, $iSurveyID, $type=null, $lbl, $gdata, $grawda
$counter++;
}

if ($cache->IsInCache("graph".$language.$iSurveyID,$DataSet->GetData()) && Yii::app()->getConfig('debug')<2) {
$cachefilename=basename($cache->GetFileFromCache("graph".$language.$iSurveyID,$DataSet->GetData()));
if ($cache->IsInCache("graph".$iSurveyID.$language.$iQuestionID,$DataSet->GetData()) && Yii::app()->getConfig('debug')<2) {
$cachefilename=basename($cache->GetFileFromCache("graph".$iSurveyID.$language.$iQuestionID,$DataSet->GetData()));
}
else
{
Expand Down Expand Up @@ -219,8 +219,8 @@ function createChart($iQuestionID, $iSurveyID, $type=null, $lbl, $gdata, $grawda
$graph->setFontProperties($rootdir.DIRECTORY_SEPARATOR.'fonts'.DIRECTORY_SEPARATOR.$chartfontfile, $chartfontsize);
$graph->drawLegend(510,30,$DataSet->GetDataDescription(),255,255,255);

$cache->WriteToCache("graph".$language.$iSurveyID,$DataSet->GetData(),$graph);
$cachefilename=basename($cache->GetFileFromCache("graph".$language.$iSurveyID,$DataSet->GetData()));
$cache->WriteToCache("graph".$iSurveyID.$language.$iQuestionID,$DataSet->GetData(),$graph);
$cachefilename=basename($cache->GetFileFromCache("graph".$iSurveyID.$language.$iQuestionID,$DataSet->GetData()));
unset($graph);
}
} //end if (bar chart)
Expand Down Expand Up @@ -284,8 +284,8 @@ function createChart($iQuestionID, $iSurveyID, $type=null, $lbl, $gdata, $grawda
$DataSet->AddAllSeries();
$DataSet->SetAbsciseLabelSerie("Serie2");

if ($cache->IsInCache("graph".$language.$iSurveyID, $DataSet->GetData()) && Yii::app()->getConfig('debug')<2) {
$cachefilename=basename($cache->GetFileFromCache("graph".$language.$iSurveyID,$DataSet->GetData()));
if ($cache->IsInCache("graph".$iSurveyID.$language.$iQuestionID, $DataSet->GetData()) && Yii::app()->getConfig('debug')<2) {
$cachefilename=basename($cache->GetFileFromCache("graph".$iSurveyID.$language.$iQuestionID,$DataSet->GetData()));
}
else
{
Expand All @@ -301,8 +301,8 @@ function createChart($iQuestionID, $iSurveyID, $type=null, $lbl, $gdata, $grawda
$graph->drawPieGraph($DataSet->GetData(),$DataSet->GetDataDescription(),225,round($gheight/2),170,PIE_PERCENTAGE,TRUE,50,20,5);
$graph->setFontProperties($rootdir."/fonts/".$chartfontfile,$chartfontsize);
$graph->drawPieLegend(430,12,$DataSet->GetData(),$DataSet->GetDataDescription(),250,250,250);
$cache->WriteToCache("graph".$language.$iSurveyID,$DataSet->GetData(),$graph);
$cachefilename=basename($cache->GetFileFromCache("graph".$language.$iSurveyID,$DataSet->GetData()));
$cache->WriteToCache("graph".$iSurveyID.$language.$iQuestionID,$DataSet->GetData(),$graph);
$cachefilename=basename($cache->GetFileFromCache("graph".$iSurveyID.$language.$iQuestionID,$DataSet->GetData()));
unset($graph);
}
} //end else -> pie charts
Expand Down

0 comments on commit 52fd3db

Please sign in to comment.