diff --git a/app/models/forms/bulk_upload_lettings/prepare_your_file.rb b/app/models/forms/bulk_upload_lettings/prepare_your_file.rb
index 6791b6238..0ca314e29 100644
--- a/app/models/forms/bulk_upload_lettings/prepare_your_file.rb
+++ b/app/models/forms/bulk_upload_lettings/prepare_your_file.rb
@@ -2,8 +2,9 @@ module Forms
module BulkUploadLettings
class PrepareYourFile
include ActiveModel::Model
+ include ActiveModel::Attributes
- attr_accessor :year
+ attribute :year, :integer
def view_path
"bulk_upload_lettings_logs/forms/prepare_your_file"
@@ -17,6 +18,10 @@ module Forms
end
end
+ def year_combo
+ "#{year}/#{year+1-2000}"
+ end
+
private
def in_crossover_period?
diff --git a/app/models/forms/bulk_upload_sales/prepare_your_file.rb b/app/models/forms/bulk_upload_sales/prepare_your_file.rb
index 71d6c7f48..89c129689 100644
--- a/app/models/forms/bulk_upload_sales/prepare_your_file.rb
+++ b/app/models/forms/bulk_upload_sales/prepare_your_file.rb
@@ -2,8 +2,9 @@ module Forms
module BulkUploadSales
class PrepareYourFile
include ActiveModel::Model
+ include ActiveModel::Attributes
- attr_accessor :year
+ attribute :year, :integer
def view_path
"bulk_upload_sales_logs/forms/prepare_your_file"
@@ -17,6 +18,12 @@ module Forms
end
end
+ def year_combo
+ "#{year}/#{year+1-2000}"
+ end
+
+ private
+
def in_crossover_period?
FormHandler.instance.forms.values.any?(&:in_crossover_period?)
end
diff --git a/app/views/bulk_upload_lettings_logs/forms/prepare_your_file.html.erb b/app/views/bulk_upload_lettings_logs/forms/prepare_your_file.html.erb
index 6e943c7a9..172fe49d8 100644
--- a/app/views/bulk_upload_lettings_logs/forms/prepare_your_file.html.erb
+++ b/app/views/bulk_upload_lettings_logs/forms/prepare_your_file.html.erb
@@ -2,14 +2,30 @@
<%= govuk_back_link href: @form.back_path %>
<% end %>
-<%= form_with model: @form, scope: :form, url: bulk_upload_lettings_log_path(id: "prepare-your-file"), method: :patch do |f| %>
-
- prepare file goes here
-
+
+
+ <%= form_with model: @form, scope: :form, url: bulk_upload_lettings_log_path(id: "prepare-your-file"), method: :patch do |f| %>
+
Upload lettings logs in bulk (<%= @form.year_combo %>)
+
Prepare your file
-
- year selected <%= @form.year %>
-
+
Create your file
+
+ - Download the bulk lettings template
+ - Export the data from your housing management system, matching the template
+ - If you cannot export it in this format, you may have to input it manually
+
- <%= f.govuk_submit %>
-<% end %>
+
Check your data
+
+ - Check data is complete and formatted correctly, using data specifications (opens in a new tab)
+
+
+
Save your file
+
+ - Save the file (CSV formay only)
+
+
+ <%= f.govuk_submit %>
+ <% end %>
+
+
diff --git a/app/views/bulk_upload_sales_logs/forms/prepare_your_file.html.erb b/app/views/bulk_upload_sales_logs/forms/prepare_your_file.html.erb
index 5aa215ebc..1f00b1195 100644
--- a/app/views/bulk_upload_sales_logs/forms/prepare_your_file.html.erb
+++ b/app/views/bulk_upload_sales_logs/forms/prepare_your_file.html.erb
@@ -2,14 +2,30 @@
<%= govuk_back_link href: @form.back_path %>
<% end %>
-<%= form_with model: @form, scope: :form, url: bulk_upload_sales_log_path(id: "prepare-your-file"), method: :patch do |f| %>
-
- prepare file goes here
-
+
+
+ <%= form_with model: @form, scope: :form, url: bulk_upload_sales_log_path(id: "prepare-your-file"), method: :patch do |f| %>
+
Upload sales logs in bulk (<%= @form.year_combo %>)
+
Prepare your file
-
- year selected <%= @form.year %>
-
+
Create your file
+
+ - Download the bulk sales template
+ - Export the data from your housing management system, matching the template
+ - If you cannot export it in this format, you may have to input it manually
+
- <%= f.govuk_submit %>
-<% end %>
+
Check your data
+
+ - Check data is complete and formatted correctly, using data specifications (opens in a new tab)
+
+
+
Save your file
+
+ - Save the file (CSV formay only)
+
+
+ <%= f.govuk_submit %>
+ <% end %>
+
+
diff --git a/spec/features/bulk_upload_lettings_logs_spec.rb b/spec/features/bulk_upload_lettings_logs_spec.rb
index f5832c3a3..f5bca4a57 100644
--- a/spec/features/bulk_upload_lettings_logs_spec.rb
+++ b/spec/features/bulk_upload_lettings_logs_spec.rb
@@ -19,13 +19,14 @@ RSpec.describe "Bulk upload lettings log" do
expect(page).to have_content("You must select a collection period to upload for")
choose("2022/2023")
-
click_button("Continue")
- expect(page).to have_content("prepare file goes here")
click_link("Back")
expect(page.find_field("form-year-2022-field")).to be_checked
+ click_button("Continue")
+
+ expect(page).to have_content("Upload lettings logs in bulk (2022/23)")
end
end
end
diff --git a/spec/features/bulk_upload_sales_logs_spec.rb b/spec/features/bulk_upload_sales_logs_spec.rb
index 95c9b8a4f..376412d90 100644
--- a/spec/features/bulk_upload_sales_logs_spec.rb
+++ b/spec/features/bulk_upload_sales_logs_spec.rb
@@ -21,10 +21,12 @@ RSpec.describe "Bulk upload sales log" do
choose("2022/2023")
click_button("Continue")
- expect(page).to have_content("prepare file goes here")
click_link("Back")
expect(page.find_field("form-year-2022-field")).to be_checked
+ click_button("Continue")
+
+ expect(page).to have_content("Upload sales logs in bulk (2022/23)")
end
end
end