Browse Source

CLDC-2505: "complete" tag added and implemented to bulk upload status

pull/1825/head
Aaron Spencer 3 years ago
parent
commit
e53b652a16
  1. 1
      app/controllers/bulk_upload_lettings_results_controller.rb
  2. 2
      app/controllers/bulk_upload_lettings_resume_controller.rb
  3. 5
      app/models/forms/bulk_upload_lettings_resume/confirm.rb
  4. 4
      app/models/forms/bulk_upload_lettings_resume/fix_choice.rb
  5. 4
      app/models/forms/bulk_upload_lettings_soft_validations_check/confirm.rb
  6. 4
      app/models/forms/bulk_upload_sales_resume/confirm.rb
  7. 4
      app/models/forms/bulk_upload_sales_resume/fix_choice.rb
  8. 4
      app/models/forms/bulk_upload_sales_soft_validations_check/confirm.rb
  9. 4
      app/models/forms/bulk_upload_sales_soft_validations_check/confirm_soft_errors.rb

1
app/controllers/bulk_upload_lettings_results_controller.rb

@ -19,6 +19,7 @@ class BulkUploadLettingsResultsController < ApplicationController
redirect_to(lettings_logs_path(bulk_upload_id: [@bulk_upload.id]))
else
@bulk_upload.update!(choice: "completed")
reset_logs_filters
end
end

2
app/controllers/bulk_upload_lettings_resume_controller.rb

@ -41,6 +41,8 @@ private
Forms::BulkUploadLettingsResume::Chosen.new(form_params.merge(bulk_upload: @bulk_upload))
when "confirm"
Forms::BulkUploadLettingsResume::Confirm.new(form_params.merge(bulk_upload: @bulk_upload))
when "completed"
Forms::BulkUploadLettingsResume::Confirm.new(form_params.merge(bulk_upload: @bulk_upload))
else
raise "invalid form"
end

5
app/models/forms/bulk_upload_lettings_resume/confirm.rb

@ -31,7 +31,8 @@ module Forms
end
def preflight_valid?
bulk_upload.choice != "create-fix-inline" && bulk_upload.choice != "bulk-confirm-soft-validations"
bulk_upload.choice != "completed" && bulk_upload.choice != "create-fix-inline" && bulk_upload.choice != "bulk-confirm-soft-validations"
end
def preflight_redirect
@ -40,6 +41,8 @@ module Forms
page_bulk_upload_lettings_resume_path(bulk_upload, :chosen)
when "bulk-confirm-soft-validations"
page_bulk_upload_lettings_soft_validations_check_path(bulk_upload, :chosen)
when "completed"
resume_bulk_upload_lettings_result_path(bulk_upload.id)
end
end
end

4
app/models/forms/bulk_upload_lettings_resume/fix_choice.rb

@ -52,7 +52,7 @@ module Forms
end
def preflight_valid?
bulk_upload.choice != "create-fix-inline" && bulk_upload.choice != "bulk-confirm-soft-validations"
bulk_upload.choice != "completed" && bulk_upload.choice != "create-fix-inline" && bulk_upload.choice != "bulk-confirm-soft-validations"
end
def preflight_redirect
@ -61,6 +61,8 @@ module Forms
page_bulk_upload_lettings_resume_path(bulk_upload, :chosen)
when "bulk-confirm-soft-validations"
page_bulk_upload_lettings_soft_validations_check_path(bulk_upload, :chosen)
when "completed"
resume_bulk_upload_lettings_result_path(bulk_upload.id)
end
end
end

4
app/models/forms/bulk_upload_lettings_soft_validations_check/confirm.rb

@ -31,7 +31,7 @@ module Forms
end
def preflight_valid?
bulk_upload.choice != "bulk-confirm-soft-validations" && bulk_upload.choice != "create-fix-inline"
bulk_upload.choice != "completed" && bulk_upload.choice != "bulk-confirm-soft-validations" && bulk_upload.choice != "create-fix-inline"
end
def preflight_redirect
@ -40,6 +40,8 @@ module Forms
page_bulk_upload_lettings_soft_validations_check_path(bulk_upload, :chosen)
when "create-fix-inline"
page_bulk_upload_lettings_resume_path(bulk_upload, :chosen)
when "completed"
resume_bulk_upload_lettings_result_path(bulk_upload.id)
end
end
end

4
app/models/forms/bulk_upload_sales_resume/confirm.rb

@ -31,7 +31,7 @@ module Forms
end
def preflight_valid?
bulk_upload.choice != "create-fix-inline" && bulk_upload.choice != "bulk-confirm-soft-validations"
bulk_upload.choice != "completed" && bulk_upload.choice != "create-fix-inline" && bulk_upload.choice != "bulk-confirm-soft-validations"
end
def preflight_redirect
@ -40,6 +40,8 @@ module Forms
page_bulk_upload_sales_resume_path(bulk_upload, :chosen)
when "bulk-confirm-soft-validations"
page_bulk_upload_sales_soft_validations_check_path(bulk_upload, :chosen)
when "completed"
resume_bulk_upload_lettings_result_path(bulk_upload.id)
end
end
end

4
app/models/forms/bulk_upload_sales_resume/fix_choice.rb

@ -52,7 +52,7 @@ module Forms
end
def preflight_valid?
bulk_upload.choice != "create-fix-inline" && bulk_upload.choice != "bulk-confirm-soft-validations"
bulk_upload.choice != "completed" && bulk_upload.choice != "create-fix-inline" && bulk_upload.choice != "bulk-confirm-soft-validations"
end
def preflight_redirect
@ -61,6 +61,8 @@ module Forms
page_bulk_upload_sales_resume_path(bulk_upload, :chosen)
when "bulk-confirm-soft-validations"
page_bulk_upload_sales_soft_validations_check_path(bulk_upload, :chosen)
when "completed"
resume_bulk_upload_lettings_result_path(bulk_upload.id)
end
end
end

4
app/models/forms/bulk_upload_sales_soft_validations_check/confirm.rb

@ -31,7 +31,7 @@ module Forms
end
def preflight_valid?
bulk_upload.choice != "bulk-confirm-soft-validations" && bulk_upload.choice != "create-fix-inline"
bulk_upload.choice != "completed" && bulk_upload.choice != "bulk-confirm-soft-validations" && bulk_upload.choice != "create-fix-inline"
end
def preflight_redirect
@ -40,6 +40,8 @@ module Forms
page_bulk_upload_sales_soft_validations_check_path(bulk_upload, :chosen)
when "create-fix-inline"
page_bulk_upload_sales_resume_path(bulk_upload, :chosen)
when "completed"
resume_bulk_upload_lettings_result_path(bulk_upload.id)
end
end
end

4
app/models/forms/bulk_upload_sales_soft_validations_check/confirm_soft_errors.rb

@ -37,7 +37,7 @@ module Forms
end
def preflight_valid?
bulk_upload.choice != "bulk-confirm-soft-validations" && bulk_upload.choice != "create-fix-inline"
bulk_upload.choice != "completed" && bulk_upload.choice != "bulk-confirm-soft-validations" && bulk_upload.choice != "create-fix-inline"
end
def preflight_redirect
@ -46,6 +46,8 @@ module Forms
page_bulk_upload_sales_soft_validations_check_path(bulk_upload, :chosen)
when "create-fix-inline"
page_bulk_upload_sales_resume_path(bulk_upload, :chosen)
when "completed"
resume_bulk_upload_lettings_result_path(bulk_upload.id)
end
end
end

Loading…
Cancel
Save