|
@@ -166,6 +166,8 @@ if($submit) {
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ $same_year = ($min_year == $max_year);
|
|
|
|
|
+
|
|
|
// Filter tests based on date range
|
|
// Filter tests based on date range
|
|
|
$tests = array_filter($tests, function($test) use ($min_unix, $max_unix) {
|
|
$tests = array_filter($tests, function($test) use ($min_unix, $max_unix) {
|
|
|
|
|
|
|
@@ -247,7 +249,8 @@ if($submit) {
|
|
|
|
|
|
|
|
foreach(range(1, 12) as $month) {
|
|
foreach(range(1, 12) as $month) {
|
|
|
|
|
|
|
|
- $label = date("M Y", mktime(0, 0, 0, $month, 1, date("Y")));
|
|
|
|
|
|
|
+ if(!$same_year) $label = date("M Y", mktime(0, 0, 0, $month, 1, date("Y")));
|
|
|
|
|
+ else $label = date("M", mktime(0, 0, 0, $month, 1, date("Y")));
|
|
|
|
|
|
|
|
$month = str_pad($month, 2, "0", STR_PAD_LEFT);
|
|
$month = str_pad($month, 2, "0", STR_PAD_LEFT);
|
|
|
$key = "$year-$month";
|
|
$key = "$year-$month";
|
|
@@ -277,7 +280,8 @@ if($submit) {
|
|
|
|
|
|
|
|
foreach(range(1, 4) as $quarter) {
|
|
foreach(range(1, 4) as $quarter) {
|
|
|
|
|
|
|
|
- $label = "Q$quarter $year";
|
|
|
|
|
|
|
+ if(!$same_year) $label = "Q$quarter $year";
|
|
|
|
|
+ else $label = "Q$quarter";
|
|
|
|
|
|
|
|
$key = "$year-$quarter";
|
|
$key = "$year-$quarter";
|
|
|
$data[$key] = clone $empty_data;
|
|
$data[$key] = clone $empty_data;
|
|
@@ -345,6 +349,7 @@ if($submit) {
|
|
|
|
|
|
|
|
$stage_key = "stage" . $test->challenge_stage . "Count";
|
|
$stage_key = "stage" . $test->challenge_stage . "Count";
|
|
|
$data[$key]->$stage_key++;
|
|
$data[$key]->$stage_key++;
|
|
|
|
|
+ $total_data->{$stage_key}++;
|
|
|
|
|
|
|
|
if($test->pass) {
|
|
if($test->pass) {
|
|
|
$data[$key]->passCount++;
|
|
$data[$key]->passCount++;
|
|
@@ -422,13 +427,13 @@ if($submit) {
|
|
|
$chart = new Chart;
|
|
$chart = new Chart;
|
|
|
$chart->setType("pie");
|
|
$chart->setType("pie");
|
|
|
$chart->setTitle("Tests by Stage $date_range_label");
|
|
$chart->setTitle("Tests by Stage $date_range_label");
|
|
|
- $chart->setLabels(["On Entry", "While Browsing", "During Play", "On Exit", "No Challenge"]);
|
|
|
|
|
|
|
+ $chart->setLabels(["1 - On Entry", "2 - While Browsing", "3 - During Play", "4 - On Exit", "5 - No Challenge"]);
|
|
|
$chart->addDataset("Counts", [
|
|
$chart->addDataset("Counts", [
|
|
|
- array_sum(array_column($data, "stage1Count")),
|
|
|
|
|
- array_sum(array_column($data, "stage2Count")),
|
|
|
|
|
- array_sum(array_column($data, "stage3Count")),
|
|
|
|
|
- array_sum(array_column($data, "stage4Count")),
|
|
|
|
|
- array_sum(array_column($data, "stage5Count")),
|
|
|
|
|
|
|
+ $total_data->stage1Count,
|
|
|
|
|
+ $total_data->stage2Count,
|
|
|
|
|
+ $total_data->stage3Count,
|
|
|
|
|
+ $total_data->stage4Count,
|
|
|
|
|
+ $total_data->stage5Count,
|
|
|
], [
|
|
], [
|
|
|
"background_colours" => [
|
|
"background_colours" => [
|
|
|
"#4CAF50",
|
|
"#4CAF50",
|
|
@@ -439,6 +444,67 @@ if($submit) {
|
|
|
]
|
|
]
|
|
|
]);
|
|
]);
|
|
|
$chart->setDatalabelSuffixes(" Test");
|
|
$chart->setDatalabelSuffixes(" Test");
|
|
|
|
|
+
|
|
|
|
|
+ // Generate table
|
|
|
|
|
+ ob_start();
|
|
|
|
|
+ ?>
|
|
|
|
|
+
|
|
|
|
|
+ <table class="table table-sm small table-bordered mt-3">
|
|
|
|
|
+ <thead>
|
|
|
|
|
+ <tr>
|
|
|
|
|
+ <th></th>
|
|
|
|
|
+ <th>Stage 1</th>
|
|
|
|
|
+ <th>Stage 2</th>
|
|
|
|
|
+ <th>Stage 3</th>
|
|
|
|
|
+ <th>Stage 4</th>
|
|
|
|
|
+ <th>Stage 5</th>
|
|
|
|
|
+ </tr>
|
|
|
|
|
+ </thead>
|
|
|
|
|
+ <tbody>
|
|
|
|
|
+ <?php
|
|
|
|
|
+ foreach(["value", "percent"] as $field) {
|
|
|
|
|
+
|
|
|
|
|
+ switch($field) {
|
|
|
|
|
+ case "value": $label = "Test Count"; break;
|
|
|
|
|
+ case "percent": $label = "Percentage"; break;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ ?>
|
|
|
|
|
+ <tr>
|
|
|
|
|
+ <td><?=htmlspecialchars($label)?></td>
|
|
|
|
|
+ <?php
|
|
|
|
|
+ foreach(range(1, 5) as $stage) {
|
|
|
|
|
+
|
|
|
|
|
+ $key = "stage{$stage}Count";
|
|
|
|
|
+ $count = $total_data->{$key};
|
|
|
|
|
+
|
|
|
|
|
+ switch($field) {
|
|
|
|
|
+ case "value":
|
|
|
|
|
+ $string = $count;
|
|
|
|
|
+ break;
|
|
|
|
|
+ case "percent":
|
|
|
|
|
+ $string = (floor(($count * 10000) / $test_count) / 100) . "%";
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ ?>
|
|
|
|
|
+ <td class="text-right"><?=$string?></td>
|
|
|
|
|
+ <?php
|
|
|
|
|
+ }
|
|
|
|
|
+ ?>
|
|
|
|
|
+ </tr>
|
|
|
|
|
+ <?php
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
|
|
+ ?>
|
|
|
|
|
+ </tbody>
|
|
|
|
|
+ </table>
|
|
|
|
|
+
|
|
|
|
|
+ <?php
|
|
|
|
|
+ $html = ob_get_clean();
|
|
|
|
|
+
|
|
|
|
|
+ $chart->setAfterHtml($html);
|
|
|
|
|
+
|
|
|
$charts[] = $chart;
|
|
$charts[] = $chart;
|
|
|
|
|
|
|
|
|
|
|
|
@@ -510,7 +576,7 @@ if($submit) {
|
|
|
$chart->setDatalabelSuffixes("%");
|
|
$chart->setDatalabelSuffixes("%");
|
|
|
$charts[] = $chart;
|
|
$charts[] = $chart;
|
|
|
|
|
|
|
|
- // Monthly Totals by Period
|
|
|
|
|
|
|
+ // Totals by Period
|
|
|
|
|
|
|
|
$test_counts = array_column($data, "testCount");
|
|
$test_counts = array_column($data, "testCount");
|
|
|
$pass_counts = array_column($data, "passCount");
|
|
$pass_counts = array_column($data, "passCount");
|
|
@@ -520,7 +586,7 @@ if($submit) {
|
|
|
$chart->setType("bar");
|
|
$chart->setType("bar");
|
|
|
$chart->setTitle("Totals by $resolution_name");
|
|
$chart->setTitle("Totals by $resolution_name");
|
|
|
$chart->setLabels($x_data_labels);
|
|
$chart->setLabels($x_data_labels);
|
|
|
- $chart->addYAxis("linear", "left", "y-axis-1", true, ["min" => 0, "max" => ceil($test_count / 10) * 10]);
|
|
|
|
|
|
|
+ $chart->addYAxis("linear", "left", "y-axis-1", true, ["min" => 0, "max" => ceil(max($test_counts) / 10) * 10]);
|
|
|
$chart->addYAxis("linear", "right", "y-axis-2", false, ["min" => 0, "max" => 100]);
|
|
$chart->addYAxis("linear", "right", "y-axis-2", false, ["min" => 0, "max" => 100]);
|
|
|
|
|
|
|
|
$chart->addDataset("Pass Rate (%)", $performance, [
|
|
$chart->addDataset("Pass Rate (%)", $performance, [
|
|
@@ -536,18 +602,28 @@ if($submit) {
|
|
|
"background_colours" => "#2196F3",
|
|
"background_colours" => "#2196F3",
|
|
|
"type" => "bar",
|
|
"type" => "bar",
|
|
|
"y_axis_id" => "y-axis-1",
|
|
"y_axis_id" => "y-axis-1",
|
|
|
|
|
+ "datalabels" => [
|
|
|
|
|
+ "display" => false
|
|
|
|
|
+ ],
|
|
|
]);
|
|
]);
|
|
|
$chart->addDataset("Pass", $pass_counts, [
|
|
$chart->addDataset("Pass", $pass_counts, [
|
|
|
"background_colours" => "#4CAF50",
|
|
"background_colours" => "#4CAF50",
|
|
|
"type" => "bar",
|
|
"type" => "bar",
|
|
|
"y_axis_id" => "y-axis-1",
|
|
"y_axis_id" => "y-axis-1",
|
|
|
|
|
+ "datalabels" => [
|
|
|
|
|
+ "display" => false
|
|
|
|
|
+ ],
|
|
|
]);
|
|
]);
|
|
|
$chart->addDataset("Fail", $fail_counts, [
|
|
$chart->addDataset("Fail", $fail_counts, [
|
|
|
"background_colours" => "#F44336",
|
|
"background_colours" => "#F44336",
|
|
|
"type" => "bar",
|
|
"type" => "bar",
|
|
|
"y_axis_id" => "y-axis-1",
|
|
"y_axis_id" => "y-axis-1",
|
|
|
|
|
+ "datalabels" => [
|
|
|
|
|
+ "display" => false
|
|
|
|
|
+ ],
|
|
|
]);
|
|
]);
|
|
|
- $chart->setDatalabelSuffixes(" %", " T", " P", " F");
|
|
|
|
|
|
|
+ $chart->setDatalabelSuffixes("%", "", "", "");
|
|
|
|
|
+ $chart->print = true;
|
|
|
$charts[] = $chart;
|
|
$charts[] = $chart;
|
|
|
|
|
|
|
|
// Point of Challenge (Each Period)
|
|
// Point of Challenge (Each Period)
|
|
@@ -696,6 +772,13 @@ if($submit) {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$chart = new Chart;
|
|
$chart = new Chart;
|
|
|
|
|
+ $chart->addXAxis([
|
|
|
|
|
+ "type" => "category",
|
|
|
|
|
+ "scale_label_config" => [
|
|
|
|
|
+ "display" => true,
|
|
|
|
|
+ "labelString" => "Area Manager",
|
|
|
|
|
+ ]
|
|
|
|
|
+ ]);
|
|
|
$chart->addYAxis("linear", "left", "y-axis-1", true, ["min" => 0, "max" => 100]);
|
|
$chart->addYAxis("linear", "left", "y-axis-1", true, ["min" => 0, "max" => 100]);
|
|
|
$chart->setType("bar");
|
|
$chart->setType("bar");
|
|
|
$chart->setTitle("Area Manager Pass Rate $date_range_label");
|
|
$chart->setTitle("Area Manager Pass Rate $date_range_label");
|
|
@@ -708,6 +791,13 @@ if($submit) {
|
|
|
|
|
|
|
|
// Area Pass Rate Period
|
|
// Area Pass Rate Period
|
|
|
$chart = new Chart;
|
|
$chart = new Chart;
|
|
|
|
|
+ $chart->addXAxis([
|
|
|
|
|
+ "type" => "category",
|
|
|
|
|
+ "scale_label_config" => [
|
|
|
|
|
+ "display" => true,
|
|
|
|
|
+ "labelString" => "Area Manager",
|
|
|
|
|
+ ]
|
|
|
|
|
+ ]);
|
|
|
$chart->addYAxis("linear", "left", "y-axis-1", true, ["min" => 0, "max" => 100]);
|
|
$chart->addYAxis("linear", "left", "y-axis-1", true, ["min" => 0, "max" => 100]);
|
|
|
$chart->setType("bar");
|
|
$chart->setType("bar");
|
|
|
$chart->setTitle("Area Manager Pass Rate by $resolution_name");
|
|
$chart->setTitle("Area Manager Pass Rate by $resolution_name");
|