From dd3aa44f733da8a6a87de20227bcbb4776d7f553 Mon Sep 17 00:00:00 2001
From: "a.croix" <croix.alexandre@gmail.com>
Date: Wed, 19 May 2021 23:59:51 +0200
Subject: [PATCH] Update getJobProgression method in Log class to be moe
efficient and clearer
---
app/Log.php | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/app/Log.php b/app/Log.php
index 75e1fe7..ee59cbc 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';
}
--
GitLab