Refs #4256: adding started_at filter

5 files changed, 10 insertions, 3 deletions

diff --git a/app/views/imports/_filters.html.slim b/app/views/imports/_filters.html.slim
index 8df326010..99fcb0232 100644
--- a/app/views/imports/_filters.html.slim
+++ b/app/views/imports/_filters.html.slim
@@ -1,7 +1,7 @@
 = search_form_for @q, url: workbench_imports_path(@workbench), html: { method: :get, class: 'form form-filter' } do |f|
   .ffg-row
     .input-group.search_bar
-      = f.search_field :name_or_creator_cont, class: 'form-control', placeholder: "Indiquez un nom d'importation..."
+      = f.search_field :name_or_creator_cont, class: 'form-control', placeholder: t('imports.filters.name_or_creator_cont')
       span.input-group-btn
         button.btn.btn-default#search_btn type='submit'
           span.fa.fa-search
@@ -11,6 +11,11 @@
       = f.label Import.human_attribute_name(:status), required: false, class: 'control-label'
       = f.input :status_eq_any, collection: @imports.map(&:status).uniq.compact, as: :check_boxes, label: false, label_method: lambda{|l| ("<span>" + l + "</span>").html_safe}, required: false, wrapper_html: { class: 'checkbox_list'}
 
+    .form-group.togglable
+      = f.label Import.human_attribute_name(:started_at), required: false, class: 'control-label'
+      .filter_menu
+        = f.input :started_at_eq, as: :date, label: false, wrapper_html: { class: 'date smart_date filter_menu-item' }, include_blank: true
+
   .actions
     = link_to t('actions.erase'), workbench_imports_path(@workbench), class: 'btn btn-link'
     = f.submit t('actions.filter'), class: 'btn btn-default'
diff --git a/app/views/imports/index.html.slim b/app/views/imports/index.html.slim
index dfbefb66c..79e464490 100644
--- a/app/views/imports/index.html.slim
+++ b/app/views/imports/index.html.slim
@@ -41,6 +41,6 @@
           = new_pagination @imports, 'pull-right'
 
     - unless @imports.any?
-      .row
+      .row.mt-xs
         .col-lg-12
           = replacement_msg t('imports.search_no_results')
diff --git a/app/views/networks/index.html.slim b/app/views/networks/index.html.slim
index 4c1f9783c..1478c3e09 100644
--- a/app/views/networks/index.html.slim
+++ b/app/views/networks/index.html.slim
@@ -40,6 +40,6 @@
           = new_pagination @networks, 'pull-right'
 
     - unless @networks.any?
-      .row
+      .row.mt-xs
         .col-lg-12
           = replacement_msg t('networks.search_no_results')
diff --git a/config/locales/imports.en.yml b/config/locales/imports.en.yml
index 3f0e3d42e..b92b8843f 100644
--- a/config/locales/imports.en.yml
+++ b/config/locales/imports.en.yml
@@ -3,6 +3,7 @@ en:
     search_no_results: "No import matching your query"
     filters:
       referential: "Select data space..."
+      name_or_creator_cont: "Select an import or creator name..."
     actions:
       new: "New import"
       show: "Import report"
diff --git a/config/locales/imports.fr.yml b/config/locales/imports.fr.yml
index 5629509bc..f7bf8c178 100644
--- a/config/locales/imports.fr.yml
+++ b/config/locales/imports.fr.yml
@@ -3,6 +3,7 @@ fr:
     search_no_results: "Aucun import ne correspond à votre recherche"
     filters:
       referential: "Sélectionnez un jeu de données..."
+      name_or_creator_cont: "Indiquez un nom d'import ou d'opérateur..."
     actions:
       new: "Nouvel import"
       show: "Rapport d'import"