Skip to content

Commit 134e162

Browse files
benkeenbenkeen
committed
sync
1 parent 6162d5a commit 134e162

File tree

10 files changed

+389
-487
lines changed

10 files changed

+389
-487
lines changed

‎code/Module.class.php‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,4 +264,72 @@ public function includeInHead($location, $params)
264264
END;
265265
}
266266

267+
268+
public function displayInPagesModule($location, $params)
269+
{
270+
$attributes = $params["form_tools_all_template_hook_params"];
271+
272+
if (!isset($attributes["vis_id"]) || empty($attributes["vis_id"])) {
273+
echo "[Data Visualization hook error: <b>No vis_id attribute</b>]";
274+
return;
275+
}
276+
if (!isset($attributes["height"]) || empty($attributes["height"])) {
277+
echo "[Data Visualization hook error: <b>No height attribute</b>]";
278+
return;
279+
}
280+
if (!isset($attributes["width"]) || empty($attributes["width"])) {
281+
echo "[Data Visualization hook error: <b>No width attribute</b>]";
282+
return;
283+
}
284+
285+
$vis_id = $attributes["vis_id"];
286+
$height = $attributes["height"];
287+
$width = $attributes["width"];
288+
289+
/*
290+
Settings that may be overridden:
291+
292+
Activity Charts:
293+
- title (vis_name)
294+
- colour ("red", "orange", "yellow", "green", "blue", "indigo", "violet", "black", "gray"
295+
- line_width (number 0-10)
296+
297+
Field Charts:
298+
299+
(pie chart)
300+
- title (vis_name)
301+
- pie_chart_format ("3D" / "2D")
302+
- include_legend ("yes" / "no")
303+
304+
(other)
305+
- title (vis_name)
306+
- colour ("red", "orange", "yellow", "green", "blue", "indigo", "violet", "black", "gray"
307+
*/
308+
309+
$overridden_settings = array();
310+
if (isset($attributes["title"])) {
311+
$overridden_settings["title"] = $attributes["title"];
312+
}
313+
if (isset($attributes["line_width"])) {
314+
$overridden_settings["line_width"] = $attributes["line_width"];
315+
}
316+
if (isset($attributes["pie_chart_format"])) {
317+
$overridden_settings["pie_chart_format"] = $attributes["pie_chart_format"];
318+
}
319+
if (isset($attributes["include_legend"])) {
320+
$overridden_settings["include_legend"] = $attributes["include_legend"];
321+
}
322+
323+
// allow both US + Canadian/UK spelling
324+
if (isset($attributes["colour"])) {
325+
$overridden_settings["colour"] = $attributes["colour"];
326+
} else {
327+
if (isset($attributes["color"])) {
328+
$overridden_settings["colour"] = $attributes["color"];
329+
}
330+
}
331+
332+
Visualizations::displayVisualization($vis_id, $width, $height, $overridden_settings);
333+
}
334+
267335
}

‎code/Visualizations.class.php‎

Lines changed: 14 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -324,75 +324,6 @@ public static function getVisualizationClients($vis_id)
324324
}
325325

326326

327-
function dv_display_in_pages_module($location, $params)
328-
{
329-
$attributes = $params["form_tools_all_template_hook_params"];
330-
331-
if (!isset($attributes["vis_id"]) || empty($attributes["vis_id"])) {
332-
echo "[Data Visualization hook error: <b>No vis_id attribute</b>]";
333-
return;
334-
}
335-
if (!isset($attributes["height"]) || empty($attributes["height"])) {
336-
echo "[Data Visualization hook error: <b>No height attribute</b>]";
337-
return;
338-
}
339-
if (!isset($attributes["width"]) || empty($attributes["width"])) {
340-
echo "[Data Visualization hook error: <b>No width attribute</b>]";
341-
return;
342-
}
343-
344-
$attributes = ft_sanitize($attributes);
345-
$vis_id = $attributes["vis_id"];
346-
$height = $attributes["height"];
347-
$width = $attributes["width"];
348-
349-
/*
350-
Settings that may be overridden:
351-
352-
Activity Charts:
353-
- title (vis_name)
354-
- colour ("red", "orange", "yellow", "green", "blue", "indigo", "violet", "black", "gray"
355-
- line_width (number 0-10)
356-
357-
Field Charts:
358-
359-
(pie chart)
360-
- title (vis_name)
361-
- pie_chart_format ("3D" / "2D")
362-
- include_legend ("yes" / "no")
363-
364-
(other)
365-
- title (vis_name)
366-
- colour ("red", "orange", "yellow", "green", "blue", "indigo", "violet", "black", "gray"
367-
*/
368-
369-
$overridden_settings = array();
370-
if (isset($attributes["title"])) {
371-
$overridden_settings["title"] = $attributes["title"];
372-
}
373-
if (isset($attributes["line_width"])) {
374-
$overridden_settings["line_width"] = $attributes["line_width"];
375-
}
376-
if (isset($attributes["pie_chart_format"])) {
377-
$overridden_settings["pie_chart_format"] = $attributes["pie_chart_format"];
378-
}
379-
if (isset($attributes["include_legend"])) {
380-
$overridden_settings["include_legend"] = $attributes["include_legend"];
381-
}
382-
383-
// allow both US + Canadian/UK spelling
384-
if (isset($attributes["colour"])) {
385-
$overridden_settings["colour"] = $attributes["colour"];
386-
} else {
387-
if (isset($attributes["color"])) {
388-
$overridden_settings["colour"] = $attributes["color"];
389-
}
390-
}
391-
392-
self::displayVisualization($vis_id, $width, $height, $overridden_settings);
393-
}
394-
395-
396327
public static function displayVisualization($vis_id, $width, $height, $overridden_settings = array())
397328
{
398329
global $g_cache;
@@ -405,7 +336,7 @@ public static function displayVisualization($vis_id, $width, $height, $overridde
405336

406337
$id_suffix = $g_cache["data_visualization_{$vis_id}_count"];
407338

408-
$vis_info = dv_get_visualization_for_display($vis_id);
339+
$vis_info = self::getVisualizationForDisplay($vis_id);
409340
$vis_type = $vis_info["vis_type"];
410341
$chart_type = $vis_info["chart_type"];
411342

@@ -414,7 +345,7 @@ public static function displayVisualization($vis_id, $width, $height, $overridde
414345
$title = $overridden_settings["title"];
415346
}
416347

417-
$title = ft_sanitize($title);
348+
$title = addcslashes($title, "'");
418349

419350
$num_rows = count($vis_info["data"]);
420351

@@ -544,18 +475,18 @@ public static function displayVisualization($vis_id, $width, $height, $overridde
544475
$js_lines_str = implode("\n", $js_lines);
545476

546477
echo <<< END
547-
<script src="https://www.google.com/jsapi"></script>
478+
<script src="https://www.gstatic.com/charts/loader.js"></script>
548479
<div id="dv_vis_{$vis_id}_{$id_suffix}"></div>
549480
<script>
550-
google.load("visualization", "1", {packages:["corechart"]});
551-
google.setOnLoadCallback(vis_drawChart);
481+
google.charts.load('current', {'packages':['corechart']});
482+
google.charts.setOnLoadCallback(vis_drawChart);
552483
function vis_drawChart() {
553-
var data = new google.visualization.DataTable();
554-
data.addColumn("string", "");
555-
data.addColumn("number", "Submissions");
556-
data.addRows($num_rows);
557-
$js_lines_str
558-
chart.draw(data, settings);
484+
var data = new google.visualization.DataTable();
485+
data.addColumn("string", "");
486+
data.addColumn("number", "Submissions");
487+
data.addRows($num_rows);
488+
$js_lines_str
489+
chart.draw(data, settings);
559490
}
560491
</script>
561492
END;
@@ -661,11 +592,11 @@ public static function createPageAndMenuItem($request)
661592
$menu_position = $request["menu_position"];
662593
$is_submenu = $request["is_submenu"];
663594

664-
$pages_module = Modules::installModule("pages");
595+
$pages_module = Modules::getModuleInstance("pages");
665596

666597
$content =<<< END
667598
<div style="border:1px solid #cccccc">
668-
{template_hook location=\"data_visualization\" vis_id=$vis_id height=400 width=738}
599+
{template_hook location="data_visualization" vis_id=$vis_id height=400 width=738}
669600
</div>
670601
END;
671602

@@ -700,7 +631,7 @@ public static function createPageAndMenuItem($request)
700631
} else {
701632
$db->query("
702633
UPDATE {PREFIX}menu_items
703-
SET list_order = list_order+1
634+
SET list_order = list_order + 1
704635
WHERE menu_id = :menu_id AND
705636
list_order > :list_order
706637
");

‎lang/en_us.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@
213213
$L["notify_page_created_and_assigned"] = "The page has been created and assigned to your menu.";
214214
$L["notify_visualization_cache_cleared"] = "The visualization cache has been cleared.";
215215
$L["notify_specific_visualization_cache_cleared"] = "The cache for this visualization has been cleared.";
216-
$L["notify_no_internet_connection"] = "Sorry, we cannot load the Google Charts library, which is needed in order for this module to work properly. This is most likely caused by there being no internet connection available.";
216+
$L["notify_no_internet_connection"] = "Sorry, we cannot load the Google Charts library. This is most likely caused by there being no internet connection available.";
217217

218218
$L["confirm_delete_visualization"] = "Are you sure you want to delete this visualization?";
219219

0 commit comments

Comments
 (0)