Browse Source

add placeholder for upload your file page

pull/1032/head
Phil Lee 4 years ago
parent
commit
7ffaa76fb3
  1. 4
      app/controllers/bulk_upload_lettings_logs_controller.rb
  2. 4
      app/controllers/bulk_upload_sales_logs_controller.rb
  3. 5
      app/models/forms/bulk_upload_lettings/prepare_your_file.rb
  4. 19
      app/models/forms/bulk_upload_lettings/upload_your_file.rb
  5. 10
      app/models/forms/bulk_upload_lettings/year.rb
  6. 5
      app/models/forms/bulk_upload_sales/prepare_your_file.rb
  7. 19
      app/models/forms/bulk_upload_sales/upload_your_file.rb
  8. 10
      app/models/forms/bulk_upload_sales/year.rb
  9. 2
      app/views/bulk_upload_lettings_logs/forms/prepare_your_file.html.erb
  10. 17
      app/views/bulk_upload_lettings_logs/forms/upload_your_file.html.erb
  11. 2
      app/views/bulk_upload_sales_logs/forms/prepare_your_file.html.erb
  12. 17
      app/views/bulk_upload_sales_logs/forms/upload_your_file.html.erb
  13. 3
      spec/features/bulk_upload_lettings_logs_spec.rb
  14. 3
      spec/features/bulk_upload_sales_logs_spec.rb

4
app/controllers/bulk_upload_lettings_logs_controller.rb

@ -15,7 +15,7 @@ class BulkUploadLettingsLogsController < ApplicationController
def update
if form.valid?
redirect_to bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year: form_params[:year] })
redirect_to form.next_path
else
render form.view_path
end
@ -33,6 +33,8 @@ private
Forms::BulkUploadLettings::Year.new(form_params)
when "prepare-your-file"
Forms::BulkUploadLettings::PrepareYourFile.new(form_params)
when "upload-your-file"
Forms::BulkUploadLettings::UploadYourFile.new(form_params)
else
raise "Page not found for path #{params[:id]}"
end

4
app/controllers/bulk_upload_sales_logs_controller.rb

@ -15,7 +15,7 @@ class BulkUploadSalesLogsController < ApplicationController
def update
if form.valid?
redirect_to bulk_upload_sales_log_path(id: "prepare-your-file", form: { year: form_params[:year] })
redirect_to form.next_path
else
render form.view_path
end
@ -33,6 +33,8 @@ private
Forms::BulkUploadSales::Year.new(form_params)
when "prepare-your-file"
Forms::BulkUploadSales::PrepareYourFile.new(form_params)
when "upload-your-file"
Forms::BulkUploadSales::UploadYourFile.new(form_params)
else
raise "Page not found for path #{params[:id]}"
end

5
app/models/forms/bulk_upload_lettings/prepare_your_file.rb

@ -3,6 +3,7 @@ module Forms
class PrepareYourFile
include ActiveModel::Model
include ActiveModel::Attributes
include Rails.application.routes.url_helpers
attribute :year, :integer
@ -18,6 +19,10 @@ module Forms
end
end
def next_path
bulk_upload_lettings_log_path(id: "upload-your-file", form: { year: })
end
def template_path
"/files/bulk-upload-lettings-template-v1.xlsx"
end

19
app/models/forms/bulk_upload_lettings/upload_your_file.rb

@ -0,0 +1,19 @@
module Forms
module BulkUploadLettings
class UploadYourFile
include ActiveModel::Model
include ActiveModel::Attributes
include Rails.application.routes.url_helpers
attribute :year, :integer
def view_path
"bulk_upload_lettings_logs/forms/upload_your_file"
end
def back_path
bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year: })
end
end
end
end

10
app/models/forms/bulk_upload_lettings/year.rb

@ -2,8 +2,10 @@ module Forms
module BulkUploadLettings
class Year
include ActiveModel::Model
include ActiveModel::Attributes
include Rails.application.routes.url_helpers
attr_accessor :year
attribute :year, :integer
validates :year, presence: true
@ -18,7 +20,11 @@ module Forms
end
def back_path
Rails.application.routes.url_helpers.lettings_logs_path
lettings_logs_path
end
def next_path
bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year: })
end
private

5
app/models/forms/bulk_upload_sales/prepare_your_file.rb

@ -3,6 +3,7 @@ module Forms
class PrepareYourFile
include ActiveModel::Model
include ActiveModel::Attributes
include Rails.application.routes.url_helpers
attribute :year, :integer
@ -18,6 +19,10 @@ module Forms
end
end
def next_path
bulk_upload_sales_log_path(id: "upload-your-file", form: { year: })
end
def template_path
"/files/bulk-upload-sales-template-v1.xlsx"
end

19
app/models/forms/bulk_upload_sales/upload_your_file.rb

@ -0,0 +1,19 @@
module Forms
module BulkUploadSales
class UploadYourFile
include ActiveModel::Model
include ActiveModel::Attributes
include Rails.application.routes.url_helpers
attribute :year, :integer
def view_path
"bulk_upload_sales_logs/forms/upload_your_file"
end
def back_path
bulk_upload_sales_log_path(id: "prepare-your-file", form: { year: })
end
end
end
end

10
app/models/forms/bulk_upload_sales/year.rb

@ -2,8 +2,10 @@ module Forms
module BulkUploadSales
class Year
include ActiveModel::Model
include ActiveModel::Attributes
include Rails.application.routes.url_helpers
attr_accessor :year
attribute :year, :integer
validates :year, presence: true
@ -18,7 +20,11 @@ module Forms
end
def back_path
Rails.application.routes.url_helpers.sales_logs_path
sales_logs_path
end
def next_path
bulk_upload_sales_log_path(id: "prepare-your-file", form: { year: })
end
private

2
app/views/bulk_upload_lettings_logs/forms/prepare_your_file.html.erb

@ -5,6 +5,8 @@
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<%= form_with model: @form, scope: :form, url: bulk_upload_lettings_log_path(id: "prepare-your-file"), method: :patch do |f| %>
<%= f.hidden_field :year %>
<span class="govuk-caption-l">Upload lettings logs in bulk (<%= @form.year_combo %>)</span>
<h1 class="govuk-heading-l">Prepare your file</h1>

17
app/views/bulk_upload_lettings_logs/forms/upload_your_file.html.erb

@ -0,0 +1,17 @@
<% content_for :before_content do %>
<%= govuk_back_link href: @form.back_path %>
<% end %>
<%= form_with model: @form, scope: :form, url: bulk_upload_lettings_log_path(id: "upload-your-file"), method: :patch do |f| %>
<%= f.govuk_error_summary %>
<div>
Upload your file goes here
</div>
<div>
year selected <%= @form.year %>
</div>
<%= f.govuk_submit %>
<% end %>

2
app/views/bulk_upload_sales_logs/forms/prepare_your_file.html.erb

@ -5,6 +5,8 @@
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<%= form_with model: @form, scope: :form, url: bulk_upload_sales_log_path(id: "prepare-your-file"), method: :patch do |f| %>
<%= f.hidden_field :year %>
<span class="govuk-caption-l">Upload sales logs in bulk (<%= @form.year_combo %>)</span>
<h1 class="govuk-heading-l">Prepare your file</h1>

17
app/views/bulk_upload_sales_logs/forms/upload_your_file.html.erb

@ -0,0 +1,17 @@
<% content_for :before_content do %>
<%= govuk_back_link href: @form.back_path %>
<% end %>
<%= form_with model: @form, scope: :form, url: bulk_upload_sales_log_path(id: "upload-your-file"), method: :patch do |f| %>
<%= f.govuk_error_summary %>
<div>
Upload your file goes here
</div>
<div>
year selected <%= @form.year %>
</div>
<%= f.govuk_submit %>
<% end %>

3
spec/features/bulk_upload_lettings_logs_spec.rb

@ -27,6 +27,9 @@ RSpec.describe "Bulk upload lettings log" do
click_button("Continue")
expect(page).to have_content("Upload lettings logs in bulk (2022/23)")
click_button("Continue")
expect(page).to have_content("Upload your file")
end
end
end

3
spec/features/bulk_upload_sales_logs_spec.rb

@ -27,6 +27,9 @@ RSpec.describe "Bulk upload sales log" do
click_button("Continue")
expect(page).to have_content("Upload sales logs in bulk (2022/23)")
click_button("Continue")
expect(page).to have_content("Upload your file")
end
end
end

Loading…
Cancel
Save