X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=app%2FModels%2FRound.php;h=7daa77957da58769f332421c6b7840407badb74e;hb=f6408dcec11bb63eb1c996d73ebf5629335e25aa;hp=2c1a43963897563cfe2686245418dc5f9c149e38;hpb=a4260a00251cef4ad806c9d5c44d4c444d6ab831;p=alttp.git

diff --git a/app/Models/Round.php b/app/Models/Round.php
index 2c1a439..7daa779 100644
--- a/app/Models/Round.php
+++ b/app/Models/Round.php
@@ -10,53 +10,98 @@ class Round extends Model
 	use HasFactory;
 
 
+	public function isComplete() {
+		if (count($this->tournament->participants) == 0) return false;
+		if (count($this->results) == 0) return false;
+		foreach ($this->tournament->getRunners() as $participant) {
+			$result = $participant->findResult($this);
+			if (!$result || !$result->has_finished) return false;
+		}
+		return true;
+	}
+
 	public function updatePlacement() {
-		$runners = [];
-		foreach ($this->tournament->participants as $p) {
-			if ($p->isRunner()) {
-				$runners[] = $p;
-			} else {
-				$result = $p->findResult($this);
-				if ($result) {
-					$result->updatePlacement(null, null);
+		if ($this->tournament->type == 'open-async') {
+			$results = $this->results->sort([Result::class, 'compareResult']);
+			$reversed = $results->reverse();
+
+			$running = 0;
+			$bonus = 1;
+			$lastResult = null;
+			foreach ($reversed as $result) {
+				$betterThanLast = is_null($lastResult) || $result->time < $lastResult;
+				if (!$result->forfeit && $betterThanLast) {
+					$running += $bonus;
+					$lastResult = $result->time;
+					$bonus = 1;
+				} else {
+					++$bonus;
+				}
+				if (!$result->forfeit) {
+					$result->updatePlacement($running, count($results) - $running + 1);
+				} else {
+					$result->updatePlacement(0, count($results));
 				}
 			}
-		}
-
-		usort($runners, Participant::compareResult($this));
-		$mapped = array_map(function ($p) {
-			return ['participant' => $p, 'result' => $p->findResult($this)];
-		}, $runners);
-		$filtered = array_filter($mapped, function($r) {
-			return $r['result'] && ($r['result']->time || $r['result']->forfeit);
-		});
-		$reversed = array_reverse($filtered);
-
-		$running = 0;
-		$bonus = 1;
-		$lastResult = null;
-		foreach ($reversed as $r) {
-			$betterThanLast = is_null($lastResult) || $r['result']->time < $lastResult;
-			if (!$r['result']->forfeit && $betterThanLast) {
-				$running += $bonus;
-				$lastResult = $r['result']->time;
-				$bonus = 1;
-			} else {
-				++$bonus;
+		} else {
+			$runners = [];
+			foreach ($this->tournament->participants as $p) {
+				if ($p->isRunner()) {
+					$runners[] = $p;
+				} else {
+					$result = $p->findResult($this);
+					if ($result) {
+						$result->updatePlacement(null, null);
+					}
+				}
 			}
-			if (!$r['result']->forfeit) {
-				$r['result']->updatePlacement($running, count($filtered) - $running + 1);
-			} else {
-				$r['result']->updatePlacement(0, count($filtered));
+
+			usort($runners, Participant::compareResult($this));
+			$mapped = array_map(function ($p) {
+				return ['participant' => $p, 'result' => $p->findResult($this)];
+			}, $runners);
+			$filtered = array_filter($mapped, function($r) {
+				return $r['result'] && ($r['result']->time || $r['result']->forfeit);
+			});
+			$reversed = array_reverse($filtered);
+
+			$running = 0;
+			$bonus = 1;
+			$lastResult = null;
+			foreach ($reversed as $r) {
+				$betterThanLast = is_null($lastResult) || $r['result']->time < $lastResult;
+				if (!$r['result']->forfeit && $betterThanLast) {
+					$running += $bonus;
+					$lastResult = $r['result']->time;
+					$bonus = 1;
+				} else {
+					++$bonus;
+				}
+				if (!$r['result']->forfeit) {
+					$r['result']->updatePlacement($running, count($filtered) - $running + 1);
+				} else {
+					$r['result']->updatePlacement(0, count($filtered));
+				}
 			}
 		}
 	}
 
 
+	public function hideResults() {
+		foreach ($this->results as $result) {
+			$result->makeHidden(['forfeit', 'placement', 'score', 'time']);
+		}
+	}
+
+
 	public function results() {
 		return $this->hasMany(Result::class);
 	}
 
+	public function rolled_by_user() {
+		return $this->belongsTo(User::class, 'rolled_by');
+	}
+
 	public function tournament() {
 		return $this->belongsTo(Tournament::class);
 	}
@@ -66,12 +111,18 @@ class Round extends Model
 		'code' => 'array',
 		'locked' => 'boolean',
 		'no_record' => 'boolean',
+		'rolled_by' => 'string',
 	];
 
 	protected $fillable = [
+		'game',
 		'number',
 		'no_record',
 		'tournament_id',
 	];
 
+	protected $with = [
+		'rolled_by_user',
+	];
+
 }