|
@@ -42,40 +42,22 @@ else {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// Genders Comparison
|
|
// Genders Comparison
|
|
|
-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++;
|
|
|
|
|
- }
|
|
|
|
|
- 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++;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+$gender_prefix = "";
|
|
|
|
|
+switch($test->challenger_gender) {
|
|
|
|
|
+ case "M": $gender_prefix = "male"; break;
|
|
|
|
|
+ case "F": $gender_prefix = "female"; break;
|
|
|
|
|
+ default: $gender_prefix = "unknown"; break;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-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++;
|
|
|
|
|
- }
|
|
|
|
|
- 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++;
|
|
|
|
|
|
|
+$gender_prefix .= "Challenge";
|
|
|
|
|
+
|
|
|
|
|
+if($gender_prefix != "unknownChallenge") {
|
|
|
|
|
+ switch($tester->gender) {
|
|
|
|
|
+ case "M": $gender_prefix .= "Male"; break;
|
|
|
|
|
+ case "F": $gender_prefix .= "Female"; break;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-?>
|
|
|
|
|
|
|
+$data[$key]->{$gender_prefix . "Count"}++;
|
|
|
|
|
+$data[$key]->{$gender_prefix . "Stages"}[$test->challenge_stage - 1]++;
|
|
|
|
|
+if($test->pass) $data[$key]->{$gender_prefix . "PassCount"}++;
|