Updated filter status

Entitled Not Entitled Evidence needed Sent for review
DFE-Digital · Oct 18, 2024 · 42b3b3f · 42b3b3f
1 parent 62609db
commit 42b3b3f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/app/data/applications.json b/app/data/applications.json
@@ -24,7 +24,7 @@
     },
     "dob": "2017-01-10",
     "status": {
-      "yes": "Entitled"
+      "yes": "Not Entitled"
     },
     "eligible": {
       "date": "2023-09-01"
@@ -75,7 +75,7 @@
     },
     "dob": "2017-12-13",
     "status": {
-      "yes": "Reviewed entitled"
+      "yes": "Not Entitled"
     },
     "eligible": {
       "date": "2023-09-01"
@@ -143,7 +143,7 @@
     },
     "dob": "2021-05-26",
     "status": {
-      "yes": "Reviewed entitled"
+      "yes": "Entitled"
     },
     "eligible": {
       "date": "2024-09-07"
@@ -194,7 +194,7 @@
     },
     "dob": "2018-12-11",
     "status": {
-      "yes": "Reviewed entitled"
+      "yes": "Entitled"
     },
     "eligible": {
       "date": "2024-09-26"
@@ -245,7 +245,7 @@
     },
     "dob": "2021-11-06",
     "status": {
-      "yes": "Entitled"
+      "yes": "Not Entitled"
     },
     "eligible": {
       "date": "2024-09-12"
@@ -279,7 +279,7 @@
     },
     "dob": "2020-07-12",
     "status": {
-      "yes": "Receiving entitlement"
+      "yes": "Entitled"
     },
     "eligible": {
       "date": "2024-09-18"
@@ -313,7 +313,7 @@
     },
     "dob": "2021-01-21",
     "status": {
-      "yes": "Receiving entitlement"
+      "yes": "Not Entitled"
     },
     "eligible": {
       "date": "2024-09-18"
@@ -432,7 +432,7 @@
     },
     "dob": "2019-10-19",
     "status": {
-      "yes": "Reviewed entitled"
+      "yes": "Entitled"
     },
     "eligible": {
       "date": "2024-09-15"
@@ -449,7 +449,7 @@
     },
     "dob": "2021-06-18",
     "status": {
-      "yes": "Reviewed entitled"
+      "yes": "Not Entitled"
     },
     "eligible": {
       "date": "2024-09-19"
@@ -466,7 +466,7 @@
     },
     "dob": "2020-02-20",
     "status": {
-      "yes": "Reviewed entitled"
+      "yes": "Entitled"
     },
     "eligible": {
       "date": "2024-10-06"

diff --git a/app/views/mvp3/_school/school-manage/report/search_1.html b/app/views/mvp3/_school/school-manage/report/search_1.html
@@ -50,7 +50,11 @@ <h2 class="govuk-heading-m" style="margin: 0;">
 
                     <tbody class="govuk-table__body">
                       {% for application in data.applications %}
-                      <tr class="govuk-table__row" data-status="{% if application.status.yes == 'Entitled' %}status-Entitled{% elif application.status.yes == 'Sent for review' %}status-review{% elif application.status.yes == 'Evidence needed' %}status-Evidence-needed{% endif %}">
+                      <tr class="govuk-table__row" data-status="{% if application.status.yes == 'Entitled' %}status-Entitled
+                      {% elif application.status.yes == 'Not Entitled' %}status-Not-Entitled
+                      {% elif application.status.yes == 'Sent for review' %}status-review
+                      {% elif application.status.yes == 'Evidence needed' %}status-Evidence-needed
+                      {% endif %}">
                         <th scope="row" class="govuk-table__header">
                           <a href="#" class="govuk-link">{{ application.id }}</a>
                         </th>
@@ -61,14 +65,10 @@ <h2 class="govuk-heading-m" style="margin: 0;">
                           {% if application.status.yes == "Entitled" %}
                             <strong class="govuk-tag govuk-tag--green">{{ application.status.yes }}</strong>
                           {% elif application.status.yes == "Sent for review" %}
-                            <strong class="govuk-tag govuk-tag--purple">{{ application.status.yes }}</strong>
-                          {% elif application.status.yes == "Review entitled" %}
                             <strong class="govuk-tag govuk-tag--blue">{{ application.status.yes }}</strong>
                           {% elif application.status.yes == "Evidence needed" %}
-                            <strong class="govuk-tag govuk-tag--light-blue">{{ application.status.yes }}</strong>
-                          {% elif application.status.yes == "Receiving entitlement" %}
                             <strong class="govuk-tag govuk-tag--turquoise">{{ application.status.yes }}</strong>
-                          {% elif application.status.yes == "Reviewed not entitled" %}
+                          {% elif application.status.yes == "Not Entitled" %}
                             <strong class="govuk-tag govuk-tag--red">{{ application.status.yes }}</strong>
                           {% else %}
                             <strong class="govuk-tag">{{ application.status.yes }}</strong>

diff --git a/app/views/mvp3/includes/filter-panel.html b/app/views/mvp3/includes/filter-panel.html
@@ -104,6 +104,10 @@ <h2 class="govuk-heading-m">Selected filters</h2>
           value: "status-Entitled",
           text: "Entitled"
           },
+          {
+            value: "status-Not-Entitled",
+            text: "Not Entitled"
+          },
           {
           value: "status-Evidence-needed",
           text: "Evidence needed"