Quellcode durchsuchen

Add alcohol pass rate chart

Alan Lam vor 2 Jahren
Ursprung
Commit
af3e6552d7

+ 44 - 3
engine/chart_generator.php

@@ -393,8 +393,49 @@ class ChartGenerator {
 
 	}
 
+	public function getPeriodicAlcoholPassRateChart(): Chart {
+		$pass_rates = [];
+		$fail_rates = [];
+
+		foreach($this->periodicData as $index => $data) {
+			$pass_count = $data->alcoholCounts["pass"];
+			$fail_count = $data->alcoholCounts["fail"];
+			$test_count = $pass_count + $fail_count;
+
+			if($test_count === 0) {
+				$pass_rate = 0;
+				$fail_rate = 0;
+			}
+			else {
+				$pass_rate = round(($pass_count / $test_count) * 100);
+				$fail_rate = 100 - $pass_rate;
+			}
+
+			$pass_rates[] = $pass_rate;
+			$fail_rates[] = $fail_rate;
+		}
+
+		$chart = new Chart();
+		$chart->addYAxis([
+			"type" => "category",
+			"stacked" => true,
+		]);
+		$chart->addXAxis([
+			"id" => "y-axis-1",
+			"tick_config" => ["min" => 0, "max" => 100],
+			"stacked" => true,
+		]);
+		$chart->setType("horizontalBar");
+		$chart->setTitle(__("Alcohol Pass Rate"));
+		$chart->setLabels($this->xDataLabels);
+		$chart->addDataset("Pass (%)", $pass_rates, ["background_colours" => self::COLOUR_GREEN]);
+		$chart->addDataset("Fail (%)", $fail_rates, ["background_colours" => self::COLOUR_RED]);
+		$chart->setDatalabelSuffixes("%", "%");
+		return $chart;
+	}
+
 	public function getPeriodicBooleanPassRateChart(array $rates, string $title): Chart {
-		$chart = new Chart;
+		$chart = new Chart();
 		$chart->addXAxis([
 			"type" => "category",
 			"stacked" => true,
@@ -407,10 +448,10 @@ class ChartGenerator {
 		$chart->setType("bar");
 		$chart->setTitle($title);
 		$chart->setLabels($this->xDataLabels);
-		$chart->addDataset("Yes (%)", array_column($rates, 0), [
+		$chart->addDataset("Yes (%)", array_column($rates, "pass"), [
 			"background_colours" => self::COLOUR_GREEN
 		]);
-		$chart->addDataset("No (%)", array_column($rates, 1), [
+		$chart->addDataset("No (%)", array_column($rates, "fail"), [
 			"background_colours" => self::COLOUR_RED
 		]);
 		$chart->setDatalabelSuffixes("%", "%");

+ 1 - 1
template_processing/age_verification_greene_king/reports_build_charts.php

@@ -24,7 +24,7 @@ $charts[] = $generator->getPeriodicPassFailRateChart();
 $charts[] = $generator->getPeriodicEyeContactChart();
 $charts[] = $generator->getPeriodicEyeContactPassRateChart();
 $charts[] = $generator->getPeriodicLineOfSightPassRateChart();
-$charts[] = $generator->getPeriodicBarPurchasePassRateChart();
+$charts[] = $generator->getPeriodicAlcoholPassRateChart();
 $charts[] = $generator->getPeriodicTotalsChart();
 $charts = array_merge($charts, $generator->getPointOfChallengeCharts("%s Point of Challenge", ["On Entry", "While Browsing", "During Play", "After Play", "No Challenge"]));
 $charts[] = $generator->getPeriodicTesterGenderChart();

+ 4 - 3
template_processing/age_verification_greene_king/reports_create_empty_objects.php

@@ -15,9 +15,6 @@ $empty_data = (object) [
 	"lineOfSightPassCounts" => [0, 0, 0],
 	"lineOfSightFailCounts" => [0, 0, 0],
 
-	"barPurchasePassCounts" => [0, 0, 0],
-	"barPurchaseFailCounts" => [0, 0, 0],
-
 	"maleTesterCount" => 0,
 	"femaleTesterCount" => 0,
 
@@ -45,6 +42,8 @@ $empty_data = (object) [
 	"unknownChallengePassCount" => 0,
 	"unknownChallengeStages" => [0, 0, 0, 0, 0],
 
+	"alcoholCounts" => ["pass" => 0, "fail" => 0],
+
 	"stage1Count" => 0,
 	"stage2Count" => 0,
 	"stage3Count" => 0,
@@ -72,4 +71,6 @@ $total_data = (object) [
 	"stage3Count" => 0,
 	"stage4Count" => 0,
 	"stage5Count" => 0,
+
+	"alcoholCounts" => ["pass" => 0, "fail" => 0],
 ];

+ 22 - 10
template_processing/age_verification_greene_king/reports_process_test.php

@@ -12,9 +12,15 @@
  * @var string $brand
  * @var Test $test
  * @var User $tester
- * @var array $test_values
+ * @var object $test_values
  */
 
+/**
+ * @param $value
+ * @param $pass
+ * @param $prefix
+ * @return void
+ */
 $booleanPassFieldIncrementor = static function($value, $pass, $prefix) use (&$data, $key) {
 
 	if($pass) {
@@ -42,8 +48,8 @@ $data[$key]->$stage_key++;
 $total_data->{$stage_key}++;
 
 $line_of_sight = $test_values->play_machine_line_of_sight ?? null;
-$bar_purchase = $test_values->bar_purchase ?? null;
 $eye_contact = $test->challenger_eye_contact ?? null;
+$pass = (bool) $test->pass;
 
 if($test->pass) {
 	$data[$key]->passCount++;
@@ -51,10 +57,6 @@ if($test->pass) {
 	if($region) $region_data[$region][$key]->passCount++;
 	if($area_manager) $area_manager_data[$area_manager][$key]->passCount++;
 	if($brand) $brand_data[$brand][$key]->passCount++;
-
-	$booleanPassFieldIncrementor($eye_contact, true, "eyeContact");
-	$booleanPassFieldIncrementor($line_of_sight, true, "lineOfSight");
-	$booleanPassFieldIncrementor($bar_purchase, true, "barPurchase");
 }
 else {
 	$data[$key]->failCount++;
@@ -62,12 +64,11 @@ else {
 	if($region) $region_data[$region][$key]->failCount++;
 	if($area_manager) $area_manager_data[$area_manager][$key]->failCount++;
 	if($brand) $brand_data[$brand][$key]->failCount++;
-
-	$booleanPassFieldIncrementor($eye_contact, false, "eyeContact");
-	$booleanPassFieldIncrementor($line_of_sight, false, "lineOfSight");
-	$booleanPassFieldIncrementor($bar_purchase, false, "barPurchase");
 }
 
+$booleanPassFieldIncrementor($eye_contact, $pass, "eyeContact");
+$booleanPassFieldIncrementor($line_of_sight, $pass, "lineOfSight");
+
 if($test->challenger_gender === "M") {
 	$data[$key]->maleChallengerCount++;
 	$total_data->maleChallengerCount++;
@@ -113,3 +114,14 @@ if($gender_prefix !== "unknownChallenge") {
 $data[$key]->{$gender_prefix . "Count"}++;
 $data[$key]->{$gender_prefix . "Stages"}[$test->challenge_stage - 1]++;
 if($test->pass) $data[$key]->{$gender_prefix . "PassCount"}++;
+
+// Alcohol Pass/Fail
+
+if($test->challenge_stage === 5) {
+	$alcohol_purchased = (bool) ($test_values->alcohol_purchased ?? false);
+	$alcohol_pass = ($alcohol_purchased === false);
+	$alcohol_key = $alcohol_pass ? "pass" : "fail";
+
+	$data[$key]->alcoholCounts[$alcohol_key]++;
+	$total_data->alcoholCounts[$alcohol_key]++;
+}