Alan Lam 3 лет назад
Родитель
Сommit
c0ccc8b070

+ 28 - 3
controllers/reports.php

@@ -61,8 +61,11 @@ foreach($all_projects as $p) {
 $all_project_ids = array_column($all_projects, "id");
 
 $data = [];
+
 $region_data = [];
 $area_manager_data = [];
+$brand_data = [];
+
 $total_data = new stdClass;
 
 $locations_missing_region = [];
@@ -205,9 +208,11 @@ if($submit) {
 		// Get region and area manager IDs
 		$regions = array_filter(array_column($locations, "region"));
 		$area_managers = array_filter(array_column($locations, "area_manager"));
+		$brands = array_filter(array_column($locations, "brand"));
 
 		uksort($regions, "strnatcasecmp");
 		uksort($area_managers, "strnatcasecmp");
+		uksort($brands, "strnatcasecmp");
 
 		foreach($regions as $region) {
 			$region_data[$region] = [];
@@ -217,8 +222,13 @@ if($submit) {
 			$area_manager_data[$area_manager] = [];
 		}
 
+		foreach($brands as $brand) {
+			$brand_data[$brand] = [];
+		}
+
 		$has_regions = !empty($region_data);
 		$has_area_managers = !empty($area_manager_data);
+		$has_brands = !empty($brand_data);
 
 		foreach($locations as $location) {
 			if($has_regions && !$location->region) $locations_missing_region[] = $location;
@@ -294,6 +304,12 @@ if($submit) {
 				$a[$key]->label = $label;
 			}
 			unset($a);
+
+			foreach($brand_data as &$b) {
+				$b[$key] = clone $empty_data;
+				$b[$key]->label = $label;
+			}
+			unset($b);
 		}
 
 		$max_unix = 0;
@@ -339,6 +355,7 @@ if($submit) {
 
 			$region = $location->region;
 			$area_manager = $location->area_manager;
+			$brand = $location->brand;
 
 			$dts = $project->dts_report ?: $test->dts_start;
 
@@ -372,8 +389,15 @@ if($submit) {
 			else {
 				$total_data->testCount++;
 				$data[$key]->testCount++;
-				if($region) $region_data[$region][$key]->testCount++;
-				if($area_manager) $area_manager_data[$area_manager][$key]->testCount++;
+				if($region) {
+					$region_data[$region][$key]->testCount++;
+				}
+				if($area_manager) {
+					$area_manager_data[$area_manager][$key]->testCount++;
+				}
+				if($brand) {
+					$brand_data[$brand][$key]->testCount++;
+				}
 
 				if($tester->gender === "M") {
 					$data[$key]->maleTesterCount++;
@@ -398,6 +422,7 @@ if($submit) {
 		$generator->setResolutionName($resolution_name);
 		$generator->setPeriodKeysAndLabels($keys, $key_labels);
 		$generator->setRegionData($region_data);
+		$generator->setBrandData($brand_data);
 		$generator->setAreaManagerData($area_manager_data);
 		$generator->setTemplate($template);
 
@@ -425,5 +450,5 @@ if($submit) {
 }
 
 View::includeOnce("header", compact("page_title"));
-View::include("reports", compact("customer", "date_range", "date_start", "date_end", "date_resolution", "all_projects", "project_table_data", "exclude_project_ids", "location_ids", "retests", "charts", "data", "total_data", "locations_missing_region", "locations_missing_area_manager", "region_data", "area_manager_data", "key_labels", "has_pass_fail"));
+View::include("reports", compact("customer", "date_range", "date_start", "date_end", "date_resolution", "all_projects", "project_table_data", "exclude_project_ids", "location_ids", "retests", "charts", "data", "total_data", "locations_missing_region", "locations_missing_area_manager", "region_data", "area_manager_data", "brand_data", "key_labels", "has_pass_fail"));
 View::includeOnce("footer");

+ 93 - 96
engine/chart_generator.php

@@ -46,6 +46,9 @@ class ChartGenerator {
 	/** @var array $areaManagerData */
 	private $areaManagerData;
 
+	/** @var array */
+	private $brandData;
+
 	/** @var Template $template */
 	private $template;
 
@@ -200,6 +203,10 @@ class ChartGenerator {
 		$this->areaManagerData = $data;
 	}
 
+	public function setBrandData(array $data): void {
+		$this->brandData = $data;
+	}
+
 	// Charts
 	public function getTestsByStageChart(): Chart {
 		$chart = new Chart;
@@ -716,96 +723,22 @@ class ChartGenerator {
 		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 $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)
+	private function getDataPassRateChart(array $data, string $entity_name): Chart {
 		$data_values = [];
 
 		$test_counts = [];
 		$pass_counts = [];
 		$fail_counts = [];
 
-		foreach($this->areaManagerData as $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"));
+		foreach($data as $datum) {
+			$total_test_count = array_sum(array_column($datum, "testCount"));
+			$total_pass_count = array_sum(array_column($datum, "passCount"));
 
-			$test_counts[] = $total_area_manager_test_count;
-			$pass_counts[] = $total_area_manager_pass_count;
-			$fail_counts[] = $total_area_manager_fail_count;
+			$test_counts[] = $total_test_count;
+			$pass_counts[] = $total_pass_count;
+			$fail_counts[] = $total_test_count - $total_pass_count;
 
-			$data_values[] = ($total_area_manager_test_count === 0) ? 0 : round(($total_area_manager_pass_count * 100) / $total_area_manager_test_count);
+			$data_values[] = ($total_test_count === 0) ? 0 : round(($total_pass_count * 100) / $total_test_count);
 		}
 
 		$chart = new Chart;
@@ -813,7 +746,7 @@ class ChartGenerator {
 			"type" => "category",
 			"scale_label_config" => [
 				"display" => true,
-				"labelString" => "Area Manager",
+				"labelString" => $entity_name,
 			]
 		]);
 		$chart->addYAxis([
@@ -821,8 +754,8 @@ class ChartGenerator {
 			"tick_config" => ["min" => 0, "max" => 100]
 		]);
 		$chart->setType("bar");
-		$chart->setTitle("Area Manager Pass Rate ({$this->dateRangeLabel})");
-		$chart->setLabels($this->getAreaManagerXDataLabels());
+		$chart->setTitle("{$entity_name} Pass Rate ({$this->dateRangeLabel})");
+		$chart->setLabels(array_keys($data));
 		$chart->addDataset("Pass %", $data_values , [
 			"background_colours" => self::COLOUR_BLUE
 		]);
@@ -835,14 +768,37 @@ class ChartGenerator {
 		return $chart;
 	}
 
-	public function getPeriodicAreaManagerPassRateChart(): Chart {
+	public function getPeriodicDataPassRateChart(string $entity): Chart {
+
+		switch($entity) {
+			case "region":
+				$data = $this->regionData;
+				$entity_name = "Region";
+				$entity_keys = $this->getRegionKeys();
+				$x_labels = $this->getRegionXDataLabels();
+				break;
+			case "areaManager":
+				$data = $this->areaManagerData;
+				$entity_name = "Area Manager";
+				$entity_keys = $this->getAreaManagerKeys();
+				$x_labels = $this->getAreaManagerKeys();
+				break;
+			case "brand":
+				$data = $this->brandData;
+				$entity_name = "Brand";
+				$entity_keys = $this->getBrandKeys();
+				$x_labels = $this->getBrandKeys();
+				break;
+			default:
+				throw new RuntimeException("Invalid entity passed to getPeriodicDataPassRateChart: $entity");
+		}
 
-		$chart = new Chart;
+		$chart = new Chart();
 		$chart->addXAxis([
 			"type" => "category",
 			"scale_label_config" => [
 				"display" => true,
-				"labelString" => "Area Manager",
+				"labelString" => $entity_name,
 			]
 		]);
 		$chart->addYAxis([
@@ -850,26 +806,62 @@ class ChartGenerator {
 			"tick_config" => ["min" => 0, "max" => 100]
 		]);
 		$chart->setType("bar");
-		$chart->setTitle("Area Manager Pass Rate by {$this->resolutionName}");
-		$chart->setLabels($this->getAreaManagerXDataLabels());
+		$chart->setTitle("{$entity_name} Pass Rate by {$this->resolutionName}");
+		$chart->setLabels($x_labels);
 
 		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);
+			foreach($entity_keys as $entity_key) {
+				$datum = $data[$entity_key][$key];
+				$data_values[] = ($datum->testCount === 0) ? 0 : round(($datum->passCount * 100) / $datum->testCount);
 			}
 			$chart->addDataset($this->periodLabels[$index], $data_values, [
 				"background_colours" => Chart::COLOURS[$index],
-				"datalabels" => [
-					"display" => false,
-				],
+				"dataLabels" => [
+					"display" => false
+				]
 			]);
 		}
 		$chart->setDatalabelSuffixes(...array_fill(0, count($this->periodKeys), "%"));
 		return $chart;
 	}
 
+	public function hasRegionData(): bool {
+		return $this->regionData !== null;
+	}
+
+	public function getRegionPassRateChart(): Chart {
+		return $this->getDataPassRateChart($this->regionData, "Region");
+	}
+
+	public function getPeriodicRegionPassRateChart(): Chart {
+		return $this->getPeriodicDataPassRateChart("region");
+	}
+
+	public function hasAreaManagerData(): bool {
+		return $this->areaManagerData !== null;
+	}
+
+	public function getAreaManagerPassRateChart(): Chart {
+		return $this->getDataPassRateChart($this->areaManagerData, "Area Manager");
+	}
+
+	public function getPeriodicAreaManagerPassRateChart(): Chart {
+		return $this->getPeriodicDataPassRateChart("areaManager");
+	}
+
+	public function hasBrandData(): bool {
+		return $this->brandData !== null;
+	}
+
+	public function getBrandPassRateChart(): Chart {
+		return $this->getDataPassRateChart($this->brandData, "Brand");
+	}
+
+	public function getPeriodicBrandPassRateChart(): Chart {
+		return $this->getPeriodicDataPassRateChart("brand");
+	}
+
 	public function getCleanlinessChart(): Chart {
 
 		$chart = new Chart;
@@ -1146,6 +1138,11 @@ class ChartGenerator {
 		return array_keys($this->areaManagerData);
 	}
 
+	private function getBrandKeys(): array {
+		if(!$this->brandData) return [];
+		return array_keys($this->brandData);
+	}
+
 	private function getAreaManagerXDataLabels(): array {
 		return $this->getAreaManagerKeys();
 	}

+ 5 - 0
template_processing/age_verification/reports_build_charts.php

@@ -39,3 +39,8 @@ if($generator->hasAreaManagerData()) {
 	$charts[] = $generator->getAreaManagerPassRateChart();
 	$charts[] = $generator->getPeriodicAreaManagerPassRateChart();
 }
+
+if($generator->hasBrandData()) {
+	$charts[] = $generator->getBrandPassRateChart();
+	$charts[] = $generator->getPeriodicBrandPassRateChart();
+}

+ 10 - 6
template_processing/age_verification/reports_process_test.php

@@ -2,12 +2,14 @@
 
 /**
  * @var object $total_data Total data
- * @var object $region_data
- * @var object $area_manager_data
+ * @var array $region_data
+ * @var array $area_manager_data
+ * @var array $brand_data
  * @var array $data Periodic data
  * @var string $key Current period key
  * @var string $region
  * @var string $area_manager
+ * @var string $brand
  * @var Test $test
  * @var User $tester
  * @var array $test_values
@@ -18,7 +20,7 @@
  * @param bool $pass Test passed
  * @param string $prefix
  */
-$booleanPassFieldIncrementor = function($value, $pass, $prefix) use (&$data, $key) {
+$booleanPassFieldIncrementor = static function($value, $pass, $prefix) use (&$data, $key) {
 
 	if($pass) {
 		$field = $prefix . "PassCounts";
@@ -52,6 +54,7 @@ if($test->pass) {
 	$total_data->passCount++;
 	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($door_sensor_alert, true, "doorSensorAlert");
@@ -61,16 +64,17 @@ else {
 	$total_data->failCount++;
 	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($door_sensor_alert, false, "doorSensorAlert");
 }
 
-if($test->challenger_gender == "M") {
+if($test->challenger_gender === "M") {
 	$data[$key]->maleChallengerCount++;
 	$total_data->maleChallengerCount++;
 }
-else if($test->challenger_gender == "F") {
+else if($test->challenger_gender === "F") {
 	$data[$key]->femaleChallengerCount++;
 	$total_data->femaleChallengerCount++;
 }
@@ -100,7 +104,7 @@ switch($test->challenger_gender) {
 
 $gender_prefix .= "Challenge";
 
-if($gender_prefix != "unknownChallenge") {
+if($gender_prefix !== "unknownChallenge") {
 	switch($tester->gender) {
 		case "M": $gender_prefix .= "Male"; break;
 		case "F": $gender_prefix .= "Female"; break;

+ 5 - 0
template_processing/age_verification_mitchells_butlers/reports_build_charts.php

@@ -41,3 +41,8 @@ if($generator->hasAreaManagerData()) {
 	$charts[] = $generator->getAreaManagerPassRateChart();
 	$charts[] = $generator->getPeriodicAreaManagerPassRateChart();
 }
+
+if($generator->hasBrandData()) {
+	$charts[] = $generator->getBrandPassRateChart();
+	$charts[] = $generator->getPeriodicBrandPassRateChart();
+}

+ 10 - 6
template_processing/age_verification_mitchells_butlers/reports_process_test.php

@@ -2,18 +2,20 @@
 
 /**
  * @var object $total_data Total data
- * @var object $region_data
- * @var object $area_manager_data
+ * @var array $region_data
+ * @var array $area_manager_data
+ * @var array $brand_data
  * @var array $data Periodic data
  * @var string $key Current period key
  * @var string $region
  * @var string $area_manager
+ * @var string $brand
  * @var Test $test
  * @var User $tester
  * @var array $test_values
  */
 
-$booleanPassFieldIncrementor = function($value, $pass, $prefix) use (&$data, $key) {
+$booleanPassFieldIncrementor = static function($value, $pass, $prefix) use (&$data, $key) {
 
 	if($pass) {
 		$field = $prefix . "PassCounts";
@@ -49,6 +51,7 @@ if($test->pass) {
 	$total_data->passCount++;
 	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");
@@ -60,6 +63,7 @@ else {
 	$total_data->failCount++;
 	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");
@@ -67,11 +71,11 @@ else {
 	$booleanPassFieldIncrementor($door_sensor_alert, false, "doorSensorAlert");
 }
 
-if($test->challenger_gender == "M") {
+if($test->challenger_gender === "M") {
 	$data[$key]->maleChallengerCount++;
 	$total_data->maleChallengerCount++;
 }
-else if($test->challenger_gender == "F") {
+else if($test->challenger_gender === "F") {
 	$data[$key]->femaleChallengerCount++;
 	$total_data->femaleChallengerCount++;
 }
@@ -101,7 +105,7 @@ switch($test->challenger_gender) {
 
 $gender_prefix .= "Challenge";
 
-if($gender_prefix != "unknownChallenge") {
+if($gender_prefix !== "unknownChallenge") {
 	switch($tester->gender) {
 		case "M": $gender_prefix .= "Male"; break;
 		case "F": $gender_prefix .= "Female"; break;

+ 5 - 0
template_processing/age_verification_stonegate/reports_build_charts.php

@@ -46,3 +46,8 @@ if($generator->hasAreaManagerData()) {
 	$charts[] = $generator->getAreaManagerPassRateChart();
 	$charts[] = $generator->getPeriodicAreaManagerPassRateChart();
 }
+
+if($generator->hasBrandData()) {
+	$charts[] = $generator->getBrandPassRateChart();
+	$charts[] = $generator->getPeriodicBrandPassRateChart();
+}

+ 6 - 2
template_processing/age_verification_stonegate/reports_process_test.php

@@ -2,12 +2,14 @@
 
 /**
  * @var object $total_data Total data
- * @var object $region_data
- * @var object $area_manager_data
+ * @var array $region_data
+ * @var array $area_manager_data
+ * @var array $brand_data
  * @var array $data Periodic data
  * @var string $key Current period key
  * @var string $region
  * @var string $area_manager
+ * @var string $brand
  * @var Test $test
  * @var User $tester
  * @var array $test_values
@@ -55,12 +57,14 @@ if($test->pass) {
 	$total_data->passCount++;
 	if($region) $region_data[$region][$key]->passCount++;
 	if($area_manager) $area_manager_data[$area_manager][$key]->passCount++;
+	if($brand) $brand_data[$brand][$key]->passCount++;
 }
 else {
 	$data[$key]->failCount++;
 	$total_data->failCount++;
 	if($region) $region_data[$region][$key]->failCount++;
 	if($area_manager) $area_manager_data[$area_manager][$key]->failCount++;
+	if($brand) $brand_data[$brand][$key]->failCount++;
 }
 
 $pass_fail_count_incrementor($eye_contact, $test->isPass(), "eyeContact");

+ 5 - 5
views/reports.php

@@ -22,6 +22,7 @@
  * @var array $total_data
  * @var array $region_data
  * @var array $area_manager_data
+ * @var array $brand_data
  */
 
 $user = Core::$user;
@@ -383,6 +384,10 @@ let projectData = <?=json_encode($project_table_data)?>;
 					"name" => "Area Manager",
 					"data" => $area_manager_data
 				],
+				(object) [
+					"name" => "Brand",
+					"data" => $brand_data
+				]
 			]
 
 			?>
@@ -439,18 +444,13 @@ let projectData = <?=json_encode($project_table_data)?>;
 							?>
 							</tbody>
 						</table>
-
 						<?php
-
 					}
 				}
 				?>
-			?>
 			</div>
 			<?php
 		}
-		?>
-		<?php
 	}
 	?>
 </div>