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

fixing issue with organization filter/sorting. also caused problems … #716

Merged
merged 1 commit into from
Oct 26, 2016
Merged

fixing issue with organization filter/sorting. also caused problems … #716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 23 additions & 16 deletions app/assets/javascripts/dashboard/protocols.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ $(document).ready ->
url: "/dashboard/protocols/#{protocol_id}/archive.js"
data: { protocol_id: protocol_id }

$(document).on 'submit', '#filterrific-no-ajax-auto-submit', ->
$('#filterrific_sorted_by').val("#{$('.protocol-sort').data('sort-name')} #{$('.protocol-sort').data('sort-order')}")

$(document).on 'click', '#save_filters_link', ->
data = {} #Grab form values

Expand Down Expand Up @@ -156,24 +159,28 @@ $(document).ready ->

# Protocol Table Sorting
$(document).on 'click', '.protocol-sort', ->
search_query = $('#search_query').val()
show_archived = $('#show_archived').val()
with_status = $('#with_status').val()
with_organization = $('#with_organization').val()
with_owner = $('#with_owner').val()
admin_filter = $('#admin_filter').val()
sorted_by = "#{$(this).data('sort-name')} #{$(this).data('sort-order')}"
page = $('#page').val() || 1
data =
'page': page
'filterrific':
'search_query': search_query
'show_archived': show_archived
'with_status': with_status
'with_organization': with_organization
'with_owner': with_owner
'admin_filter': admin_filter
'sorted_by': sorted_by

data = {} #Grab form values

# REVIEW this is not fetching values from multiselects
$.each $('form#filterrific-no-ajax-auto-submit').serializeArray(), (i, field) ->
data[field.name] = field.value

data["page"] = page
data["filterrific[sorted_by]"] = sorted_by

# manually enter those in
if data["filterrific[with_status][]"].length
data["filterrific[with_status][]"] = $("#filterrific_with_status").val()

if data["filterrific[with_organization][]"] && data["filterrific[with_organization][]"].length
data["filterrific[with_organization][]"] = $("#filterrific_with_organization").val()

if data["filterrific[with_owner][]"] && data["filterrific[with_owner][]"].length
data["filterrific[with_owner][]"] = $("#filterrific_with_owner").val()

$.ajax
type: 'get'
url: "/dashboard/protocols.js"
Expand Down
3 changes: 2 additions & 1 deletion app/views/dashboard/protocol_filters/_filter_protocols_form.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
.clearfix

= form_for_filterrific filterrific, remote: true, html: { id: 'filterrific-no-ajax-auto-submit', autocomplete: 'off' } do |form|
= form.hidden_field :sorted_by
.panel-body
#protocol_filter_form_display
.form-group.row
Expand All @@ -54,7 +55,7 @@
= filterrific.select_options[:with_organization].each do |org_type, orgs|
%optgroup{ label: org_type }
- orgs.each do |name, id|
%option{ value: id, selected: filterrific.with_organization && filterrific.with_organization.include?(id.to_s), data: {content: name} }
%option{ value: id, selected: filterrific.with_organization && filterrific.with_organization.include?(id), data: {content: name} }
- if admin
%hr
.form-group.row
Expand Down