|
|
|
@ -8,7 +8,7 @@ class FilterManager |
|
|
|
@filter_type = filter_type |
|
|
|
@filter_type = filter_type |
|
|
|
end |
|
|
|
end |
|
|
|
|
|
|
|
|
|
|
|
def filter_by_search(base_collection, search_term = nil) |
|
|
|
def self.filter_by_search(base_collection, search_term = nil) |
|
|
|
if search_term.present? |
|
|
|
if search_term.present? |
|
|
|
base_collection.search_by(search_term) |
|
|
|
base_collection.search_by(search_term) |
|
|
|
else |
|
|
|
else |
|
|
|
@ -16,7 +16,7 @@ class FilterManager |
|
|
|
end |
|
|
|
end |
|
|
|
end |
|
|
|
end |
|
|
|
|
|
|
|
|
|
|
|
def filter_logs(logs, search_term, filters, all_orgs, user) |
|
|
|
def self.filter_logs(logs, search_term, filters, all_orgs, user) |
|
|
|
logs = filter_by_search(logs, search_term) |
|
|
|
logs = filter_by_search(logs, search_term) |
|
|
|
|
|
|
|
|
|
|
|
filters.each do |category, values| |
|
|
|
filters.each do |category, values| |
|
|
|
@ -58,7 +58,7 @@ class FilterManager |
|
|
|
|
|
|
|
|
|
|
|
def filtered_logs(logs, search_term, filters) |
|
|
|
def filtered_logs(logs, search_term, filters) |
|
|
|
all_orgs = params["organisation_select"] == "all" |
|
|
|
all_orgs = params["organisation_select"] == "all" |
|
|
|
filter_logs(logs, search_term, filters, all_orgs, current_user) |
|
|
|
FilterManager.filter_logs(logs, search_term, filters, all_orgs, current_user) |
|
|
|
end |
|
|
|
end |
|
|
|
|
|
|
|
|
|
|
|
def bulk_upload |
|
|
|
def bulk_upload |
|
|
|
|