From 480d65fc1f1ae1c5772251fff9aacfb0ea4f6fcd Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Thu, 3 May 2018 18:17:59 +0200
Subject: [PATCH] Fake import works, won't fire rules yet. also needs a state.

---
 app/Http/Controllers/Import/JobStatusController.php | 12 ++++++++++--
 public/js/ff/import/status_v2.js                    |  5 ++++-
 resources/lang/en_US/import.php                     |  1 +
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Import/JobStatusController.php b/app/Http/Controllers/Import/JobStatusController.php
index a804735a73..fe30e59af2 100644
--- a/app/Http/Controllers/Import/JobStatusController.php
+++ b/app/Http/Controllers/Import/JobStatusController.php
@@ -102,7 +102,17 @@ class JobStatusController extends Controller
             'tag_name'      => null === $importJob->tag_id ? null : $importJob->tag->tag,
             'journals'      => $extendedStatus['count'] ?? 0,
             'journals_text' => trans_choice('import.status_with_count', $extendedStatus['count'] ?? 0),
+            'tag_text'      => '',
         ];
+        if (null !== $importJob->tag_id) {
+            $json['tag_text'] = trans(
+                'import.status_finished_job',
+                ['count' => $extendedStatus['count'],
+                 'link'  => route('tags.show', [$importJob->tag_id]),
+                 'tag'   => $importJob->tag->tag,
+                ]
+            );
+        }
 
         return response()->json($json);
     }
@@ -230,8 +240,6 @@ class JobStatusController extends Controller
         }
 
 
-
-
     }
 
     //    /**
diff --git a/public/js/ff/import/status_v2.js b/public/js/ff/import/status_v2.js
index fe8dc6bb04..51436101b8 100644
--- a/public/js/ff/import/status_v2.js
+++ b/public/js/ff/import/status_v2.js
@@ -95,6 +95,9 @@ function showJobResults(data) {
     // render the count:
     $('#import-status-more-info').append($('<span>').text(data.journals_text));
 
+    if(data.tag_id) {
+        $('#import-status-more-info').append($('<br>')).append($('<span>').html(data.tag_text));
+    }
 
     // render relevant data from JSON thing.
     if (data.errors.length > 0) {
@@ -182,7 +185,7 @@ function showProgressBox(status) {
 
     // hide initial status box:
     $('.status_initial').hide();
-    if(status === 'running') {
+    if(status === 'running' || status === 'ready_to_run') {
         $('#import-status-txt').text(langImportRunning);
     } else {
         $('#import-status-txt').text(langImportStoring);
diff --git a/resources/lang/en_US/import.php b/resources/lang/en_US/import.php
index c9a4c01524..ca2d6d0b4c 100644
--- a/resources/lang/en_US/import.php
+++ b/resources/lang/en_US/import.php
@@ -49,6 +49,7 @@ return [
     'status_errors_single'       => 'An error has occurred during the import. It does not appear to be fatal.',
     'status_errors_multi'        => 'Some errors occurred during the import. These do not appear to be fatal.',
     'status_with_count'          => 'One transaction has been imported|:count transactions have been imported.',
+    'job_status_breadcrumb'      => 'Import job state',
 
     'status_bread_crumb'                   => 'Import status',
     'status_sub_title'                     => 'Import status',