Skip to content

Combine voting when 2 matches remaining in each group #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Syrefva wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Combine voting when 2 matches remaining in each group #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a51a99e
combine groups after there's <= 2 in each group instead of == 1
Syrefva Aug 18, 2024
89c6a23
update the text on the voting page
Syrefva Aug 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions api/round.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public static function getBracketRounds($bracketId, $tier, $group = false, $igno
if (false !== $group) {
$params['group'] = $group;

// Check to see how many rounds there are in the group total. If there's only one, come back and get them all
// Check number of "round"s there are in the group. If <= 2, come back and get them all
$result = self::createQuery()
->count('total')
->where('bracketId', $bracketId)
Expand All @@ -160,7 +160,7 @@ public static function getBracketRounds($bracketId, $tier, $group = false, $igno
->where('deleted', 0)
->execute();
$row = Lib\Db::Fetch($result);
if (is_object($row) && (int)$row->total == 1) {
if (is_object($row) && (int)$row->total <= 2) {
$retVal = self::getBracketRounds($bracketId, $tier, false, $ignoreCache);
$result = null;
} else {
Expand Down Expand Up @@ -496,14 +496,19 @@ public static function getBracketTitleForRound(Bracket $bracket, Round $round) {
if (!$retVal) {
$retVal = 'Voting - Round ' . $round->tier . ', ';

$group = 'All Groups';
$groups = [];
// set the group only if all "round"s (matchups) belong to the same group
$group = 'Group ' . chr($round->group + 65);
foreach ($roundsInTier as $tierRound) {
if (isset($groups[$tierRound->group])) {
$group = 'Group ' . chr($round->group + 65);
if (!isset($first_group)) {
$first_group = $tierRound->group;
}

// if any "round" is in a different group than the 1st (basically if any 2 don't match),
// display "All Groups"
if ($tierRound->group !== $first_group) {
$group = 'All Groups';
break;
}
$groups[$tierRound->group] = true;
}

$retVal .= $group;
Expand Down