Closes #24 again

foodcoopsat · Mar 1, 2024 · 6cb809e · 6cb809e
1 parent d0f321c
commit 6cb809e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less
@@ -603,28 +603,37 @@ span.negative_amout {
   align-items: center;
 }
 
+.m-0 {
+  margin:0 !important;
+}
+
 .ml-1 {
-  margin-left: 3px;
+  margin-left: 3px !important;
+}
+
+.ml-2 {
+  margin-left: 6px !important;
 }
 
 td.ml-1 > *:first-child {
-  margin-left: 3px;
+  margin-left: 3px !important;
 }
 
+
 .mr-1 {
-  margin-right: 3px;
+  margin-right: 3px !important;
 }
 
 td.mr-1 > *:last-child {
   margin-right: 3px;
 }
 
 .mt-1 {
-  margin-top: 3px;
+  margin-top: 3px !important;
 }
 
 .mb-1 {
-  margin-bottom: 3px;
+  margin-bottom: 3px !important;
 }
 
 .text-decoration-none:hover {

diff --git a/app/controllers/article_units_controller.rb b/app/controllers/article_units_controller.rb
@@ -15,7 +15,8 @@ def search
 
     unless @query.nil?
       @article_units = @article_units.select do |_key, value|
-        value[:name].downcase.include?(@query) || value[:symbol]&.downcase&.include?(@query)
+        (value[:name].downcase.include?(@query) || value[:symbol]&.downcase&.include?(@query)) &&
+          (params[:only_recommended] == "0" || !value[:untranslated])
       end
     end
 

diff --git a/app/views/article_units/index.html.haml b/app/views/article_units/index.html.haml
@@ -1,5 +1,8 @@
 =form_with url: search_article_units_path, method: :get, id: :article_unit_search_form, html: {'data-remote': true} do |form|
-  = form.text_field :q, id: :article_unit_search, placeholder: t('.search')
+  .d-flex.align-items-center
+    = form.text_field :q, id: :article_unit_search, placeholder: t('.search'), class: 'm-0'
+    = form.check_box :only_recommended, id: :only_recommended, class: 'm-0 ml-2', checked: true
+    = form.label :only_recommended, t('.only_recommended'), class: 'm-0 ml-1', for: :only_recommended
 
 %table.table.table-striped
   %thead
@@ -31,7 +34,7 @@
     }
 
     $(document).ready(function () {
-      $('#article_unit_search').on('input', debounce(250, () => {
+      $('#article_unit_search, #only_recommended').on('input', debounce(250, () => {
         $('#article_unit_search_form').submit();
       }));
     });