kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-19 19:01:58 +00:00
Code Issues Projects Releases Wiki Activity

Divide by zero.

Browse Source
This commit is contained in:
James Cole
2016-08-14 09:10:08 +02:00
parent d287ae97f8
commit 85f484e73c
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/ImportController.php
View File

@@ -166,7 +166,7 @@ class ImportController extends Controller
*/ */
public function json(ImportJob $job) public function json(ImportJob $job)
{ {
$result = [ $result = [
'showPercentage' => false, 'showPercentage' => false,
'status' => $job->status, 'status' => $job->status,
'key' => $job->key, 'key' => $job->key,
@@ -179,11 +179,16 @@ class ImportController extends Controller
'stepsDone' => $job->extended_status['steps_done'], 'stepsDone' => $job->extended_status['steps_done'],
'statusText' => trans('firefly.import_status_' . $job->status), 'statusText' => trans('firefly.import_status_' . $job->status),
]; ];
$percentage = 0;
if ($job->extended_status['total_steps'] !== 0) {
$percentage = round(($job->extended_status['steps_done'] / $job->extended_status['total_steps']) * 100, 0);
}
if ($job->status === 'import_running') { if ($job->status === 'import_running') {
$result['started'] = true; $result['started'] = true;
$result['running'] = true; $result['running'] = true;
$result['showPercentage'] = true; $result['showPercentage'] = true;
$result['percentage'] = round(($job->extended_status['steps_done'] / $job->extended_status['total_steps']) * 100, 0); $result['percentage'] = $percentage;
} }
return Response::json($result); return Response::json($result);