kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Better report for finished import.

Browse Source
This commit is contained in:
James Cole
2016-08-14 10:11:49 +02:00
parent 106665a468
commit 70b63e1736
4 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -168,10 +168,8 @@ class ImportController extends Controller
{
$result = [
'showPercentage' => false,
'status' => $job->status,
'key' => $job->key,
'started' => false,
'completed' => false,
'finished' => false,
'running' => false,
'errors' => $job->extended_status['errors'],
'percentage' => 0,
@@ -183,6 +181,9 @@ class ImportController extends Controller
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_complete') {
$result['finished'] = true;
}
if ($job->status === 'import_running') {
$result['started'] = true;