Merge pull request #251 from ministryofjustice/EMP-431-fe-feature-crm…

…-7-official-use-section Emp 431 fe feature crm 7 official use section
ministryofjustice · Sep 2, 2024 · f791003 · f791003
2 parents e057a6e + 700441e
commit f791003
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 21 deletions.
diff --git a/server/services/config/crm7DisplayConfig.json b/server/services/config/crm7DisplayConfig.json
@@ -590,13 +590,11 @@
       "title": "Office Use Only",
       "subsections": [
         {
-          "title": "Quality Control",
-          "fields": [
-            {
-              "label": "Decision",
-              "apiField": "decisionOfficeUseOnly"
-            }
-          ]
+          "title": "Office Use Only",
+          "customDisplay": {
+            "name": "crm7OfficeUseOnly",
+            "apiField": "OfficeUseOnly"
+          }
         }
       ]
     },

diff --git a/server/views/components/customDisplay/crm5/crm5OfficeUseOnly.njk b/server/views/components/customDisplay/crm5/crm5OfficeUseOnly.njk
@@ -11,24 +11,24 @@
         "Refer": "Refer For ICA"
     } %}
 
-    {% if data.qualityControl.decision == 'G' %}
+    {% if data.QualityControl.decision == 'G' %}
         {% set reasonLabel = "Notes" %}
     {% else %}
         {% set reasonLabel = "Reason for decision" %}
     {% endif %}
 
     {% set fieldsQualityControl = [
-        { label: "Decision", value: decisionOptions[data.qualityControl.decision] },
-        { label: reasonLabel, value: data.qualityControl.decisionReason }
+        { label: "Decision", value: decisionOptions[data.QualityControl.decision] },
+        { label: reasonLabel, value: data.QualityControl.decisionReason }
     ] %}
     {{ formSubsection('Quality Control', fieldsQualityControl) }}
 
     {# Authority Section #}
     {% set fieldsAuthority = [
-        { label: "New Limit Request", value: data.authority.newLimitRequest | formatCurrency },
-        { label: "Upper Limit Extended To", value: data.authority.upperLimitExtended | formatCurrency },
-        { label: "Signed Authority", value: data.authority.signedAuth },
-        { label: "Decision Date", value: data.authority.signedAuthDate | formatDate }
+        { label: "New Limit Request", value: data.Authority.newLimitRequest | formatCurrency },
+        { label: "Upper Limit Extended To", value: data.Authority.upperLimitExtended | formatCurrency },
+        { label: "Signed Authority", value: data.Authority.signedAuth },
+        { label: "Decision Date", value: data.Authority.signedAuthDate | formatDate }
     ] %}
     {{ formSubsection('Authority', fieldsAuthority) }}
 

diff --git a/server/views/components/customDisplay/crm7/crm7OfficeUseOnly.njk b/server/views/components/customDisplay/crm7/crm7OfficeUseOnly.njk
@@ -0,0 +1,28 @@
+{% from "../../formFieldList.njk" import formFieldList %}
+{% from "../../formSubsection.njk" import formSubsection %}
+{% from "../../formField.njk" import formField %}
+
+{% macro crm7OfficeUseOnly(data) %}
+    {# Quality Control Section #}
+    {% set decisionOptions = {
+        "G": "Grant",
+        "PG": "Part Grant",
+        "R": "Reject",
+        "Refer": "Refer For ICA"
+    } %}
+
+    {% set fieldsQualityControl = [
+        { label: "Decision", value: decisionOptions[data.QualityControl.decision] },
+        { label: "Reason for decision", value: data.QualityControl.decisionReason },
+        { label: "Destruction Date", value: data.QualityControl.destructionDate | formatDate }
+    ] %}
+    {{ formSubsection('Quality Control', fieldsQualityControl) }}
+
+    {# Authority Section #}
+    {% set fieldsAuthority = [
+        { label: "Signed Authority", value: data.Authority.signedAuth },
+        { label: "Decision Date", value: data.Authority.signedAuthDate | formatDate }
+    ] %}
+    {{ formSubsection('Authority', fieldsAuthority) }}
+
+{% endmacro %}
diff --git a/server/views/components/customDisplay/customDisplay.njk b/server/views/components/customDisplay/customDisplay.njk
@@ -5,6 +5,7 @@
 {% from "./crm7/crm7Disbursements.njk" import crm7Disbursements %}
 {% from "./crm7/crm7ClaimForCosts.njk" import crm7ClaimForCosts %}
 {% from "./crm7/crm7ScheduleOfTime.njk" import crm7ScheduleOfTime %}
+{% from "./crm7/crm7OfficeUseOnly.njk" import crm7OfficeUseOnly %}
 {% from "./crm14/crm14AboutTheInformation.njk" import crm14AboutTheInformation %}
 {% from "./crm14/crm14InterestsOfJustice.njk" import crm14InterestsOfJustice %}
 {% from "./crm14/crm14Declarations.njk" import crm14Declarations %}
@@ -33,6 +34,8 @@
         {{ crm7ClaimForCosts(params.value) }}
     {% elif params.name == 'crm7ScheduleOfTime' %}
         {{ crm7ScheduleOfTime(params.value) }}
+    {% elif params.name == 'crm7OfficeUseOnly' %}
+        {{ crm7OfficeUseOnly(params.value) }}
     {% elif params.name == 'crm14InterestsOfJustice' %}
         {{ crm14InterestsOfJustice(params.value) }}
         {% elif params.name == 'crm14AboutTheInformation' %}

diff --git a/server/views/components/formFieldList.njk b/server/views/components/formFieldList.njk
@@ -1,11 +1,9 @@
 {% from "./formField.njk" import formField %}
 
 {% macro formFieldList(fields) %}
-
-    <dl class="govuk-summary-list">
-        {% for field in fields %}
-            {{ formField(field) }}
-        {% endfor %}
-    </dl>
-
+<dl class="govuk-summary-list">
+    {% for field in fields %}
+        {{ formField(field) }}
+    {% endfor %}
+</dl>
 {% endmacro %}