فهرست منبع

Add unspecified challenger gender slice to pie chart

Alan Lam 8 سال پیش
والد
کامیت
4ac0487e1e
1فایلهای تغییر یافته به همراه14 افزوده شده و 2 حذف شده
  1. 14 2
      controllers/reports.php

+ 14 - 2
controllers/reports.php

@@ -198,8 +198,10 @@ if($submit) {
 
 			"maleTesterCount" => 0,
 			"femaleTesterCount" => 0,
+
 			"maleChallengerCount" => 0,
 			"femaleChallengerCount" => 0,
+			"unspecifiedChallengerCount" => 0,
 
 			"maleChallengeMaleCount" => 0,
 			"maleChallengeMalePassCount" => 0,
@@ -223,8 +225,11 @@ if($submit) {
 		$total_data = (object) [
 			"maleTesterCount" => 0,
 			"femaleTesterCount" => 0,
+
 			"maleChallengerCount" => 0,
 			"femaleChallengerCount" => 0,
+			"unspecifiedChallengerCount" => 0,
+
 			"testCount" => 0,
 			"passCount" => 0,
 			"failCount" => 0,
@@ -378,10 +383,15 @@ if($submit) {
 				$data[$key]->maleChallengerCount++;
 				$total_data->maleChallengerCount++;
 			}
-			if($test->challenger_gender == "F") {
+			else if($test->challenger_gender == "F") {
 				$data[$key]->femaleChallengerCount++;
 				$total_data->femaleChallengerCount++;
 			}
+			else {
+				$data[$key]->unspecifiedChallengerCount++;
+				$total_data->unspecifiedChallengerCount++;
+			}
+
 
 			if($tester->gender == "M") {
 				if($test->challenger_gender == "M") {
@@ -460,14 +470,16 @@ if($submit) {
 		$chart = new Chart;
 		$chart->setType("pie");
 		$chart->setTitle("Staff Gender $date_range_label");
-		$chart->setLabels(["Male", "Female"]);
+		$chart->setLabels(["Male", "Female", "Unspecified"]);
 		$chart->addDataset("Counts", [
 			$total_data->maleChallengerCount,
 			$total_data->femaleChallengerCount,
+			$total_data->unspecifiedChallengerCount,
 		], [
 			"background_colours" => [
 				"#2196F3",
 				"#E91E63",
+				"#9E9E9E",
 			]
 		]);
 		$chart->setDatalabelSuffixes(" Test");