Browse Source

CLDC-2405: sales log ownership method adjusted and added to view

pull/1732/head
Aaron Spencer 3 years ago
parent
commit
65bc22f5e5
  1. 37
      app/components/sales_log_summary_component.html.erb
  2. 13
      app/models/sales_log.rb

37
app/components/sales_log_summary_component.html.erb

@ -4,40 +4,35 @@
<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 %>
<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>
<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>
<%= log.ownership_scheme(uppercase: true) %><br>
<% end %>
<% if log.saledate %>
Sale completed <time datetime="<%= log.saledate.iso8601 %>"><%= log.saledate.to_formatted_s(:govuk_date) %></time>
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>
<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">
@ -47,7 +42,7 @@
<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>
<span class="app-log-summary__footer--actor">by <%= log.created_by.name || log.created_by.email %></span>
<% end %>
</p>
</footer>

13
app/models/sales_log.rb

@ -383,12 +383,13 @@ class SalesLog < Log
beds.nil? ? nil : [beds, LaSaleRange::MAX_BEDS].min
end
def ownership_scheme
case ownershipsch
when 1 then "shared ownership"
when 2 then "discounted ownership"
when 3 then "outright sale"
end
def ownership_scheme(uppercase: false)
owner_scheme = case ownershipsch
when 1 then "shared ownership"
when 2 then "discounted ownership"
when 3 then "outright or other sale"
end
uppercase ? owner_scheme.capitalize : owner_scheme
end
def combined_income

Loading…
Cancel
Save