kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 09:22:33 +00:00
Code Issues Projects Releases Wiki Activity

More code for import routine.

Browse Source
This commit is contained in:
James Cole
2017-06-22 21:50:10 +02:00
parent cddaccb7f7
commit edb355941c
9 changed files with 275 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@ use FireflyIII\Import\ImportProcedureInterface;
use FireflyIII\Import\Routine\ImportRoutine;
use FireflyIII\Import\Storage\ImportStorage;
use FireflyIII\Models\ImportJob;
use FireflyIII\Models\Tag;
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use FireflyIII\Repositories\User\UserRepositoryInterface;
@@ -188,11 +189,12 @@ 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 === 'complete') {
$tagId = $job->extended_status['importTag'];
/** @var TagRepositoryInterface $repository */
$repository = app(TagRepositoryInterface::class);
$tag = $repository->find($tagId);
if ($job->status === 'finished') {
// $tagId = $job->extended_status['importTag'];
// /** @var TagRepositoryInterface $repository */
// $repository = app(TagRepositoryInterface::class);
// $tag = $repository->find($tagId);
$tag = new Tag;
$result['finished'] = true;
$result['finishedText'] = trans('firefly.import_finished_link', ['link' => route('tags.show', [$tag->id]), 'tag' => $tag->tag]);
}
@@ -201,6 +203,7 @@ class ImportController extends Controller
$result['started'] = true;
$result['running'] = true;
$result['percentage'] = $percentage;
$result['showPercentage'] = true;
}
return Response::json($result);
@@ -241,7 +244,7 @@ class ImportController extends Controller
$routine = new ImportRoutine($job);
$routine->run();
return 'ok dan';
return 'done!';
}
/**