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

Keeping filters state on pagination #638

Merged
merged 4 commits into from
Oct 17, 2020
Merged

Keeping filters state on pagination #638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4623f16
Keeping filters state on pagination
GPrimola Oct 4, 2020
d32dae9
Fix Code Climates complaints.
GPrimola Oct 4, 2020
8e797ce
Fixed active issue on ada filter buttons
GPrimola Oct 13, 2020
e56923e
Fixed undefined function problem when run rspec.
GPrimola Oct 17, 2020
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
28 changes: 22 additions & 6 deletions app/controllers/restrooms_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
class RestroomsController < ApplicationController
respond_to :html, :json

before_action :restrooms_filters, only: [:index]
before_action :list_restrooms, only: [:index]
before_action :find_restroom, only: [:show, :update, :edit, :destroy]

Expand Down Expand Up @@ -74,13 +75,28 @@ def update
end

private
def restrooms_filters
@filters =
params
.fetch(:filters, '')
.split(',')
.reduce({}) do |filters, filter|
filters[filter] = true if ['accessible', 'changing_table', 'unisex'].include?(filter)

filters
end
end

def list_restrooms
@restrooms = Restroom.current.page(params[:page])
@restrooms = if params[:search].present? || params[:map] == "1"
@restrooms.near([params[:lat], params[:long]], 20, :order => 'distance')
else
@restrooms.reverse_order
end
@restrooms = Restroom.current.where(@filters).page(params[:page])
@restrooms =
if params[:search].present? || params[:map] == "1"
@restrooms.near([params[:lat], params[:long]], 20, :order => 'distance')
else
@restrooms.reverse_order
end

@restrooms = @restrooms.out_of_range? ? @restrooms.page(1) : @restrooms
end

def display_errors
Expand Down
70 changes: 50 additions & 20 deletions app/javascript/packs/views/restrooms/restrooms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,57 @@
// You can use CoffeeScript in this file: http://coffeescript.org/

$(() => {
$('#ada_filter').click(function() {
if ($(this).hasClass("active")) {
$('.listItem.not_accessible').show();
} else {
$('.listItem.not_accessible').hide();
}
});
const filters = {
'#ada_filter': 'accessible',
'#unisex_filter': 'unisex',
'#changing_table_filter': 'changing_table'
};

$('#unisex_filter').click(function() {
if ($(this).hasClass("active")) {
$('.listItem.not_unisex').show();
} else {
$('.listItem.not_unisex').hide();
}
});
function getSearchParams() {
const { search: search } = location;
return new URLSearchParams(search);
}
function applyFilters(filters) {
const { origin: url, pathname: path } = location;
const searchParams = getSearchParams();
searchParams.set('filters', filters);
location = `${url}${path}?${searchParams.toString()}`
}

function getFilters() {
const searchParams = getSearchParams();
const filters = searchParams.get('filters') || '';
return filters.split(',').filter(filter => filter && filter.length > 0);
}

function removeFilter(toRemove) {
const filters =
getFilters()
.filter((filter) => filter != toRemove);

applyFilters(filters);
}

$('#changing_table_filter').click(function() {
if ($(this).hasClass("active")) {
$('.listItem.no_changing_table').show();
} else {
$('.listItem.no_changing_table').hide();
function addFilter(filter) {
let filters = getFilters();

if (filters.indexOf(filter) == -1) {
filters.push(filter);
}
});

applyFilters(filters);
}

function addOnClickEvent(filterElementId) {
const filter = filters[filterElementId];
$(filterElementId).click(function() {
if ($(this).hasClass("active")) {
removeFilter(filter);
} else {
addFilter(filter);
}
});
}

Object.keys(filters).forEach(addOnClickEvent);
});
12 changes: 6 additions & 6 deletions app/views/restrooms/index.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
.col-xs-12.headroom
#filters.clearfix
.btn-group{:data => {:toggle => "buttons"}}
%label#ada_filter.filter.btn.btn-light-purple.linkbutton{:title => t("restroom.accessible")}
%input{:type => "checkbox"}
%button#ada_filter.filter.btn.btn-light-purple.linkbutton{:title => t("restroom.accessible"), :class => ("active" if @filters.keys.include?('accessible'))}
%input{:type => "checkbox", :checked => @filters.keys.include?('accessible')}
%i.fa.fa-wheelchair
%label#unisex_filter.filter.btn-light-purple.btn.linkbutton{:title => t("restroom.type.unisex")}
%input{:type => "checkbox"}
%button#unisex_filter.filter.btn-light-purple.btn.linkbutton{:title => t("restroom.type.unisex"), :class => ("active" if @filters.keys.include?('unisex'))}
%input{:type => "checkbox", :checked => @filters.keys.include?('unisex')}
%i.fa.fa-transgender-alt
%label#changing_table_filter.filter.btn-light-purple.btn.linkbutton{:title => t("restroom.changing_table")}
%input{:type => "checkbox"}
%button#changing_table_filter.filter.btn-light-purple.btn.linkbutton{:title => t("restroom.changing_table"), :class => ("active" if @filters.keys.include?('changing_table'))}
%input{:type => "checkbox", :checked => @filters.keys.include?('changing_table')}
%i.fa.fa-child

.map-toggle-btn.mapToggle.linkbutton.btn-lg.btn-light-purple
Expand Down