Skip to content

Commit

Permalink
updated all avticity log views
Browse files Browse the repository at this point in the history
  • Loading branch information
@ryantk
ryantk committed Nov 2, 2023
1 parent 174d27e commit 84b69e5
Show file tree
Hide file tree
Showing 5 changed files with 78 additions and 78 deletions.
8 changes: 1 addition & 7 deletions app/views/frameworks/evaluations/show.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@

<div class="pull-up-10 govuk-!-margin-bottom-8 flex-align-center">
<% if @evaluation.action_required %>
<span>
<strong class="govuk-tag govuk-tag--red">
ACTION
</strong>
</span>
<span><strong class="govuk-tag govuk-tag--red">ACTION</strong></span>
<% end %>
<span><%= @evaluation.display_status %></span>
<span class="govuk-body">Case Owner: <%= @evaluation.display_assignee %></span>
Expand Down Expand Up @@ -66,6 +62,4 @@
<% end %>
</div>
</div>


<% end %>
63 changes: 33 additions & 30 deletions app/views/frameworks/provider_contacts/show.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,40 +4,43 @@
<span class="govuk-caption-l">Framework Provider Contact</span>
<h1 class="govuk-heading-l"><%= @provider_contact.name %></h2>

<div class="govuk-tabs" data-module="govuk-tabs" data-component="select-tab">
<ul class="govuk-tabs__list">
<li class="govuk-tabs__list-item govuk-tabs__list-item--selected">
<%= link_to "Details", "#provider-contact-details", class: "govuk-tabs__tab" %>
</li>
<li class="govuk-tabs__list-item">
<%= link_to "Frameworks", "#frameworks-register", class: "govuk-tabs__tab" %>
</li>
<li class="govuk-tabs__list-item">
<%= link_to "History", "#provider-contact-activity", class: "govuk-tabs__tab" %>
</li>
</ul>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<div class="govuk-tabs" data-module="govuk-tabs" data-component="select-tab">
<ul class="govuk-tabs__list">
<li class="govuk-tabs__list-item govuk-tabs__list-item--selected">
<%= link_to "Details", "#provider-contact-details", class: "govuk-tabs__tab" %>
</li>
<li class="govuk-tabs__list-item">
<%= link_to "Frameworks", "#frameworks-register", class: "govuk-tabs__tab" %>
</li>
</ul>

<%= turbo_frame_tag "provider-contact-details-frame" do %>
<div id="provider-contact-details" class="govuk-tabs__panel">
<%= render "frameworks/provider_contacts/show/details" %>
</div>
<% end %>
<%= turbo_frame_tag "provider-contact-details-frame" do %>
<div id="provider-contact-details" class="govuk-tabs__panel">
<%= render "frameworks/provider_contacts/show/details" %>
</div>
<% end %>

<%= turbo_frame_tag "frameworks-register-frame", src: frameworks_frameworks_path(**{ viewing_from_entity: true, frameworks_filter: { provider_contact: [@provider_contact.id] } }.merge(request.params.except(:controller, :action))) do %>
<div id="frameworks-register" class="govuk-tabs__panel govuk-tabs__panel--hidden">
<p class="govuk-body">Loading...</p>
<%= turbo_frame_tag "frameworks-register-frame", src: frameworks_frameworks_path(**{ viewing_from_entity: true, frameworks_filter: { provider_contact: [@provider_contact.id] } }.merge(request.params.except(:controller, :action))) do %>
<div id="frameworks-register" class="govuk-tabs__panel govuk-tabs__panel--hidden">
<p class="govuk-body">Loading...</p>
</div>
<% end %>
</div>
<% end %>

<%= turbo_frame_tag "framework-contact-activity-frame" do %>
<div id="provider-contact-activity" class="govuk-tabs__panel govuk-tabs__panel--hidden">
<h2 class="govuk-heading-m">Actions</h2>
<ul class="govuk-list">
<li><%= link_to "Edit Contact", edit_frameworks_provider_contact_path(@provider_contact), class: "govuk-link" %></li>
</ul>
</div>

<div class="govuk-grid-column-one-third">
<h2 class="govuk-heading-m">Activity</h2>

<%= turbo_frame_tag "activity-log-frame" do %>
<%= render "frameworks/provider_contacts/show/history" %>
</div>
<% end %>
<% end %>
</div>
</div>

<h2 class="govuk-heading-m">Actions</h2>
<ul class="govuk-list">
<li><%= link_to "Edit Contact", edit_frameworks_provider_contact_path(@provider_contact), class: "govuk-link" %></li>
</ul>
<% end %>
2 changes: 1 addition & 1 deletion app/views/frameworks/provider_contacts/show/_history.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<%= render "frameworks/activity_log_items/list", activity_log_items: @activity_log_items %>
<%= render "frameworks/activity_log_items/history", activity_log_items: @activity_log_items %>
<%= render "components/pagination", records: @activity_log_items, page_param_name: 'activities_page', pagination_params: { anchor: "provider-contact-activity" } %>
81 changes: 42 additions & 39 deletions app/views/frameworks/providers/show.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,49 +4,52 @@
<span class="govuk-caption-l">Framework Provider</span>
<h1 class="govuk-heading-l"><%= @provider.display_name %></h2>

<div class="govuk-tabs" data-module="govuk-tabs" data-component="select-tab">
<ul class="govuk-tabs__list">
<li class="govuk-tabs__list-item govuk-tabs__list-item--selected">
<%= link_to "Details", "#provider-details", class: "govuk-tabs__tab" %>
</li>
<li class="govuk-tabs__list-item">
<%= link_to "Contacts", "#provider-contacts", class: "govuk-tabs__tab" %>
</li>
<li class="govuk-tabs__list-item">
<%= link_to "Frameworks", "#frameworks-register", class: "govuk-tabs__tab" %>
</li>
<li class="govuk-tabs__list-item">
<%= link_to "History", "#provider-activity", class: "govuk-tabs__tab" %>
</li>
</ul>

<%= turbo_frame_tag "provider-details-frame" do %>
<div id="provider-details" class="govuk-tabs__panel">
<%= render "frameworks/providers/show/details" %>
</div>
<% end %>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<div class="govuk-tabs" data-module="govuk-tabs" data-component="select-tab">
<ul class="govuk-tabs__list">
<li class="govuk-tabs__list-item govuk-tabs__list-item--selected">
<%= link_to "Details", "#provider-details", class: "govuk-tabs__tab" %>
</li>
<li class="govuk-tabs__list-item">
<%= link_to "Contacts", "#provider-contacts", class: "govuk-tabs__tab" %>
</li>
<li class="govuk-tabs__list-item">
<%= link_to "Frameworks", "#frameworks-register", class: "govuk-tabs__tab" %>
</li>
</ul>

<%= turbo_frame_tag "provider-contacts-frame", src: frameworks_provider_contacts_path(**{ viewing_from_entity: true, provider_contacts_filter: { provider: [@provider.id] }}.merge(request.params.except(:controller, :action))) do %>
<div id="provider-contacts" class="govuk-tabs__panel govuk-tabs__panel--hidden">
<p class="govuk-body">Loading...</p>
</div>
<% end %>
<%= turbo_frame_tag "provider-details-frame" do %>
<div id="provider-details" class="govuk-tabs__panel">
<%= render "frameworks/providers/show/details" %>
</div>
<% end %>

<%= turbo_frame_tag "frameworks-register-frame", src: frameworks_frameworks_path(**{ viewing_from_entity: true, frameworks_filter: { provider: [@provider.id] }}.merge(request.params.except(:controller, :action))) do %>
<div id="frameworks-register" class="govuk-tabs__panel govuk-tabs__panel--hidden">
<p class="govuk-body">Loading...</p>
<%= turbo_frame_tag "provider-contacts-frame", src: frameworks_provider_contacts_path(**{ viewing_from_entity: true, provider_contacts_filter: { provider: [@provider.id] }}.merge(request.params.except(:controller, :action))) do %>
<div id="provider-contacts" class="govuk-tabs__panel govuk-tabs__panel--hidden">
<p class="govuk-body">Loading...</p>
</div>
<% end %>

<%= turbo_frame_tag "frameworks-register-frame", src: frameworks_frameworks_path(**{ viewing_from_entity: true, frameworks_filter: { provider: [@provider.id] }}.merge(request.params.except(:controller, :action))) do %>
<div id="frameworks-register" class="govuk-tabs__panel govuk-tabs__panel--hidden">
<p class="govuk-body">Loading...</p>
</div>
<% end %>
</div>
<% end %>

<%= turbo_frame_tag "framework-activity-frame" do %>
<div id="provider-activity" class="govuk-tabs__panel govuk-tabs__panel--hidden">
<h2 class="govuk-heading-m">Actions</h2>
<ul class="govuk-list">
<li><%= link_to "Edit Provider", edit_frameworks_provider_path(@provider), class: "govuk-link" %></li>
</ul>
</div>

<div class="govuk-grid-column-one-third">
<h2 class="govuk-heading-m">Activity</h2>

<%= turbo_frame_tag "activity-log-frame" do %>
<%= render "frameworks/providers/show/history" %>
</div>
<% end %>
<% end %>
</div>
</div>

<h2 class="govuk-heading-m">Actions</h2>
<ul class="govuk-list">
<li><%= link_to "Edit Provider", edit_frameworks_provider_path(@provider), class: "govuk-link" %></li>
</ul>
<% end %>
2 changes: 1 addition & 1 deletion app/views/frameworks/providers/show/_history.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<%= render "frameworks/activity_log_items/list", activity_log_items: @activity_log_items %>
<%= render "frameworks/activity_log_items/history", activity_log_items: @activity_log_items %>
<%= render "components/pagination", records: @activity_log_items, page_param_name: 'activities_page', pagination_params: { anchor: "provider-activity" } %>

0 comments on commit 84b69e5

Please sign in to comment.