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

Finetune import status page.

Browse Source
This commit is contained in:
James Cole
2016-08-14 08:10:42 +02:00
parent 7f5b94fe43
commit e440d55034
3 changed files with 47 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,6 +127,12 @@ class ImportController extends Controller
*/ */
public function finished(ImportJob $job) public function finished(ImportJob $job)
{ {
if (!$this->jobInCorrectStep($job, 'finished')) {
Log::debug('Job is not in correct state for finished()', ['status' => $job->status]);
return $this->redirectToCorrectStep($job);
}
$subTitle = trans('firefly.import_finished'); $subTitle = trans('firefly.import_finished');
$subTitleIcon = 'fa-star'; $subTitleIcon = 'fa-star';
@@ -379,6 +385,8 @@ class ImportController extends Controller
case 'settings': case 'settings':
case 'store-settings': case 'store-settings':
return $job->status === 'import_configuration_saved'; return $job->status === 'import_configuration_saved';
case 'finished':
return $job->status === 'import_finished';
case 'complete': case 'complete':
return $job->status === 'settings_complete'; return $job->status === 'settings_complete';
case 'status': case 'status':

4
resources/lang/en_US/firefly.php
View File

@@ -782,4 +782,8 @@ return [
'import_status_settings_complete' => 'The import is ready to start.', 'import_status_settings_complete' => 'The import is ready to start.',
'import_status_import_complete' => 'The import has completed.', 'import_status_import_complete' => 'The import has completed.',
'import_status_import_running' => 'The import is currently running. Please be patient.', 'import_status_import_running' => 'The import is currently running. Please be patient.',
'import_status_header' => 'Import status and progress',
'import_status_errors' => 'Import errors',
'import_status_report' => 'Import report',
'import_finished' => 'Import has finished',
]; ];

48
resources/views/import/status.twig
View File

@@ -5,15 +5,12 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12">
<div class="box box-default"> <div class="box box-primary">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'import_status'|_ }}</h3> <h3 class="box-title">{{ 'import_status_header'|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<div class="row">
<div class="col-lg-6 col-lg-offset-3">
<div class="progress" id="import-status-holder"> <div class="progress" id="import-status-holder">
<div id="import-status-bar" class="progress-bar progress-bar-info active progress-bar-striped" role="progressbar" <div id="import-status-bar" class="progress-bar progress-bar-info active progress-bar-striped" role="progressbar"
aria-valuenow="100" aria-valuemin="0" aria-valuenow="100" aria-valuemin="0"
@@ -21,17 +18,42 @@
</div> </div>
</div> </div>
<p id="import-status-txt">{{ 'import_status_settings_complete'|_ }}</p> <p id="import-status-txt">{{ 'import_status_settings_complete'|_ }}</p>
<p id="import-status-more-info"></p>
<p id="import-status-error-intro"></p>
<ul id="import-status-error-list"></ul>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12">
<div class="box box-danger">
<div class="box-header with-border">
<h3 class="box-title">{{ 'import_status_errors'|_ }}</h3>
</div>
<div class="box-body">
<p id="import-status-error-intro">
No errors detected.
</p>
<ul id="import-status-error-list"></ul>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12">
<div class="box box-default">
<div class="box-header with-border">
<h3 class="box-title">{{ 'import_status_report'|_ }}</h3>
</div>
<div class="box-body">
<p id="import-status-more-info">
Nothing to report so far
</p>
</div>
</div>
</div>
</div>
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<script type="text/javascript"> <script type="text/javascript">