Skip to content

Commit 6162d5a

Browse files
benkeenbenkeen
committed
mostly working now
1 parent c843ae7 commit 6162d5a

28 files changed

+743
-657
lines changed

‎activity_charts/add.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,17 @@
1818
$message = "";
1919
if (isset($_POST["add"])) {
2020
list($success, $message, $vis_id) = ActivityCharts::addActivityChart($request, $L);
21-
$form_id = $request["form_id"];
22-
$view_id = isset($request["view_id"]) ? $request["view_id"] : "";
21+
if ($success) {
22+
header("location: edit.php?vis_id=$vis_id&page=main&is_new");
23+
exit;
24+
}
2325
}
2426

2527
$js = General::getFormViewMappingJs();
2628

2729
$page_vars = array(
30+
"g_success" => $success,
31+
"g_message" => $message,
2832
"vis_id" => $vis_id,
2933
"form_id" => $form_id,
3034
"view_id" => $view_id,

‎activity_charts/page_advanced.php‎

Lines changed: 36 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,50 @@
11
<?php
22

3-
$pages_module_available = ft_check_module_enabled("pages");
3+
use FormTools\Core;
4+
use FormTools\Modules;
45

5-
if (isset($_GET["msg"]) && $_GET["msg"] == "page_created")
6-
{
7-
$g_success = true;
8-
$g_message = $L["notify_page_created_and_assigned"];
6+
$root_url = Core::getRootUrl();
7+
$pages_module_available = Modules::checkModuleEnabled("pages");
8+
9+
$success = true;
10+
$message = "";
11+
if (isset($_GET["msg"]) && $_GET["msg"] == "page_created") {
12+
$success = true;
13+
$message = $L["notify_page_created_and_assigned"];
914
}
1015

1116
$page_vars["pages_module_available"] = $pages_module_available;
1217
$page_vars["vis_id"] = $vis_id;
1318
$page_vars["vis_info"] = $vis_info;
14-
$page_vars["js_messages"] = array("phrase_please_select", "phrase_please_select_form", "word_edit", "word_delete",
15-
"word_cancel", "word_yes", "word_no");
19+
$page_vars["js_messages"] = array(
20+
"phrase_please_select", "phrase_please_select_form", "word_edit", "word_delete",
21+
"word_cancel", "word_yes", "word_no"
22+
);
23+
$page_vars["css_files"] = array(
24+
"$root_url/global/codemirror/lib/codemirror.css",
25+
);
26+
$page_vars["js_files"] = array(
27+
"$root_url/global/codemirror/lib/codemirror.js",
28+
"$root_url/global/codemirror/mode/xml/xml.js",
29+
"$root_url/global/codemirror/mode/smarty/smarty.js",
30+
"$root_url/global/codemirror/mode/php/php.js",
31+
"$root_url/global/codemirror/mode/htmlmixed/htmlmixed.js",
32+
"$root_url/global/codemirror/mode/css/css.js",
33+
"$root_url/global/codemirror/mode/javascript/javascript.js",
34+
"$root_url/global/codemirror/mode/clike/clike.js"
35+
);
36+
1637
$page_vars["module_js_messages"] = array("phrase_delete_visualization", "confirm_delete_visualization");
1738
$page_vars["head_js"] =<<< END
1839
$(function() {
19-
vis_ns.init_create_page_and_menu_item_dialog();
20-
$("#menu_id").bind("change", function() {
21-
vis_ns.select_menu(this.value);
22-
});
23-
$("#delete_visualization").bind("click", function() {
24-
vis_ns.delete_visualization($vis_id);
25-
});
40+
vis_ns.init_create_page_and_menu_item_dialog();
41+
$("#menu_id").bind("change", function() {
42+
vis_ns.select_menu(this.value);
43+
});
44+
$("#delete_visualization").bind("click", function() {
45+
vis_ns.delete_visualization($vis_id);
46+
});
2647
});
2748
END;
2849

29-
$page_vars["head_string"] =<<< END
30-
<script src="../global/scripts/manage_visualizations.js"></script>
31-
<link type="text/css" rel="stylesheet" href="../global/css/styles.css">
32-
END;
33-
34-
ft_display_module_page("templates/activity_charts/edit.tpl", $page_vars);
50+
$module->displayPage("templates/activity_charts/edit.tpl", $page_vars);

‎activity_charts/page_appearance.php‎

Lines changed: 33 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,51 @@
11
<?php
22

3-
$num_submissions = ft_get_submission_count($vis_info["form_id"], $vis_info["view_id"]);
3+
use FormTools\Submissions;
4+
5+
$num_submissions = Submissions::getSubmissionCount($vis_info["form_id"], $vis_info["view_id"]);
46

57
$page_vars["has_submissions_in_view"] = ($num_submissions > 0) ? "yes" : "no";
6-
$page_vars["js_messages"] = array("phrase_please_select", "phrase_please_select_form", "word_edit", "word_delete",
7-
"word_yes", "word_no");
8+
$page_vars["js_messages"] = array(
9+
"phrase_please_select", "phrase_please_select_form", "word_edit", "word_delete",
10+
"word_yes", "word_no"
11+
);
812
$page_vars["module_js_messages"] = array("phrase_delete_visualization", "confirm_delete_visualization");
9-
$page_vars["head_string"] =<<< END
10-
<script src="../global/scripts/manage_visualizations.js"></script>
11-
<link type="text/css" rel="stylesheet" href="../global/css/styles.css">
12-
<script src="https://www.google.com/jsapi"></script>
13-
END;
14-
1513
$page_vars["head_js"] =<<< END
1614
if (typeof google != "undefined") {
17-
google.load("visualization", "1", {packages:["corechart"]});
15+
google.charts.load('current', {'packages':['corechart']});
16+
google.charts.setOnLoadCallback(vis_ns.update_activity_chart_data);
1817
}
1918
2019
$(function() {
21-
if (typeof google == "undefined") {
22-
$("#no_internet_connection").show();
23-
}
24-
if ($("#has_submissions_in_view").val() == "no") {
25-
$("#no_data_message").show();
26-
}
27-
if ($("input[name=chart_type]:checked").val() == "column_chart") {
28-
$("#line_width").attr("disabled", "disabled");
29-
}
30-
$("#delete_visualization").bind("click", function() {
31-
vis_ns.delete_visualization($vis_id);
32-
});
33-
34-
vis_ns.update_activity_chart_data();
35-
36-
$("#date_range, input[name=submission_count_group]").bind("change", vis_ns.update_activity_chart_data);
37-
$("input[name=chart_type], #colour, #line_width").bind("change keyup", vis_ns.redraw_activity_chart);
38-
$("#vis_name").bind("blur", vis_ns.redraw_activity_chart);
39-
40-
$("input[name=chart_type]").bind("change", function() {
41-
if (this.value == "column_chart") {
42-
$("#line_width").attr("disabled", "disabled");
43-
} else {
44-
$("#line_width").attr("disabled", "");
20+
if (typeof google == "undefined") {
21+
$("#no_internet_connection").show();
22+
}
23+
if ($("#has_submissions_in_view").val() == "no") {
24+
$("#no_data_message").show();
25+
}
26+
if ($("input[name=chart_type]:checked").val() == "column_chart") {
27+
$("#line_width").attr("disabled", "disabled");
4528
}
46-
});
29+
$("#delete_visualization").bind("click", function() {
30+
vis_ns.delete_visualization($vis_id);
31+
});
32+
33+
$("#date_range, input[name=submission_count_group]").bind("change", vis_ns.update_activity_chart_data);
34+
$("input[name=chart_type], #colour, #line_width").bind("change keyup", vis_ns.redraw_activity_chart);
35+
$("#vis_name").bind("blur", vis_ns.redraw_activity_chart);
36+
37+
$("input[name=chart_type]").bind("change", function() {
38+
if (this.value == "column_chart") {
39+
$("#line_width").attr("disabled", "disabled");
40+
} else {
41+
$("#line_width").attr("disabled", "");
42+
}
43+
});
4744
});
4845
4946
$js
5047
5148
var rules = [];
5249
END;
5350

54-
ft_display_module_page("templates/activity_charts/edit.tpl", $page_vars);
51+
$module->displayPage("templates/activity_charts/edit.tpl", $page_vars);

‎activity_charts/page_main.php‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
<?php
22

3-
$page_vars["js_messages"] = array("phrase_please_select", "phrase_please_select_form", "word_edit", "word_delete",
4-
"word_yes", "word_no");
5-
$page_vars["module_js_messages"] = array("phrase_delete_visualization", "confirm_delete_visualization");
6-
$page_vars["head_string"] =<<< END
7-
<script src="../global/scripts/manage_visualizations.js"></script>
8-
<link type="text/css" rel="stylesheet" href="../global/css/styles.css">
9-
END;
3+
if (isset($_GET["is_new"])) {
4+
$page_vars["g_success"] = true;
5+
$page_vars["g_message"] = $L["notify_activity_chart_created"];
6+
}
107

8+
$page_vars["js_messages"] = array(
9+
"phrase_please_select", "phrase_please_select_form", "word_edit", "word_delete",
10+
"word_yes", "word_no"
11+
);
12+
$page_vars["module_js_messages"] = array("phrase_delete_visualization", "confirm_delete_visualization");
1113
$page_vars["head_js"] =<<< END
1214
$(function() {
13-
$("#delete_visualization").bind("click", function() {
14-
vis_ns.delete_visualization($vis_id);
15-
});
15+
$("#delete_visualization").bind("click", function() {
16+
vis_ns.delete_visualization($vis_id);
17+
});
1618
});
1719
1820
$js
@@ -22,4 +24,4 @@
2224
rules.push("required,form_id,{$L["validation_no_form_id"]}");
2325
END;
2426

25-
ft_display_module_page("templates/activity_charts/edit.tpl", $page_vars);
27+
$module->displayPage("templates/activity_charts/edit.tpl", $page_vars);

‎activity_charts/page_permissions.php‎

Lines changed: 46 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?php
22

3-
$views = ft_get_form_views($vis_info["form_id"]);
3+
use FormTools\Views;
4+
5+
$views = Views::getFormViews($vis_info["form_id"]);
46
$access_views = explode(",", $vis_info["access_views"]);
57

68
$page_vars["vis_id"] = $vis_id;
@@ -9,55 +11,50 @@
911
$page_vars["access_views"] = $access_views;
1012
$page_vars["js_messages"] = array("phrase_please_select", "phrase_please_select_form", "word_edit", "word_delete", "word_yes", "word_no");
1113
$page_vars["module_js_messages"] = array("phrase_delete_visualization", "confirm_delete_visualization");
12-
$page_vars["head_string"] =<<< END
13-
<link type="text/css" rel="stylesheet" href="../global/css/styles.css">
14-
<script src="../global/scripts/manage_visualizations.js"></script>
15-
END;
16-
17-
$page_vars["head_js"] =<<< EOF
1814

15+
$page_vars["head_js"] =<<< END
1916
$(function() {
20-
$("#delete_visualization").bind("click", function() {
21-
vis_ns.delete_visualization($vis_id);
22-
});
23-
$("input[name=access_type]").bind("click change", function() {
24-
var form_type = this.value;
25-
if (form_type == "private") {
26-
$("#custom_clients").show();
27-
} else {
28-
$("#custom_clients").hide();
29-
}
30-
});
31-
$("input[name=access_view_mapping]").bind("click change", function() {
32-
var form_type = this.value;
33-
if (form_type == "all") {
34-
$("#custom_views").hide();
35-
} else {
36-
$("#custom_views").show();
37-
}
38-
});
39-
$(".form_ids").bind("click", function() {
40-
var form_id = this.value;
41-
if (this.checked) {
42-
$("#f" + form_id + "_views").show();
43-
} else {
44-
$("#f" + form_id + "_views").hide();
45-
}
46-
});
47-
$(".view_ids").bind("click", function() {
48-
var view_id = this.value;
49-
if ($(this).hasClass("all_views")) {
50-
if (this.checked) {
51-
$(this).closest("ul").find(".view_ids").not(".all_views").attr({ checked: "", disabled: "disabled" });
52-
} else {
53-
$(this).closest("ul").find(".view_ids").not(".all_views").attr({ disabled: "" });
54-
}
55-
}
56-
});
57-
$("form").bind("submit", function() {
58-
ft.select_all("selected_client_ids[]");
59-
});
17+
$("#delete_visualization").bind("click", function() {
18+
vis_ns.delete_visualization($vis_id);
19+
});
20+
$("input[name=access_type]").bind("click change", function() {
21+
var form_type = this.value;
22+
if (form_type == "private") {
23+
$("#custom_clients").show();
24+
} else {
25+
$("#custom_clients").hide();
26+
}
27+
});
28+
$("input[name=access_view_mapping]").bind("click change", function() {
29+
var form_type = this.value;
30+
if (form_type == "all") {
31+
$("#custom_views").hide();
32+
} else {
33+
$("#custom_views").show();
34+
}
35+
});
36+
$(".form_ids").bind("click", function() {
37+
var form_id = this.value;
38+
if (this.checked) {
39+
$("#f" + form_id + "_views").show();
40+
} else {
41+
$("#f" + form_id + "_views").hide();
42+
}
43+
});
44+
$(".view_ids").bind("click", function() {
45+
var view_id = this.value;
46+
if ($(this).hasClass("all_views")) {
47+
if (this.checked) {
48+
$(this).closest("ul").find(".view_ids").not(".all_views").attr({ checked: "", disabled: "disabled" });
49+
} else {
50+
$(this).closest("ul").find(".view_ids").not(".all_views").attr({ disabled: "" });
51+
}
52+
}
53+
});
54+
$("form").bind("submit", function() {
55+
ft.select_all("selected_client_ids[]");
56+
});
6057
});
61-
EOF;
58+
END;
6259

63-
ft_display_module_page("templates/activity_charts/edit.tpl", $page_vars);
60+
$module->displayPage("templates/activity_charts/edit.tpl", $page_vars);

‎code/ActivityCharts.class.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public static function addActivityChart($info, $L)
5151
INSERT INTO {PREFIX}module_data_visualizations (vis_name, vis_type, chart_type,
5252
form_id, view_id, cache_update_frequency, date_range, submission_count_group, colour, line_width)
5353
VALUE (:vis_name, :vis_type, :chart_type, :form_id, :view_id, :cache_update_frequency,
54-
:date_range, :submission_count_group, :colour, :line_width
54+
:date_range, :submission_count_group, :colour, :line_width)
5555
");
5656
$db->bindAll(array(
5757
"vis_name" => $info["vis_name"],
@@ -67,7 +67,7 @@ public static function addActivityChart($info, $L)
6767
));
6868
$db->execute();
6969
} catch (PDOException $e) {
70-
return array(false, $L["notify_error_creating_activity_chart"], "");
70+
return array(false, $L["notify_error_creating_activity_chart"] . $e->getMessage(), "");
7171
}
7272

7373
return array(true, $L["notify_activity_chart_created"], $db->getInsertId());
@@ -185,7 +185,8 @@ public static function getActivityInfo($form_id, $view_id, $date_range, $submiss
185185
break;
186186
default:
187187
if (array_key_exists($date_range, self::$intervalMap)) {
188-
$date_range_clause = "submission_date >= DATE_SUB(NOW(), INTERVAL {self::$intervalMap[$date_range]} DAY)";
188+
$value = self::$intervalMap[$date_range];
189+
$date_range_clause = "submission_date >= DATE_SUB(NOW(), INTERVAL {$value} DAY)";
189190
}
190191
break;
191192
}

0 commit comments

Comments
 (0)