2.0.0

Author: benkeen

index.php

@@ -82,9 +82,6 @@
     "chart_type" => $chart_type,
     "account_type" => $account_type,
     "client_id" => $client_id,
-    "js_files" => array(
-        "scripts/visualizations.js"
-    ),
     "js_messages" => array(
         "word_delete", "word_edit", "phrase_please_select_form", "phrase_please_select", "word_yes", "word_no"
     ),
@@ -167,5 +164,9 @@
 $js
 END;
 
+$page_vars["head_string"] =<<< END
+<script src="scripts/visualizations.js"></script>
+END;
+
 
 $module->displayPage("templates/index.tpl", $page_vars);

module_config.php

@@ -210,6 +210,70 @@
 
 
 $FILES = array(
-
+    "README.md",
+    "activity_charts/add.php",
+    "activity_charts/edit.php",
+    "activity_charts/index.html",
+    "activity_charts/page_advanced.php",
+    "activity_charts/page_appearance.php",
+    "activity_charts/page_main.php",
+    "activity_charts/page_permissions.php",
+    "activity_charts/settings.php",
+    "code/ActivityCharts.class.php",
+    "code/FIeldCharts.class.php",
+    "code/General.class.php",
+    "code/Module.class.php",
+    "code/Visualizations.class.php",
+    "code/actions.php",
+    "code/index.html",
+    "css/index.html",
+    "css/styles.css",
+    "css/visualizations.css",
+    "field_charts/add.php",
+    "field_charts/edit.php",
+    "field_charts/index.html",
+    "field_charts/page_advanced.php",
+    "field_charts/page_appearance.php",
+    "field_charts/page_main.php",
+    "field_charts/page_permissions.php",
+    "field_charts/settings.php",
+    "help.php",
+    "images/example_area_chart.png",
+    "images/example_pie_chart.png",
+    "images/icon_visualization.png",
+    "images/icon_visualization16x16.png",
+    "images/refresh.png",
+    "index.php",
+    "lang/en_us.php",
+    "lang/index.html",
+    "library.php",
+    "module_config.php",
+    "no_internet_connection.tpl",
+    "scripts/index.html",
+    "scripts/manage_visualizations.js",
+    "scripts/visualizations.js",
+    "settings.php",
+    "smarty_plugins/function.activity_chart_date_range.php",
+    "smarty_plugins/function.cache_frequency_dropdown.php",
+    "smarty_plugins/function.colour_dropdown.php",
+    "smarty_plugins/function.line_width_dropdown.php",
+    "templates/activity_charts/add.tpl",
+    "templates/activity_charts/edit.tpl",
+    "templates/activity_charts/settings.tpl",
+    "templates/activity_charts/tab_advanced.tpl",
+    "templates/activity_charts/tab_appearance.tpl",
+    "templates/activity_charts/tab_main.tpl",
+    "templates/activity_charts/tab_permissions.tpl",
+    "templates/field_charts/add.tpl",
+    "templates/field_charts/edit.tpl",
+    "templates/field_charts/settings.tpl",
+    "templates/field_charts/tab_advanced.tpl",
+    "templates/field_charts/tab_appearance.tpl",
+    "templates/field_charts/tab_main.tpl",
+    "templates/field_charts/tab_permissions.tpl",
+    "templates/help.tpl",
+    "templates/index.html",
+    "templates/index.tpl",
+    "templates/settings.tpl"
 );
 

scripts/visualizations.js

@@ -99,7 +99,7 @@ dv_ns.show_visualizations_dialog = function() {
   });
 
   return false;
-}
+};
 
 
 /**
@@ -204,10 +204,8 @@ dv_ns.get_visualization_response = function(json) {
 
 
 dv_ns.draw_activity_chart = function(json, show_title, target_el, width, height) {
-  var vis_id     = json.vis_id;
   var vis_colour = json.vis_colour;
   var line_width = json.line_width;
-  var chart_type = json.chart_type;
 
   var data = new google.visualization.DataTable();
   data.addColumn("string", "");
@@ -220,7 +218,8 @@ dv_ns.draw_activity_chart = function(json, show_title, target_el, width, height)
 
   data.addRows(num_rows);
   for (var i=0, j=num_rows; i<j; i++) {
-    data.setValue(i, 0, json.data[i].label.toString());
+    var label = (json.data[i].label === null) ? "" : json.data[i].label.toString();
+    data.setValue(i, 0, label);
     data.setValue(i, 1, json.data[i].data);
   }