Browse Source

Add more charts for Greene King bar pass rate and age verification

Alan Lam 2 years ago
parent
commit
910a919cdc

+ 39 - 4
engine/chart_generator.php

@@ -309,6 +309,39 @@ class ChartGenerator {
 		return $chart;
 		return $chart;
 	}
 	}
 
 
+	public function getPassFailCountChartByKey(string $title, string $object_key): Chart {
+		$data = $this->totalData;
+
+		$counts = $data->$object_key;
+
+		$pass_count = $counts["pass"] ?? 0;
+		$fail_count = $counts["fail"] ?? 0;
+
+		$dataset = [$pass_count, $fail_count];
+		$labels = ["Pass", "Fail"];
+		$colours = [self::COLOUR_GREEN, self::COLOUR_RED];
+
+		/*
+		if($data->voidCount > 0) {
+			$dataset[] = $data->voidCount;
+			$labels[] = "Void";
+			$colours[] = self::COLOUR_GREY;
+		}
+		*/
+
+		$title = sprintf("%s (%s)", $title, $this->dateRangeLabel);
+
+		$chart = new Chart();
+		$chart->setType("pie");
+		$chart->setTitle($title);
+		$chart->setLabels($labels);
+		$chart->addDataset("Counts", $dataset, [
+			"background_colours" => $colours,
+			"datalabels" => Chart::DATALABELS_BOX,
+		]);
+		return $chart;
+	}
+
 	public function getPeriodicPassFailRateChart(): Chart {
 	public function getPeriodicPassFailRateChart(): Chart {
 
 
 		$chart = new Chart;
 		$chart = new Chart;
@@ -403,13 +436,15 @@ class ChartGenerator {
 
 
 	}
 	}
 
 
-	public function getPeriodicAlcoholPassRateChart(): Chart {
+	public function getPeriodicPassRateChartByKey(string $title, string $object_key): Chart {
 		$pass_rates = [];
 		$pass_rates = [];
 		$fail_rates = [];
 		$fail_rates = [];
 
 
 		foreach($this->periodicData as $index => $data) {
 		foreach($this->periodicData as $index => $data) {
-			$pass_count = $data->alcoholCounts["pass"];
-			$fail_count = $data->alcoholCounts["fail"];
+			$counts = $data->$object_key;
+
+			$pass_count = $counts["pass"];
+			$fail_count = $counts["fail"];
 			$test_count = $pass_count + $fail_count;
 			$test_count = $pass_count + $fail_count;
 
 
 			if($test_count === 0) {
 			if($test_count === 0) {
@@ -436,7 +471,7 @@ class ChartGenerator {
 			"stacked" => true,
 			"stacked" => true,
 		]);
 		]);
 		$chart->setType("horizontalBar");
 		$chart->setType("horizontalBar");
-		$chart->setTitle(__("Alcohol Pass Rate"));
+		$chart->setTitle($title);
 		$chart->setLabels($this->xDataLabels);
 		$chart->setLabels($this->xDataLabels);
 		$chart->addDataset("Pass (%)", $pass_rates, ["background_colours" => self::COLOUR_GREEN]);
 		$chart->addDataset("Pass (%)", $pass_rates, ["background_colours" => self::COLOUR_GREEN]);
 		$chart->addDataset("Fail (%)", $fail_rates, ["background_colours" => self::COLOUR_RED]);
 		$chart->addDataset("Fail (%)", $fail_rates, ["background_colours" => self::COLOUR_RED]);

+ 4 - 1
template_processing/age_verification_greene_king/reports_build_charts.php

@@ -9,6 +9,8 @@ $charts[] = $generator->getTestsByStageChart(["1 - On Entry", "2 - While Browsin
 $charts[] = $generator->getChallengerGenderChart();
 $charts[] = $generator->getChallengerGenderChart();
 $charts[] = $generator->getTesterGenderChart();
 $charts[] = $generator->getTesterGenderChart();
 $charts[] = $generator->getPassFailCountChart();
 $charts[] = $generator->getPassFailCountChart();
+$charts[] = $generator->getPassFailCountChartByKey(__("Bar Age Verification"), "barAgeVerificationCounts");
+$charts[] = $generator->getPassFailCountChartByKey(__("Bar Pass / Fail"), "barCounts");
 
 
 if(!empty($venue_type_data)) {
 if(!empty($venue_type_data)) {
 	$charts[] = ChartGenerator::getVenueTypePassFailChart($venue_type_data);
 	$charts[] = ChartGenerator::getVenueTypePassFailChart($venue_type_data);
@@ -24,7 +26,8 @@ $charts[] = $generator->getPeriodicPassFailRateChart();
 $charts[] = $generator->getPeriodicEyeContactChart();
 $charts[] = $generator->getPeriodicEyeContactChart();
 $charts[] = $generator->getPeriodicEyeContactPassRateChart();
 $charts[] = $generator->getPeriodicEyeContactPassRateChart();
 $charts[] = $generator->getPeriodicLineOfSightPassRateChart();
 $charts[] = $generator->getPeriodicLineOfSightPassRateChart();
-$charts[] = $generator->getPeriodicAlcoholPassRateChart();
+$charts[] = $generator->getPeriodicPassRateChartByKey(__("Bar Age Verification Rate"), "barAgeVerificationCounts");
+$charts[] = $generator->getPeriodicPassRateChartByKey(__("Bar Pass Rate"), "barCounts");
 $charts[] = $generator->getPeriodicTotalsChart();
 $charts[] = $generator->getPeriodicTotalsChart();
 $charts = array_merge($charts, $generator->getPointOfChallengeCharts("%s Point of Challenge", ["On Entry", "While Browsing", "During Play", "After Play", "No Challenge"]));
 $charts = array_merge($charts, $generator->getPointOfChallengeCharts("%s Point of Challenge", ["On Entry", "While Browsing", "During Play", "After Play", "No Challenge"]));
 $charts[] = $generator->getPeriodicTesterGenderChart();
 $charts[] = $generator->getPeriodicTesterGenderChart();

+ 4 - 2
template_processing/age_verification_greene_king/reports_create_empty_objects.php

@@ -42,7 +42,8 @@ $empty_data = (object) [
 	"unknownChallengePassCount" => 0,
 	"unknownChallengePassCount" => 0,
 	"unknownChallengeStages" => [0, 0, 0, 0, 0],
 	"unknownChallengeStages" => [0, 0, 0, 0, 0],
 
 
-	"alcoholCounts" => ["pass" => 0, "fail" => 0],
+	"barCounts" => ["pass" => 0, "fail" => 0],
+	"barAgeVerificationCounts" => ["pass" => 0, "fail" => 0],
 
 
 	"stage1Count" => 0,
 	"stage1Count" => 0,
 	"stage2Count" => 0,
 	"stage2Count" => 0,
@@ -72,5 +73,6 @@ $total_data = (object) [
 	"stage4Count" => 0,
 	"stage4Count" => 0,
 	"stage5Count" => 0,
 	"stage5Count" => 0,
 
 
-	"alcoholCounts" => ["pass" => 0, "fail" => 0],
+	"barCounts" => ["pass" => 0, "fail" => 0],
+	"barAgeVerificationCounts" => ["pass" => 0, "fail" => 0],
 ];
 ];

+ 8 - 4
template_processing/age_verification_greene_king/reports_process_test.php

@@ -118,10 +118,14 @@ if($test->pass) $data[$key]->{$gender_prefix . "PassCount"}++;
 // Alcohol Pass/Fail
 // Alcohol Pass/Fail
 
 
 if($test->challenge_stage === 5) {
 if($test->challenge_stage === 5) {
+	$av = (bool) ($test_values->bar_age_verification ?? false);
+	$av_key = $av ? "pass" : "fail";
+	$data[$key]->barAgeVerificationCounts[$av_key]++;
+	$total_data->barAgeVerificationCounts[$av_key]++;
+
 	$alcohol_purchased = (bool) ($test_values->alcohol_purchased ?? false);
 	$alcohol_purchased = (bool) ($test_values->alcohol_purchased ?? false);
-	$alcohol_pass = ($alcohol_purchased === false);
-	$alcohol_key = $alcohol_pass ? "pass" : "fail";
+	$alcohol_key = ($alcohol_purchased === false) ? "pass" : "fail";
 
 
-	$data[$key]->alcoholCounts[$alcohol_key]++;
-	$total_data->alcoholCounts[$alcohol_key]++;
+	$data[$key]->barCounts[$alcohol_key]++;
+	$total_data->barCounts[$alcohol_key]++;
 }
 }