|
|
@@ -701,10 +701,19 @@ if($submit) {
|
|
|
|
|
|
// Region Pass Rate (Selected Date Range)
|
|
|
$data_values = [];
|
|
|
+
|
|
|
+ $test_counts = [];
|
|
|
+ $pass_counts = [];
|
|
|
+ $fail_counts = [];
|
|
|
+
|
|
|
foreach($region_data as $region => $r_data) {
|
|
|
$total_region_test_count = array_sum(array_column($r_data, "testCount"));
|
|
|
$total_region_pass_count = array_sum(array_column($r_data, "passCount"));
|
|
|
|
|
|
+ $test_counts[] = $total_region_test_count;
|
|
|
+ $pass_counts[] = $total_region_pass_count;
|
|
|
+ $fail_counts[] = $total_region_test_count - $total_region_pass_count;
|
|
|
+
|
|
|
$data_values[] = ($total_region_test_count == 0) ? 0 : round(($total_region_pass_count * 100) / $total_region_test_count);
|
|
|
}
|
|
|
|
|
|
@@ -716,10 +725,15 @@ if($submit) {
|
|
|
$chart->setType("bar");
|
|
|
$chart->setTitle("Region Pass Rate $date_range_label");
|
|
|
$chart->setLabels($x_data_labels);
|
|
|
- $chart->addDataset("Pass Rate (%)", $data_values , [
|
|
|
+ $chart->addDataset("Pass %", $data_values , [
|
|
|
"background_colours" => "#2196F3"
|
|
|
]);
|
|
|
+ $chart->addPrintDataset("Tests", $test_counts);
|
|
|
+ $chart->addPrintDataset("Pass", $pass_counts);
|
|
|
+ $chart->addPrintDataset("Fail", $fail_counts);
|
|
|
+
|
|
|
$chart->setDatalabelSuffixes("%");
|
|
|
+ $chart->print = true;
|
|
|
$charts[] = $chart;
|
|
|
|
|
|
// Region Pass Rate Period
|
|
|
@@ -758,11 +772,20 @@ if($submit) {
|
|
|
|
|
|
// Area Pass Rate (Selected Date Range)
|
|
|
$data_values = [];
|
|
|
+
|
|
|
+ $test_counts = [];
|
|
|
+ $pass_counts = [];
|
|
|
+ $fail_counts = [];
|
|
|
+
|
|
|
foreach($area_manager_data as $area_manager => $a_data) {
|
|
|
$total_area_manager_test_count = array_sum(array_column($a_data, "testCount"));
|
|
|
$total_area_manager_pass_count = array_sum(array_column($a_data, "passCount"));
|
|
|
$total_area_manager_fail_count = array_sum(array_column($a_data, "failCount"));
|
|
|
|
|
|
+ $test_counts[] = $total_area_manager_test_count;
|
|
|
+ $pass_counts[] = $total_area_manager_pass_count;
|
|
|
+ $fail_counts[] = $total_area_manager_fail_count;
|
|
|
+
|
|
|
$data_values[] = ($total_region_test_count == 0) ? 0 : round(($total_area_manager_pass_count * 100) / $total_area_manager_test_count);
|
|
|
}
|
|
|
|
|
|
@@ -781,10 +804,14 @@ if($submit) {
|
|
|
$chart->setType("bar");
|
|
|
$chart->setTitle("Area Manager Pass Rate $date_range_label");
|
|
|
$chart->setLabels($x_data_labels);
|
|
|
- $chart->addDataset("Pass Rate (%)", $data_values , [
|
|
|
+ $chart->addDataset("Pass %", $data_values , [
|
|
|
"background_colours" => "#2196F3"
|
|
|
]);
|
|
|
+ $chart->addPrintDataset("Tests", $test_counts);
|
|
|
+ $chart->addPrintDataset("Pass", $pass_counts);
|
|
|
+ $chart->addPrintDataset("Fail", $fail_counts);
|
|
|
$chart->setDatalabelSuffixes("%");
|
|
|
+ $chart->print = true;
|
|
|
$charts[] = $chart;
|
|
|
|
|
|
// Area Pass Rate Period
|