Jelajahi Sumber

Add support for print datasets

Alan Lam 8 tahun lalu
induk
melakukan
e624a9f3d9
3 mengubah file dengan 50 tambahan dan 5 penghapusan
  1. 29 2
      controllers/reports.php
  2. 1 1
      controllers/reports_presentation.php
  3. 20 2
      engine/chart.php

+ 29 - 2
controllers/reports.php

@@ -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

+ 1 - 1
controllers/reports_presentation.php

@@ -42,7 +42,7 @@ foreach($charts_b64 as $index => $b64) {
 	$chart = $charts[$index];
 
 	$labels = $chart->getLabels();
-	$datasets = $chart->getDatasets();
+	$datasets = array_merge($chart->getDatasets(), $chart->getPrintDatasets());
 
 	$column_count = 1 + count($labels);
 

+ 20 - 2
engine/chart.php

@@ -11,6 +11,7 @@ class Chart {
 	private $title = "Untitled";
 	private $type = "bar";
 	private $datasets = [];
+	private $printDatasets = [];
 	private $labels = [];
 	private $printLabels = null;
 
@@ -137,10 +138,24 @@ class Chart {
 
 	}
 
+	public function addPrintDataset($label, $data) {
+
+		$dataset = [
+			"label" => $label,
+			"data" => $data,
+		];
+
+		$this->printDatasets[] = (object) $dataset;
+	}
+
 	public function getDatasets() {
 		return $this->datasets;
 	}
 
+	public function getPrintDatasets() {
+		return $this->printDatasets;
+	}
+
 	public function getLabels() {
 		return $this->labels;
 	}
@@ -253,14 +268,17 @@ class Chart {
 			</thead>
 			<tbody>
 			<?php
-			foreach($this->datasets as $index => $dataset) {
+
+			$datasets = array_merge($this->datasets, $this->printDatasets);
+
+			foreach($datasets as $index => $dataset) {
 
 				$suffix = "";
 
 				$suffixes = $this->printSuffixes ?? $this->datalabelSuffixes;
 
 				if($suffixes) {
-					$suffix = $suffixes[$index];
+					$suffix = $suffixes[$index] ?? "";
 				}
 
 				$data = $dataset->data;