consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a button to toggle advanced filters

Browse Source 
As mentioned in commit 5311daadf, there are several reasons to use
buttons in these situations.
This commit is contained in:
Javi Martín
2024-10-11 23:34:26 +02:00
parent bc4fd63950
commit 29968d1d9f
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/admin/budget_investments/search_form.scss
View File

@@ -1,5 +1,6 @@
.admin-budget-investments-search-form { .admin-budget-investments-search-form {
.advanced-filters { .advanced-filters {
@include link;
margin: $line-height 0; margin: $line-height 0;
@include breakpoint(medium) { @include breakpoint(medium) {

9
app/components/admin/budget_investments/search_form_component.html.erb
View File

@@ -1,10 +1,9 @@
<%= form_tag(admin_budget_budget_investments_path(budget), method: :get, enforce_utf8: false, class: "admin-budget-investments-search-form") do %> <%= form_tag(admin_budget_budget_investments_path(budget), method: :get, enforce_utf8: false, class: "admin-budget-investments-search-form") do %>
<div class="small-12 column"> <div class="small-12 column">
<%= link_to "#advanced_filters_content", <%= button_tag t("admin.budget_investments.index.advanced_filters"),
data: { toggle: "advanced_filters" }, type: :button,
class: "advanced-filters float-right clear" do %> data: { toggle: "advanced_filters" },
<%= t("admin.budget_investments.index.advanced_filters") %> class: "advanced-filters float-right clear" %>
<% end %>
</div> </div>
<div id="advanced_filters" class="<%= advanced_menu_visibility %>" data-toggler=".hide"> <div id="advanced_filters" class="<%= advanced_menu_visibility %>" data-toggler=".hide">

38
spec/system/admin/budget_investments_spec.rb
View File

@@ -245,7 +245,7 @@ describe "Admin budget investments", :admin do
expect(page).to have_link("Investment without admin") expect(page).to have_link("Investment without admin")
expect(page).to have_link("Investment with admin") expect(page).to have_link("Investment with admin")
click_link "Advanced filters" click_button "Advanced filters"
check("Without assigned admin") check("Without assigned admin")
click_button "Filter" click_button "Filter"
@@ -269,7 +269,7 @@ describe "Admin budget investments", :admin do
expect(page).to have_link("Investment without valuator") expect(page).to have_link("Investment without valuator")
expect(page).to have_link("Investment with valuator") expect(page).to have_link("Investment with valuator")
click_link "Advanced filters" click_button "Advanced filters"
check "Without assigned valuator" check "Without assigned valuator"
click_button "Filter" click_button "Filter"
@@ -305,7 +305,7 @@ describe "Admin budget investments", :admin do
expect(page).to have_link("Investment without valuation") expect(page).to have_link("Investment without valuation")
expect(page).to have_link("Investment with valuation") expect(page).to have_link("Investment with valuation")
click_link "Advanced filters" click_button "Advanced filters"
check "Under valuation" check "Under valuation"
click_button "Filter" click_button "Filter"
@@ -329,7 +329,7 @@ describe "Admin budget investments", :admin do
expect(page).to have_link("Investment valuation open") expect(page).to have_link("Investment valuation open")
expect(page).to have_link("Investment valuation finished") expect(page).to have_link("Investment valuation finished")
click_link "Advanced filters" click_button "Advanced filters"
check "Valuation finished" check "Valuation finished"
click_button "Filter" click_button "Filter"
@@ -353,7 +353,7 @@ describe "Admin budget investments", :admin do
expect(page).to have_link("Investment winner") expect(page).to have_link("Investment winner")
expect(page).to have_link("Investment without winner") expect(page).to have_link("Investment without winner")
click_link "Advanced filters" click_button "Advanced filters"
check "Winners" check "Winners"
click_button "Filter" click_button "Filter"
@@ -497,7 +497,7 @@ describe "Admin budget investments", :admin do
visit admin_budget_budget_investments_path(budget) visit admin_budget_budget_investments_path(budget)
click_link "Advanced filters" click_button "Advanced filters"
check "Winners" check "Winners"
click_button "Filter" click_button "Filter"
@@ -515,7 +515,7 @@ describe "Admin budget investments", :admin do
visit admin_budget_budget_investments_path(budget) visit admin_budget_budget_investments_path(budget)
click_link "Advanced filters" click_button "Advanced filters"
check "Winners" check "Winners"
click_button "Filter" click_button "Filter"
@@ -551,7 +551,7 @@ describe "Admin budget investments", :admin do
expect(page).to have_link("St. 200 supports") expect(page).to have_link("St. 200 supports")
expect(page).to have_link("St. 300 supports") expect(page).to have_link("St. 300 supports")
click_link "Advanced filters" click_button "Advanced filters"
fill_in "min_total_supports", with: 180 fill_in "min_total_supports", with: 180
click_button "Filter" click_button "Filter"
@@ -587,7 +587,7 @@ describe "Admin budget investments", :admin do
expect(page).to have_link("St. 200 supports") expect(page).to have_link("St. 200 supports")
expect(page).to have_link("St. 300 supports") expect(page).to have_link("St. 300 supports")
click_link "Advanced filters" click_button "Advanced filters"
fill_in "max_total_supports", with: 180 fill_in "max_total_supports", with: 180
click_button "Filter" click_button "Filter"
@@ -651,7 +651,7 @@ describe "Admin budget investments", :admin do
expect(page).to have_content("More schools") expect(page).to have_content("More schools")
expect(page).to have_content("More hospitals") expect(page).to have_content("More hospitals")
click_link "Advanced filters" click_button "Advanced filters"
check("Feasible") check("Feasible")
click_button "Filter" click_button "Filter"
@@ -703,7 +703,7 @@ describe "Admin budget investments", :admin do
expect(page).to have_content("More hospitals") expect(page).to have_content("More hospitals")
expect(page).not_to have_content("More hostals") expect(page).not_to have_content("More hostals")
click_link "Advanced filters" click_button "Advanced filters"
within("#advanced_filters") { check("Feasible") } within("#advanced_filters") { check("Feasible") }
click_button("Filter") click_button("Filter")
@@ -1339,7 +1339,7 @@ describe "Admin budget investments", :admin do
scenario "Filtering by valuation and selection" do scenario "Filtering by valuation and selection" do
visit admin_budget_budget_investments_path(budget) visit admin_budget_budget_investments_path(budget)
click_link "Advanced filters" click_button "Advanced filters"
check "Valuation finished" check "Valuation finished"
click_button "Filter" click_button "Filter"
@@ -1384,7 +1384,7 @@ describe "Admin budget investments", :admin do
scenario "Aggregating results" do scenario "Aggregating results" do
visit admin_budget_budget_investments_path(budget) visit admin_budget_budget_investments_path(budget)
click_link "Advanced filters" click_button "Advanced filters"
within("#advanced_filters") { check("Undecided") } within("#advanced_filters") { check("Undecided") }
click_button("Filter") click_button("Filter")
@@ -1422,7 +1422,7 @@ describe "Admin budget investments", :admin do
end end
end end
click_link "Advanced filters" click_button "Advanced filters"
within("#advanced_filters") { check("Selected") } within("#advanced_filters") { check("Selected") }
click_button("Filter") click_button("Filter")
@@ -1438,7 +1438,7 @@ describe "Admin budget investments", :admin do
scenario "Unselecting an investment" do scenario "Unselecting an investment" do
visit admin_budget_budget_investments_path(budget) visit admin_budget_budget_investments_path(budget)
click_link "Advanced filters" click_button "Advanced filters"
within("#advanced_filters") { check("Selected") } within("#advanced_filters") { check("Selected") }
click_button("Filter") click_button("Filter")
@@ -1507,7 +1507,7 @@ describe "Admin budget investments", :admin do
investment2.update!(administrator: admin) investment2.update!(administrator: admin)
visit admin_budget_budget_investments_path(budget) visit admin_budget_budget_investments_path(budget)
click_link "Advanced filters" click_button "Advanced filters"
check "Under valuation" check "Under valuation"
click_button "Filter" click_button "Filter"
@@ -1561,7 +1561,7 @@ describe "Admin budget investments", :admin do
visit admin_budget_budget_investments_path(budget) visit admin_budget_budget_investments_path(budget)
click_link "Advanced filters" click_button "Advanced filters"
check "Under valuation" check "Under valuation"
click_button "Filter" click_button "Filter"
@@ -1614,7 +1614,7 @@ describe "Admin budget investments", :admin do
visit admin_budget_budget_investments_path(budget) visit admin_budget_budget_investments_path(budget)
click_link "Advanced filters" click_button "Advanced filters"
check "Under valuation" check "Under valuation"
click_button "Filter" click_button "Filter"
@@ -1704,7 +1704,7 @@ describe "Admin budget investments", :admin do
create(:budget_investment, :finished, budget: budget, title: "Finished Investment") create(:budget_investment, :finished, budget: budget, title: "Finished Investment")
visit admin_budget_budget_investments_path(budget) visit admin_budget_budget_investments_path(budget)
click_link "Advanced filters" click_button "Advanced filters"
check "Valuation finished" check "Valuation finished"
click_button "Filter" click_button "Filter"

2
spec/system/admin/budgets_spec.rb
View File

@@ -490,7 +490,7 @@ describe "Admin budgets", :admin do
create(:budget_investment, :winner, budget: budget) create(:budget_investment, :winner, budget: budget)
visit admin_budget_budget_investments_path(budget) visit admin_budget_budget_investments_path(budget)
click_link "Advanced filters" click_button "Advanced filters"
check "Winners" check "Winners"
click_button "Filter" click_button "Filter"