Skip to content
Snippets Groups Projects
Commit fe7e7c6b authored by a.croix's avatar a.croix
Browse files

Correct processorJobId in WowaJob + correct condition in getJobProgression method

parent ea9d381a
No related branches found
No related tags found
1 merge request!1Include Wowa Training
Pipeline #5929 failed
......@@ -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);
......
......@@ -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';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment