Alan Lam 6 лет назад
Родитель
Сommit
c94e51c6d9
2 измененных файлов с 12 добавлено и 9 удалено
  1. 4 1
      controllers/reports.php
  2. 8 8
      engine/chart_generator.php

+ 4 - 1
controllers/reports.php

@@ -163,7 +163,10 @@ if($submit) {
 				$min_dts = "{$date_start} 00:00:00";
 				$max_dts = "{$date_end} 23:59:59";
 
-				$date_range_label = "{$min_day}/{$min_month}/{$min_year} - {$max_day}/{$max_month}/{$max_year}";
+				$min_time = strtotime($min_dts);
+				$max_time = strtotime($max_dts);
+
+				$date_range_label = sprintf("%s - %s", date("j M y", $min_time), date("j M y", $max_time));
 
 				if(preg_match("/01-01$/", $date_start) && preg_match("/12-31$/", $date_end)) {
 					$date_range_label = $min_year == $max_year ? $min_year : "{$min_year} - {$max_year}";

+ 8 - 8
engine/chart_generator.php

@@ -82,7 +82,7 @@ class ChartGenerator {
 	public function getTestsByStageChart(): Chart {
 		$chart = new Chart;
 		$chart->setType("doughnut");
-		$chart->setTitle("Tests by Stage {$this->dateRangeLabel}");
+		$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,
@@ -111,7 +111,7 @@ class ChartGenerator {
 	public function getChallengerGenderChart(): Chart {
 		$chart = new Chart;
 		$chart->setType("pie");
-		$chart->setTitle("Staff Gender {$this->dateRangeLabel}");
+		$chart->setTitle("Staff Gender ({$this->dateRangeLabel})");
 		$chart->setLabels(["Male", "Female", "Unspecified"]);
 		$chart->addDataset("Counts", [
 			$this->totalData->maleChallengerCount,
@@ -131,7 +131,7 @@ class ChartGenerator {
 	public function getTesterGenderChart(): Chart {
 		$chart = new Chart;
 		$chart->setType("pie");
-		$chart->setTitle("Tester Gender {$this->dateRangeLabel}");
+		$chart->setTitle("Tester Gender ({$this->dateRangeLabel})");
 		$chart->setLabels(["Male", "Female"]);
 		$chart->addDataset("Counts", [
 			$this->totalData->maleTesterCount,
@@ -149,7 +149,7 @@ class ChartGenerator {
 	public function getPassFailCountChart(): Chart {
 		$chart = new Chart;
 		$chart->setType("pie");
-		$chart->setTitle("Pass / Fail {$this->dateRangeLabel}");
+		$chart->setTitle("Pass / Fail ({$this->dateRangeLabel})");
 		$chart->setLabels(["Pass", "Fail"]);
 		$chart->addDataset("Counts", [
 			$this->totalData->passCount,
@@ -438,7 +438,7 @@ class ChartGenerator {
 			"tick_config" => ["min" => 0, "max" => ceil(max($gender_test_counts) / 10) * 10]
 		]);
 		$chart->setType("bar");
-		$chart->setTitle("Gender Comparison {$this->dateRangeLabel}");
+		$chart->setTitle("Gender Comparison ({$this->dateRangeLabel})");
 		$chart->setLabels(array_column($gender_keys, "label"));
 		$chart->addDataset("Tests", $gender_test_counts, [
 			"background_colours" => self::COLOUR_BLUE
@@ -582,7 +582,7 @@ class ChartGenerator {
 			"tick_config" => ["min" => 0, "max" => 100]
 		]);
 		$chart->setType("bar");
-		$chart->setTitle("Region Pass Rate {$this->dateRangeLabel}");
+		$chart->setTitle("Region Pass Rate ({$this->dateRangeLabel})");
 		$chart->setLabels($this->getRegionXDataLabels());
 		$chart->addDataset("Pass %", $data_values , [
 			"background_colours" => self::COLOUR_BLUE
@@ -658,7 +658,7 @@ class ChartGenerator {
 			"tick_config" => ["min" => 0, "max" => 100]
 		]);
 		$chart->setType("bar");
-		$chart->setTitle("Area Manager Pass Rate {$this->dateRangeLabel}");
+		$chart->setTitle("Area Manager Pass Rate ({$this->dateRangeLabel})");
 		$chart->setLabels($this->getAreaManagerXDataLabels());
 		$chart->addDataset("Pass %", $data_values , [
 			"background_colours" => self::COLOUR_BLUE
@@ -711,7 +711,7 @@ class ChartGenerator {
 
 		$chart = new Chart;
 		$chart->setType("doughnut");
-		$chart->setTitle("Tests by Cleanliness {$this->dateRangeLabel}");
+		$chart->setTitle("Tests by Cleanliness ({$this->dateRangeLabel})");
 		$chart->setLabels(["Very dirty", "Dirty", "Adequate", "Clean", "Very Clean"]);
 		$chart->addDataset("Tests", [
 			$this->totalData->cleanlinessCounts[0],