diff --git a/app/controllers/bulk_upload_lettings_results_controller.rb b/app/controllers/bulk_upload_lettings_results_controller.rb index 7c981785a..a7ea2605a 100644 --- a/app/controllers/bulk_upload_lettings_results_controller.rb +++ b/app/controllers/bulk_upload_lettings_results_controller.rb @@ -19,7 +19,6 @@ 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 diff --git a/app/controllers/bulk_upload_lettings_resume_controller.rb b/app/controllers/bulk_upload_lettings_resume_controller.rb index 8cf7e9c0d..132ca095b 100644 --- a/app/controllers/bulk_upload_lettings_resume_controller.rb +++ b/app/controllers/bulk_upload_lettings_resume_controller.rb @@ -41,8 +41,6 @@ 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 diff --git a/app/controllers/bulk_upload_sales_results_controller.rb b/app/controllers/bulk_upload_sales_results_controller.rb index 1ed44aae9..feb7b3e06 100644 --- a/app/controllers/bulk_upload_sales_results_controller.rb +++ b/app/controllers/bulk_upload_sales_results_controller.rb @@ -17,7 +17,6 @@ class BulkUploadSalesResultsController < ApplicationController redirect_to(sales_logs_path(bulk_upload_id: [@bulk_upload.id])) else - @bulk_upload.update!(choice: "completed") reset_logs_filters end end diff --git a/app/models/bulk_upload.rb b/app/models/bulk_upload.rb index 65a25507b..552f6fbeb 100644 --- a/app/models/bulk_upload.rb +++ b/app/models/bulk_upload.rb @@ -10,6 +10,10 @@ class BulkUpload < ApplicationRecord after_initialize :generate_identifier, unless: :identifier + def completed? + incomplete_logs = logs.where.not(status: "completed") + !incomplete_logs.exists? + end def year_combo "#{year}/#{year - 2000 + 1}" end diff --git a/app/models/forms/bulk_upload_lettings_resume/chosen.rb b/app/models/forms/bulk_upload_lettings_resume/chosen.rb index 6a6f670c4..b795d8d4b 100644 --- a/app/models/forms/bulk_upload_lettings_resume/chosen.rb +++ b/app/models/forms/bulk_upload_lettings_resume/chosen.rb @@ -8,7 +8,7 @@ module Forms attribute :bulk_upload def view_path - "bulk_upload_lettings_resume/chosen" + bulk_upload.completed? ? "bulk_upload_lettings_resume/completed" : "bulk_upload_lettings_resume/chosen" end def back_path diff --git a/app/models/forms/bulk_upload_lettings_resume/confirm.rb b/app/models/forms/bulk_upload_lettings_resume/confirm.rb index aaa0ccd6b..c109cd1b1 100644 --- a/app/models/forms/bulk_upload_lettings_resume/confirm.rb +++ b/app/models/forms/bulk_upload_lettings_resume/confirm.rb @@ -31,8 +31,7 @@ module Forms end def preflight_valid? - - bulk_upload.choice != "completed" && bulk_upload.choice != "create-fix-inline" && bulk_upload.choice != "bulk-confirm-soft-validations" + bulk_upload.choice != "create-fix-inline" && bulk_upload.choice != "bulk-confirm-soft-validations" end def preflight_redirect @@ -41,8 +40,6 @@ 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 diff --git a/app/models/forms/bulk_upload_lettings_resume/fix_choice.rb b/app/models/forms/bulk_upload_lettings_resume/fix_choice.rb index 9e41f1618..76ee10d17 100644 --- a/app/models/forms/bulk_upload_lettings_resume/fix_choice.rb +++ b/app/models/forms/bulk_upload_lettings_resume/fix_choice.rb @@ -52,7 +52,7 @@ module Forms end def preflight_valid? - bulk_upload.choice != "completed" && bulk_upload.choice != "create-fix-inline" && bulk_upload.choice != "bulk-confirm-soft-validations" + bulk_upload.choice != "create-fix-inline" && bulk_upload.choice != "bulk-confirm-soft-validations" end def preflight_redirect @@ -61,8 +61,6 @@ 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 diff --git a/app/models/forms/bulk_upload_lettings_soft_validations_check/confirm.rb b/app/models/forms/bulk_upload_lettings_soft_validations_check/confirm.rb index 1fb967a27..aba75791e 100644 --- a/app/models/forms/bulk_upload_lettings_soft_validations_check/confirm.rb +++ b/app/models/forms/bulk_upload_lettings_soft_validations_check/confirm.rb @@ -31,7 +31,7 @@ module Forms end def preflight_valid? - bulk_upload.choice != "completed" && bulk_upload.choice != "bulk-confirm-soft-validations" && bulk_upload.choice != "create-fix-inline" + bulk_upload.choice != "bulk-confirm-soft-validations" && bulk_upload.choice != "create-fix-inline" end def preflight_redirect @@ -40,8 +40,6 @@ 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 diff --git a/app/models/forms/bulk_upload_lettings_soft_validations_check/confirm_soft_errors.rb b/app/models/forms/bulk_upload_lettings_soft_validations_check/confirm_soft_errors.rb index 880b8b871..34b4b97f3 100644 --- a/app/models/forms/bulk_upload_lettings_soft_validations_check/confirm_soft_errors.rb +++ b/app/models/forms/bulk_upload_lettings_soft_validations_check/confirm_soft_errors.rb @@ -37,7 +37,7 @@ module Forms end def preflight_valid? - bulk_upload.choice != "completed" && bulk_upload.choice != "bulk-confirm-soft-validations" && bulk_upload.choice != "create-fix-inline" + bulk_upload.choice != "bulk-confirm-soft-validations" && bulk_upload.choice != "create-fix-inline" end def preflight_redirect @@ -46,8 +46,6 @@ 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 diff --git a/app/models/forms/bulk_upload_sales_resume/chosen.rb b/app/models/forms/bulk_upload_sales_resume/chosen.rb index 2fa85c6c9..3bf32ee71 100644 --- a/app/models/forms/bulk_upload_sales_resume/chosen.rb +++ b/app/models/forms/bulk_upload_sales_resume/chosen.rb @@ -8,7 +8,7 @@ module Forms attribute :bulk_upload def view_path - "bulk_upload_sales_resume/chosen" + bulk_upload.completed? ? "bulk_upload_sales_resume/completed" : "bulk_upload_sales_resume/chosen" end def back_path diff --git a/app/models/forms/bulk_upload_sales_resume/confirm.rb b/app/models/forms/bulk_upload_sales_resume/confirm.rb index 84fc6dca9..1211ef3f0 100644 --- a/app/models/forms/bulk_upload_sales_resume/confirm.rb +++ b/app/models/forms/bulk_upload_sales_resume/confirm.rb @@ -31,7 +31,7 @@ module Forms end def preflight_valid? - bulk_upload.choice != "completed" && bulk_upload.choice != "create-fix-inline" && bulk_upload.choice != "bulk-confirm-soft-validations" + bulk_upload.choice != "create-fix-inline" && bulk_upload.choice != "bulk-confirm-soft-validations" end def preflight_redirect @@ -40,8 +40,6 @@ 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_sales_result_path(bulk_upload.id) end end end diff --git a/app/models/forms/bulk_upload_sales_resume/fix_choice.rb b/app/models/forms/bulk_upload_sales_resume/fix_choice.rb index 1c8e13d9d..fc565e2f6 100644 --- a/app/models/forms/bulk_upload_sales_resume/fix_choice.rb +++ b/app/models/forms/bulk_upload_sales_resume/fix_choice.rb @@ -52,7 +52,7 @@ module Forms end def preflight_valid? - bulk_upload.choice != "completed" && bulk_upload.choice != "create-fix-inline" && bulk_upload.choice != "bulk-confirm-soft-validations" + bulk_upload.choice != "create-fix-inline" && bulk_upload.choice != "bulk-confirm-soft-validations" end def preflight_redirect @@ -61,8 +61,6 @@ 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_sales_result_path(bulk_upload.id) end end end diff --git a/app/models/forms/bulk_upload_sales_soft_validations_check/confirm.rb b/app/models/forms/bulk_upload_sales_soft_validations_check/confirm.rb index 3c6441d6e..894f55123 100644 --- a/app/models/forms/bulk_upload_sales_soft_validations_check/confirm.rb +++ b/app/models/forms/bulk_upload_sales_soft_validations_check/confirm.rb @@ -31,7 +31,7 @@ module Forms end def preflight_valid? - bulk_upload.choice != "completed" && bulk_upload.choice != "bulk-confirm-soft-validations" && bulk_upload.choice != "create-fix-inline" + bulk_upload.choice != "bulk-confirm-soft-validations" && bulk_upload.choice != "create-fix-inline" end def preflight_redirect @@ -40,8 +40,6 @@ 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 diff --git a/app/models/forms/bulk_upload_sales_soft_validations_check/confirm_soft_errors.rb b/app/models/forms/bulk_upload_sales_soft_validations_check/confirm_soft_errors.rb index 04e00c706..041647cf0 100644 --- a/app/models/forms/bulk_upload_sales_soft_validations_check/confirm_soft_errors.rb +++ b/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 != "completed" && bulk_upload.choice != "bulk-confirm-soft-validations" && bulk_upload.choice != "create-fix-inline" + bulk_upload.choice != "bulk-confirm-soft-validations" && bulk_upload.choice != "create-fix-inline" end def preflight_redirect @@ -46,8 +46,6 @@ 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 diff --git a/app/views/bulk_upload_lettings_resume/completed.html.erb b/app/views/bulk_upload_lettings_resume/completed.html.erb new file mode 100644 index 000000000..7bb3b6314 --- /dev/null +++ b/app/views/bulk_upload_lettings_resume/completed.html.erb @@ -0,0 +1,14 @@ +<% content_for :before_content do %> + <%= govuk_back_link href: @form.back_path %> +<% end %> + +
You have created logs from your bulk upload, and the logs are complete. Return to lettings logs to view them.
+ + <%= govuk_button_link_to "Return to lettings logs", lettings_logs_path %> +You have created logs from your bulk upload, and the logs are complete. Return to sales logs to view them.
+ + <%= govuk_button_link_to "Return to sales logs", sales_logs_path %> +