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

Add Skip button to POB edit screen #2703

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add Skip button to POB edit screen #2703

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
c3a9a77
Add Skip button to POB edit screen
AnneV-Learn Dec 21, 2023
5006c3a
Merge branch 'master' into fc_1606_av
AnneV-Learn Dec 27, 2023
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
4 changes: 2 additions & 2 deletions app/controllers/freecen1_vld_entries_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def propagate_pob
if pob_invalid_count.positive?
@freecen1_vld_entry = Freecen1VldEntry.where(freecen1_vld_file_id: @freecen1_vld_file._id, pob_valid: false, id: {'$gt': params[:id]}).order_by(dwelling_number: 1, sequence_in_household: 1).first
if @freecen1_vld_entry.blank?
redirect_to(manual_validate_pobs_freecen1_vld_file_path(id: @freecen1_vld_entry.freecen1_vld_file_id)) && return
redirect_to(manual_validate_pobs_freecen1_vld_file_path(id: @freecen1_vld_file.id)) && return

else
redirect_to(edit_pob_freecen1_vld_entry_path(id: @freecen1_vld_entry.id)) && return
Expand Down Expand Up @@ -117,7 +117,7 @@ def update
if pob_invalid_count.positive?
@freecen1_vld_entry = Freecen1VldEntry.where(freecen1_vld_file_id: @freecen1_vld_file._id, pob_valid: false, id: {'$gt': params[:id]}).order_by(dwelling_number: 1, sequence_in_household: 1).first
if @freecen1_vld_entry.blank?
redirect_to(manual_validate_pobs_freecen1_vld_file_path(id: @freecen1_vld_entry.freecen1_vld_file_id)) && return
redirect_to(manual_validate_pobs_freecen1_vld_file_path(id: @freecen1_vld_file.id)) && return

else
redirect_to(edit_pob_freecen1_vld_entry_path(id: @freecen1_vld_entry.id)) && return
Expand Down
9 changes: 9 additions & 0 deletions app/helpers/freecen1_vld_entries_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,11 @@
module Freecen1VldEntriesHelper

def skip_record(file_id, entry_id)
freecen1_vld_entry = Freecen1VldEntry.where(freecen1_vld_file_id: file_id, pob_valid: false, id: {'$gt': entry_id}).order_by(dwelling_number: 1, sequence_in_household: 1).first
if freecen1_vld_entry.blank?
link_to 'Skip', manual_validate_pobs_freecen1_vld_file_path(id: file_id), class: 'btn btn--small', title: 'Back (this is the last invalid entry)', data: { confirm: 'Are you sure you want to Skip this record?'}
else
link_to 'Skip', edit_pob_freecen1_vld_entry_path(id: freecen1_vld_entry.id), class: 'btn btn--small', title: 'Move to next invalid entry', data: { confirm: 'Are you sure you want to Skip this record?'}
end
end
end
12 changes: 7 additions & 5 deletions app/views/freecen1_vld_entries/edit_pob.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,19 @@
<div style='text-align: center'>
<% if session[:propagate_pob].present? && session[:propagate_pob] == @freecen1_vld_entry.id%>
<p><b> PROPAGATE: </b></p>
<%= f.submit 'Alternative', :class => "btn btn--small", title: 'Propagate Alternative POB values only'%>
<%= f.submit 'Notes', :class => "btn btn--small", title: 'Propagate Notes only'%>
<%= f.submit 'Both', :class => "btn btn--small", title: 'Propagate Alternative POB values & Notes'%>
<%= f.submit 'Alternative', class: 'btn btn--small', title: 'Propagate Alternative POB values only.'%>
<%= f.submit 'Notes', class: 'btn btn--small', title: 'Propagate Notes only'%>
<%= f.submit 'Both', class: 'btn btn--small', title: 'Propagate Alternative POB values & Notes'%>
<% else%>
<%= f.submit 'Submit', :class => "btn btn--small", data: { confirm: 'Are you sure you want to Save the changes?'}, title: 'Saves changes.'%>
<%= f.submit 'Accept', :class => "btn btn--small", data: { confirm: 'Are you sure you want to Override warnings?'}, title: 'Saves changes and overrides warnings.'%>
<%= f.submit 'Accept', class: 'btn btn--small', data: { confirm: 'Are you sure you want to Override warnings?'}, title: 'Saves changes and overrides warnings.'%>
<br>
<%= skip_record(@freecen1_vld_entry.freecen1_vld_file_id, @freecen1_vld_entry._id) %>
<% end%>
</div>
<div style='text-align: center'>
<% if session[:propagate_pob].present? && session[:propagate_pob] == @freecen1_vld_entry.id%>
<%= f.submit 'No Propagation Required', class: "btn btn--small", title: 'No Propagation Required'%>
<%= f.submit 'No Propagation Required', class: 'btn btn--small', title: 'No Propagation Required.'%>
<% else%>
<%= link_to 'Cancel', manual_validate_pobs_freecen1_vld_file_path(id: @freecen1_vld_entry.freecen1_vld_file_id)%>
<% end %>
Expand Down