Merge pull request #1852 from DFE-Digital/improve-task-list-design

Improve task list designs
DFE-Digital · Dec 8, 2023 · eae342c · eae342c
2 parents 87bbe2b + 62eaced
commit eae342c
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 12 deletions.
diff --git a/app/assets/stylesheets/application.sass.scss b/app/assets/stylesheets/application.sass.scss
@@ -75,7 +75,7 @@ ul.autocomplete__menu {
   margin-bottom: 0;
 }
 
-.app-table__center {
-  text-align: center;
+.app-table__center_right {
+  text-align: right;
   vertical-align: middle;
 }
diff --git a/app/components/task_list/component.html.erb b/app/components/task_list/component.html.erb
@@ -1,15 +1,17 @@
 <ol class="app-task-list">
   <% sections.each do |section| %>
     <li>
-      <h2 class="app-task-list__section">
-        <% if sections.count > 1 %>
-          <span class="app-task-list__section-number"><%= section[:number] %>. </span>
-        <% end %>
+      <% if (title = section[:title]).present? %>
+        <h2 class="app-task-list__section">
+          <% if sections.count > 1 %>
+            <span class="app-task-list__section-number"><%= section[:number] %>. </span>
+          <% end %>
 
-        <%= section[:title] %>
-      </h2>
+          <%= title %>
+        </h2>
+      <% end %>
 
-      <ul class="<%= section[:title].present? ? 'app-task-list__items' : 'app-task-list__items-no-indentation' %>">
+      <ul class="<%= section[:indentation] == false ? 'app-task-list__items-no-indentation' : 'app-task-list__items' %>">
         <% section[:items].each do |item| %>
           <li class="app-task-list__item">
             <% status_id = "#{section[:number]}-#{section[:key]}-#{item[:key]}-status" %>

diff --git a/app/components/task_list/component.rb b/app/components/task_list/component.rb
@@ -30,7 +30,7 @@ def sections
         .map do |section, index|
           section.merge(
             number: index + 1,
-            key: section[:title].parameterize,
+            key: section[:title]&.parameterize,
             items:
               section[:items].map do |item|
                 item.merge(key: item[:name].parameterize)

diff --git a/app/views/assessor_interface/assessment_recommendation_review/edit.html.erb b/app/views/assessor_interface/assessment_recommendation_review/edit.html.erb
@@ -21,7 +21,7 @@
           <%= simple_format @professional_standing_request.verify_note %>
         </td>
 
-        <td class="govuk-table__cell app-table__center">
+        <td class="govuk-table__cell app-table__center_right govuk-!-padding-right-1">
           <%= render(StatusTag::Component.new(@professional_standing_request.status)) %>
         </td>
       </tr>

diff --git a/app/views/assessor_interface/professional_standing_requests/show.html.erb b/app/views/assessor_interface/professional_standing_requests/show.html.erb
@@ -10,7 +10,7 @@
 <%= render(TaskList::Component.new(
   [
     {
-      title: "",
+      indentation: false,
       items: [
         {
           name: "Request LoPS verification",

diff --git a/app/views/assessor_interface/qualification_requests/index.html.erb b/app/views/assessor_interface/qualification_requests/index.html.erb
@@ -11,6 +11,7 @@
       [
         {
           title: "Qualifications",
+          indentation: false,
           items: @qualification_requests.map do |qualification_request|
             {
               name: qualification_title(qualification_request.qualification),

diff --git a/app/views/assessor_interface/reference_requests/index.html.erb b/app/views/assessor_interface/reference_requests/index.html.erb
@@ -17,6 +17,7 @@
         [
           {
             title: "Work references",
+            indentation: false,
             items: @reference_requests.each_with_index.map do |reference_request, index|
               {
                 name: work_history_name_and_duration(reference_request.work_history, most_recent: index.zero?),

diff --git a/app/views/assessor_interface/review_verifications/index.html.erb b/app/views/assessor_interface/review_verifications/index.html.erb
@@ -12,6 +12,7 @@
     [
       {
         title: "LoPS",
+        indentation: false,
         items: [
           {
             name: region_teaching_authority_name(@application_form.region, context: :assessor).upcase_first,