|
@@ -1,6 +1,7 @@
|
|
|
<?php
|
|
<?php
|
|
|
|
|
|
|
|
Core::addScript("public/js/Chart.bundle.min.js");
|
|
Core::addScript("public/js/Chart.bundle.min.js");
|
|
|
|
|
+Core::addScript("public/js/chartjs-plugin-datalabels.min.js");
|
|
|
Core::addScript("public/js/app-performance.js");
|
|
Core::addScript("public/js/app-performance.js");
|
|
|
|
|
|
|
|
Core::addBreadcrumb("/account", "Account");
|
|
Core::addBreadcrumb("/account", "Account");
|
|
@@ -105,6 +106,7 @@ if($submit) {
|
|
|
switch($date_range) {
|
|
switch($date_range) {
|
|
|
case "ytd":
|
|
case "ytd":
|
|
|
// Nothing to do
|
|
// Nothing to do
|
|
|
|
|
+ $date_range_label = "YTD";
|
|
|
break;
|
|
break;
|
|
|
|
|
|
|
|
case "unbound":
|
|
case "unbound":
|
|
@@ -118,10 +120,12 @@ if($submit) {
|
|
|
if($year < $min_year) $min_year = $year;
|
|
if($year < $min_year) $min_year = $year;
|
|
|
if($year > $max_year) $max_year = $year;
|
|
if($year > $max_year) $max_year = $year;
|
|
|
}
|
|
}
|
|
|
|
|
+ $date_range_label = "$min_year - $max_year";
|
|
|
break;
|
|
break;
|
|
|
|
|
|
|
|
case "custom":
|
|
case "custom":
|
|
|
// TODO
|
|
// TODO
|
|
|
|
|
+ $date_range_label = "Custom";
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -353,7 +357,7 @@ if($submit) {
|
|
|
// Challenger Gender
|
|
// Challenger Gender
|
|
|
$chart = new Chart;
|
|
$chart = new Chart;
|
|
|
$chart->setType("pie");
|
|
$chart->setType("pie");
|
|
|
- $chart->setTitle("Staff Gender");
|
|
|
|
|
|
|
+ $chart->setTitle("Staff Gender $date_range_label");
|
|
|
$chart->setLabels(["Male", "Female"]);
|
|
$chart->setLabels(["Male", "Female"]);
|
|
|
$chart->addDataset("Counts", [
|
|
$chart->addDataset("Counts", [
|
|
|
$total_data->maleChallengerCount,
|
|
$total_data->maleChallengerCount,
|
|
@@ -369,7 +373,7 @@ if($submit) {
|
|
|
// Tester Gender
|
|
// Tester Gender
|
|
|
$chart = new Chart;
|
|
$chart = new Chart;
|
|
|
$chart->setType("pie");
|
|
$chart->setType("pie");
|
|
|
- $chart->setTitle("Tester Gender");
|
|
|
|
|
|
|
+ $chart->setTitle("Tester Gender $date_range_label");
|
|
|
$chart->setLabels(["Male", "Female"]);
|
|
$chart->setLabels(["Male", "Female"]);
|
|
|
$chart->addDataset("Counts", [
|
|
$chart->addDataset("Counts", [
|
|
|
$total_data->maleTesterCount,
|
|
$total_data->maleTesterCount,
|
|
@@ -385,7 +389,7 @@ if($submit) {
|
|
|
// Pass / Fail
|
|
// Pass / Fail
|
|
|
$chart = new Chart;
|
|
$chart = new Chart;
|
|
|
$chart->setType("pie");
|
|
$chart->setType("pie");
|
|
|
- $chart->setTitle("Pass / Fail");
|
|
|
|
|
|
|
+ $chart->setTitle("Pass / Fail $date_range_label");
|
|
|
$chart->setLabels(["Pass", "Fail"]);
|
|
$chart->setLabels(["Pass", "Fail"]);
|
|
|
$chart->addDataset("Counts", [
|
|
$chart->addDataset("Counts", [
|
|
|
$total_data->passCount,
|
|
$total_data->passCount,
|
|
@@ -413,30 +417,37 @@ if($submit) {
|
|
|
]);
|
|
]);
|
|
|
$charts[] = $chart;
|
|
$charts[] = $chart;
|
|
|
|
|
|
|
|
- // Point of Challenge (Current Period)
|
|
|
|
|
|
|
+ // Point of Challenge (Each Period)
|
|
|
|
|
|
|
|
- $period_data = $data[$key];
|
|
|
|
|
|
|
+ foreach($keys as $index => $key) {
|
|
|
|
|
+ $key_label = $key_labels[$index];
|
|
|
|
|
+
|
|
|
|
|
+ $period_data = $data[$key];
|
|
|
|
|
+
|
|
|
|
|
+ if($period_data->testCount == 0) continue;
|
|
|
|
|
+
|
|
|
|
|
+ $chart = new Chart;
|
|
|
|
|
+ $chart->setType("pie");
|
|
|
|
|
+ $chart->setTitle("$key_label Point of Challenge");
|
|
|
|
|
+ $chart->setLabels(["On Entry", "While Browsing", "During Play", "On Exit", "No Challenge"]);
|
|
|
|
|
+ $chart->addDataset("Counts", [
|
|
|
|
|
+ $period_data->stage1Count,
|
|
|
|
|
+ $period_data->stage2Count,
|
|
|
|
|
+ $period_data->stage3Count,
|
|
|
|
|
+ $period_data->stage4Count,
|
|
|
|
|
+ $period_data->stage5Count,
|
|
|
|
|
+ ], [
|
|
|
|
|
+ "background_colours" => [
|
|
|
|
|
+ "#4CAF50",
|
|
|
|
|
+ "#FFEB3B",
|
|
|
|
|
+ "#FBC02D",
|
|
|
|
|
+ "#FFAB91",
|
|
|
|
|
+ "#F44336",
|
|
|
|
|
+ ]
|
|
|
|
|
+ ]);
|
|
|
|
|
+ $charts[] = $chart;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
- $chart = new Chart;
|
|
|
|
|
- $chart->setType("pie");
|
|
|
|
|
- $chart->setTitle("$current_period_name Performance by Point of Challenge");
|
|
|
|
|
- $chart->setLabels(["On Entry", "While Browsing", "During Play", "On Exit", "No Challenge"]);
|
|
|
|
|
- $chart->addDataset("Counts", [
|
|
|
|
|
- $period_data->stage1Count,
|
|
|
|
|
- $period_data->stage2Count,
|
|
|
|
|
- $period_data->stage3Count,
|
|
|
|
|
- $period_data->stage4Count,
|
|
|
|
|
- $period_data->stage5Count,
|
|
|
|
|
- ], [
|
|
|
|
|
- "background_colours" => [
|
|
|
|
|
- "#4CAF50",
|
|
|
|
|
- "#FFEB3B",
|
|
|
|
|
- "#FBC02D",
|
|
|
|
|
- "#FFAB91",
|
|
|
|
|
- "#F44336",
|
|
|
|
|
- ]
|
|
|
|
|
- ]);
|
|
|
|
|
- $charts[] = $chart;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|