Merge branch 'meta/fixes' into develop

This commit is contained in:
Jeroen De Meerleer 2019-12-22 18:15:29 +01:00
commit 6f78b4ebe1
Signed by: JeroenED
GPG Key ID: 28CCCB8F62BFADD6
4 changed files with 9 additions and 15 deletions

2
dist/template.php vendored
View File

@ -2,7 +2,7 @@
// EDIT ME! // EDIT ME!
$pairingfile = 'your pairing-file.swar'; $pairingfile = 'your pairing-file.swar';
$fileformat = 'Swar-4'; // Possible getValue()s: Pairtwo-5, Pairtwo-6, Swar-4 $fileformat = 'Swar-4'; // Possible values: Pairtwo-5, Pairtwo-6, Swar-4
?> ?>
<!doctype html> <!doctype html>

View File

@ -224,7 +224,7 @@ class Player
{ {
$points = 0; $points = 0;
foreach ($this->Pairings as $key=>$pairing) { foreach ($this->Pairings as $key=>$pairing) {
if($key < $round || $round == -1) { if ($key < $round || $round == -1) {
if (array_search($pairing->Result, Constants::Won) !== false) { if (array_search($pairing->Result, Constants::Won) !== false) {
$points = $points + 1; $points = $points + 1;
} elseif (array_search($pairing->Result, Constants::Draw) !== false) { } elseif (array_search($pairing->Result, Constants::Draw) !== false) {
@ -330,7 +330,7 @@ class Player
*/ */
public function __get(string $key) public function __get(string $key)
{ {
if($key == 'PlayedGames') { if ($key == 'PlayedGames') {
return $this->playedGames(); return $this->playedGames();
} elseif ($key == 'NoOfWins') { } elseif ($key == 'NoOfWins') {
return $this->noOfWins(); return $this->noOfWins();

View File

@ -150,14 +150,11 @@ class Round
{ {
if ($key == 'Bye') { if ($key == 'Bye') {
return $this->bye(); return $this->bye();
} } elseif ($key == 'Absent') {
elseif ($key == 'Absent') {
return $this->absent(); return $this->absent();
} } elseif ($key == 'GamesByBoard') {
elseif ($key == 'GamesByBoard') {
return $this->gamesByBoard(); return $this->gamesByBoard();
} } elseif (isset($this->BinaryData[$key])) {
elseif (isset($this->BinaryData[$key])) {
return $this->BinaryData[$key]; return $this->BinaryData[$key];
} }
return null; return null;

View File

@ -928,14 +928,11 @@ class Tournament
{ {
if ($key == 'Participants') { if ($key == 'Participants') {
return $this->participants(); return $this->participants();
} } elseif ($key == 'AverageElo') {
elseif ($key == 'AverageElo') {
return $this->averageElo(); return $this->averageElo();
} } elseif ($key == 'Ranking') {
elseif ($key == 'Ranking') {
return $this->ranking(); return $this->ranking();
} } elseif (isset($this->BinaryData[$key])) {
elseif (isset($this->BinaryData[$key])) {
return $this->BinaryData[$key]; return $this->BinaryData[$key];
} }
return null; return null;