diff --git a/app/Log.php b/app/Log.php index 75e1fe7c77b2deed9b076d44fa13575e5278e13e..ee59cbc13298072777e5c73fd64896a9032da0bb 100644 --- a/app/Log.php +++ b/app/Log.php @@ -19,17 +19,13 @@ class Log extends Model return "Calculation in progress..."; } if ($wowa->status == Wowa::STATE_COLLECTION) { - $result = 'Evidences collection : '; $log = self::where('job_id', '=', $wowa->id) ->where('training', '=', false)->orderBy('progression', 'desc')->first(); - return $result . $log->progression; - } elseif ($wowa->status == Wowa::STATE_RUNNING) { - $result = 'Training : '; + return $log->progression; + } elseif ($wowa->status == Wowa::STATE_RUNNING || $wowa->status == Wowa::STATE_SUCCESS) { $log = self::where('job_id', '=', $wowa->id) ->where('training', '=', true)->orderBy('progression', 'desc')->first(); - return $result . ((($logs->progression + 1) / $wowa->generation_number) * 100); - } elseif ($wowa->status = Wowa::STATE_SUCCESS) { - return (($logs->progression + 1) / $wowa->generation_number) * 100; + return ((($log->progression + 1) / $wowa->generation_number) * 100); } else { return 'Error'; }