Skip to content

Commit

Permalink
add search for reviews
Browse files Browse the repository at this point in the history
  • Loading branch information
SepsiLaszlo committed Dec 26, 2024
1 parent b7e732c commit 11ab6d1
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
8 changes: 7 additions & 1 deletion app/controllers/entry_requests_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,14 @@ def review
authorize :entry_request, :review?
@resorts = Group.where(id: Group::RESORTS).order(:name)
@entry_requests = EntryRequest.joins(:evaluation).includes(:group, :user).where('evaluations.semester': SystemAttribute.semester.to_s)
.where("entry_requests.entry_type != 'KDO' OR entry_requests.justification != NULL").order(:id)
.where("entry_requests.entry_type != 'KDO' OR entry_requests.justification != NULL")
if params[:unfinalized] == '1'
@entry_requests = @entry_requests.where(finalized: false)
end
@order = params[:order] || 'id'
@entry_requests = @entry_requests.order(@order)
end

def update_review
entry_request = EntryRequest.find(params[:id])
if current_user.roles.rvt_leader?
Expand Down
13 changes: 13 additions & 0 deletions app/views/entry_requests/review.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,19 @@
<div class="uk-height-viewport uk-responsive-width">
<h1 class="uk-h1">Színes belépő bírálás</h1>

<%= form_with url: review_entry_requests_path, method: :get, local: true,
class: "entry-request-review uk-form uk-container-center uk-panel uk-panel-box uk-margin-bottom" do |form| %>
<div class="uk-form-row">
<%= form.label :unfinalized, "Nem véglegesek" %>
<%= form.check_box :unfinalized, checked: params[:unfinalized] == '1', include_hidden: false %>
<%= form.label :order, "Rendezés", class: 'uk-margin-left' %>
<%= form.select :order, [["---", "id"],["Kör", 'evaluations.group_id' ], ["Belépő", 'entry_type']], selected: @order%>
</div>
<div class="uk-form-row">
<%= form.submit "Szűrés", class: 'uk-button'%>
</div>
<% end %>

<% @entry_requests.each do |entry_request| %>
<%= form_with model: entry_request, id: "entry-request-#{entry_request.id}",
html: { onload: "initEntryRequestReview(#{entry_request.id})", oninput: "submitEntryRequestReview(#{entry_request.id})" },
Expand Down

0 comments on commit 11ab6d1

Please sign in to comment.