Merge pull request #54 from hmcts/fr-updates

Financial remedy updates
hmcts · Jul 24, 2018 · 2952eb6 · 2952eb6
2 parents 440653d + d8c4f10
commit 2952eb6
Show file tree

Hide file tree

Showing 28 changed files with 133 additions and 105 deletions.
diff --git a/app/assets/downloads/ConsentOrder.docx b/app/assets/downloads/ConsentOrder.docx
diff --git a/app/assets/downloads/ConsentOrder.pdf b/app/assets/downloads/ConsentOrder.pdf
diff --git a/app/assets/downloads/D8.pdf b/app/assets/downloads/D8.pdf
diff --git a/app/assets/downloads/D81.pdf b/app/assets/downloads/D81.pdf
diff --git a/app/assets/downloads/D84.pdf b/app/assets/downloads/D84.pdf
diff --git a/app/assets/downloads/FormA.pdf b/app/assets/downloads/FormA.pdf
diff --git a/app/components/header/header.html b/app/components/header/header.html
@@ -11,7 +11,7 @@
       <nav class="jui-primary-nav" aria-label="Global navigation">
         <ul class="jui-primary-nav__list">
           <li class="jui-primary-nav__item"><a class="jui-primary-nav__link" href="/app/dashboard">Dashboard</a></li>
-          <li class="jui-primary-nav__item"><a class="jui-primary-nav__link" href="/signout">Signout</a></li>
+          <li class="jui-primary-nav__item"><a class="jui-primary-nav__link" href="/sign-out">Sign out</a></li>
         </ul>
       </nav>
 

diff --git a/app/data/cases.js b/app/data/cases.js
@@ -6,7 +6,7 @@ module.exports = [
   {
     id: 'FR1231612322',
     typeId: types.fr.id,
-    status: 'Deadline expired',
+    status: 'Draft consent order submitted',
     applicationDate: moment('2017-11-20 13:01'),
     lastAction: moment('2018-01-25 16:48'),
     tribunalCentre: 'Fox Court',
@@ -71,7 +71,7 @@ module.exports = [
     }],
     linkedCases: [{
       type: 'Divorce',
-      id: 'SC1245612322'
+      id: 'BV18D00153'
     }]
   },
 
@@ -346,10 +346,10 @@ module.exports = [
     reason: 'Separated for 2 years and consent',
     applicationDate: moment('2018-05-09'),
     documents: [{
-      id: '1',
+      id: 'key-facts',
       label: 'Key facts'
     }, {
-      id: '2',
+      id: 'decree-nisi-application',
       label: 'Application for decree nisi'
     }],
     lastAction: moment('2018-05-09'),
@@ -378,11 +378,15 @@ module.exports = [
   {
     id: 'BV18D00153',
     typeId: types.divorce.id,
+    linkedCases: [{
+      type: 'Financial remedy',
+      id: 'FR1231612322'
+    }],
     parties: [
       {
         type: 'Petitioner',
-        firstName: 'Thomas',
-        lastName: 'Jones',
+        firstName: 'John',
+        lastName: 'Smith',
         representative: {
           name: '',
           role: '',
@@ -391,8 +395,8 @@ module.exports = [
       },
       {
         type: 'Respondent',
-        firstName: 'Victoria',
-        lastName: 'Jones',
+        firstName: 'Jane',
+        lastName: 'Smith',
         representative: {
           name: '',
           role: '',
@@ -404,11 +408,11 @@ module.exports = [
     reason: 'Separated for 2 years and consent',
     applicationDate: moment('2018-05-09'),
     documents: [{
-      id: '1',
-      label: 'Key facts'
+      id: 'd8',
+      label: 'D8'
     }, {
-      id: '2',
-      label: 'Application for decree nisi'
+      id: 'd84',
+      label: 'D84'
     }],
     lastAction: moment('2018-05-09'),
     petitioner: '',

diff --git a/app/routes/divorce.js b/app/routes/divorce.js
@@ -25,6 +25,16 @@ router.get('/app/cases/:id/divorce', (req, res) => {
 	pageObject.representativesRows.push([{ html: 'Petitioner' }, { html: _case.petitioner ? _case.petitioner : 'Unrepresented' }]);
 	pageObject.representativesRows.push([{ html: 'Respondent' }, { html: _case.respondent ? _case.respondent : 'Unrepresented' }]);
 
+	pageObject.linkedCaseRows = [];
+
+	_case.linkedCases.forEach((item) => {
+		pageObject.linkedCaseRows.push([{
+			html: item.type
+		}, {
+			html: `<a href="/app/cases/${item.id}">${item.id}</a>`
+		}])
+	});
+
 	res.render('app/case/divorce/summary', pageObject);
 });
 

diff --git a/app/routes/fr.js b/app/routes/fr.js
@@ -27,7 +27,7 @@ router.get('/app/cases/:id/fr', (req, res) => {
 		pageObject.linkedCaseRows.push([{
 			html: item.type
 		}, {
-			html: `<a href="/">${item.id}</a>`
+			html: `<a href="/app/cases/${item.id}">${item.id}</a>`
 		}])
 	});
 

diff --git a/app/routes/helpers.js b/app/routes/helpers.js
@@ -9,7 +9,7 @@ function getPartiesLine(_case) {
 			return party.firstName + ' ' + party.lastName;
 		}
 
-	}).join(' versus ');
+	}).join(' v ');
 }
 
 function getAppellantName(_case) {
@@ -46,7 +46,7 @@ function getCaseActions(_case) {
 			return [
 				{
 					href: `/app/cases/${_case.id}/pip/make-decision`,
-					text: 'Make decision'
+					text: 'Make a decision'
 				},
 				{
 					href: `/app/cases/${_case.id}/pip/list-for-hearing`,
@@ -57,14 +57,14 @@ function getCaseActions(_case) {
 			return [
 				{
 					href: `/app/cases/${_case.id}/fr/decision`,
-					text: 'Make decision'
+					text: 'Make a decision'
 				}
 			];
 		case 'divorce':
 			return [
 				{
 					href: `/app/cases/${_case.id}/divorce/make-decision`,
-					text: 'Make decision'
+					text: 'Make a decision'
 				},
 				{
 					href: `/app/cases/${_case.id}/divorce/mark-as-prepared`,

diff --git a/app/routes/jui.js b/app/routes/jui.js
@@ -10,7 +10,7 @@ router.use(function(req, res, next) {
 	next();
 });
 
-router.get('/signout', (req, res) => {
+router.get('/sign-out', (req, res) => {
 	req.session.destroy();
 	res.redirect('/app/signin');
 });

diff --git a/app/views/app/case/divorce/documents/d8.html b/app/views/app/case/divorce/documents/d8.html
@@ -0,0 +1,7 @@
+{% extends "layouts/admin/casefile-3.html" %}
+
+{% block file_content %}
+
+  <iframe src="/public/downloads/d8.pdf" height="8000" width="100%"></iframe>
+
+{% endblock %}
diff --git a/app/views/app/case/divorce/documents/d84.html b/app/views/app/case/divorce/documents/d84.html
@@ -0,0 +1,7 @@
+{% extends "layouts/admin/casefile-3.html" %}
+
+{% block file_content %}
+
+  <iframe src="/public/downloads/d84.pdf" height="1200" width="100%"></iframe>
+
+{% endblock %}
diff --git a/app/views/app/case/divorce/documents/2.html → ...ce/documents/decree-nisi-application.html b/app/views/app/case/divorce/documents/2.html → ...ce/documents/decree-nisi-application.html
diff --git a/app/views/app/case/divorce/documents/1.html → ...app/case/divorce/documents/key-facts.html b/app/views/app/case/divorce/documents/1.html → ...app/case/divorce/documents/key-facts.html
@@ -134,7 +134,7 @@ <h2 class="govuk-heading-l">Key facts</h2>
       }) }}
 
     </div>
-    
+
   </div>
 
 {% endblock %}
diff --git a/app/views/app/case/divorce/summary.html b/app/views/app/case/divorce/summary.html
@@ -34,6 +34,14 @@ <h2 class="govuk-heading-m  govuk-!-margin-bottom-2">Case details</h2>
           "rows": detailsRows
         }) }}
 
+        <h2 class="govuk-heading-m  govuk-!-margin-bottom-2">Linked cases</h2>
+
+        {{ govukTable({
+          "classes": "govuk-!-margin-bottom-7  jui-table  jui-table--fixed",
+          "firstCellIsHeader": true,
+          "rows": linkedCaseRows
+        }) }}
+
         <h2 class="govuk-heading-m  govuk-!-margin-bottom-2">Representatives</h2>
 
         {{ govukTable({
@@ -56,7 +64,7 @@ <h2 class="govuk-heading-m  govuk-!-margin-bottom-4">Recent events</h2>
             "events": recentEvents
           })}}
 
-          <p><a href="/app/cases/{{_case.id}}/timeline">View all events</a></p>
+          <p><a href="/app/cases/{{_case.id}}/timeline">View full timeline</a></p>
 
         {% else %}
 

diff --git a/app/views/app/case/fr/decision/upload-2.html b/app/views/app/case/fr/decision/upload-2.html
@@ -32,7 +32,7 @@
                   classes: 'govuk-label--l'
                 },
                 hint: {
-                  html: '<a href="/">Download latest version</a>'
+                  html: '<a href="/public/downloads/ConsentOrder.docx">Download latest version</a>'
                 }
               }) }}
 

diff --git a/app/views/app/case/fr/documents/1.html b/app/views/app/case/fr/documents/1.html
@@ -2,53 +2,6 @@
 
 {% block file_content %}
 
-  <div class="jui-casefile-page-content" data-page="1">
-
-    <div class="jui-casefile-page-head">
-      <img src="/public/images/logo-hmcts.svg" alt="HM Courts &amp; Tribunals Service">
-    </div>
-
-    <div class="jui-casefile-page-body">
-
-      <h2 class="govuk-heading-l">Consent order</h2>
-
-      <p>By reason of mental and physical health problems significantly limited. As a result Mr Alan Jones qualifies for the above award of Personal Independence Payment. In reaching its decision the Tribunal considered all of the evidence.</p>
-
-    </div>
-
-  </div>
-
-  <div class="jui-casefile-page-content" data-page="2">
-
-    <div class="jui-casefile-page-head">
-      <img src="/public/images/logo-hmcts.svg" alt="HM Courts &amp; Tribunals Service">
-    </div>
-
-    <div class="jui-casefile-page-body">
-
-      {{ govukTable({
-        "firstCellIsHeader": true,
-        "caption": "Section 1 (continued)",
-        "captionClasses": "govuk-heading-s",
-        "classes": "  govuk-!-margin-bottom-8  jui-table  jui-table--fixed",
-        "rows": [
-          [
-            {"text": "Decision Maker’s name and address where documents for the Decision Maker may be sent or delivered"},
-            {"html": "Arron Setton<br>Personal Independence Payment (9)<br>Mall Handling Site 29<br>Liverpool, WV78 1AA"}
-          ],
-          [
-            {"text": "Name and addresses of any other respondents and their representatives."},
-            {"html": "Joseph Fontainour<br>123 The Way<br>London<br>B4 4FF"}
-          ],
-          [
-            {"text": "Name and address of Appoinetee"},
-            {"html": "N/A"}
-          ]
-        ]
-      }) }}
-
-    </div>
-
-  </div>
+  <iframe src="/public/downloads/ConsentOrder.pdf" height="6900" width="100%"></iframe>
 
 {% endblock %}
diff --git a/app/views/app/case/fr/documents/2.html b/app/views/app/case/fr/documents/2.html
@@ -1,23 +1,7 @@
-{% extends "layouts/admin/casefile.html" %}
+{% extends "layouts/admin/casefile-3.html" %}
 
 {% block file_content %}
 
-  <div class="jui-casefile-page-content" data-page="1">
-
-    <div class="jui-casefile-page-head">
-      <img src="/public/images/logo-hmcts.svg" alt="HM Courts &amp; Tribunals Service">
-    </div>
-
-    <div class="jui-casefile-page-body">
-
-      <h2 class="govuk-heading-l">Form A</h2>
-
-      <p>Mr Alan Jones does not qualify for an award of the mobility component from 12/07/2017. He scores 4 points. This is insufficient to meet the threshold for the test.</p>
-
-      <p>By reason of mental and physical health problems significantly limited. As a result Mr Alan Jones qualifies for the above award of Personal Independence Payment. In reaching its decision the Tribunal considered all of the evidence.</p>
-
-    </div>
-
-  </div>
+  <iframe src="/public/downloads/FormA.pdf" height="7000" width="100%"></iframe>
 
 {% endblock %}
diff --git a/app/views/app/case/fr/documents/3.html b/app/views/app/case/fr/documents/3.html
@@ -0,0 +1,58 @@
+{% extends "layouts/admin/casefile-3.html" %}
+
+{% block file_content %}
+
+  <iframe src="/public/downloads/D81.pdf" height="6900" width="100%"></iframe>
+  <!--
+  <div class="jui-casefile-page-content" data-page="1">
+
+    <div class="jui-casefile-page-head">
+      <img src="/public/images/logo-hmcts.svg" alt="HM Courts &amp; Tribunals Service">
+    </div>
+
+    <div class="jui-casefile-page-body">
+
+      <h2 class="govuk-heading-l">Consent order</h2>
+
+      <p>By reason of mental and physical health problems significantly limited. As a result Mr Alan Jones qualifies for the above award of Personal Independence Payment. In reaching its decision the Tribunal considered all of the evidence.</p>
+
+    </div>
+
+  </div>
+
+  <div class="jui-casefile-page-content" data-page="2">
+
+    <div class="jui-casefile-page-head">
+      <img src="/public/images/logo-hmcts.svg" alt="HM Courts &amp; Tribunals Service">
+    </div>
+
+    <div class="jui-casefile-page-body">
+
+      {{ govukTable({
+        "firstCellIsHeader": true,
+        "caption": "Section 1 (continued)",
+        "captionClasses": "govuk-heading-s",
+        "classes": "  govuk-!-margin-bottom-8  jui-table  jui-table--fixed",
+        "rows": [
+          [
+            {"text": "Decision Maker’s name and address where documents for the Decision Maker may be sent or delivered"},
+            {"html": "Arron Setton<br>Personal Independence Payment (9)<br>Mall Handling Site 29<br>Liverpool, WV78 1AA"}
+          ],
+          [
+            {"text": "Name and addresses of any other respondents and their representatives."},
+            {"html": "Joseph Fontainour<br>123 The Way<br>London<br>B4 4FF"}
+          ],
+          [
+            {"text": "Name and address of Appoinetee"},
+            {"html": "N/A"}
+          ]
+        ]
+      }) }}
+
+    </div>
+
+
+  </div>
+  -->
+
+{% endblock %}
-Original file line number
+Diff line change
@@ Expand Up / @@ -134,7 +134,7 @@ <h2 class="govuk-heading-l">Key facts</h2> @@
           }) }}
         </div>
       </div>
     {% endblock %}