diff --git a/app/controllers/duplicate_logs_controller.rb b/app/controllers/duplicate_logs_controller.rb index 3a9baf900..6dfc7074a 100644 --- a/app/controllers/duplicate_logs_controller.rb +++ b/app/controllers/duplicate_logs_controller.rb @@ -1,2 +1,7 @@ class DuplicateLogsController < ApplicationController + def show + @log = LettingsLog.find(params[:lettings_log_id]) + @duplicate_logs = LettingsLog.duplicate_logs_for_organisation(current_user.organisation_id, @log) + @all_duplicates = [@log, *@duplicate_logs] + end end diff --git a/app/helpers/tag_helper.rb b/app/helpers/tag_helper.rb index 074ef21ed..5a7498b78 100644 --- a/app/helpers/tag_helper.rb +++ b/app/helpers/tag_helper.rb @@ -12,6 +12,7 @@ module TagHelper activating_soon: "Activating soon", reactivating_soon: "Reactivating soon", deactivated: "Deactivated", + deleted: "Deleted", }.freeze COLOUR = { @@ -25,6 +26,7 @@ module TagHelper activating_soon: "blue", reactivating_soon: "blue", deactivated: "grey", + deleted: "red", }.freeze def status_tag(status, classes = []) diff --git a/app/views/duplicate_logs/_duplicate_log.html.erb b/app/views/duplicate_logs/_duplicate_log.html.erb new file mode 100644 index 000000000..5d44f2fd8 --- /dev/null +++ b/app/views/duplicate_logs/_duplicate_log.html.erb @@ -0,0 +1,26 @@ +
+ Created + <% if log.created_by %> + + <% end %> +
+These logs are duplicates
These logs have the same values for the following fields. Choose one to keep or correct the answers.
<% end %> + + <% @all_duplicates.each do |log| %> + <%= render partial: "duplicate_log", locals: { log: log } %> + <% end %>