Skip to content

Ticket #47: Frontend Kategorieauswahl #72

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

Open
ro3t wants to merge 2 commits into
base: master
Choose a base branch
from
+4 −11
Open

Ticket #47: Frontend Kategorieauswahl #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14a1b88
Ticket #47: Frontend Kategorieauswahl
ro3t Jul 21, 2023
a68c979
permit für passende Parameter nutzen
nbennke Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/assets/javascripts/forms.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ $ ->

KS.content().on 'change', 'select[data-update]', ->
if (target = $("##{ $(@).data('update') }"))? && (url = target.data('src'))?
$.ajax(url: url, dataType: 'json', data: category: $(@).val()).done (response) ->
$.ajax(url: url, dataType: 'json', data: { category: $(@).val(), lat: $('#request_lat').val(), long: $('#request_long').val()}).done (response) ->
target.html('').append "<option disabled='disabled' selected='selected' class='placeholder'>#{
target.data('placeholder') }</option>"
$(response).each ->
Expand Down
9 changes: 1 addition & 8 deletions app/controllers/services_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,7 @@ class ServicesController < ApplicationController
respond_to :json

def index
services = Service.collection.to_a.dup
if (type = params[:type]).present?
services.reject! { |s| s.type != type }
end
if (category = params[:category]).present?
services.reject! { |s| s.group != category }
end
respond_with services
respond_with Service.where(params.permit(:lat, :long).merge(group: params[:category], keywords: params[:type]))
rescue ActionController::UnknownFormat
head :not_acceptable
end
Expand Down
4 changes: 2 additions & 2 deletions app/helpers/requests_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ def categories(type, current = nil)
end

def services(category = nil, current = nil)
services = Service.collection.select { |s| s.group == category }.map { |s|
services = Service.collection.select { |s| s.group == category }.map { |s|
[s.service_name, s.service_code]
}.insert 0, [t('placeholder.select.service'), disabled: true, class: :placeholder]
options_for_select services, current
options_for_select services, current
end

def service
Expand Down