nicolas/phone_app
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

color search ok

Browse Source
This commit is contained in:
Barnabé 2021-08-27 19:42:35 +02:00
parent b61ff2567f
commit de44f95293
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/admin/p_articles_controller.rb
View File

@ -15,9 +15,9 @@ class Admin::PArticlesController < ApplicationController
if params[:search][:p_product_color].to_s != ""
if params[:search][:p_product_color].to_s == "null"
@p_articles = @p_articles.where(:p_product_color => nil)
@p_articles = @p_articles.joins(:p_product_ref).where("p_product_color_id = ?", nil)
else
@p_articles = @p_articles.where(:p_product_color => params[:search][:p_product_color])
@p_articles = @p_articles.joins(:p_product_ref).where("p_product_color_id = ?", params[:search][:p_product_color])
end
end
@ -25,6 +25,10 @@ class Admin::PArticlesController < ApplicationController
@p_articles = @p_articles.joins(:p_product_ref).where("cc_name LIKE ?", "#{params[:search][:p_product_ref_cc_name]}%")
end
if params[:search][:p_grade_id]
@p_articles = @p_articles.where("p_grade_id LIKE ?", "#{params[:search][:p_grade_id]}%")
end
if params[:search][:p_product_ref_cc_code]
@p_articles = @p_articles.joins(:p_product_ref).where("cc_code LIKE ?", "#{params[:search][:p_product_ref_cc_code]}%")
end

7
app/views/admin/p_articles/index.html.haml
View File

@ -18,9 +18,12 @@
%td=text_field_tag "search[p_serial_num_value]", params[:search][:p_serial_num_value],:class => "form-control", :placeholder => "N° de serie"
%td.pl-2 Grade :
%td=select_tag "search[p_grade_id]", options_for_select([["",""],["Aucune","null"]]+PGrade.pluck(:grade, :id), params[:search][:p_grade_id]), class: "custom-select"
%td.pl-2 Couleur :
%td
Couleur :
=select_tag "search[p_product_color]", options_for_select([["",""],["Aucune","null"]]+PProductColor.pluck(:color, :id), params[:search][:p_product_color])
=select_tag "search[p_product_color]", options_for_select([["",""],["Aucune","null"]]+PProductColor.pluck(:color, :id), params[:search][:p_product_color]),class: "custom-select"
=render :partial => "qi/qi_ordered_table_search_footer", :locals => {:collection_object => @p_articles}