Procházet zdrojové kódy

Add bar and combined by month charts

Alan Lam před 2 roky
rodič
revize
f7d156ac65

+ 32 - 3
engine/chart_generator.php

@@ -346,7 +346,36 @@ class ChartGenerator {
 		return $chart;
 	}
 
-	public function getPeriodicPassFailRateChart(string $title = "Pass / Fail"): Chart {
+	public function getPeriodicPassFailRateChart(array $options = []): Chart {
+
+		$title = $options["title"] ?? "Pass / Fail";
+		$array_key = $options["array_key"] ?? null;
+
+		$pass_rates = [];
+		$fail_rates = [];
+
+		foreach($this->periodicData as $period) {
+			if($array_key) {
+				$pass_count = $period->$array_key["pass"];
+				$fail_count = $period->$array_key["fail"];
+			}
+			else {
+				$pass_count = $period->passCount;
+				$fail_count = $period->failCount;
+			}
+
+			$test_count = $pass_count + $fail_count;
+
+			if($test_count === 0) {
+				$pass_rates[] = 0;
+				$fail_rates[] = 0;
+			}
+			else {
+				$pass_rate = round(($pass_count / $test_count) * 100);
+				$pass_rates[] = $pass_rate;
+				$fail_rates[] = 100 - $pass_rate;
+			}
+		}
 
 		$chart = new Chart();
 		$chart->addXAxis([
@@ -362,10 +391,10 @@ class ChartGenerator {
 		$chart->setType("bar");
 		$chart->setTitle("{$title} by {$this->resolutionName}");
 		$chart->setLabels($this->xDataLabels);
-		$chart->addDataset("Pass Rate (%)", $this->getPeriodicPassRates(), [
+		$chart->addDataset("Pass Rate (%)", $pass_rates, [
 			"background_colours" => self::COLOUR_GREEN
 		]);
-		$chart->addDataset("Fail Rate (%)", $this->getPeriodicFailRates(), [
+		$chart->addDataset("Fail Rate (%)", $fail_rates, [
 			"background_colours" => self::COLOUR_RED
 		]);
 		$chart->setDatalabelSuffixes("%", "%");

+ 11 - 3
template_processing/age_verification_greene_king/reports_build_charts.php

@@ -49,9 +49,17 @@ if(!empty($venue_type_data)) {
 	}
 }
 
-$periodic_pass_fail_chart = $generator->getPeriodicPassFailRateChart(__("Gaming Pass / Fail"));
-$periodic_pass_fail_chart->setCategories(["All", "Gaming"]);
-$charts[] = $periodic_pass_fail_chart;
+$gaming_periodic_pass_fail_chart = $generator->getPeriodicPassFailRateChart(["title" => __("Gaming Pass / Fail")]);
+$gaming_periodic_pass_fail_chart->setCategories(["All", "Gaming"]);
+$charts[] = $gaming_periodic_pass_fail_chart;
+
+$alcohol_periodic_pass_fail_chart = $generator->getPeriodicPassFailRateChart(["title" => __("Alcohol Pass / Fail"), "array_key" => "barCounts"]);
+$alcohol_periodic_pass_fail_chart->setCategories(["All", "Alcohol"]);
+$charts[] = $alcohol_periodic_pass_fail_chart;
+
+$combined_periodic_pass_fail_chart = $generator->getPeriodicPassFailRateChart(["title" => __("Combined Pass / Fail"), "array_key" => "combinedCounts"]);
+$combined_periodic_pass_fail_chart->setCategories(["All", "Gaming", "Alcohol"]);
+$charts[] = $combined_periodic_pass_fail_chart;
 
 $periodic_eye_contact_chart = $generator->getPeriodicEyeContactChart();
 $periodic_eye_contact_chart->setCategories(["All", "Gaming", "Eye Contact"]);