Alan Lam 8 лет назад
Родитель
Сommit
317f54c7d0
1 измененных файлов с 172 добавлено и 5 удалено
  1. 172 5
      controllers/reports.php

+ 172 - 5
controllers/reports.php

@@ -205,15 +205,23 @@ if($submit) {
 
 			"maleChallengeMaleCount" => 0,
 			"maleChallengeMalePassCount" => 0,
+			"maleChallengeMaleStages" => [0, 0, 0, 0, 0],
 
 			"maleChallengeFemaleCount" => 0,
 			"maleChallengeFemalePassCount" => 0,
+			"maleChallengeFemaleStages" => [0, 0, 0, 0, 0],
 
 			"femaleChallengeMaleCount" => 0,
 			"femaleChallengeMalePassCount" => 0,
+			"femaleChallengeMaleStages" => [0, 0, 0, 0, 0],
 
 			"femaleChallengeFemaleCount" => 0,
 			"femaleChallengeFemalePassCount" => 0,
+			"femaleChallengeFemaleStages" => [0, 0, 0, 0, 0],
+
+			"unknownChallengeCount" => 0,
+			"unknownChallengePassCount" => 0,
+			"unknownChallengeStages" => [0, 0, 0, 0, 0],
 
 			"stage1Count" => 0,
 			"stage2Count" => 0,
@@ -392,27 +400,41 @@ if($submit) {
 				$total_data->unspecifiedChallengerCount++;
 			}
 
-
+			// Mutual Genders
 			if($tester->gender == "M") {
 				if($test->challenger_gender == "M") {
 					$data[$key]->maleChallengeMaleCount++;
+					$data[$key]->maleChallengeMaleStages[$test->challenge_stage - 1]++;
 					if($test->pass) $data[$key]->maleChallengeMalePassCount++;
 				}
-				if($test->challenger_gender == "F") {
+				else if($test->challenger_gender == "F") {
 					$data[$key]->femaleChallengeMaleCount++;
+					$data[$key]->femaleChallengeMaleStages[$test->challenge_stage - 1]++;
 					if($test->pass) $data[$key]->femaleChallengeMalePassCount++;
 				}
+				else {
+					$data[$key]->unknownChallengeCount++;
+					$data[$key]->unknownChallengeStages[$test->challenge_stage - 1]++;
+					if($test->pass) $data[$key]->unknownChallengePassCount++;
+				}
 			}
 
 			if($tester->gender == "F") {
 				if($test->challenger_gender == "M") {
 					$data[$key]->maleChallengeFemaleCount++;
+					$data[$key]->maleChallengeFemaleStages[$test->challenge_stage - 1]++;
 					if($test->pass) $data[$key]->maleChallengeFemalePassCount++;
 				}
-				if($test->challenger_gender == "F") {
+				else if($test->challenger_gender == "F") {
 					$data[$key]->femaleChallengeFemaleCount++;
+					$data[$key]->femaleChallengeFemaleStages[$test->challenge_stage - 1]++;
 					if($test->pass) $data[$key]->femaleChallengeFemalePassCount++;
 				}
+				else {
+					$data[$key]->unknownChallengeCount++;
+					$data[$key]->unknownChallengeStages[$test->challenge_stage - 1]++;
+					if($test->pass) $data[$key]->unknownChallengePassCount++;
+				}
 			}
 		}
 
@@ -686,9 +708,153 @@ if($submit) {
 		]);
 		$charts[] = $chart;
 
-		$pass_counts = array_column($data, "passCount");
-		$fail_counts = array_column($data, "failCount");
+		// 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"));
+		}
+
+		// Mutual Genders 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("Mutual Genders $date_range_label");
+		$chart->setLabels(array_column($gender_keys, "label"));
+		$chart->addDataset("Tests", $gender_test_counts, [
+			"background_colours" => "#2196F3"
+		]);
+		$charts[] = $chart;
+
+		// Mutual Genders 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("Mutual Genders 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;
+
+		// Mutual Genders 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");
+
+		/*
+		header("Content-Type: text/plain");
+		print_r($fcf_counts);
+		print_r($fcf_pass_counts);
+
+		die();
+		*/
+
+		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("Mutual Genders 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;
+
+		// Mutual Genders 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);
@@ -761,6 +927,7 @@ if($submit) {
 
 		}
 
+		// Area Manager Graphs
 		if($has_area_managers) {
 
 			ksort($area_manager_data, SORT_NATURAL);