Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change award year switch to submit form on change #2993

Merged
merged 3 commits into from
Jul 4, 2024
Merged

Change award year switch to submit form on change #2993

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a1d721
Use id instead of class as selector
TheDancingClown Jul 3, 2024
eb427bb
Pass search query if entered but not submitted
TheDancingClown Jul 3, 2024
a41dcc0
Change award year switch to submit form
TheDancingClown Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 11 additions & 2 deletions app/assets/javascripts/admin/applications-filter.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ filterApplicationsDropdowns = () ->
.length
$(this).closest(".applications-filter").find("label[data-value='select_all'] input").prop("checked", unselected is 0)

# On clicking the award year radio
# On clicking the award year radio set search query to entered text
$(document).on "click", ".applications-filter .input__award-years input[type='radio']", (e) ->
e.stopPropagation()
# if other selected, show dropdown of years, otherwise get form answers for current year or all years
Expand All @@ -133,9 +133,18 @@ filterApplicationsDropdowns = () ->
dropdown = dropdownWrapper.find(".dropdown-toggle")
dropdown.focus().click()
else
search_query = $(this).closest(".new_search").find("#search_query").val()
search_query = $(this).closest("#new_search").find("#search_query").val()
url = new URL($(this).data('url'), document.baseURI)
url.searchParams.set('[search][query]', search_query)
window.location = url
TheDancingClown marked this conversation as resolved.
Show resolved Hide resolved

# On clicking the award year from the other year dropdown set search query to entered text
$(document).on "click", ".applications-filter .other-years-dropdown .dropdown-menu li", (e) ->
e.stopPropagation()
e.preventDefault()
search_query = $(this).closest("#new_search").find("#search_query").val()
url = new URL($(this).data('url'), document.baseURI)
url.searchParams.set('[search][query]', search_query)
window.location = url
TheDancingClown marked this conversation as resolved.
Show resolved Hide resolved

$(document).ready(ready)
8 changes: 4 additions & 4 deletions app/views/shared/form_answers/_admin_award_year.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ fieldset.award-year-z-index.applications-filter.award-year-radios
span.caret-container
span.caret
ul.dropdown-menu.dropdown-menu-right
li class="#{'active' if params[:year].to_s == 'all_years' || !params[:year]}"
= link_to "All Years", url_for(params.permit(:controller, :action).merge(year: :all_years, search: params[:search]))
li class="#{'active' if params[:year].to_s == 'all_years' || !params[:year]}" data-url="#{url_for(params.permit(:controller, :action).merge(year: :all_years, search: params[:search]))}"
= link_to "All Years", "#"

- AwardYear.admin_switch.each do |year, label|
li class="#{'active' if label == current_year_text}"
= link_to label, url_for(params.permit(:controller, :action).merge(year: year, search: params[:search]))
li class="#{'active' if label == current_year_text}" data-url="#{url_for(params.permit(:controller, :action).merge(year: year, search: params[:search]))}"
= link_to label, "#"