Browse Source

CDLC-2405: LogSummaryComponent split into sales and lettings files

pull/1732/head
Aaron Spencer 3 years ago
parent
commit
9462065629
  1. 33
      app/components/lettings_log_summary_component.html.erb
  2. 13
      app/components/lettings_log_summary_component.rb
  3. 55
      app/components/sales_log_summary_component.html.erb
  4. 2
      app/components/sales_log_summary_component.rb
  5. 6
      app/views/logs/_log_list.html.erb
  6. 2
      spec/components/lettings_log_summary_component_spec.rb

33
app/components/log_summary_component.html.erb → app/components/lettings_log_summary_component.html.erb

@ -3,11 +3,11 @@
<div class="govuk-grid-column-one-half"> <div class="govuk-grid-column-one-half">
<header class="app-log-summary__header"> <header class="app-log-summary__header">
<h2 class="app-log-summary__title"> <h2 class="app-log-summary__title">
<%= govuk_link_to log.lettings? ? lettings_log_path(log) : sales_log_path(log) do %> <%= govuk_link_to lettings_log_path(log) do %>
<span class="govuk-visually-hidden">Log </span><%= log.id %> <span class="govuk-visually-hidden">Log </span><%= log.id %>
<% end %> <% end %>
</h2> </h2>
<% if log.lettings? && (log.tenancycode? or log.propcode?) %> <% if log.tenancycode? or log.propcode? %>
<dl class="app-metadata app-metadata--inline"> <dl class="app-metadata app-metadata--inline">
<% if log.tenancycode? %> <% if log.tenancycode? %>
<div class="app-metadata__item"> <div class="app-metadata__item">
@ -23,18 +23,8 @@
<% end %> <% end %>
</dl> </dl>
<% end %> <% end %>
<% if log.sales? %>
<dl class="app-metadata app-metadata--inline">
<% if log.purchaser_code %>
<div class="app-metadata__item">
<dt class="app-metadata__term">Purchaser</dt>
<dd class="app-metadata__definition"><%= log.purchaser_code %></dd>
</div>
<% end %>
</dl>
<% end %>
</header> </header>
<% if log.lettings? && (log.needstype? or log.startdate?) %> <% if log.needstype? or log.startdate? %>
<p class="govuk-body govuk-!-margin-bottom-2"> <p class="govuk-body govuk-!-margin-bottom-2">
<% if log.needstype? %> <% if log.needstype? %>
<%= log.is_general_needs? ? "General needs" : "Supported housing" %><br> <%= log.is_general_needs? ? "General needs" : "Supported housing" %><br>
@ -44,21 +34,6 @@
<% end %> <% end %>
</p> </p>
<% end %> <% end %>
<% if log.sales? %>
<p class="govuk-body govuk-!-margin-bottom-2">
<% if log.ownership_scheme %>
<%= case log.ownership_scheme
when "shared ownership" then "Shared ownership"
when "discounted ownership" then "Discounted ownership"
when "outright sale" then "Outright or other sale"
end %>
<br>
<% end %>
<% if log.saledate %>
Sale completed <time datetime="<%= log.saledate.iso8601 %>"><%= log.saledate.to_formatted_s(:govuk_date) %></time>
<% end %>
</p>
<% end %>
<% if current_user.support? || current_user.organisation.has_managing_agents? %> <% if current_user.support? || current_user.organisation.has_managing_agents? %>
<dl class="app-metadata"> <dl class="app-metadata">
<% if log.owning_organisation %> <% if log.owning_organisation %>
@ -67,7 +42,7 @@
<dd class="app-metadata__definition"><%= log.owning_organisation&.name %></dd> <dd class="app-metadata__definition"><%= log.owning_organisation&.name %></dd>
</div> </div>
<% end %> <% end %>
<% if log.lettings? && log.managing_organisation %> <% if log.managing_organisation %>
<div class="app-metadata__item"> <div class="app-metadata__item">
<dt class="app-metadata__term">Managed by</dt> <dt class="app-metadata__term">Managed by</dt>
<dd class="app-metadata__definition"><%= log.managing_organisation&.name %></dd> <dd class="app-metadata__definition"><%= log.managing_organisation&.name %></dd>

13
app/components/lettings_log_summary_component.rb

@ -0,0 +1,13 @@
class LettingsLogSummaryComponent < ViewComponent::Base
attr_reader :current_user, :log
def initialize(current_user:, log:)
@current_user = current_user
@log = log
super
end
def log_status
helpers.status_tag(log.status)
end
end

55
app/components/sales_log_summary_component.html.erb

@ -0,0 +1,55 @@
<article class="app-log-summary">
<div class="govuk-grid-row">
<div class="govuk-grid-column-one-half">
<header class="app-log-summary__header">
<h2 class="app-log-summary__title">
<%= govuk_link_to sales_log_path(log) do %>
<span class="govuk-visually-hidden">Log </span><%= log.id %>
<% end %>
</h2>
<dl class="app-metadata app-metadata--inline">
<% if log.purchaser_code %>
<div class="app-metadata__item">
<dt class="app-metadata__term">Purchaser</dt>
<dd class="app-metadata__definition"><%= log.purchaser_code %></dd>
</div>
<% end %>
</dl>
</header>
<p class="govuk-body govuk-!-margin-bottom-2">
<% if log.ownership_scheme %>
<%= case log.ownership_scheme
when "shared ownership" then "Shared ownership"
when "discounted ownership" then "Discounted ownership"
when "outright sale" then "Outright or other sale"
end %>
<br>
<% end %>
<% if log.saledate %>
Sale completed <time datetime="<%= log.saledate.iso8601 %>"><%= log.saledate.to_formatted_s(:govuk_date) %></time>
<% end %>
</p>
<% if current_user.support? || current_user.organisation.has_managing_agents? %>
<dl class="app-metadata">
<% if log.owning_organisation %>
<div class="app-metadata__item">
<dt class="app-metadata__term">Owned by</dt>
<dd class="app-metadata__definition"><%= log.owning_organisation&.name %></dd>
</div>
<% end %>
</dl>
<% end %>
</div>
<footer class="govuk-grid-column-one-half app-log-summary__footer">
<p class="govuk-body govuk-!-margin-bottom-2">
<%= log_status %>
</p>
<p class="govuk-body">
Created <time datetime="<%= log.created_at.iso8601 %>"><%= log.created_at.to_formatted_s(:govuk_date) %></time>
<% if log.created_by %>
<span class="app-log-summary__footer--actor">by <%= log.created_by.name || log.created_by.email %></span>
<% end %>
</p>
</footer>
</div>
</article>

2
app/components/log_summary_component.rb → app/components/sales_log_summary_component.rb

@ -1,4 +1,4 @@
class LogSummaryComponent < ViewComponent::Base class SalesLogSummaryComponent < ViewComponent::Base
attr_reader :current_user, :log attr_reader :current_user, :log
def initialize(current_user:, log:) def initialize(current_user:, log:)

6
app/views/logs/_log_list.html.erb

@ -17,5 +17,9 @@
</div> </div>
</h2> </h2>
<% logs.map do |log| %> <% logs.map do |log| %>
<%= render(LogSummaryComponent.new(current_user:, log:)) %> <% if log.sales? %>
<%= render(SalesLogSummaryComponent.new(current_user:, log:)) %>
<% else %>
<%= render(LettingsLogSummaryComponent.new(current_user:, log:)) %>
<% end %>
<% end %> <% end %>

2
spec/components/log_summary_component_spec.rb → spec/components/lettings_log_summary_component_spec.rb

@ -1,6 +1,6 @@
require "rails_helper" require "rails_helper"
RSpec.describe LogSummaryComponent, type: :component do RSpec.describe LettingsLogSummaryComponent, type: :component do
let(:support_user) { FactoryBot.create(:user, :support) } let(:support_user) { FactoryBot.create(:user, :support) }
let(:coordinator_user) { FactoryBot.create(:user) } let(:coordinator_user) { FactoryBot.create(:user) }
let(:propcode) { "P3647" } let(:propcode) { "P3647" }
Loading…
Cancel
Save