diff --git a/app/Log.php b/app/Log.php index ee59cbc13298072777e5c73fd64896a9032da0bb..8cd45b774e7ab49642792dfeb5e0f86c27e9410c 100644 --- a/app/Log.php +++ b/app/Log.php @@ -4,7 +4,6 @@ namespace App; use Illuminate\Database\Eloquent\Model; -use Illuminate\Support\Facades\DB; class Log extends Model { @@ -17,8 +16,7 @@ class Log extends Model $logs = self::where('job_id', '=', $wowa->id)->orderBy('progression', 'desc')->first(); if (!is_object($logs)) { return "Calculation in progress..."; - } - if ($wowa->status == Wowa::STATE_COLLECTION) { + } elseif ($wowa->status == Wowa::STATE_COLLECTION) { $log = self::where('job_id', '=', $wowa->id) ->where('training', '=', false)->orderBy('progression', 'desc')->first(); return $log->progression; diff --git a/resources/views/wowa/index.blade.php b/resources/views/wowa/index.blade.php index 082d6db31d437b573385cec24e2cf355988e32d1..67a7e6e633f3df3be2bf5bd5e5f7a9b038cc0bc8 100644 --- a/resources/views/wowa/index.blade.php +++ b/resources/views/wowa/index.blade.php @@ -20,7 +20,7 @@ <th>User</th> <th>Score</th> <th>Status</th> - <th>Progression</th> + <th>Progression (%)</th> <th></th> </tr> @foreach($wowas as $wowa)