diff --git a/app/Jobs/WowaJob.php b/app/Jobs/WowaJob.php index f45925c8d314a9bfb0aff71c03c387b4b5d67e53..056de6d31d0f7227924e939b72c9ed92e9e3d9fd 100644 --- a/app/Jobs/WowaJob.php +++ b/app/Jobs/WowaJob.php @@ -102,6 +102,7 @@ class WowaJob implements ShouldQueue $this->wowa->status = Wowa::STATE_RUNNING; $this->wowa->save(); $processor->setTrainingBooleanTrue(); + $processor->setJobId($this->wowa->id); $logg->pushProcessor($processor); try { $solution = $trainer->run($this->evidences, $this->is_true_alert); diff --git a/app/Log.php b/app/Log.php index 8cd45b774e7ab49642792dfeb5e0f86c27e9410c..e5e1788e680bebf265ca4815bbc70eb993d43ae8 100644 --- a/app/Log.php +++ b/app/Log.php @@ -23,6 +23,9 @@ class Log extends Model } 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(); + if (!is_object($log)) { + return "Calculation progress..."; + } return ((($log->progression + 1) / $wowa->generation_number) * 100); } else { return 'Error';