Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scope amended (#2133 Updated) #2146

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/views/super_admin/organisations/_locations.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% if locations.any? %>
<table class="govuk-table">
<thead class="govuk-table__head">
<thead class="govuk-table__head" scope="row">
</thead>
<tbody class="govuk-table__body">
<% locations.each do |location| %>
Expand Down
22 changes: 11 additions & 11 deletions app/views/super_admin/organisations/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -29,34 +29,34 @@
<table class="govuk-table">
<thead class="govuk-table__head">
<tr class="govuk-table__row">
<th class="govuk-table__header govuk-!-width-one-half"><%= sort_link "name" %></th>
<th class="govuk-table__header"><%= sort_link "created_at", "Created on" %></th>
<th class="govuk-table__header govuk-table__header"><%= sort_link "mous.created_at", "MOU Signed" %></th>
<th class="govuk-table__header govuk-table__header--numeric"><%= sort_link "locations_count", "Locations" %></th>
<th class="govuk-table__header govuk-!-width-one-half" scope="row"><%= sort_link "name" %></th>
<th class="govuk-table__header" scope="row"><%= sort_link "created_at", "Created on" %></th>
<th class="govuk-table__header govuk-table__header" scope="row"><%= sort_link "mous.created_at", "MOU Signed" %></th>
<th class="govuk-table__header govuk-table__header--numeric" scope="row"><%= sort_link "locations_count", "Locations" %></th>
<th class="govuk-table__header govuk-table__header--numeric"><%= sort_link "ips_count", "IPs" %></th>
<th class="govuk-table__header"><%= sort_link "certificates_count", "Uses EAP-TLS" %></th>
<th class="govuk-table__header" scope="row"><%= sort_link "certificates_count", "Uses EAP-TLS" %></th>
</tr>
</thead>
<tbody class="govuk-table__body" aria-live="polite">
<% @organisations.each do |organisation| %>
<tr class="govuk-table__row result-row">
<td class="govuk-table__cell govuk-!-width-one-half" scope="row">
<th class="govuk-table__cell govuk-!-width-one-half" scope="row">
<%= link_to organisation.name, super_admin_organisation_path(organisation), class: "govuk-link filter-by" %>
</td>
<td class="govuk-table__cell" scope="row">
</th>
<td class="govuk-table__cell">
<%= organisation.created_at.strftime("%e %b %Y") %>
</td>
<td class="govuk-table__cell govuk-table__cell" scope="row">
<td class="govuk-table__cell govuk-table__cell">
<% if organisation.latest_mou_created_at.present? %>
<%= organisation.latest_mou_created_at.strftime("%e %b %Y") %>
<% else %>
-
<% end %>
</td>
<td class="govuk-table__cell govuk-table__cell--numeric" scope="row">
<td class="govuk-table__cell govuk-table__cell--numeric">
<%= organisation.locations_count %>
</td>
<td class="govuk-table__cell govuk-table__cell--numeric" scope="row">
<td class="govuk-table__cell govuk-table__cell--numeric">
<%= organisation.ips_count %>
</td>
<td class="govuk-table__cell govuk-table__cell">
Expand Down
Loading