Skip to content
Snippets Groups Projects
Commit 0d20f965 authored by alvaro's avatar alvaro
Browse files

Starting support of .curie in columns for visualizations

parent 0ba11828
No related branches found
No related tags found
No related merge requests found
......@@ -16,19 +16,28 @@ class Haanga_Extension_Filter_GoogleVizBarChart{
if(strpos($v,"=")){
break;
}
$variable['name'] = $v;
$variable['value'] = 'value';
if(strpos($v, ".")){
$aux = explode(".", $v);
$variable['name'] = $aux[0];
$variable['value'] = $aux[1];
}
$fieldCounter++;
$columnType = 'number';
if($firstColumn){
$columnType = 'string';
$firstColumn = false;
}
array_push($varList, $v);
$data .= " data.addColumn('".$columnType."', '".$v."');\n";
array_push($varList, $variable);
$data .= " data.addColumn('".$columnType."', '".$variable['name']."');\n";
}
foreach($obj as $k){
foreach($varList as $v){
$value = ($j==0)?"'".$k->$v->value."'":$k->$v->value;
$name = $v['name'];
$val = $v['value'];
$value = ($j==0)?"'".$k->$name->$val."'":$k->$name->$val;
$data .=" data.setCell($i, $j, ".$value.");\n";
$j++;
}
......
......@@ -16,19 +16,28 @@ class Haanga_Extension_Filter_GoogleVizColumnChart{
if(strpos($v,"=")){
break;
}
$variable['name'] = $v;
$variable['value'] = 'value';
if(strpos($v, ".")){
$aux = explode(".", $v);
$variable['name'] = $aux[0];
$variable['value'] = $aux[1];
}
$fieldCounter++;
$columnType = 'number';
if($firstColumn){
$columnType = 'string';
$firstColumn = false;
}
array_push($varList, $v);
$data .= " data.addColumn('".$columnType."', '".$v."');\n";
array_push($varList, $variable);
$data .= " data.addColumn('".$columnType."', '".$variable['name']."');\n";
}
foreach($obj as $k){
foreach($varList as $v){
$value = ($j==0)?"'".$k->$v->value."'":$k->$v->value;
$name = $v['name'];
$val = $v['value'];
$value = ($j==0)?"'".$k->$name->$val."'":$k->$name->$val;
$data .=" data.setCell($i, $j, ".$value.");\n";
$j++;
}
......
......@@ -8,12 +8,25 @@ class Haanga_Extension_Filter_GoogleVizTable{
$j = 0;
$randId = rand();
$names = explode(",", $varname);
$varList = array();
foreach($names as $v){
$data .= " data.addColumn('string', '".$v."');\n";
$variable['name'] = $v;
$variable['value'] = 'value';
if(strpos($v, ".")){
$aux = explode(".", $v);
$variable['name'] = $aux[0];
$variable['value'] = $aux[1];
}
array_push($varList, $variable);
$data .= " data.addColumn('string', '".$variable['name']."');\n";
}
foreach($obj as $k){
foreach($names as $v){
$data .=" data.setCell($i, $j, '".$k->$v->value."');\n";
foreach($varList as $v){
$name = $v['name'];
$val = $v['value'];
$data .=" data.setCell($i, $j, '".$k->$name->$val."');\n";
$j++;
}
$i++;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment