Преглед на файлове

Consolidate chart generation and add additional pass rate charts

Alan Lam преди 7 години
родител
ревизия
459ba0c0e6

+ 35 - 44
controllers/reports.php

@@ -1,4 +1,5 @@
-<?php
+<?php /** @noinspection PhpIncludeInspection */
+/** @noinspection PhpUnhandledExceptionInspection */
 
 Core::addScript("public/js/Chart.bundle.min.js");
 Core::addScript("public/js/chartjs-plugin-datalabels.min.js");
@@ -47,7 +48,7 @@ $all_projects = Project::query([
 
 if(Core::$user->isCustomer()) {
 	// Filter to only projects that have past the deadline
-	$all_projects = array_filter($all_projects, function($project) {
+	$all_projects = array_filter($all_projects, function(Project $project) {
 		return $project->isPastDeadline();
 	});
 }
@@ -61,7 +62,7 @@ foreach($all_projects as $p) {
 $data = [];
 $region_data = [];
 $area_manager_data = [];
-$total_data = false;
+$total_data = new stdClass;
 
 $locations_missing_region = [];
 $locations_missing_area_manager = [];
@@ -214,7 +215,7 @@ if($submit) {
 		$same_year = ($min_year == $max_year);
 
 		// Filter tests based on date range
-		$tests = array_filter($tests, function($test) use ($min_unix, $max_unix) {
+		$tests = array_filter($tests, function(Test $test) use ($min_unix, $max_unix) {
 
 			$project = $test->getProject();
 
@@ -223,12 +224,8 @@ if($submit) {
 			$dt = new DateTime($dts . " UTC");
 			$unix = $dt->format("U");
 
-			if($unix < $min_unix) {
-				return false;
-			}
-			if($unix > $max_unix) {
-				return false;
-			}
+			if($unix < $min_unix) return false;
+			if($unix > $max_unix) return false;
 
 			return true;
 		});
@@ -249,26 +246,12 @@ if($submit) {
 					$resolution_name = "Month";
 
 					foreach(range(1, 12) as $month) {
-
 						if(!$same_year) $label = date("M Y", mktime(0, 0, 0, $month, 1, date("Y")));
 						else $label = date("M", mktime(0, 0, 0, $month, 1, date("Y")));
 
 						$month = str_pad($month, 2, "0", STR_PAD_LEFT);
-						$key = "$year-$month";
-						$data[$key] = clone $empty_data;
-						$data[$key]->label = $label;
-
-						foreach($region_data as &$r) {
-							$r[$key] = clone $empty_data;
-							$r[$key]->label = $label;
-						}
 
-						foreach($area_manager_data as &$a) {
-							$a[$key] = clone $empty_data;
-							$a[$key]->label = $label;
-						}
-
-						$keys[] = $key;
+						$keys[] = "$year-$month";
 						$key_labels[] = $label;
 					}
 
@@ -280,30 +263,34 @@ if($submit) {
 					$resolution_name = "Quarter";
 
 					foreach(range(1, 4) as $quarter) {
-
 						if(!$same_year) $label = "Q$quarter $year";
 						else $label = "Q$quarter";
 
-						$key = "$year-$quarter";
-						$data[$key] = clone $empty_data;
-						$data[$key]->label = $label;
-
-						foreach($region_data as &$r) {
-							$r[$key] = clone $empty_data;
-							$r[$key]->label = $label;
-						}
-
-						foreach($area_manager_data as &$a) {
-							$a[$key] = clone $empty_data;
-							$a[$key]->label = $label;
-						}
-
-						$keys[] = $key;
+						$keys[] = "$year-$quarter";
 						$key_labels[] = $label;
 					}
 
 					break;
 			}
+
+
+		}
+
+		foreach($keys as $index => $key) {
+			$label = $key_labels[$index];
+
+			$data[$key] = clone $empty_data;
+			$data[$key]->label = $label;
+
+			foreach($region_data as &$r) {
+				$r[$key] = clone $empty_data;
+				$r[$key]->label = $label;
+			}
+
+			foreach($area_manager_data as &$a) {
+				$a[$key] = clone $empty_data;
+				$a[$key]->label = $label;
+			}
 		}
 
 		$max_unix = 0;
@@ -364,9 +351,13 @@ if($submit) {
 		$current_month = date("m", $max_unix);
 		$current_quarter = ceil(date("n", $max_unix) / 3);
 
-		$x_data_labels = array_values(array_map(function($d) {
-			return $d->label;
-		}, $data));
+		// Initialise generator
+		$generator = new ChartGenerator($total_data, $data);
+		$generator->setDateRangeLabel($date_range_label);
+		$generator->setResolutionName($resolution_name);
+		$generator->setPeriodKeysAndLabels($keys, $key_labels);
+		$generator->setRegionData($region_data);
+		$generator->setAreaManagerData($area_manager_data);
 
 		// Build charts hook
 		require $template->getProcessingFilePath("reports_build_charts.php");

+ 1024 - 0
engine/chart_generator.php

@@ -0,0 +1,1024 @@
+<?php
+
+/**
+ * Class ChartGenerator
+ */
+
+class ChartGenerator {
+
+	const COLOUR_GREEN = "#4CAF50";
+	const COLOUR_RED = "#F44336";
+	const COLOUR_YELLOW = "#FFEB3B";
+	const COLOUR_LIGHT_GREY = "#CCCCCC";
+	const COLOUR_LIGHT_RED = "#FFAB91";
+	const COLOUR_ORANGE = "#FBC02D";
+	const COLOUR_BLUE = "#2196F3";
+	const COLOUR_MAGENTA = "#E91E63";
+	const COLOUR_DARK_BLUE = "#3F51B5";
+	const COLOUR_PURPLE = "#9C27B0";
+	const COLOUR_GREY = "#9E9E9E";
+
+	/** @var object $totalData */
+	private $totalData;
+
+	/** @var array $periodicData */
+	private $periodicData;
+
+	/** @var string $dateRangeLabel */
+	private $dateRangeLabel;
+
+	/** @var string $resolutionName */
+	private $resolutionName;
+
+	/** @var string[] $xDataLabels */
+	private $xDataLabels;
+
+	/** @var string[] $periodKeys */
+	private $periodKeys;
+
+	/** @var string[] $periodLabels */
+	private $periodLabels;
+
+	/** @var array $regionData */
+	private $regionData;
+
+	/** @var array $areaManagerData */
+	private $areaManagerData;
+
+	public function __construct(object $total_data, array $periodic_data) {
+		$this->totalData = $total_data;
+		$this->periodicData = $periodic_data;
+
+		$this->xDataLabels = array_values(array_map(function($d) {
+			return $d->label;
+		}, $this->periodicData));
+	}
+
+	public function setDateRangeLabel(string $label) {
+		$this->dateRangeLabel = $label;
+	}
+
+	public function setResolutionName(string $name) {
+		$this->resolutionName = $name;
+	}
+
+	public function setPeriodKeysAndLabels(array $keys, array $labels) {
+		$this->periodKeys = $keys;
+		$this->periodLabels = $labels;
+	}
+
+	public function setRegionData(array $data) {
+		ksort($data, SORT_NATURAL);
+		$this->regionData = $data;
+	}
+
+	public function setAreaManagerData(array $data) {
+		ksort($data, SORT_NATURAL);
+		$this->areaManagerData = $data;
+	}
+
+	// Charts
+	public function getTestsByStageChart(): Chart {
+		$chart = new Chart;
+		$chart->setType("doughnut");
+		$chart->setTitle("Tests by Stage {$this->dateRangeLabel}");
+		$chart->setLabels(["1 - On Entry", "2 - While Browsing", "3 - During Play", "4 - On Exit", "5 - No Challenge"]);
+		$chart->addDataset("Tests", [
+			$this->totalData->stage1Count,
+			$this->totalData->stage2Count,
+			$this->totalData->stage3Count,
+			$this->totalData->stage4Count,
+			$this->totalData->stage5Count,
+		], [
+			"background_colours" => [
+				self::COLOUR_GREEN,
+				self::COLOUR_YELLOW,
+				self::COLOUR_ORANGE,
+				self::COLOUR_LIGHT_RED,
+				self::COLOUR_RED,
+			],
+			"datalabels" => Chart::DATALABELS_BOX,
+		]);
+		$chart->setPrintSuffixes("");
+		$chart->print = true;
+		$chart->printPercentages = true;
+		$chart->printTotalColumn = true;
+		$chart->setPrintLabels(["Stage 1", "Stage 2", "Stage 3", "Stage 4", "Stage 5"]);
+		return $chart;
+	}
+
+	public function getChallengerGenderChart(): Chart {
+		$chart = new Chart;
+		$chart->setType("pie");
+		$chart->setTitle("Staff Gender {$this->dateRangeLabel}");
+		$chart->setLabels(["Male", "Female", "Unspecified"]);
+		$chart->addDataset("Counts", [
+			$this->totalData->maleChallengerCount,
+			$this->totalData->femaleChallengerCount,
+			$this->totalData->unspecifiedChallengerCount,
+		], [
+			"background_colours" => [
+				self::COLOUR_BLUE,
+				self::COLOUR_MAGENTA,
+				self::COLOUR_GREY,
+			],
+			"datalabels" => Chart::DATALABELS_BOX,
+		]);
+		return $chart;
+	}
+
+	public function getTesterGenderChart(): Chart {
+		$chart = new Chart;
+		$chart->setType("pie");
+		$chart->setTitle("Tester Gender {$this->dateRangeLabel}");
+		$chart->setLabels(["Male", "Female"]);
+		$chart->addDataset("Counts", [
+			$this->totalData->maleTesterCount,
+			$this->totalData->femaleTesterCount,
+		], [
+			"background_colours" => [
+				self::COLOUR_BLUE,
+				self::COLOUR_MAGENTA,
+			],
+			"datalabels" => Chart::DATALABELS_BOX,
+		]);
+		return $chart;
+	}
+
+	public function getPassFailCountChart(): Chart {
+		$chart = new Chart;
+		$chart->setType("pie");
+		$chart->setTitle("Pass / Fail {$this->dateRangeLabel}");
+		$chart->setLabels(["Pass", "Fail"]);
+		$chart->addDataset("Counts", [
+			$this->totalData->passCount,
+			$this->totalData->failCount,
+		], [
+			"background_colours" => [
+				self::COLOUR_GREEN,
+				self::COLOUR_RED,
+			],
+			"datalabels" => Chart::DATALABELS_BOX,
+		]);
+		return $chart;
+	}
+
+	public function getPeriodicPassFailRateChart(): Chart {
+
+		$chart = new Chart;
+		$chart->addXAxis([
+			"type" => "category",
+			"stacked" => true,
+		]);
+		$chart->addYAxis([
+			"id" => "y-axis-1",
+			"tick_config" => ["min" => 0, "max" => 100],
+			"stacked" => true,
+		]);
+
+		$chart->setType("bar");
+		$chart->setTitle("Pass / Fail by {$this->resolutionName}");
+		$chart->setLabels($this->xDataLabels);
+		$chart->addDataset("Pass Rate (%)", $this->getPeriodicPassRates(), [
+			"background_colours" => self::COLOUR_GREEN
+		]);
+		$chart->addDataset("Fail Rate (%)", $this->getPeriodicFailRates(), [
+			"background_colours" => self::COLOUR_RED
+		]);
+		$chart->setDatalabelSuffixes("%", "%");
+		return $chart;
+	}
+
+	public function getPeriodicDoorSensorAlertPassRateChart(): Chart {
+		return $this->getPeriodicPassRateChart(
+			"Pass Rate by Door Sensor Alert",
+			$this->getPeriodicPassRateByDoorSensorAlert(1),
+			$this->getPeriodicPassRateByDoorSensorAlert(0),
+			$this->getPeriodicPassRateByDoorSensorAlert(2)
+		);
+	}
+
+	public function getPeriodicEyeContactPassRateChart(): Chart {
+		return $this->getPeriodicPassRateChart(
+			"Pass Rate by Eye Contact",
+			$this->getPeriodicPassRateByEyeContact(1),
+			$this->getPeriodicPassRateByEyeContact(0),
+			$this->getPeriodicPassRateByEyeContact(2)
+		);
+	}
+
+	public function getPeriodicLineOfSightPassRateChart(): Chart {
+
+		return $this->getPeriodicPassRateChart(
+			"Pass Rate by Line of Sight",
+			$this->getPeriodicPassRateByLineOfSight(1),
+			$this->getPeriodicPassRateByLineOfSight(0),
+			$this->getPeriodicPassRateByLineOfSight(2)
+		);
+
+	}
+
+	public function getPeriodicBarPurchasePassRateChart(): Chart {
+
+		return $this->getPeriodicPassRateChart(
+			"Pass Rate by Bar Purchase",
+			$this->getPeriodicPassRateByBarPurchase(1),
+			$this->getPeriodicPassRateByBarPurchase(0),
+			$this->getPeriodicPassRateByBarPurchase(2)
+		);
+
+	}
+
+	public function getPeriodicEyeContactChart(): Chart {
+
+		$rates = $this->getEyeContactRates();
+
+		$chart = new Chart;
+		$chart->addXAxis([
+			"type" => "category",
+			"stacked" => true,
+		]);
+		$chart->addYAxis([
+			"id" => "y-axis-1",
+			"tick_config" => ["min" => 0, "max" => 100],
+			"stacked" => true,
+		]);
+		$chart->setType("bar");
+		$chart->setTitle("Eye Contact by {$this->resolutionName}");
+		$chart->setLabels($this->xDataLabels);
+		$chart->addDataset("Yes (%)", array_column($rates, 0), [
+			"background_colours" => self::COLOUR_GREEN
+		]);
+		$chart->addDataset("No (%)", array_column($rates, 1), [
+			"background_colours" => self::COLOUR_RED
+		]);
+		$chart->setDatalabelSuffixes("%", "%");
+		return $chart;
+	}
+
+	public function getPeriodicTotalsChart(): Chart {
+
+		$test_counts = $this->getPeriodicTestCounts();
+		$pass_rates = $this->getPeriodicPassRates();
+		$pass_counts = $this->getPeriodicPassCounts();
+		$fail_counts = $this->getPeriodicFailCounts();
+
+		$chart = new Chart;
+		$chart->setType("bar");
+		$chart->setTitle("Totals by {$this->resolutionName}");
+		$chart->setLabels($this->xDataLabels);
+		$chart->addYAxis([
+			"id" => "y-axis-1",
+			"tick_config" => ["min" => 0, "max" => ceil(max($test_counts) / 10) * 10]
+		]);
+		$chart->addYAxis([
+			"position" => "right",
+			"id" => "y-axis-2",
+			"grid_lines" => false,
+			"tick_config" => ["min" => 0, "max" => 100]
+		]);
+
+		$chart->addDataset("Pass Rate (%)", $pass_rates, [
+			"border_colours" => self::COLOUR_YELLOW,
+			"background_colours" => "transparent",
+			"type" => "line",
+			"y_axis_id" => "y-axis-2",
+			"datalabels" => [
+				"display" => false
+			],
+			"line_tension" => 0,
+		]);
+		$chart->addDataset("Test Count", $test_counts, [
+			"background_colours" => self::COLOUR_BLUE,
+			"type" => "bar",
+			"y_axis_id" => "y-axis-1",
+			"datalabels" => [
+				"display" => false
+			],
+		]);
+		$chart->addDataset("Pass", $pass_counts, [
+			"background_colours" => self::COLOUR_GREEN,
+			"type" => "bar",
+			"y_axis_id" => "y-axis-1",
+			"datalabels" => [
+				"display" => false
+			],
+		]);
+		$chart->addDataset("Fail", $fail_counts, [
+			"background_colours" => self::COLOUR_RED,
+			"type" => "bar",
+			"y_axis_id" => "y-axis-1",
+			"datalabels" => [
+				"display" => false
+			],
+		]);
+		$chart->setDatalabelSuffixes("%", "", "", "");
+		$chart->print = true;
+		return $chart;
+	}
+
+	/**
+	 * @return Chart[]
+	 * @throws Exception
+	 */
+	public function getPointOfChallengeCharts(): array {
+		$charts = [];
+
+		foreach($this->periodKeys as $index => $key) {
+			$key_label = $this->periodLabels[$index];
+
+			$period_data = $this->periodicData[$key];
+
+			if($period_data->testCount == 0) continue;
+
+			$chart = new Chart;
+			$chart->setType("pie");
+			$chart->setTitle("$key_label Point of Challenge");
+			$chart->setLabels(["On Entry", "While Browsing", "During Play", "On Exit", "No Challenge"]);
+			$chart->addDataset("Counts", [
+				$period_data->stage1Count,
+				$period_data->stage2Count,
+				$period_data->stage3Count,
+				$period_data->stage4Count,
+				$period_data->stage5Count,
+			], [
+				"background_colours" => [
+					self::COLOUR_GREEN,
+					self::COLOUR_YELLOW,
+					self::COLOUR_ORANGE,
+					self::COLOUR_LIGHT_RED,
+					self::COLOUR_RED,
+				],
+				"datalabels" => Chart::DATALABELS_BOX,
+			]);
+			$charts[] = $chart;
+		}
+
+		return $charts;
+	}
+
+	public function getPeriodicTesterGenderChart(): Chart {
+
+		$male_counts = $this->getPeriodicMaleTesterCount();
+		$female_counts = $this->getPeriodicFemaleTesterCount();
+
+		$chart = new Chart;
+		$chart->addYAxis([
+			"id" => "y-axis-1",
+			"tick_config" => ["min" => 0, "max" => ceil(max(max($male_counts), max($female_counts)) / 10) * 10]
+		]);
+
+		$chart->setType("bar");
+		$chart->setTitle("Tester Gender by {$this->resolutionName}");
+		$chart->setLabels($this->xDataLabels);
+		$chart->addDataset("Male", $male_counts, [
+			"background_colours" => self::COLOUR_BLUE
+		]);
+		$chart->addDataset("Female", $female_counts, [
+			"background_colours" => self::COLOUR_MAGENTA
+		]);
+		return $chart;
+	}
+
+	public function getPeriodicTestCountChart(): Chart {
+		$test_counts = $this->getPeriodicTestCounts();
+
+		$chart = new Chart;
+		$chart->addYAxis([
+			"id" => "y-axis-1",
+			"tick_config" => ["min" => 0, "max" => ceil(max($test_counts) / 10) * 10]
+		]);
+		$chart->setType("bar");
+		$chart->setTitle("Tests by {$this->resolutionName}");
+		$chart->setLabels($this->xDataLabels);
+		$chart->addDataset("Tests", $test_counts, [
+			"background_colours" => self::COLOUR_BLUE
+		]);
+		$charts[] = $chart;
+		return $chart;
+	}
+
+	public function getGenderComparisonCharts(): array {
+
+		$charts = [];
+
+		$gender_keys = [
+			"maleChallengeMale" => [
+				"title" => "Male Challenge Male",
+				"label" => "M Cha. M",
+			],
+			"maleChallengeFemale" => [
+				"title" => "Male Challenge Female",
+				"label" => "M Cha. F",
+			],
+			"femaleChallengeMale" => [
+				"title" => "Female Challenge Male",
+				"label" => "F Cha. M",
+			],
+			"femaleChallengeFemale" => [
+				"title" => "Female Challenge Female",
+				"label" => "F Cha. F",
+			],
+			"unknownChallenge" => [
+				"title" => "Gender Not Specified",
+				"label" => "Gender Not Specified",
+			],
+		];
+
+		$gender_test_counts = [];
+		foreach($gender_keys as $gk => $gv) {
+			$gender_test_counts[] = array_sum(array_column($this->periodicData, "{$gk}Count"));
+		}
+
+		// Gender Comparison by Date Range
+		$chart = new Chart;
+		$chart->addYAxis([
+			"id" => "y-axis-1",
+			"tick_config" => ["min" => 0, "max" => ceil(max($gender_test_counts) / 10) * 10]
+		]);
+		$chart->setType("bar");
+		$chart->setTitle("Gender Comparison {$this->dateRangeLabel}");
+		$chart->setLabels(array_column($gender_keys, "label"));
+		$chart->addDataset("Tests", $gender_test_counts, [
+			"background_colours" => self::COLOUR_BLUE
+		]);
+		$charts[] = $chart;
+
+		// Gender Comparison by Resolution
+		$mcm_counts = array_column($this->periodicData, "maleChallengeMaleCount");
+		$mcf_counts = array_column($this->periodicData, "maleChallengeFemaleCount");
+		$fcm_counts = array_column($this->periodicData, "femaleChallengeMaleCount");
+		$fcf_counts = array_column($this->periodicData, "femaleChallengeFemaleCount");
+		$ns_counts = array_column($this->periodicData, "unknownChallengeCount");
+
+		$chart = new Chart;
+		$chart->addYAxis([
+			"id" => "y-axis-1",
+			"tick_config" => ["min" => 0, "max" => ceil(max(max($mcm_counts), max($mcf_counts), max($fcm_counts), max($fcf_counts)) / 10) * 10]
+		]);
+		$chart->setType("bar");
+		$chart->setTitle("Gender Comparison by {$this->resolutionName}");
+		$chart->setLabels($this->xDataLabels);
+		$chart->addDataset("M Cha. M", $mcm_counts, ["background_colours" => self::COLOUR_BLUE]);
+		$chart->addDataset("M Cha. F", $mcf_counts, ["background_colours" => self::COLOUR_DARK_BLUE]);
+		$chart->addDataset("F Cha. M", $fcm_counts, ["background_colours" => self::COLOUR_PURPLE]);
+		$chart->addDataset("F Cha. F", $fcf_counts, ["background_colours" => self::COLOUR_MAGENTA]);
+		$chart->addDataset("Not Specified", $ns_counts, ["background_colours" => self::COLOUR_GREY]);
+		$chart->print = true;
+		$charts[] = $chart;
+
+		// Gender Comparison Pass Rate by Resolution
+		/** @noinspection PhpUnusedLocalVariableInspection */
+		{
+			$mcm_pass_counts = array_column($this->periodicData, "maleChallengeMalePassCount");
+			$mcf_pass_counts = array_column($this->periodicData, "maleChallengeFemalePassCount");
+			$fcm_pass_counts = array_column($this->periodicData, "femaleChallengeMalePassCount");
+			$fcf_pass_counts = array_column($this->periodicData, "femaleChallengeFemalePassCount");
+			$ns_pass_counts = array_column($this->periodicData, "unknownChallengePassCount");
+		}
+
+		/**
+		 * @var float $mcm_pass_rates
+		 * @var float $mcf_pass_rates
+		 * @var float $fcm_pass_rates
+		 * @var float $fcf_pass_rates
+		 * @var float $ns_pass_rates
+		 */
+
+		foreach(["mcm", "mcf", "fcm", "fcf", "ns"] as $prefix) {
+			$pass_rates = [];
+			$pass_counts = ${$prefix . "_pass_counts"};
+			$test_counts = ${$prefix . "_counts"};
+
+			foreach($test_counts as $index => $test_count) {
+				if($test_count == 0) {
+					$pass_rates[] = 0;
+					continue;
+				}
+				$pass_rates[] = number_format(($pass_counts[$index] * 100) / $test_count, 2);
+			}
+
+			${$prefix . "_pass_rates"} = $pass_rates;
+		}
+
+		$chart = new Chart;
+		$chart->addYAxis([
+			"id" => "y-axis-1",
+			"tick_config" => ["min" => 0, "max" => 100],
+		]);
+		$chart->setType("bar");
+		$chart->setTitle("Gender Comparison Pass Rate by {$this->resolutionName}");
+		$chart->setLabels($this->xDataLabels);
+		$chart->addDataset("M Cha. M", $mcm_pass_rates, ["background_colours" => self::COLOUR_BLUE, "datalabels" => ["display" => false],  "line_tension" => 0]);
+		$chart->addDataset("M Cha. F", $mcf_pass_rates, ["background_colours" => self::COLOUR_DARK_BLUE, "datalabels" => ["display" => false], "line_tension" => 0]);
+		$chart->addDataset("F Cha. M", $fcm_pass_rates, ["background_colours" => self::COLOUR_PURPLE, "datalabels" => ["display" => false], "line_tension" => 0]);
+		$chart->addDataset("F Cha. F", $fcf_pass_rates, ["background_colours" => self::COLOUR_MAGENTA, "datalabels" => ["display" => false], "line_tension" => 0]);
+		$chart->addDataset("Not Specified", $ns_pass_rates, ["background_colours" => self::COLOUR_GREY, "datalabels" => ["display" => false], "line_tension" => 0]);
+		$chart->print = true;
+		$chart->setDatalabelSuffixes("%", "%", "%", "%", "%");
+		$charts[] = $chart;
+
+		// Gender Comparison Point of Challenge
+		foreach($this->periodKeys as $index => $key) {
+			$key_label = $this->periodLabels[$index];
+			$period_data = $this->periodicData[$key];
+
+			foreach($gender_keys as $prefix => $gv) {
+
+				$title = $gv["label"];
+				$test_count = $period_data->{$prefix . "Count"};
+				$stage_data = $period_data->{$prefix . "Stages"};
+
+				if($test_count == 0) continue;
+
+				$chart = new Chart;
+				$chart->setType("pie");
+				$chart->setTitle("$key_label $title Point of Challenge");
+				$chart->setLabels(["On Entry", "While Browsing", "During Play", "On Exit", "No Challenge"]);
+				$chart->addDataset("Counts", $stage_data, [
+					"background_colours" => [
+						self::COLOUR_GREEN,
+						self::COLOUR_YELLOW,
+						self::COLOUR_ORANGE,
+						self::COLOUR_LIGHT_RED,
+						self::COLOUR_RED,
+					],
+					"datalabels" => Chart::DATALABELS_BOX,
+				]);
+				$charts[] = $chart;
+			}
+		}
+
+		return $charts;
+	}
+
+	public function hasRegionData(): bool {
+		return $this->regionData !== null;
+	}
+
+	public function getRegionPassRateChart(): Chart {
+
+		$data_values = [];
+
+		$test_counts = [];
+		$pass_counts = [];
+		$fail_counts = [];
+
+		foreach($this->regionData 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);
+		}
+
+		$chart = new Chart;
+		$chart->addYAxis([
+			"id" => "y-axis-1",
+			"tick_config" => ["min" => 0, "max" => 100]
+		]);
+		$chart->setType("bar");
+		$chart->setTitle("Region Pass Rate {$this->dateRangeLabel}");
+		$chart->setLabels($this->getRegionXDataLabels());
+		$chart->addDataset("Pass %", $data_values , [
+			"background_colours" => self::COLOUR_BLUE
+		]);
+		$chart->addPrintDataset("Tests", $test_counts);
+		$chart->addPrintDataset("Pass", $pass_counts);
+		$chart->addPrintDataset("Fail", $fail_counts);
+
+		$chart->setDatalabelSuffixes("%");
+		$chart->print = true;
+		$chart->printTotalColumn = true;
+
+		return $chart;
+	}
+
+	public function getPeriodicRegionPassRateChart(): Chart {
+		$chart = new Chart;
+		$chart->addYAxis([
+			"id" => "y-axis-1",
+			"tick_config" => ["min" => 0, "max" => 100]
+		]);
+		$chart->setType("bar");
+		$chart->setTitle("Region Pass Rate by {$this->resolutionName}");
+		$chart->setLabels($this->getRegionXDataLabels());
+
+		foreach($this->periodKeys as $index => $key) {
+			$data_values = [];
+			foreach($this->getRegionKeys() as $region) {
+				$r_data = $this->regionData[$region][$key];
+				$data_values[] = ($r_data->testCount == 0) ? 0 : round(($r_data->passCount * 100) / $r_data->testCount);
+			}
+			$chart->addDataset($this->periodLabels[$index], $data_values, ["background_colours" => Chart::COLOURS[$index]]);
+		}
+		$chart->setDatalabelSuffixes(...array_fill(0, count($this->periodKeys), "%"));
+		return $chart;
+	}
+
+	public function hasAreaManagerData(): bool {
+		return $this->areaManagerData !== null;
+	}
+
+	public function getAreaManagerPassRateChart(): Chart {
+
+		// Area Pass Rate (Selected Date Range)
+		$data_values = [];
+
+		$test_counts = [];
+		$pass_counts = [];
+		$fail_counts = [];
+
+		foreach($this->areaManagerData 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_area_manager_test_count == 0) ? 0 : round(($total_area_manager_pass_count * 100) / $total_area_manager_test_count);
+		}
+
+		$chart = new Chart;
+		$chart->addXAxis([
+			"type" => "category",
+			"scale_label_config" => [
+				"display" => true,
+				"labelString" => "Area Manager",
+			]
+		]);
+		$chart->addYAxis([
+			"id" => "y-axis-1",
+			"tick_config" => ["min" => 0, "max" => 100]
+		]);
+		$chart->setType("bar");
+		$chart->setTitle("Area Manager Pass Rate {$this->dateRangeLabel}");
+		$chart->setLabels($this->getAreaManagerXDataLabels());
+		$chart->addDataset("Pass %", $data_values , [
+			"background_colours" => self::COLOUR_BLUE
+		]);
+		$chart->addPrintDataset("Tests", $test_counts);
+		$chart->addPrintDataset("Pass", $pass_counts);
+		$chart->addPrintDataset("Fail", $fail_counts);
+		$chart->setDatalabelSuffixes("%");
+		$chart->print = true;
+		$chart->printTotalColumn = true;
+		return $chart;
+	}
+
+	public function getPeriodicAreaManagerPassRateChart(): Chart {
+
+		$chart = new Chart;
+		$chart->addXAxis([
+			"type" => "category",
+			"scale_label_config" => [
+				"display" => true,
+				"labelString" => "Area Manager",
+			]
+		]);
+		$chart->addYAxis([
+			"id" => "y-axis-1",
+			"tick_config" => ["min" => 0, "max" => 100]
+		]);
+		$chart->setType("bar");
+		$chart->setTitle("Area Manager Pass Rate by {$this->resolutionName}");
+		$chart->setLabels($this->getAreaManagerXDataLabels());
+
+		foreach($this->periodKeys as $index => $key) {
+			$data_values = [];
+			foreach($this->getAreaManagerKeys() as $area_manager) {
+				$a_data = $this->areaManagerData[$area_manager][$key];
+				$data_values[] = ($a_data->testCount == 0) ? 0 : round(($a_data->passCount * 100) / $a_data->testCount);
+			}
+			$chart->addDataset($this->periodLabels[$index], $data_values, [
+				"background_colours" => Chart::COLOURS[$index],
+				"datalabels" => [
+					"display" => false,
+				],
+			]);
+		}
+		$chart->setDatalabelSuffixes(...array_fill(0, count($this->periodKeys), "%"));
+		return $chart;
+	}
+
+	public function getCleanlinessChart(): Chart {
+
+		$chart = new Chart;
+		$chart->setType("doughnut");
+		$chart->setTitle("Tests by Cleanliness {$this->dateRangeLabel}");
+		$chart->setLabels(["Very dirty", "Dirty", "Adequate", "Clean", "Very Clean"]);
+		$chart->addDataset("Tests", [
+			$this->totalData->cleanlinessCounts[0],
+			$this->totalData->cleanlinessCounts[1],
+			$this->totalData->cleanlinessCounts[2],
+			$this->totalData->cleanlinessCounts[3],
+			$this->totalData->cleanlinessCounts[4],
+		], [
+			"background_colours" => [
+				self::COLOUR_RED,
+				self::COLOUR_LIGHT_RED,
+				self::COLOUR_ORANGE,
+				self::COLOUR_YELLOW,
+				self::COLOUR_GREEN,
+			],
+			"datalabels" => Chart::DATALABELS_BOX,
+		]);
+		$chart->setPrintSuffixes("");
+		$chart->print = true;
+		$chart->printTotalColumn = true;
+		$chart->printPercentages = true;
+		return $chart;
+	}
+
+	/**
+	 * @return Chart[]
+	 * @throws Exception
+	 */
+	public function getPeriodicCleanlinessCharts(): array {
+		$charts = [];
+
+		foreach($this->periodKeys as $index => $key) {
+			$key_label = $this->periodLabels[$index];
+
+			$period_data = $this->periodicData[$key];
+
+			if($period_data->testCount == 0) continue;
+
+			$chart = new Chart;
+			$chart->setType("pie");
+			$chart->setTitle("$key_label Cleanliness");
+			$chart->setLabels(["Very dirty", "Dirty", "Adequate", "Clean", "Very Clean"]);
+			$chart->addDataset("Counts", [
+				$period_data->cleanlinessCounts[0],
+				$period_data->cleanlinessCounts[1],
+				$period_data->cleanlinessCounts[2],
+				$period_data->cleanlinessCounts[3],
+				$period_data->cleanlinessCounts[4],
+			], [
+				"background_colours" => [
+					self::COLOUR_RED,
+					self::COLOUR_LIGHT_RED,
+					self::COLOUR_ORANGE,
+					self::COLOUR_YELLOW,
+					self::COLOUR_GREEN,
+				],
+				"datalabels" => Chart::DATALABELS_BOX,
+			]);
+			$charts[] = $chart;
+		}
+
+		return $charts;
+	}
+
+	public function getPeriodicStaffBadgeWornChart(): Chart {
+		$staff_badge_worn_counts = array_column($this->periodicData, "staffBadgeWornCounts");
+
+		$unknown_counts = array_column($staff_badge_worn_counts, 0);
+		$no_counts = array_column($staff_badge_worn_counts, 1);
+		$yes_counts = array_column($staff_badge_worn_counts, 2);
+
+		$chart = new Chart;
+		$chart->setType("bar");
+		$chart->setTitle("Staff Badge Worn by {$this->resolutionName}");
+		$chart->setLabels($this->xDataLabels);
+		$chart->addDataset("Don't know", $unknown_counts, [
+			"background_colours" => self::COLOUR_LIGHT_GREY
+		]);
+		$chart->addDataset("No", $no_counts, [
+			"background_colours" => self::COLOUR_RED
+		]);
+		$chart->addDataset("Yes", $yes_counts, [
+			"background_colours" => self::COLOUR_GREEN
+		]);
+		return $chart;
+	}
+
+	public function getPeriodicStaffOfferedDrinkChart(): Chart {
+		$counts = array_column($this->periodicData, "staffOfferedDrinkCounts");
+		return $this->getPeriodicBooleanChart("Staff Offered Drink", $counts);
+	}
+
+	public function getPeriodicStaffOfferedPromotionChart(): Chart {
+		$counts = array_column($this->periodicData, "staffOfferedPromotionCounts");
+		return $this->getPeriodicBooleanChart("Staff Offered Promotion", $counts);
+	}
+
+	public function getPeriodicStaffOfferedHelpChart(): Chart {
+		$counts = array_column($this->periodicData, "staffOfferedHelpCounts");
+		return $this->getPeriodicBooleanChart("Staff Offered Help", $counts);
+	}
+
+	public function getPeriodicStaffBehaviourCharts(): array {
+
+		$charts = [];
+
+		foreach($this->periodKeys as $index => $key) {
+			$key_label = $this->periodLabels[$index];
+
+			$period_data = $this->periodicData[$key];
+
+			if($period_data->testCount == 0) continue;
+
+			$chart = new Chart;
+			$chart->setType("pie");
+			$chart->setTitle("$key_label Staff Behaviour");
+			$chart->setLabels(["N/A", "Rude", "Slightly rude", "Neither rude or polite", "Polite", "Very polite"]);
+			$chart->addDataset("Counts", [
+				$period_data->staffBehaviourCounts[0],
+				$period_data->staffBehaviourCounts[1],
+				$period_data->staffBehaviourCounts[2],
+				$period_data->staffBehaviourCounts[3],
+				$period_data->staffBehaviourCounts[4],
+				$period_data->staffBehaviourCounts[5],
+			], [
+				"background_colours" => [
+					self::COLOUR_LIGHT_GREY,
+					self::COLOUR_RED,
+					self::COLOUR_LIGHT_RED,
+					self::COLOUR_ORANGE,
+					self::COLOUR_YELLOW,
+					self::COLOUR_GREEN,
+				],
+				"datalabels" => Chart::DATALABELS_BOX,
+			]);
+			$charts[] = $chart;
+		}
+
+		return $charts;
+	}
+
+	public function getPeriodicStaffUniformChart(): Chart {
+		$counts = array_column($this->periodicData, "staffUniformCounts");
+		return $this->getPeriodicBooleanChart("Staff Uniform", $counts);
+	}
+
+	// Private methods
+
+	private function getPeriodicPassRates() {
+		return array_values(array_map(function($d) {
+			if($d->testCount == 0) return 0;
+			return round(($d->passCount / $d->testCount) * 100);
+		}, $this->periodicData));
+	}
+
+	private function getPeriodicFailRates() {
+		return array_values(array_map(function($d) {
+			if($d->testCount == 0) return 0;
+			$pass_rate = round(($d->passCount / $d->testCount) * 100);
+			return 100 - $pass_rate;
+		}, $this->periodicData));
+	}
+
+	private function getPeriodicPassRateByDoorSensorAlert(int $index) {
+		return array_values(array_map(function($data) use ($index) {
+			if($data->testCount == 0) return null;
+			if($data->doorSensorAlertFailCounts[$index] == 0) return 100;
+			return round(($data->doorSensorAlertPassCounts[$index] / $data->testCount) * 100);
+		}, $this->periodicData));
+	}
+
+	private function getPeriodicPassRateByEyeContact(int $index) {
+		return array_values(array_map(function($data) use ($index) {
+			if($data->testCount == 0) return null;
+			if($data->eyeContactFailCounts[$index] == 0) return 100;
+			return round(($data->eyeContactPassCounts[$index] / $data->testCount) * 100);
+		}, $this->periodicData));
+	}
+
+	private function getPeriodicPassRateByLineOfSight(int $index) {
+		return array_values(array_map(function($data) use ($index) {
+			if($data->testCount == 0) return null;
+			if($data->lineOfSightFailCounts[$index] == 0) return 100;
+			return round(($data->lineOfSightPassCounts[$index] / $data->testCount) * 100);
+		}, $this->periodicData));
+	}
+
+	private function getPeriodicPassRateByBarPurchase(int $index) {
+		return array_values(array_map(function($data) use ($index) {
+			if($data->testCount == 0) return null;
+			if($data->barPurchaseFailCounts[$index] == 0) return 100;
+			return round(($data->barPurchasePassCounts[$index] / $data->testCount) * 100);
+		}, $this->periodicData));
+	}
+
+	private function getEyeContactRates(): array {
+		return array_values(array_map(function($period) {
+			if($period->testCount == 0) return [0, 0, 0];
+
+			$yes = round(($period->eyeContactCounts[0] / $period->testCount) * 100);
+			$no = 100 - $yes;
+			$na = 0;
+
+			return [$yes, $no, $na];
+		}, $this->periodicData));
+	}
+
+	private function getPeriodicTestCounts(): array {
+		return array_column($this->periodicData, "testCount");
+	}
+
+	private function getPeriodicPassCounts(): array {
+		return array_column($this->periodicData, "passCount");
+	}
+
+	private function getPeriodicFailCounts(): array {
+		return array_column($this->periodicData, "failCount");
+	}
+
+	private function getPeriodicMaleTesterCount(): array {
+		return array_values(array_map(function($d) {
+			return $d->maleTesterCount;
+		}, $this->periodicData));
+	}
+
+	private function getPeriodicFemaleTesterCount(): array {
+		return array_values(array_map(function($d) {
+			return $d->femaleTesterCount;
+		}, $this->periodicData));
+	}
+
+	private function getRegionKeys(): array {
+		if(!$this->regionData) return [];
+		return array_keys($this->regionData);
+	}
+
+	private function getRegionXDataLabels(): array {
+		return array_map(function($key) {
+			return "Region $key";
+		}, $this->getRegionKeys());
+	}
+
+	private function getAreaManagerKeys(): array {
+		if(!$this->areaManagerData) return [];
+		return array_keys($this->areaManagerData);
+	}
+
+	private function getAreaManagerXDataLabels(): array {
+		return $this->getAreaManagerKeys();
+	}
+
+	private function getPeriodicBooleanChart(string $title, array $values): Chart {
+
+		$no_counts = array_column($values, 0);
+		$yes_counts = array_column($values, 1);
+
+		$chart = new Chart;
+		$chart->setType("bar");
+		$chart->setTitle("{$title} by {$this->resolutionName}");
+		$chart->setLabels($this->xDataLabels);
+		$chart->addDataset("No", $no_counts, [
+			"background_colours" => self::COLOUR_RED
+		]);
+		$chart->addDataset("Yes", $yes_counts, [
+			"background_colours" => self::COLOUR_GREEN
+		]);
+		return $chart;
+	}
+
+	private function getPeriodicPassRateChart(string $title, array $yes_rates, array $no_rates, ?array $null_rates = null) {
+
+		$chart = new Chart;
+		$chart->addYAxis([
+			"tick_config" => ["min" => 0, "max" => 100],
+		]);
+
+		$chart->setType("line");
+		$chart->setTitle($title);
+		$chart->setLabels($this->xDataLabels);
+
+		$chart->setDatalabelSuffixes("%", "%");
+
+		if($null_rates !== null) {
+			$chart->addDataset("Don't Know", $null_rates, [
+				"background_colours" => self::COLOUR_GREY . "3F",
+				"border_colours" => self::COLOUR_GREY,
+				"line_tension" => 0,
+				"datalabels" => ["display" => false],
+			]);
+			$chart->setDatalabelSuffixes("%", "%", "%");
+		}
+
+		$chart->addDataset("No", $no_rates, [
+			"background_colours" => self::COLOUR_RED . "3F",
+			"border_colours" => self::COLOUR_RED,
+			"line_tension" => 0,
+			"datalabels" => ["display" => false],
+		]);
+
+		$chart->addDataset("Yes", $yes_rates, [
+			"background_colours" => self::COLOUR_GREEN . "3F",
+			"border_colours" => self::COLOUR_GREEN,
+			"line_tension" => 0,
+			"datalabels" => ["display" => false],
+		]);
+
+		$chart->print = true;
+		return $chart;
+	}
+
+}

+ 22 - 587
template_processing/age_verification/reports_build_charts.php

@@ -1,592 +1,27 @@
 <?php
 
-// Tests by Stage
-
-$chart = new Chart;
-$chart->setType("doughnut");
-$chart->setTitle("Tests by Stage $date_range_label");
-$chart->setLabels(["1 - On Entry", "2 - While Browsing", "3 - During Play", "4 - On Exit", "5 - No Challenge"]);
-$chart->addDataset("Tests", [
-	$total_data->stage1Count,
-	$total_data->stage2Count,
-	$total_data->stage3Count,
-	$total_data->stage4Count,
-	$total_data->stage5Count,
-], [
-	"background_colours" => [
-		"#4CAF50",
-		"#FFEB3B",
-		"#FBC02D",
-		"#FFAB91",
-		"#F44336",
-	],
-	"datalabels" => Chart::DATALABELS_BOX,
-]);
-$chart->setPrintSuffixes("");
-$chart->print = true;
-$chart->printPercentages = true;
-$chart->printTotalColumn = true;
-$chart->setPrintLabels(["Stage 1", "Stage 2", "Stage 3", "Stage 4", "Stage 5"]);
-
-$charts[] = $chart;
-
-
-// Challenger Gender
-$chart = new Chart;
-$chart->setType("pie");
-$chart->setTitle("Staff Gender $date_range_label");
-$chart->setLabels(["Male", "Female", "Unspecified"]);
-$chart->addDataset("Counts", [
-	$total_data->maleChallengerCount,
-	$total_data->femaleChallengerCount,
-	$total_data->unspecifiedChallengerCount,
-], [
-	"background_colours" => [
-		"#2196F3",
-		"#E91E63",
-		"#9E9E9E",
-	],
-	"datalabels" => Chart::DATALABELS_BOX,
-]);
-$charts[] = $chart;
-
-// Tester Gender
-$chart = new Chart;
-$chart->setType("pie");
-$chart->setTitle("Tester Gender $date_range_label");
-$chart->setLabels(["Male", "Female"]);
-$chart->addDataset("Counts", [
-	$total_data->maleTesterCount,
-	$total_data->femaleTesterCount,
-], [
-	"background_colours" => [
-		"#2196F3",
-		"#E91E63",
-	],
-	"datalabels" => Chart::DATALABELS_BOX,
-]);
-$charts[] = $chart;
-
-// Pass / Fail
-$chart = new Chart;
-$chart->setType("pie");
-$chart->setTitle("Pass / Fail $date_range_label");
-$chart->setLabels(["Pass", "Fail"]);
-$chart->addDataset("Counts", [
-	$total_data->passCount,
-	$total_data->failCount,
-], [
-	"background_colours" => [
-		"#4CAF50",
-		"#F44336",
-	],
-	"datalabels" => Chart::DATALABELS_BOX,
-]);
-$charts[] = $chart;
-
-// Pass Rate Period
-$pass_rates = array_values(array_map(function($d) {
-	if($d->testCount == 0) return 0;
-	return round(($d->passCount / $d->testCount) * 100);
-}, $data));
-
-$fail_rates = array_values(array_map(function($d) {
-	if($d->testCount == 0) return 0;
-	$pass_rate = round(($d->passCount / $d->testCount) * 100);
-	return 100 - $pass_rate;
-}, $data));
-
-$chart = new Chart;
-$chart->addXAxis([
-	"type" => "category",
-	"stacked" => true,
-]);
-$chart->addYAxis([
-	"id" => "y-axis-1",
-	"tick_config" => ["min" => 0, "max" => 100],
-	"stacked" => true,
-]);
-
-$chart->setType("bar");
-$chart->setTitle("Pass / Fail by $resolution_name");
-$chart->setLabels($x_data_labels);
-$chart->addDataset("Pass Rate (%)", $pass_rates, [
-	"background_colours" => "#4CAF50"
-]);
-$chart->addDataset("Fail Rate (%)", $fail_rates, [
-	"background_colours" => "#F44336"
-]);
-$chart->setDatalabelSuffixes("%", "%");
-$charts[] = $chart;
-
-// Eye Contact Period
-$eye_contact_rates = array_values(array_map(function($period) {
-	if($period->testCount == 0) return [0, 0, 0];
-
-	$yes = round(($period->eyeContactCounts[0] / $period->testCount) * 100);
-	$no = 100 - $yes;
-	$na = 0;
-
-	return [$yes, $no, $na];
-}, $data));
-
-$chart = new Chart;
-$chart->addXAxis([
-	"type" => "category",
-	"stacked" => true,
-]);
-$chart->addYAxis([
-	"id" => "y-axis-1",
-	"tick_config" => ["min" => 0, "max" => 100],
-	"stacked" => true,
-]);
-$chart->setType("bar");
-$chart->setTitle("Eye Contact by {$resolution_name}");
-$chart->setLabels($x_data_labels);
-$chart->addDataset("Yes (%)", array_column($eye_contact_rates, 0), [
-	"background_colours" => "#4CAF50"
-]);
-$chart->addDataset("No (%)", array_column($eye_contact_rates, 1), [
-	"background_colours" => "#F44336"
-]);
-$chart->setDatalabelSuffixes("%", "%");
-$charts[] = $chart;
-
-// Totals by Period
-
-$test_counts = array_column($data, "testCount");
-$pass_counts = array_column($data, "passCount");
-$fail_counts = array_column($data, "failCount");
-
-$chart = new Chart;
-$chart->setType("bar");
-$chart->setTitle("Totals by $resolution_name");
-$chart->setLabels($x_data_labels);
-$chart->addYAxis([
-	"id" => "y-axis-1",
-	"tick_config" => ["min" => 0, "max" => ceil(max($test_counts) / 10) * 10]
-]);
-$chart->addYAxis([
-	"position" => "right",
-	"id" => "y-axis-2",
-	"grid_lines" => false,
-	"tick_config" => ["min" => 0, "max" => 100]
-]);
-
-$chart->addDataset("Pass Rate (%)", $pass_rates, [
-	"border_colours" => "#FFEB3B",
-	"background_colours" => "transparent",
-	"type" => "line",
-	"y_axis_id" => "y-axis-2",
-	"datalabels" => [
-		"display" => false
-	],
-	"line_tension" => 0,
-]);
-$chart->addDataset("Test Count", $test_counts, [
-	"background_colours" => "#2196F3",
-	"type" => "bar",
-	"y_axis_id" => "y-axis-1",
-	"datalabels" => [
-		"display" => false
-	],
-]);
-$chart->addDataset("Pass", $pass_counts, [
-	"background_colours" => "#4CAF50",
-	"type" => "bar",
-	"y_axis_id" => "y-axis-1",
-	"datalabels" => [
-		"display" => false
-	],
-]);
-$chart->addDataset("Fail", $fail_counts, [
-	"background_colours" => "#F44336",
-	"type" => "bar",
-	"y_axis_id" => "y-axis-1",
-	"datalabels" => [
-		"display" => false
-	],
-]);
-$chart->setDatalabelSuffixes("%", "", "", "");
-$chart->print = true;
-$charts[] = $chart;
-
-// Point of Challenge (Each Period)
-
-foreach($keys as $index => $key) {
-	$key_label = $key_labels[$index];
-
-	$period_data = $data[$key];
-
-	if($period_data->testCount == 0) continue;
-
-	$chart = new Chart;
-	$chart->setType("pie");
-	$chart->setTitle("$key_label Point of Challenge");
-	$chart->setLabels(["On Entry", "While Browsing", "During Play", "On Exit", "No Challenge"]);
-	$chart->addDataset("Counts", [
-		$period_data->stage1Count,
-		$period_data->stage2Count,
-		$period_data->stage3Count,
-		$period_data->stage4Count,
-		$period_data->stage5Count,
-	], [
-		"background_colours" => [
-			"#4CAF50",
-			"#FFEB3B",
-			"#FBC02D",
-			"#FFAB91",
-			"#F44336",
-		],
-		"datalabels" => Chart::DATALABELS_BOX,
-	]);
-	$charts[] = $chart;
+/** @var ChartGenerator $generator */
+
+$charts[] = $generator->getTestsByStageChart();
+$charts[] = $generator->getChallengerGenderChart();
+$charts[] = $generator->getTesterGenderChart();
+$charts[] = $generator->getPassFailCountChart();
+$charts[] = $generator->getPeriodicPassFailRateChart();
+$charts[] = $generator->getPeriodicEyeContactChart();
+$charts[] = $generator->getPeriodicDoorSensorAlertPassRateChart();
+$charts[] = $generator->getPeriodicEyeContactPassRateChart();
+$charts[] = $generator->getPeriodicTotalsChart();
+$charts = array_merge($charts, $generator->getPointOfChallengeCharts());
+$charts[] = $generator->getPeriodicTesterGenderChart();
+$charts[] = $generator->getPeriodicTestCountChart();
+$charts = array_merge($charts, $generator->getGenderComparisonCharts());
+
+if($generator->hasRegionData()) {
+	$charts[] = $generator->getRegionPassRateChart();
+	$charts[] = $generator->getPeriodicRegionPassRateChart();
 }
 
-// Tester Genders by Period
-$male_counts = array_values(array_map(function($d) {
-	return $d->maleTesterCount;
-}, $data));
-
-$female_counts = array_values(array_map(function($d) {
-	return $d->femaleTesterCount;
-}, $data));
-
-$chart = new Chart;
-$chart->addYAxis([
-	"id" => "y-axis-1",
-	"tick_config" => ["min" => 0, "max" => ceil(max(max($male_counts), max($female_counts)) / 10) * 10]
-]);
-
-$chart->setType("bar");
-$chart->setTitle("Tester Gender by $resolution_name");
-$chart->setLabels($x_data_labels);
-$chart->addDataset("Male", $male_counts, [
-	"background_colours" => "#2196F3"
-]);
-$chart->addDataset("Female", $female_counts, [
-	"background_colours" => "#E91E63"
-]);
-$charts[] = $chart;
-
-// Test Count by Period
-$test_counts = array_values(array_map(function($d) {
-	return $d->testCount;
-}, $data));
-
-$chart = new Chart;
-$chart->addYAxis([
-	"id" => "y-axis-1",
-	"tick_config" => ["min" => 0, "max" => ceil(max($test_counts) / 10) * 10]
-]);
-$chart->setType("bar");
-$chart->setTitle("Tests by $resolution_name");
-$chart->setLabels($x_data_labels);
-$chart->addDataset("Tests", $test_counts, [
-	"background_colours" => "#2196F3"
-]);
-$charts[] = $chart;
-
-// Gender Graphs
-$gender_keys = [
-	"maleChallengeMale" => [
-		"title" => "Male Challenge Male",
-		"label" => "M Cha. M",
-	],
-	"maleChallengeFemale" => [
-		"title" => "Male Challenge Female",
-		"label" => "M Cha. F",
-	],
-	"femaleChallengeMale" => [
-		"title" => "Female Challenge Male",
-		"label" => "F Cha. M",
-	],
-	"femaleChallengeFemale" => [
-		"title" => "Female Challenge Female",
-		"label" => "F Cha. F",
-	],
-	"unknownChallenge" => [
-		"title" => "Gender Not Specified",
-		"label" => "Gender Not Specified",
-	],
-];
-
-$gender_test_counts = [];
-foreach($gender_keys as $gk => $gv) {
-	$gender_test_counts[] = array_sum(array_column($data, "{$gk}Count"));
+if($generator->hasAreaManagerData()) {
+	$charts[] = $generator->getAreaManagerPassRateChart();
+	$charts[] = $generator->getPeriodicAreaManagerPassRateChart();
 }
-
-// Gender Comparison by Date Range
-$chart = new Chart;
-$chart->addYAxis([
-	"id" => "y-axis-1",
-	"tick_config" => ["min" => 0, "max" => ceil(max($gender_test_counts) / 10) * 10]
-]);
-$chart->setType("bar");
-$chart->setTitle("Gender Comparison $date_range_label");
-$chart->setLabels(array_column($gender_keys, "label"));
-$chart->addDataset("Tests", $gender_test_counts, [
-	"background_colours" => "#2196F3"
-]);
-$charts[] = $chart;
-
-// Gender Comparison by Resolution
-$mcm_counts = array_column($data, "maleChallengeMaleCount");
-$mcf_counts = array_column($data, "maleChallengeFemaleCount");
-$fcm_counts = array_column($data, "femaleChallengeMaleCount");
-$fcf_counts = array_column($data, "femaleChallengeFemaleCount");
-$ns_counts = array_column($data, "unknownChallengeCount");
-
-$chart = new Chart;
-$chart->addYAxis([
-	"id" => "y-axis-1",
-	"tick_config" => ["min" => 0, "max" => ceil(max(max($mcm_counts), max($mcf_counts), max($fcm_counts), max($fcf_counts)) / 10) * 10]
-]);
-$chart->setType("bar");
-$chart->setTitle("Gender Comparison by $resolution_name");
-$chart->setLabels($x_data_labels);
-$chart->addDataset("M Cha. M", $mcm_counts, ["background_colours" => "#2196F3"]);
-$chart->addDataset("M Cha. F", $mcf_counts, ["background_colours" => "#3F51B5"]);
-$chart->addDataset("F Cha. M", $fcm_counts, ["background_colours" => "#9C27B0"]);
-$chart->addDataset("F Cha. F", $fcf_counts, ["background_colours" => "#E91E63"]);
-$chart->addDataset("Not Specified", $ns_counts, ["background_colours" => "#9E9E9E"]);
-$chart->print = true;
-$charts[] = $chart;
-
-// Gender Comparison Pass Rate by Resolution
-$mcm_pass_counts = array_column($data, "maleChallengeMalePassCount");
-$mcf_pass_counts = array_column($data, "maleChallengeFemalePassCount");
-$fcm_pass_counts = array_column($data, "femaleChallengeMalePassCount");
-$fcf_pass_counts = array_column($data, "femaleChallengeFemalePassCount");
-$ns_pass_counts = array_column($data, "unknownChallengePassCount");
-
-foreach(["mcm", "mcf", "fcm", "fcf", "ns"] as $prefix) {
-	$pass_rates = [];
-	$pass_counts = ${$prefix . "_pass_counts"};
-	$test_counts = ${$prefix . "_counts"};
-
-	foreach($test_counts as $index => $test_count) {
-		if($test_count == 0) {
-			$pass_rates[] = 0;
-			continue;
-		}
-		$pass_rates[] = number_format(($pass_counts[$index] * 100) / $test_count, 2);
-	}
-
-	${$prefix . "_pass_rates"} = $pass_rates;
-}
-
-$chart = new Chart;
-$chart->addYAxis([
-	"id" => "y-axis-1",
-	"tick_config" => ["min" => 0, "max" => 100],
-]);
-$chart->setType("bar");
-$chart->setTitle("Gender Comparison Pass Rate by $resolution_name");
-$chart->setLabels($x_data_labels);
-$chart->addDataset("M Cha. M", $mcm_pass_rates, ["background_colours" => "#2196F3", "datalabels" => ["display" => false],  "line_tension" => 0]);
-$chart->addDataset("M Cha. F", $mcf_pass_rates, ["background_colours" => "#3F51B5", "datalabels" => ["display" => false], "line_tension" => 0]);
-$chart->addDataset("F Cha. M", $fcm_pass_rates, ["background_colours" => "#9C27B0", "datalabels" => ["display" => false], "line_tension" => 0]);
-$chart->addDataset("F Cha. F", $fcf_pass_rates, ["background_colours" => "#E91E63", "datalabels" => ["display" => false], "line_tension" => 0]);
-$chart->addDataset("Not Specified", $ns_pass_rates, ["background_colours" => "#9E9E9E", "datalabels" => ["display" => false], "line_tension" => 0]);
-$chart->print = true;
-$chart->setDatalabelSuffixes("%", "%", "%", "%", "%");
-$charts[] = $chart;
-
-// Gender Comparison Point of Challenge
-foreach($keys as $index => $key) {
-	$key_label = $key_labels[$index];
-	$period_data = $data[$key];
-
-	foreach($gender_keys as $prefix => $gv) {
-
-		$title = $gv["label"];
-		$test_count = $period_data->{$prefix . "Count"};
-		$stage_data = $period_data->{$prefix . "Stages"};
-
-		if($test_count == 0) continue;
-
-		$chart = new Chart;
-		$chart->setType("pie");
-		$chart->setTitle("$key_label $title Point of Challenge");
-		$chart->setLabels(["On Entry", "While Browsing", "During Play", "On Exit", "No Challenge"]);
-		$chart->addDataset("Counts", $stage_data, [
-			"background_colours" => [
-				"#4CAF50",
-				"#FFEB3B",
-				"#FBC02D",
-				"#FFAB91",
-				"#F44336",
-			],
-			"datalabels" => Chart::DATALABELS_BOX,
-		]);
-		$charts[] = $chart;
-	}
-}
-
-// Region Graphs
-if($has_regions) {
-
-	ksort($region_data, SORT_NATURAL);
-
-	$region_keys = array_keys($region_data);
-
-	$x_data_labels = array_map(function($key) {
-		return "Region $key";
-	}, $region_keys);
-
-	// 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);
-	}
-
-	$chart = new Chart;
-	$chart->addYAxis([
-		"id" => "y-axis-1",
-		"tick_config" => ["min" => 0, "max" => 100]
-	]);
-	$chart->setType("bar");
-	$chart->setTitle("Region Pass Rate $date_range_label");
-	$chart->setLabels($x_data_labels);
-	$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;
-	$chart->printTotalColumn = true;
-	$charts[] = $chart;
-
-	// Region Pass Rate Period
-	$chart = new Chart;
-	$chart->addYAxis([
-		"id" => "y-axis-1",
-		"tick_config" => ["min" => 0, "max" => 100]
-	]);
-	$chart->setType("bar");
-	$chart->setTitle("Region Pass Rate by $resolution_name");
-	$chart->setLabels($x_data_labels);
-
-	foreach($keys as $index => $key) {
-		$data_values = [];
-		foreach($region_keys as $region) {
-			$r_data = $region_data[$region][$key];
-			$data_values[] = ($r_data->testCount == 0) ? 0 : round(($r_data->passCount * 100) / $r_data->testCount);
-		}
-		$chart->addDataset($key_labels[$index], $data_values, ["background_colours" => Chart::COLOURS[$index]]);
-	}
-	$chart->setDatalabelSuffixes(...array_fill(0, count($keys), "%"));
-
-	$charts[] = $chart;
-
-}
-
-// Area Manager Graphs
-if($has_area_managers) {
-
-	ksort($area_manager_data, SORT_NATURAL);
-
-	$area_manager_keys = array_keys($area_manager_data);
-
-	$x_data_labels = array_map(function($key) {
-		return "$key";
-	}, $area_manager_keys);
-
-	// 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_area_manager_test_count == 0) ? 0 : round(($total_area_manager_pass_count * 100) / $total_area_manager_test_count);
-	}
-
-	$chart = new Chart;
-	$chart->addXAxis([
-		"type" => "category",
-		"scale_label_config" => [
-			"display" => true,
-			"labelString" => "Area Manager",
-		]
-	]);
-	$chart->addYAxis([
-		"id" => "y-axis-1",
-		"tick_config" => ["min" => 0, "max" => 100]
-	]);
-	$chart->setType("bar");
-	$chart->setTitle("Area Manager Pass Rate $date_range_label");
-	$chart->setLabels($x_data_labels);
-	$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;
-	$chart->printTotalColumn = true;
-	$charts[] = $chart;
-
-	// Area Pass Rate Period
-	$chart = new Chart;
-	$chart->addXAxis([
-		"type" => "category",
-		"scale_label_config" => [
-			"display" => true,
-			"labelString" => "Area Manager",
-		]
-	]);
-	$chart->addYAxis([
-		"id" => "y-axis-1",
-		"tick_config" => ["min" => 0, "max" => 100]
-	]);
-	$chart->setType("bar");
-	$chart->setTitle("Area Manager Pass Rate by $resolution_name");
-	$chart->setLabels($x_data_labels);
-
-	foreach($keys as $index => $key) {
-		$data_values = [];
-		foreach($area_manager_keys as $area_manager) {
-			$a_data = $area_manager_data[$area_manager][$key];
-			$data_values[] = ($a_data->testCount == 0) ? 0 : round(($a_data->passCount * 100) / $a_data->testCount);
-		}
-		$chart->addDataset($key_labels[$index], $data_values, [
-			"background_colours" => Chart::COLOURS[$index],
-			"datalabels" => [
-				"display" => false,
-			],
-		]);
-	}
-	$chart->setDatalabelSuffixes(...array_fill(0, count($keys), "%"));
-
-	$charts[] = $chart;
-
-}
-
-?>

+ 6 - 0
template_processing/age_verification/reports_create_empty_objects.php

@@ -8,6 +8,12 @@ $empty_data = (object) [
 
 	"eyeContactCounts" => [0, 0, 0],
 
+	"eyeContactPassCounts" => [0, 0, 0],
+	"eyeContactFailCounts" => [0, 0, 0],
+
+	"lineOfSightPassCounts" => [0, 0, 0],
+	"lineOfSightFailCounts" => [0, 0, 0],
+
 	"maleTesterCount" => 0,
 	"femaleTesterCount" => 0,
 

+ 41 - 0
template_processing/age_verification/reports_process_test.php

@@ -1,20 +1,61 @@
 <?php
 
+/**
+ * @var object $total_data Total data
+ * @var array $data Periodic data
+ * @var string $key Current period key
+ * @var string $region
+ * @var string $area_manager
+ * @var Test $test
+ * @var array $test_values
+ */
+
+$booleanPassFieldIncrementor = function($value, $pass, $prefix) use (&$data, $key) {
+
+	if($pass) {
+		$field = $prefix . "PassCounts";
+	}
+	else {
+		$field = $prefix . "FailCounts";
+	}
+
+	if($value === null) {
+		$index = 2;
+	}
+	else if($value) {
+		$index = 1;
+	}
+	else {
+		$index = 0;
+	}
+
+	$data[$key]->$field[$index]++;
+};
+
 $stage_key = "stage" . $test->challenge_stage . "Count";
 $data[$key]->$stage_key++;
 $total_data->{$stage_key}++;
 
+$door_sensor_alert = $test_values->door_sensor_alert ?? null;
+$eye_contact = $test->challenger_eye_contact ?? null;
+
 if($test->pass) {
 	$data[$key]->passCount++;
 	$total_data->passCount++;
 	if($region) $region_data[$region][$key]->passCount++;
 	if($area_manager) $area_manager_data[$area_manager][$key]->passCount++;
+
+	$booleanPassFieldIncrementor($eye_contact, true, "eyeContact");
+	$booleanPassFieldIncrementor($door_sensor_alert, true, "doorSensorAlert");
 }
 else {
 	$data[$key]->failCount++;
 	$total_data->failCount++;
 	if($region) $region_data[$region][$key]->failCount++;
 	if($area_manager) $area_manager_data[$area_manager][$key]->failCount++;
+
+	$booleanPassFieldIncrementor($eye_contact, false, "eyeContact");
+	$booleanPassFieldIncrementor($door_sensor_alert, false, "doorSensorAlert");
 }
 
 if($test->challenger_gender == "M") {

+ 24 - 587
template_processing/age_verification_mitchells_butlers/reports_build_charts.php

@@ -1,592 +1,29 @@
 <?php
 
-// Tests by Stage
-
-$chart = new Chart;
-$chart->setType("doughnut");
-$chart->setTitle("Tests by Stage $date_range_label");
-$chart->setLabels(["1 - On Entry", "2 - While Browsing", "3 - During Play", "4 - On Exit", "5 - No Challenge"]);
-$chart->addDataset("Tests", [
-	$total_data->stage1Count,
-	$total_data->stage2Count,
-	$total_data->stage3Count,
-	$total_data->stage4Count,
-	$total_data->stage5Count,
-], [
-	"background_colours" => [
-		"#4CAF50",
-		"#FFEB3B",
-		"#FBC02D",
-		"#FFAB91",
-		"#F44336",
-	],
-	"datalabels" => Chart::DATALABELS_BOX,
-]);
-$chart->setPrintSuffixes("");
-$chart->print = true;
-$chart->printPercentages = true;
-$chart->printTotalColumn = true;
-$chart->setPrintLabels(["Stage 1", "Stage 2", "Stage 3", "Stage 4", "Stage 5"]);
-
-$charts[] = $chart;
-
-
-// Challenger Gender
-$chart = new Chart;
-$chart->setType("pie");
-$chart->setTitle("Staff Gender $date_range_label");
-$chart->setLabels(["Male", "Female", "Unspecified"]);
-$chart->addDataset("Counts", [
-	$total_data->maleChallengerCount,
-	$total_data->femaleChallengerCount,
-	$total_data->unspecifiedChallengerCount,
-], [
-	"background_colours" => [
-		"#2196F3",
-		"#E91E63",
-		"#9E9E9E",
-	],
-	"datalabels" => Chart::DATALABELS_BOX,
-]);
-$charts[] = $chart;
-
-// Tester Gender
-$chart = new Chart;
-$chart->setType("pie");
-$chart->setTitle("Tester Gender $date_range_label");
-$chart->setLabels(["Male", "Female"]);
-$chart->addDataset("Counts", [
-	$total_data->maleTesterCount,
-	$total_data->femaleTesterCount,
-], [
-	"background_colours" => [
-		"#2196F3",
-		"#E91E63",
-	],
-	"datalabels" => Chart::DATALABELS_BOX,
-]);
-$charts[] = $chart;
-
-// Pass / Fail
-$chart = new Chart;
-$chart->setType("pie");
-$chart->setTitle("Pass / Fail $date_range_label");
-$chart->setLabels(["Pass", "Fail"]);
-$chart->addDataset("Counts", [
-	$total_data->passCount,
-	$total_data->failCount,
-], [
-	"background_colours" => [
-		"#4CAF50",
-		"#F44336",
-	],
-	"datalabels" => Chart::DATALABELS_BOX,
-]);
-$charts[] = $chart;
-
-// Pass Rate Period
-$pass_rates = array_values(array_map(function($d) {
-	if($d->testCount == 0) return 0;
-	return round(($d->passCount / $d->testCount) * 100);
-}, $data));
-
-$fail_rates = array_values(array_map(function($d) {
-	if($d->testCount == 0) return 0;
-	$pass_rate = round(($d->passCount / $d->testCount) * 100);
-	return 100 - $pass_rate;
-}, $data));
-
-$chart = new Chart;
-$chart->addXAxis([
-	"type" => "category",
-	"stacked" => true,
-]);
-$chart->addYAxis([
-	"id" => "y-axis-1",
-	"tick_config" => ["min" => 0, "max" => 100],
-	"stacked" => true,
-]);
-
-$chart->setType("bar");
-$chart->setTitle("Pass / Fail by $resolution_name");
-$chart->setLabels($x_data_labels);
-$chart->addDataset("Pass Rate (%)", $pass_rates, [
-	"background_colours" => "#4CAF50"
-]);
-$chart->addDataset("Fail Rate (%)", $fail_rates, [
-	"background_colours" => "#F44336"
-]);
-$chart->setDatalabelSuffixes("%", "%");
-$charts[] = $chart;
-
-// Eye Contact Period
-$eye_contact_rates = array_values(array_map(function($period) {
-	if($period->testCount == 0) return [0, 0, 0];
-
-	$yes = round(($period->eyeContactCounts[0] / $period->testCount) * 100);
-	$no = 100 - $yes;
-	$na = 0;
-
-	return [$yes, $no, $na];
-}, $data));
-
-$chart = new Chart;
-$chart->addXAxis([
-	"type" => "category",
-	"stacked" => true,
-]);
-$chart->addYAxis([
-	"id" => "y-axis-1",
-	"tick_config" => ["min" => 0, "max" => 100],
-	"stacked" => true,
-]);
-$chart->setType("bar");
-$chart->setTitle("Eye Contact by {$resolution_name}");
-$chart->setLabels($x_data_labels);
-$chart->addDataset("Yes (%)", array_column($eye_contact_rates, 0), [
-	"background_colours" => "#4CAF50"
-]);
-$chart->addDataset("No (%)", array_column($eye_contact_rates, 1), [
-	"background_colours" => "#F44336"
-]);
-$chart->setDatalabelSuffixes("%", "%");
-$charts[] = $chart;
-
-// Totals by Period
-
-$test_counts = array_column($data, "testCount");
-$pass_counts = array_column($data, "passCount");
-$fail_counts = array_column($data, "failCount");
-
-$chart = new Chart;
-$chart->setType("bar");
-$chart->setTitle("Totals by $resolution_name");
-$chart->setLabels($x_data_labels);
-$chart->addYAxis([
-	"id" => "y-axis-1",
-	"tick_config" => ["min" => 0, "max" => ceil(max($test_counts) / 10) * 10]
-]);
-$chart->addYAxis([
-	"position" => "right",
-	"id" => "y-axis-2",
-	"grid_lines" => false,
-	"tick_config" => ["min" => 0, "max" => 100]
-]);
-
-$chart->addDataset("Pass Rate (%)", $pass_rates, [
-	"border_colours" => "#FFEB3B",
-	"background_colours" => "transparent",
-	"type" => "line",
-	"y_axis_id" => "y-axis-2",
-	"datalabels" => [
-		"display" => false
-	],
-	"line_tension" => 0,
-]);
-$chart->addDataset("Test Count", $test_counts, [
-	"background_colours" => "#2196F3",
-	"type" => "bar",
-	"y_axis_id" => "y-axis-1",
-	"datalabels" => [
-		"display" => false
-	],
-]);
-$chart->addDataset("Pass", $pass_counts, [
-	"background_colours" => "#4CAF50",
-	"type" => "bar",
-	"y_axis_id" => "y-axis-1",
-	"datalabels" => [
-		"display" => false
-	],
-]);
-$chart->addDataset("Fail", $fail_counts, [
-	"background_colours" => "#F44336",
-	"type" => "bar",
-	"y_axis_id" => "y-axis-1",
-	"datalabels" => [
-		"display" => false
-	],
-]);
-$chart->setDatalabelSuffixes("%", "", "", "");
-$chart->print = true;
-$charts[] = $chart;
-
-// Point of Challenge (Each Period)
-
-foreach($keys as $index => $key) {
-	$key_label = $key_labels[$index];
-
-	$period_data = $data[$key];
-
-	if($period_data->testCount == 0) continue;
-
-	$chart = new Chart;
-	$chart->setType("pie");
-	$chart->setTitle("$key_label Point of Challenge");
-	$chart->setLabels(["On Entry", "While Browsing", "During Play", "On Exit", "No Challenge"]);
-	$chart->addDataset("Counts", [
-		$period_data->stage1Count,
-		$period_data->stage2Count,
-		$period_data->stage3Count,
-		$period_data->stage4Count,
-		$period_data->stage5Count,
-	], [
-		"background_colours" => [
-			"#4CAF50",
-			"#FFEB3B",
-			"#FBC02D",
-			"#FFAB91",
-			"#F44336",
-		],
-		"datalabels" => Chart::DATALABELS_BOX,
-	]);
-	$charts[] = $chart;
+/** @var ChartGenerator $generator */
+
+$charts[] = $generator->getTestsByStageChart();
+$charts[] = $generator->getChallengerGenderChart();
+$charts[] = $generator->getTesterGenderChart();
+$charts[] = $generator->getPassFailCountChart();
+$charts[] = $generator->getPeriodicPassFailRateChart();
+$charts[] = $generator->getPeriodicEyeContactChart();
+$charts[] = $generator->getPeriodicDoorSensorAlertPassRateChart();
+$charts[] = $generator->getPeriodicEyeContactPassRateChart();
+$charts[] = $generator->getPeriodicLineOfSightPassRateChart();
+$charts[] = $generator->getPeriodicBarPurchasePassRateChart();
+$charts[] = $generator->getPeriodicTotalsChart();
+$charts = array_merge($charts, $generator->getPointOfChallengeCharts());
+$charts[] = $generator->getPeriodicTesterGenderChart();
+$charts[] = $generator->getPeriodicTestCountChart();
+$charts = array_merge($charts, $generator->getGenderComparisonCharts());
+
+if($generator->hasRegionData()) {
+	$charts[] = $generator->getRegionPassRateChart();
+	$charts[] = $generator->getPeriodicRegionPassRateChart();
 }
 
-// Tester Genders by Period
-$male_counts = array_values(array_map(function($d) {
-	return $d->maleTesterCount;
-}, $data));
-
-$female_counts = array_values(array_map(function($d) {
-	return $d->femaleTesterCount;
-}, $data));
-
-$chart = new Chart;
-$chart->addYAxis([
-	"id" => "y-axis-1",
-	"tick_config" => ["min" => 0, "max" => ceil(max(max($male_counts), max($female_counts)) / 10) * 10]
-]);
-
-$chart->setType("bar");
-$chart->setTitle("Tester Gender by $resolution_name");
-$chart->setLabels($x_data_labels);
-$chart->addDataset("Male", $male_counts, [
-	"background_colours" => "#2196F3"
-]);
-$chart->addDataset("Female", $female_counts, [
-	"background_colours" => "#E91E63"
-]);
-$charts[] = $chart;
-
-// Test Count by Period
-$test_counts = array_values(array_map(function($d) {
-	return $d->testCount;
-}, $data));
-
-$chart = new Chart;
-$chart->addYAxis([
-	"id" => "y-axis-1",
-	"tick_config" => ["min" => 0, "max" => ceil(max($test_counts) / 10) * 10]
-]);
-$chart->setType("bar");
-$chart->setTitle("Tests by $resolution_name");
-$chart->setLabels($x_data_labels);
-$chart->addDataset("Tests", $test_counts, [
-	"background_colours" => "#2196F3"
-]);
-$charts[] = $chart;
-
-// Gender Graphs
-$gender_keys = [
-	"maleChallengeMale" => [
-		"title" => "Male Challenge Male",
-		"label" => "M Cha. M",
-	],
-	"maleChallengeFemale" => [
-		"title" => "Male Challenge Female",
-		"label" => "M Cha. F",
-	],
-	"femaleChallengeMale" => [
-		"title" => "Female Challenge Male",
-		"label" => "F Cha. M",
-	],
-	"femaleChallengeFemale" => [
-		"title" => "Female Challenge Female",
-		"label" => "F Cha. F",
-	],
-	"unknownChallenge" => [
-		"title" => "Gender Not Specified",
-		"label" => "Gender Not Specified",
-	],
-];
-
-$gender_test_counts = [];
-foreach($gender_keys as $gk => $gv) {
-	$gender_test_counts[] = array_sum(array_column($data, "{$gk}Count"));
+if($generator->hasAreaManagerData()) {
+	$charts[] = $generator->getAreaManagerPassRateChart();
+	$charts[] = $generator->getPeriodicAreaManagerPassRateChart();
 }
-
-// Gender Comparison by Date Range
-$chart = new Chart;
-$chart->addYAxis([
-	"id" => "y-axis-1",
-	"tick_config" => ["min" => 0, "max" => ceil(max($gender_test_counts) / 10) * 10]
-]);
-$chart->setType("bar");
-$chart->setTitle("Gender Comparison $date_range_label");
-$chart->setLabels(array_column($gender_keys, "label"));
-$chart->addDataset("Tests", $gender_test_counts, [
-	"background_colours" => "#2196F3"
-]);
-$charts[] = $chart;
-
-// Gender Comparison by Resolution
-$mcm_counts = array_column($data, "maleChallengeMaleCount");
-$mcf_counts = array_column($data, "maleChallengeFemaleCount");
-$fcm_counts = array_column($data, "femaleChallengeMaleCount");
-$fcf_counts = array_column($data, "femaleChallengeFemaleCount");
-$ns_counts = array_column($data, "unknownChallengeCount");
-
-$chart = new Chart;
-$chart->addYAxis([
-	"id" => "y-axis-1",
-	"tick_config" => ["min" => 0, "max" => ceil(max(max($mcm_counts), max($mcf_counts), max($fcm_counts), max($fcf_counts)) / 10) * 10]
-]);
-$chart->setType("bar");
-$chart->setTitle("Gender Comparison by $resolution_name");
-$chart->setLabels($x_data_labels);
-$chart->addDataset("M Cha. M", $mcm_counts, ["background_colours" => "#2196F3"]);
-$chart->addDataset("M Cha. F", $mcf_counts, ["background_colours" => "#3F51B5"]);
-$chart->addDataset("F Cha. M", $fcm_counts, ["background_colours" => "#9C27B0"]);
-$chart->addDataset("F Cha. F", $fcf_counts, ["background_colours" => "#E91E63"]);
-$chart->addDataset("Not Specified", $ns_counts, ["background_colours" => "#9E9E9E"]);
-$chart->print = true;
-$charts[] = $chart;
-
-// Gender Comparison Pass Rate by Resolution
-$mcm_pass_counts = array_column($data, "maleChallengeMalePassCount");
-$mcf_pass_counts = array_column($data, "maleChallengeFemalePassCount");
-$fcm_pass_counts = array_column($data, "femaleChallengeMalePassCount");
-$fcf_pass_counts = array_column($data, "femaleChallengeFemalePassCount");
-$ns_pass_counts = array_column($data, "unknownChallengePassCount");
-
-foreach(["mcm", "mcf", "fcm", "fcf", "ns"] as $prefix) {
-	$pass_rates = [];
-	$pass_counts = ${$prefix . "_pass_counts"};
-	$test_counts = ${$prefix . "_counts"};
-
-	foreach($test_counts as $index => $test_count) {
-		if($test_count == 0) {
-			$pass_rates[] = 0;
-			continue;
-		}
-		$pass_rates[] = number_format(($pass_counts[$index] * 100) / $test_count, 2);
-	}
-
-	${$prefix . "_pass_rates"} = $pass_rates;
-}
-
-$chart = new Chart;
-$chart->addYAxis([
-	"id" => "y-axis-1",
-	"tick_config" => ["min" => 0, "max" => 100],
-]);
-$chart->setType("bar");
-$chart->setTitle("Gender Comparison Pass Rate by $resolution_name");
-$chart->setLabels($x_data_labels);
-$chart->addDataset("M Cha. M", $mcm_pass_rates, ["background_colours" => "#2196F3", "datalabels" => ["display" => false],  "line_tension" => 0]);
-$chart->addDataset("M Cha. F", $mcf_pass_rates, ["background_colours" => "#3F51B5", "datalabels" => ["display" => false], "line_tension" => 0]);
-$chart->addDataset("F Cha. M", $fcm_pass_rates, ["background_colours" => "#9C27B0", "datalabels" => ["display" => false], "line_tension" => 0]);
-$chart->addDataset("F Cha. F", $fcf_pass_rates, ["background_colours" => "#E91E63", "datalabels" => ["display" => false], "line_tension" => 0]);
-$chart->addDataset("Not Specified", $ns_pass_rates, ["background_colours" => "#9E9E9E", "datalabels" => ["display" => false], "line_tension" => 0]);
-$chart->print = true;
-$chart->setDatalabelSuffixes("%", "%", "%", "%", "%");
-$charts[] = $chart;
-
-// Gender Comparison Point of Challenge
-foreach($keys as $index => $key) {
-	$key_label = $key_labels[$index];
-	$period_data = $data[$key];
-
-	foreach($gender_keys as $prefix => $gv) {
-
-		$title = $gv["label"];
-		$test_count = $period_data->{$prefix . "Count"};
-		$stage_data = $period_data->{$prefix . "Stages"};
-
-		if($test_count == 0) continue;
-
-		$chart = new Chart;
-		$chart->setType("pie");
-		$chart->setTitle("$key_label $title Point of Challenge");
-		$chart->setLabels(["On Entry", "While Browsing", "During Play", "On Exit", "No Challenge"]);
-		$chart->addDataset("Counts", $stage_data, [
-			"background_colours" => [
-				"#4CAF50",
-				"#FFEB3B",
-				"#FBC02D",
-				"#FFAB91",
-				"#F44336",
-			],
-			"datalabels" => Chart::DATALABELS_BOX,
-		]);
-		$charts[] = $chart;
-	}
-}
-
-// Region Graphs
-if($has_regions) {
-
-	ksort($region_data, SORT_NATURAL);
-
-	$region_keys = array_keys($region_data);
-
-	$x_data_labels = array_map(function($key) {
-		return "Region $key";
-	}, $region_keys);
-
-	// 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);
-	}
-
-	$chart = new Chart;
-	$chart->addYAxis([
-		"id" => "y-axis-1",
-		"tick_config" => ["min" => 0, "max" => 100]
-	]);
-	$chart->setType("bar");
-	$chart->setTitle("Region Pass Rate $date_range_label");
-	$chart->setLabels($x_data_labels);
-	$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;
-	$chart->printTotalColumn = true;
-	$charts[] = $chart;
-
-	// Region Pass Rate Period
-	$chart = new Chart;
-	$chart->addYAxis([
-		"id" => "y-axis-1",
-		"tick_config" => ["min" => 0, "max" => 100]
-	]);
-	$chart->setType("bar");
-	$chart->setTitle("Region Pass Rate by $resolution_name");
-	$chart->setLabels($x_data_labels);
-
-	foreach($keys as $index => $key) {
-		$data_values = [];
-		foreach($region_keys as $region) {
-			$r_data = $region_data[$region][$key];
-			$data_values[] = ($r_data->testCount == 0) ? 0 : round(($r_data->passCount * 100) / $r_data->testCount);
-		}
-		$chart->addDataset($key_labels[$index], $data_values, ["background_colours" => Chart::COLOURS[$index]]);
-	}
-	$chart->setDatalabelSuffixes(...array_fill(0, count($keys), "%"));
-
-	$charts[] = $chart;
-
-}
-
-// Area Manager Graphs
-if($has_area_managers) {
-
-	ksort($area_manager_data, SORT_NATURAL);
-
-	$area_manager_keys = array_keys($area_manager_data);
-
-	$x_data_labels = array_map(function($key) {
-		return "$key";
-	}, $area_manager_keys);
-
-	// 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_area_manager_test_count == 0) ? 0 : round(($total_area_manager_pass_count * 100) / $total_area_manager_test_count);
-	}
-
-	$chart = new Chart;
-	$chart->addXAxis([
-		"type" => "category",
-		"scale_label_config" => [
-			"display" => true,
-			"labelString" => "Area Manager",
-		]
-	]);
-	$chart->addYAxis([
-		"id" => "y-axis-1",
-		"tick_config" => ["min" => 0, "max" => 100]
-	]);
-	$chart->setType("bar");
-	$chart->setTitle("Area Manager Pass Rate $date_range_label");
-	$chart->setLabels($x_data_labels);
-	$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;
-	$chart->printTotalColumn = true;
-	$charts[] = $chart;
-
-	// Area Pass Rate Period
-	$chart = new Chart;
-	$chart->addXAxis([
-		"type" => "category",
-		"scale_label_config" => [
-			"display" => true,
-			"labelString" => "Area Manager",
-		]
-	]);
-	$chart->addYAxis([
-		"id" => "y-axis-1",
-		"tick_config" => ["min" => 0, "max" => 100]
-	]);
-	$chart->setType("bar");
-	$chart->setTitle("Area Manager Pass Rate by $resolution_name");
-	$chart->setLabels($x_data_labels);
-
-	foreach($keys as $index => $key) {
-		$data_values = [];
-		foreach($area_manager_keys as $area_manager) {
-			$a_data = $area_manager_data[$area_manager][$key];
-			$data_values[] = ($a_data->testCount == 0) ? 0 : round(($a_data->passCount * 100) / $a_data->testCount);
-		}
-		$chart->addDataset($key_labels[$index], $data_values, [
-			"background_colours" => Chart::COLOURS[$index],
-			"datalabels" => [
-				"display" => false,
-			],
-		]);
-	}
-	$chart->setDatalabelSuffixes(...array_fill(0, count($keys), "%"));
-
-	$charts[] = $chart;
-
-}
-
-?>

+ 12 - 0
template_processing/age_verification_mitchells_butlers/reports_create_empty_objects.php

@@ -8,6 +8,18 @@ $empty_data = (object) [
 
 	"eyeContactCounts" => [0, 0, 0],
 
+	"eyeContactPassCounts" => [0, 0, 0],
+	"eyeContactFailCounts" => [0, 0, 0],
+
+	"lineOfSightPassCounts" => [0, 0, 0],
+	"lineOfSightFailCounts" => [0, 0, 0],
+
+	"doorSensorAlertPassCounts" => [0, 0, 0],
+	"doorSensorAlertFailCounts" => [0, 0, 0],
+
+	"barPurchasePassCounts" => [0, 0, 0],
+	"barPurchaseFailCounts" => [0, 0, 0],
+
 	"maleTesterCount" => 0,
 	"femaleTesterCount" => 0,
 

+ 47 - 0
template_processing/age_verification_mitchells_butlers/reports_process_test.php

@@ -1,20 +1,67 @@
 <?php
 
+/**
+ * @var object $total_data Total data
+ * @var array $data Periodic data
+ * @var string $key Current period key
+ * @var string $region
+ * @var string $area_manager
+ * @var Test $test
+ * @var array $test_values
+ */
+
+$booleanPassFieldIncrementor = function($value, $pass, $prefix) use (&$data, $key) {
+
+	if($pass) {
+		$field = $prefix . "PassCounts";
+	}
+	else {
+		$field = $prefix . "FailCounts";
+	}
+
+	if($value === null) {
+		$index = 2;
+	}
+	else if($value) {
+		$index = 1;
+	}
+	else {
+		$index = 0;
+	}
+
+	$data[$key]->$field[$index]++;
+};
+
 $stage_key = "stage" . $test->challenge_stage . "Count";
 $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;
+$door_sensor_alert = $test_values->door_sensor_alert ?? null;
+$eye_contact = $test->challenger_eye_contact ?? null;
+
 if($test->pass) {
 	$data[$key]->passCount++;
 	$total_data->passCount++;
 	if($region) $region_data[$region][$key]->passCount++;
 	if($area_manager) $area_manager_data[$area_manager][$key]->passCount++;
+
+	$booleanPassFieldIncrementor($eye_contact, true, "eyeContact");
+	$booleanPassFieldIncrementor($line_of_sight, true, "lineOfSight");
+	$booleanPassFieldIncrementor($bar_purchase, true, "barPurchase");
+	$booleanPassFieldIncrementor($door_sensor_alert, true, "doorSensorAlert");
 }
 else {
 	$data[$key]->failCount++;
 	$total_data->failCount++;
 	if($region) $region_data[$region][$key]->failCount++;
 	if($area_manager) $area_manager_data[$area_manager][$key]->failCount++;
+
+	$booleanPassFieldIncrementor($eye_contact, false, "eyeContact");
+	$booleanPassFieldIncrementor($line_of_sight, false, "lineOfSight");
+	$booleanPassFieldIncrementor($bar_purchase, false, "barPurchase");
+	$booleanPassFieldIncrementor($door_sensor_alert, false, "doorSensorAlert");
 }
 
 if($test->challenger_gender == "M") {

+ 13 - 249
template_processing/mystery_shop/reports_build_charts.php

@@ -1,251 +1,15 @@
 <?php
 
-// Tests by Cleanliness
-
-$chart = new Chart;
-$chart->setType("doughnut");
-$chart->setTitle("Tests by Cleanliness $date_range_label");
-$chart->setLabels(["Very dirty", "Dirty", "Adequate", "Clean", "Very Clean"]);
-$chart->addDataset("Tests", [
-	$total_data->cleanlinessCounts[0],
-	$total_data->cleanlinessCounts[1],
-	$total_data->cleanlinessCounts[2],
-	$total_data->cleanlinessCounts[3],
-	$total_data->cleanlinessCounts[4],
-], [
-	"background_colours" => [
-		"#F44336",
-		"#FFAB91",
-		"#FBC02D",
-		"#FFEB3B",
-		"#4CAF50",
-	],
-	"datalabels" => Chart::DATALABELS_BOX,
-]);
-$chart->setPrintSuffixes("");
-$chart->print = true;
-$chart->printTotalColumn = true;
-$chart->printPercentages = true;
-
-$charts[] = $chart;
-
-// Cleanliness (Each Period)
-foreach($keys as $index => $key) {
-	$key_label = $key_labels[$index];
-
-	$period_data = $data[$key];
-
-	if($period_data->testCount == 0) continue;
-
-	$chart = new Chart;
-	$chart->setType("pie");
-	$chart->setTitle("$key_label Cleanliness");
-	$chart->setLabels(["Very dirty", "Dirty", "Adequate", "Clean", "Very Clean"]);
-	$chart->addDataset("Counts", [
-		$period_data->cleanlinessCounts[0],
-		$period_data->cleanlinessCounts[1],
-		$period_data->cleanlinessCounts[2],
-		$period_data->cleanlinessCounts[3],
-		$period_data->cleanlinessCounts[4],
-	], [
-		"background_colours" => [
-			"#F44336",
-			"#FFAB91",
-			"#FBC02D",
-			"#FFEB3B",
-			"#4CAF50",
-		],
-		"datalabels" => Chart::DATALABELS_BOX,
-	]);
-	$charts[] = $chart;
-}
-
-// Tester Gender
-$chart = new Chart;
-$chart->setType("pie");
-$chart->setTitle("Tester Gender $date_range_label");
-$chart->setLabels(["Male", "Female"]);
-$chart->addDataset("Counts", [
-	$total_data->maleTesterCount,
-	$total_data->femaleTesterCount,
-], [
-	"background_colours" => [
-		"#2196F3",
-		"#E91E63",
-	],
-	"datalabels" => Chart::DATALABELS_BOX,
-]);
-$charts[] = $chart;
-
-// Staff Badge Worn
-$staff_badge_worn_counts = array_column($data, "staffBadgeWornCounts");
-
-$unknown_counts = array_column($staff_badge_worn_counts, 0);
-$no_counts = array_column($staff_badge_worn_counts, 1);
-$yes_counts = array_column($staff_badge_worn_counts, 2);
-
-$chart = new Chart;
-$chart->setType("bar");
-$chart->setTitle("Staff Badge Worn by $resolution_name");
-$chart->setLabels($x_data_labels);
-$chart->addDataset("Don't know", $unknown_counts, [
-	"background_colours" => "#CCCCCC"
-]);
-$chart->addDataset("No", $no_counts, [
-	"background_colours" => "#F44336"
-]);
-$chart->addDataset("Yes", $yes_counts, [
-	"background_colours" => "#4CAF50"
-]);
-$charts[] = $chart;
-
-// Staff Offered Drink
-$staff_offered_drink_counts = array_column($data, "staffOfferedDrinkCounts");
-
-$no_counts = array_column($staff_offered_drink_counts, 0);
-$yes_counts = array_column($staff_offered_drink_counts, 1);
-
-$chart = new Chart;
-$chart->setType("bar");
-$chart->setTitle("Staff Offered Drink by $resolution_name");
-$chart->setLabels($x_data_labels);
-$chart->addDataset("No", $no_counts, [
-	"background_colours" => "#F44336"
-]);
-$chart->addDataset("Yes", $yes_counts, [
-	"background_colours" => "#4CAF50"
-]);
-$charts[] = $chart;
-
-// Staff Offered Promotion
-$staff_offered_promotion_counts = array_column($data, "staffOfferedPromotionCounts");
-
-$no_counts = array_column($staff_offered_promotion_counts, 0);
-$yes_counts = array_column($staff_offered_promotion_counts, 1);
-
-$chart = new Chart;
-$chart->setType("bar");
-$chart->setTitle("Staff Offered Promotion by $resolution_name");
-$chart->setLabels($x_data_labels);
-$chart->addDataset("No", $no_counts, [
-	"background_colours" => "#F44336"
-]);
-$chart->addDataset("Yes", $yes_counts, [
-	"background_colours" => "#4CAF50"
-]);
-$charts[] = $chart;
-
-// Staff Offered Help
-$staff_offered_help_counts = array_column($data, "staffOfferedHelpCounts");
-
-$no_counts = array_column($staff_offered_help_counts, 0);
-$yes_counts = array_column($staff_offered_help_counts, 1);
-
-$chart = new Chart;
-$chart->setType("bar");
-$chart->setTitle("Staff Offered Help by $resolution_name");
-$chart->setLabels($x_data_labels);
-$chart->addDataset("No", $no_counts, [
-	"background_colours" => "#F44336"
-]);
-$chart->addDataset("Yes", $yes_counts, [
-	"background_colours" => "#4CAF50"
-]);
-$charts[] = $chart;
-
-// Staff Behaviour (Each Period)
-foreach($keys as $index => $key) {
-	$key_label = $key_labels[$index];
-
-	$period_data = $data[$key];
-
-	if($period_data->testCount == 0) continue;
-
-	$chart = new Chart;
-	$chart->setType("pie");
-	$chart->setTitle("$key_label Staff Behaviour");
-	$chart->setLabels(["N/A", "Rude", "Slightly rude", "Neither rude or polite", "Polite", "Very polite"]);
-	$chart->addDataset("Counts", [
-		$period_data->staffBehaviourCounts[0],
-		$period_data->staffBehaviourCounts[1],
-		$period_data->staffBehaviourCounts[2],
-		$period_data->staffBehaviourCounts[3],
-		$period_data->staffBehaviourCounts[4],
-		$period_data->staffBehaviourCounts[5],
-	], [
-		"background_colours" => [
-			"#CCCCCC",
-			"#F44336",
-			"#FFAB91",
-			"#FBC02D",
-			"#FFEB3B",
-			"#4CAF50",
-		],
-		"datalabels" => Chart::DATALABELS_BOX,
-	]);
-	$charts[] = $chart;
-}
-
-// Staff Uniform
-$staff_uniform_counts = array_column($data, "staffUniformCounts");
-
-$no_counts = array_column($staff_uniform_counts, 0);
-$yes_counts = array_column($staff_uniform_counts, 1);
-
-$chart = new Chart;
-$chart->setType("bar");
-$chart->setTitle("Staff Uniform by $resolution_name");
-$chart->setLabels($x_data_labels);
-$chart->addDataset("No", $no_counts, [
-	"background_colours" => "#F44336"
-]);
-$chart->addDataset("Yes", $yes_counts, [
-	"background_colours" => "#4CAF50"
-]);
-$charts[] = $chart;
-
-// Tester Genders by Period
-$male_counts = array_values(array_map(function($d) {
-	return $d->maleTesterCount;
-}, $data));
-
-$female_counts = array_values(array_map(function($d) {
-	return $d->femaleTesterCount;
-}, $data));
-
-$chart = new Chart;
-$chart->addYAxis([
-	"id" => "y-axis-1",
-	"tick_config" => ["min" => 0, "max" => ceil(max(max($male_counts), max($female_counts)) / 10) * 10]
-]);
-
-$chart->setType("bar");
-$chart->setTitle("Tester Gender by $resolution_name");
-$chart->setLabels($x_data_labels);
-$chart->addDataset("Male", $male_counts, [
-	"background_colours" => "#2196F3"
-]);
-$chart->addDataset("Female", $female_counts, [
-	"background_colours" => "#E91E63"
-]);
-$charts[] = $chart;
-
-// Test Count by Period
-$test_counts = array_values(array_map(function($d) {
-	return $d->testCount;
-}, $data));
-
-$chart = new Chart;
-$chart->addYAxis([
-	"id" => "y-axis-1",
-	"tick_config" => ["min" => 0, "max" => ceil(max($test_counts) / 10) * 10]
-]);
-$chart->setType("bar");
-$chart->setTitle("Tests by $resolution_name");
-$chart->setLabels($x_data_labels);
-$chart->addDataset("Tests", $test_counts, [
-	"background_colours" => "#2196F3"
-]);
-$charts[] = $chart;
-
-?>
+/** @var ChartGenerator $generator */
+
+$charts[] = $generator->getCleanlinessChart();
+$charts = array_merge($charts, $generator->getPeriodicCleanlinessCharts());
+$charts[] = $generator->getTesterGenderChart();
+$charts[] = $generator->getPeriodicStaffBadgeWornChart();
+$charts[] = $generator->getPeriodicStaffOfferedDrinkChart();
+$charts[] = $generator->getPeriodicStaffOfferedPromotionChart();
+$charts[] = $generator->getPeriodicStaffOfferedHelpChart();
+$charts = array_merge($charts, $generator->getPeriodicStaffBehaviourCharts());
+$charts[] = $generator->getPeriodicStaffUniformChart();
+$charts[] = $generator->getPeriodicTesterGenderChart();
+$charts[] = $generator->getPeriodicTestCountChart();