Просмотр исходного кода

Remove charts and adjust titles for Greene King

Alan Lam 2 лет назад
Родитель
Сommit
ed190ff0ca

+ 12 - 12
engine/chart_generator.php

@@ -218,10 +218,10 @@ class ChartGenerator {
 	}
 
 	// Charts
-	public function getTestsByStageChart(array $labels): Chart {
+	public function getTestsByStageChart(array $labels, string $title = "Tests by Stage"): Chart {
 		$chart = new Chart;
 		$chart->setType("doughnut");
-		$chart->setTitle("Tests by Stage ({$this->dateRangeLabel})");
+		$chart->setTitle("$title ({$this->dateRangeLabel})");
 		$chart->setLabels($labels);
 		$chart->addDataset("Tests", [
 			$this->totalData->stage1Count,
@@ -285,7 +285,7 @@ class ChartGenerator {
 		return $chart;
 	}
 
-	public function getPassFailCountChart(): Chart {
+	public function getPassFailCountChart(string $title = "Pass / Fail"): Chart {
 		$data = $this->totalData;
 
 		$dataset = [$data->passCount, $data->failCount];
@@ -300,7 +300,7 @@ class ChartGenerator {
 
 		$chart = new Chart;
 		$chart->setType("pie");
-		$chart->setTitle("Pass / Fail ({$this->dateRangeLabel})");
+		$chart->setTitle("{$title} ({$this->dateRangeLabel})");
 		$chart->setLabels($labels);
 		$chart->addDataset("Counts", $dataset, [
 			"background_colours" => $colours,
@@ -342,7 +342,7 @@ class ChartGenerator {
 		return $chart;
 	}
 
-	public function getPeriodicPassFailRateChart(): Chart {
+	public function getPeriodicPassFailRateChart(string $title = "Pass / Fail"): Chart {
 
 		$chart = new Chart;
 		$chart->addXAxis([
@@ -356,7 +356,7 @@ class ChartGenerator {
 		]);
 
 		$chart->setType("bar");
-		$chart->setTitle("Pass / Fail by {$this->resolutionName}");
+		$chart->setTitle("{$title} by {$this->resolutionName}");
 		$chart->setLabels($this->xDataLabels);
 		$chart->addDataset("Pass Rate (%)", $this->getPeriodicPassRates(), [
 			"background_colours" => self::COLOUR_GREEN
@@ -414,10 +414,10 @@ class ChartGenerator {
 		);
 	}
 
-	public function getPeriodicLineOfSightPassRateChart(): Chart {
+	public function getPeriodicLineOfSightPassRateChart(string $title = "Pass Rate by Line of Sight"): Chart {
 
 		return $this->getPeriodicPassRateChart(
-			"Pass Rate by Line of Sight",
+			$title,
 			$this->getPeriodicPassRateByLineOfSight(1),
 			$this->getPeriodicPassRateByLineOfSight(0),
 			$this->getPeriodicPassRateByLineOfSight(2)
@@ -510,7 +510,7 @@ class ChartGenerator {
 		);
 	}
 
-	public function getPeriodicTotalsChart(): Chart {
+	public function getPeriodicTotalsChart(string $title = "Totals"): Chart {
 
 		$test_counts = $this->getPeriodicTestCounts();
 		$pass_rates = $this->getPeriodicPassRates();
@@ -519,7 +519,7 @@ class ChartGenerator {
 
 		$chart = new Chart;
 		$chart->setType("bar");
-		$chart->setTitle("Totals by {$this->resolutionName}");
+		$chart->setTitle("{$title} by {$this->resolutionName}");
 		$chart->setLabels($this->xDataLabels);
 		$chart->addYAxis([
 			"id" => "y-axis-1",
@@ -636,7 +636,7 @@ class ChartGenerator {
 		return $chart;
 	}
 
-	public function getPeriodicTestCountChart(): Chart {
+	public function getPeriodicTestCountChart(string $title = "Tests"): Chart {
 		$test_counts = $this->getPeriodicTestCounts();
 		$pass_rates = $this->getPeriodicPassRates();
 		$pass_rate_max = ceil(max($pass_rates) / 10) * 10;
@@ -652,7 +652,7 @@ class ChartGenerator {
 			"position" => "right"
 		]);
 		$chart->setType("bar");
-		$chart->setTitle("Tests by {$this->resolutionName}");
+		$chart->setTitle("{$title} by {$this->resolutionName}");
 		$chart->setLabels($this->xDataLabels);
 		$chart->addDataset("Tests", $test_counts, [
 			"background_colours" => self::COLOUR_BLUE

+ 19 - 19
template_processing/age_verification_greene_king/reports_build_charts.php

@@ -5,12 +5,12 @@
  * @var Template $template
  */
 
-$charts[] = $generator->getTestsByStageChart(["1 - On Entry", "2 - While Browsing", "3 - During Play", "4 - After Play", "5 - No Challenge"]);
-$charts[] = $generator->getChallengerGenderChart();
-$charts[] = $generator->getTesterGenderChart();
-$charts[] = $generator->getPassFailCountChart();
-$charts[] = $generator->getPassFailCountChartByKey(__("Bar Age Verification"), "barAgeVerificationCounts");
-$charts[] = $generator->getPassFailCountChartByKey(__("Bar Pass / Fail"), "barCounts");
+$charts[] = $generator->getTestsByStageChart(["1 - On Entry", "2 - While Browsing", "3 - During Play", "4 - After Play", "5 - No Challenge"], __("Gaming Tests by Stage"));
+//$charts[] = $generator->getChallengerGenderChart();
+//$charts[] = $generator->getTesterGenderChart();
+$charts[] = $generator->getPassFailCountChart(__("Gaming Pass / Fail"));
+$charts[] = $generator->getPassFailCountChartByKey(__("Alcohol Age Verification"), "barAgeVerificationCounts");
+$charts[] = $generator->getPassFailCountChartByKey(__("Alcohol Pass / Fail"), "barCounts");
 
 if(!empty($venue_type_data)) {
 	$charts[] = ChartGenerator::getVenueTypePassFailChart($venue_type_data);
@@ -22,21 +22,21 @@ if(!empty($venue_type_data)) {
 	}
 }
 
-$charts[] = $generator->getPeriodicPassFailRateChart();
-$charts[] = $generator->getPeriodicEyeContactChart();
-$charts[] = $generator->getPeriodicEyeContactPassRateChart();
-$charts[] = $generator->getPeriodicLineOfSightPassRateChart();
-$charts[] = $generator->getPeriodicPassRateChartByKey(__("Bar Age Verification Rate"), "barAgeVerificationCounts");
-$charts[] = $generator->getPeriodicPassRateChartByKey(__("Bar Pass Rate"), "barCounts");
-$charts[] = $generator->getPeriodicTotalsChart();
-$charts = array_merge($charts, $generator->getPointOfChallengeCharts("%s Point of Challenge", ["On Entry", "While Browsing", "During Play", "After Play", "No Challenge"]));
-$charts[] = $generator->getPeriodicTesterGenderChart();
-$charts[] = $generator->getPeriodicTestCountChart();
-$charts = array_merge($charts, $generator->getGenderComparisonCharts());
+$charts[] = $generator->getPeriodicPassFailRateChart(__("Gaming Pass / Fail"));
+//$charts[] = $generator->getPeriodicEyeContactChart();
+//$charts[] = $generator->getPeriodicEyeContactPassRateChart();
+$charts[] = $generator->getPeriodicLineOfSightPassRateChart(__("Gaming Pass Rate by Line of Sight"));
+$charts[] = $generator->getPeriodicPassRateChartByKey(__("Alcohol Age Verification Rate"), "barAgeVerificationCounts");
+$charts[] = $generator->getPeriodicPassRateChartByKey(__("Alcohol Pass Rate"), "barCounts");
+$charts[] = $generator->getPeriodicTotalsChart(__("Gaming Totals"));
+$charts = array_merge($charts, $generator->getPointOfChallengeCharts("Gaming %s Point of Challenge", ["On Entry", "While Browsing", "During Play", "After Play", "No Challenge"]));
+//$charts[] = $generator->getPeriodicTesterGenderChart();
+$charts[] = $generator->getPeriodicTestCountChart(__("Gaming Tests"));
+//$charts = array_merge($charts, $generator->getGenderComparisonCharts());
 
 if($generator->hasRegionData()) {
-	$charts[] = $generator->getRegionPassRateChart();
-	$charts[] = $generator->getPeriodicRegionPassRateChart();
+//	$charts[] = $generator->getRegionPassRateChart();
+//	$charts[] = $generator->getPeriodicRegionPassRateChart();
 }
 
 if($generator->hasAreaManagerData()) {