2.0.5

formtools · Jan 25, 2018 · 818e02a · 818e02a
1 parent e9ab9c8
commit 818e02a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/code/Module.class.php b/code/Module.class.php
@@ -17,8 +17,8 @@ class Module extends FormToolsModule
     protected $author = "Ben Keen";
     protected $authorEmail = "ben.keen@gmail.com";
     protected $authorLink = "https://formtools.org";
-    protected $version = "2.0.4";
-    protected $date = "2017-11-29";
+    protected $version = "2.0.5";
+    protected $date = "2018-01-24";
     protected $originLanguage = "en_us";
     protected $jsFiles = array(
         "https://www.gstatic.com/charts/loader.js",

diff --git a/code/Visualizations.class.php b/code/Visualizations.class.php
@@ -346,13 +346,17 @@ public static function displayVisualization($vis_id, $width, $height, $overridde
         }
 
         $title = addcslashes($title, "'");
-
         $num_rows = count($vis_info["data"]);
 
         $js_lines = array();
-        for ($i = 0; $i < count($vis_info["data"]); $i++) {
-            $label = addslashes($vis_info["data"][$i]["label"]);
-            $data = $vis_info["data"][$i]["data"];
+        for ($i = 0; $i<$num_rows; $i++) {
+            if ($vis_type === "field") {
+                $label = addslashes($vis_info["data"][$i]["field_value"]);
+                $data = $vis_info["data"][$i]["count"];
+            } else {
+                $label = addslashes($vis_info["data"][$i]["label"]);
+                $data = $vis_info["data"][$i]["data"];
+            }
             $js_lines[] = "data.setValue($i, 0, \"$label\");";
             $js_lines[] = "data.setValue($i, 1, $data);";
         }