baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

uniform partials

pull/608/head
JG 3 years ago
parent
efa7eadf24
commit
e167e5863d
4 changed files with 82 additions and 78 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/frontend/styles/_table-group.scss
  2. 60
      app/views/organisations/_organisation_list.html.erb
  3. 94
      app/views/users/_user_list.html.erb
  4. 4
      spec/features/log_spec.rb

2
app/frontend/styles/_table-group.scss
Unescape View File

@ -2,7 +2,7 @@
overflow-x: auto; overflow-x: auto;
overflow-y: hidden; overflow-y: hidden;
margin: govuk-spacing(-3) govuk-spacing(-3) govuk-spacing(3); margin: govuk-spacing(-3) govuk-spacing(-3) govuk-spacing(3);
padding: govuk-spacing(1) govuk-spacing(3); padding: govuk-spacing(3) govuk-spacing(3);
scrollbar-color: $govuk-text-colour govuk-colour("light-grey"); scrollbar-color: $govuk-text-colour govuk-colour("light-grey");
.govuk-table { .govuk-table {

60
app/views/organisations/_organisation_list.html.erb
Unescape View File

@ -1,35 +1,37 @@
<%= govuk_table do |table| %> <section class="app-table-group" tabindex="0" aria-labelledby="<%= title.dasherize %>">
<%= table.caption(classes: %w[govuk-!-font-size-19 govuk-!-font-weight-regular]) do |caption| %> <%= govuk_table do |table| %>
<% if searched.present? %> <%= table.caption(classes: %w[govuk-!-font-size-19 govuk-!-font-weight-regular]) do |caption| %>
<strong><%= pagy.count %></strong> <%= item_label %> found matching ‘<%= searched %>’ of <strong><%= total_count %></strong> total organisations. <%= govuk_link_to("Clear search", request.path) %> <% if searched.present? %>
<% else %> <strong><%= pagy.count %></strong> <%= item_label %> found matching ‘<%= searched %>’ of <strong><%= total_count %></strong> total organisations. <%= govuk_link_to("Clear search", request.path) %>
<strong><%= pagy.count %></strong> total organisations. <% else %>
<strong><%= pagy.count %></strong> total organisations.
<% end %>
<% end %> <% end %>
<% end %> <%= table.head do |head| %>
<%= table.head do |head| %> <%= head.row do |row| %>
<%= head.row do |row| %> <% row.cell(header: true, text: "Name", html_attributes: {
<% row.cell(header: true, text: "Name", html_attributes: { scope: "col",
scope: "col", }) %>
}) %> <% row.cell(header: true, text: "Registration number", html_attributes: {
<% row.cell(header: true, text: "Registration number", html_attributes: { scope: "col",
scope: "col", }) %>
}) %> <% row.cell(header: true, text: "Type", html_attributes: {
<% row.cell(header: true, text: "Type", html_attributes: { scope: "col",
scope: "col", }) %>
}) %> <% end %>
<% end %> <% end %>
<% end %> <% @organisations.each do |organisation| %>
<% @organisations.each do |organisation| %> <%= table.body do |body| %>
<%= table.body do |body| %> <%= body.row do |row| %>
<%= body.row do |row| %> <% row.cell(header: true, html_attributes: {
<% row.cell(header: true, html_attributes: { scope: "row",
scope: "row", }) do %>
}) do %> <%= govuk_link_to(organisation.name, "organisations/#{organisation.id}/logs") %>
<%= govuk_link_to(organisation.name, "organisations/#{organisation.id}/logs") %> <% end %>
<% row.cell(text: organisation.housing_registration_no) %>
<% row.cell(text: organisation.display_provider_type) %>
<% end %> <% end %>
<% row.cell(text: organisation.housing_registration_no) %>
<% row.cell(text: organisation.display_provider_type) %>
<% end %> <% end %>
<% end %> <% end %>
<% end %> <% end %>
<% end %> </section>

94
app/views/users/_user_list.html.erb
Unescape View File

@ -1,54 +1,56 @@
<%= govuk_table do |table| %> <section class="app-table-group" tabindex="0" aria-labelledby="<%= title.dasherize %>">
<%= table.caption(classes: %w[govuk-!-font-size-19 govuk-!-font-weight-regular]) do |caption| %> <%= govuk_table do |table| %>
<span class="govuk-!-margin-right-4"> <%= table.caption(classes: %w[govuk-!-font-size-19 govuk-!-font-weight-regular]) do |caption| %>
<% if searched.present? %> <span class="govuk-!-margin-right-4">
<strong><%= pagy.count %></strong> <%= item_label %> found matching ‘<%= searched %>’ of <strong><%= total_count %></strong> total users. <%= govuk_link_to("Clear search", request.path) %> <% if searched.present? %>
<% else %> <strong><%= pagy.count %></strong> <%= item_label %> found matching ‘<%= searched %>’ of <strong><%= total_count %></strong> total users. <%= govuk_link_to("Clear search", request.path) %>
<strong><%= pagy.count %></strong> total users. <% else %>
<strong><%= pagy.count %></strong> total users.
<% end %>
</span>
<% if current_user.support? %>
<% query = searched.present? ? "?search=#{searched}" : nil %>
<%= govuk_link_to "Download (CSV)", "/users.csv#{query}", type: "text/csv" %>
<% end %> <% end %>
</span>
<% if current_user.support? %>
<% query = searched.present? ? "?search=#{searched}" : nil %>
<%= govuk_link_to "Download (CSV)", "/users.csv#{query}", type: "text/csv" %>
<% end %> <% end %>
<% end %> <%= table.head do |head| %>
<%= table.head do |head| %> <%= head.row do |row| %>
<%= head.row do |row| %> <% row.cell(header: true, text: "Name and email adress", html_attributes: {
<% row.cell(header: true, text: "Name and email adress", html_attributes: { scope: "col",
scope: "col", }) %>
}) %> <% row.cell(header: true, text: "Organisation and role", html_attributes: {
<% row.cell(header: true, text: "Organisation and role", html_attributes: { scope: "col",
scope: "col", }) %>
}) %> <% row.cell(header: true, text: "Last logged in", html_attributes: {
<% row.cell(header: true, text: "Last logged in", html_attributes: { scope: "col",
scope: "col", }) %>
}) %> <% end %>
<% end %> <% end %>
<% end %> <% users.each do |user| %>
<% users.each do |user| %> <%= table.body do |body| %>
<%= table.body do |body| %> <%= body.row do |row| %>
<%= body.row do |row| %> <% row.cell(header: true, html_attributes: {
<% row.cell(header: true, html_attributes: { scope: "row",
scope: "row", }) do %>
}) do %> <%= simple_format(user_cell(user), {}, wrapper_tag: "span") %>
<%= simple_format(user_cell(user), {}, wrapper_tag: "span") %> <% if user.is_data_protection_officer? || user.is_key_contact? %>
<% if user.is_data_protection_officer? || user.is_key_contact? %> <br>
<br> <% end %>
<%= user.is_data_protection_officer? ? govuk_tag(
classes: "app-tag--small",
colour: "turquoise",
text: "Data protection officer",
) : "" %>
<%= user.is_key_contact? ? govuk_tag(
classes: "app-tag--small",
colour: "turquoise",
text: "Key contact",
) : "" %>
<% end %> <% end %>
<%= user.is_data_protection_officer? ? govuk_tag( <% row.cell(text: simple_format(org_cell(user), {}, wrapper_tag: "div")) %>
classes: "app-tag--small", <% row.cell(text: user.last_sign_in_at&.to_formatted_s(:govuk_date)) %>
colour: "turquoise",
text: "Data protection officer",
) : "" %>
<%= user.is_key_contact? ? govuk_tag(
classes: "app-tag--small",
colour: "turquoise",
text: "Key contact",
) : "" %>
<% end %> <% end %>
<% row.cell(text: simple_format(org_cell(user), {}, wrapper_tag: "div")) %>
<% row.cell(text: user.last_sign_in_at&.to_formatted_s(:govuk_date)) %>
<% end %> <% end %>
<% end %> <% end %>
<% end %> <% end %>
<% end %> </section>

4
spec/features/log_spec.rb
Unescape View File

@ -17,13 +17,13 @@ RSpec.describe "Log Features" do
context "when I search for a specific log" do context "when I search for a specific log" do
it "there is a search bar with a message and search button for logs" do it "there is a search bar with a message and search button for logs" do
expect(page).to have_field("search-field") expect(page).to have_field("search")
expect(page).to have_content("Search by log ID, tenant code, property reference or postcode") expect(page).to have_content("Search by log ID, tenant code, property reference or postcode")
expect(page).to have_button("Search") expect(page).to have_button("Search")
end end
it "displays log matching the log ID" do it "displays log matching the log ID" do
fill_in("search-field", with: log_to_search.id) fill_in("search", with: log_to_search.id)
click_button("Search") click_button("Search")
expect(page).to have_content(log_to_search.id) expect(page).to have_content(log_to_search.id)
expect(page).not_to have_content(same_organisation_log.id) expect(page).not_to have_content(same_organisation_log.id)

Write Preview
Loading…
Cancel
Save