|
|
@@ -400,7 +400,7 @@ if($submit) {
|
|
|
$total_data->unspecifiedChallengerCount++;
|
|
|
}
|
|
|
|
|
|
- // Mutual Genders
|
|
|
+ // Genders Comparison
|
|
|
if($tester->gender == "M") {
|
|
|
if($test->challenger_gender == "M") {
|
|
|
$data[$key]->maleChallengeMaleCount++;
|
|
|
@@ -737,21 +737,21 @@ if($submit) {
|
|
|
$gender_test_counts[] = array_sum(array_column($data, "{$gk}Count"));
|
|
|
}
|
|
|
|
|
|
- // Mutual Genders by Date Range
|
|
|
+ // Gender Comparison 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->setTitle("Gender Comparison $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
|
|
|
+ // Gender Comparison by Resolution
|
|
|
$mcm_counts = array_column($data, "maleChallengeMaleCount");
|
|
|
$mcf_counts = array_column($data, "maleChallengeFemaleCount");
|
|
|
$fcm_counts = array_column($data, "femaleChallengeMaleCount");
|
|
|
@@ -764,7 +764,7 @@ if($submit) {
|
|
|
"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->setTitle("Gender Comparison 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"]);
|
|
|
@@ -774,7 +774,7 @@ if($submit) {
|
|
|
$chart->print = true;
|
|
|
$charts[] = $chart;
|
|
|
|
|
|
- // Mutual Genders Pass Rate by Resolution
|
|
|
+ // Gender Comparison 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");
|
|
|
@@ -811,7 +811,7 @@ if($submit) {
|
|
|
"tick_config" => ["min" => 0, "max" => 100],
|
|
|
]);
|
|
|
$chart->setType("bar");
|
|
|
- $chart->setTitle("Mutual Genders Pass Rate by $resolution_name");
|
|
|
+ $chart->setTitle("Gender Comparison 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]);
|
|
|
@@ -822,7 +822,7 @@ if($submit) {
|
|
|
$chart->setDatalabelSuffixes("%", "%", "%", "%", "%");
|
|
|
$charts[] = $chart;
|
|
|
|
|
|
- // Mutual Genders Point of Challenge
|
|
|
+ // Gender Comparison Point of Challenge
|
|
|
foreach($keys as $index => $key) {
|
|
|
$key_label = $key_labels[$index];
|
|
|
$period_data = $data[$key];
|