diff --git a/app/assets/downloads/ConsentOrder.docx b/app/assets/downloads/ConsentOrder.docx new file mode 100644 index 00000000..7a738dc6 Binary files /dev/null and b/app/assets/downloads/ConsentOrder.docx differ diff --git a/app/assets/downloads/ConsentOrder.pdf b/app/assets/downloads/ConsentOrder.pdf new file mode 100644 index 00000000..7ec1fbe1 Binary files /dev/null and b/app/assets/downloads/ConsentOrder.pdf differ diff --git a/app/assets/downloads/D8.pdf b/app/assets/downloads/D8.pdf new file mode 100644 index 00000000..56c2477f Binary files /dev/null and b/app/assets/downloads/D8.pdf differ diff --git a/app/assets/downloads/D81.pdf b/app/assets/downloads/D81.pdf new file mode 100644 index 00000000..899375fd Binary files /dev/null and b/app/assets/downloads/D81.pdf differ diff --git a/app/assets/downloads/D84.pdf b/app/assets/downloads/D84.pdf new file mode 100644 index 00000000..215a7eff Binary files /dev/null and b/app/assets/downloads/D84.pdf differ diff --git a/app/assets/downloads/FormA.pdf b/app/assets/downloads/FormA.pdf new file mode 100644 index 00000000..1bfdb8aa Binary files /dev/null and b/app/assets/downloads/FormA.pdf differ diff --git a/app/components/header/header.html b/app/components/header/header.html index 68459540..6389c252 100644 --- a/app/components/header/header.html +++ b/app/components/header/header.html @@ -11,7 +11,7 @@ diff --git a/app/data/cases.js b/app/data/cases.js index b92b5505..e9f988fb 100644 --- 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 index ddbc187d..8692900d 100644 --- 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: `${item.id}` + }]) + }); + res.render('app/case/divorce/summary', pageObject); }); diff --git a/app/routes/fr.js b/app/routes/fr.js index a24fe4c9..e9a7c0a2 100644 --- 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: `${item.id}` + html: `${item.id}` }]) }); diff --git a/app/routes/helpers.js b/app/routes/helpers.js index 8f6c7877..4a3d79f9 100644 --- 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 index 36417386..6b50e654 100644 --- 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 new file mode 100644 index 00000000..3703f7ce --- /dev/null +++ b/app/views/app/case/divorce/documents/d8.html @@ -0,0 +1,7 @@ +{% extends "layouts/admin/casefile-3.html" %} + +{% block file_content %} + + + +{% endblock %} \ No newline at end of file diff --git a/app/views/app/case/divorce/documents/d84.html b/app/views/app/case/divorce/documents/d84.html new file mode 100644 index 00000000..08f4741b --- /dev/null +++ b/app/views/app/case/divorce/documents/d84.html @@ -0,0 +1,7 @@ +{% extends "layouts/admin/casefile-3.html" %} + +{% block file_content %} + + + +{% endblock %} \ No newline at end of file diff --git a/app/views/app/case/divorce/documents/2.html b/app/views/app/case/divorce/documents/decree-nisi-application.html similarity index 100% rename from app/views/app/case/divorce/documents/2.html rename to app/views/app/case/divorce/documents/decree-nisi-application.html diff --git a/app/views/app/case/divorce/documents/1.html b/app/views/app/case/divorce/documents/key-facts.html similarity index 99% rename from app/views/app/case/divorce/documents/1.html rename to app/views/app/case/divorce/documents/key-facts.html index e1627194..e105108d 100644 --- a/app/views/app/case/divorce/documents/1.html +++ b/app/views/app/case/divorce/documents/key-facts.html @@ -134,7 +134,7 @@

Key facts

}) }} - + {% endblock %} \ No newline at end of file diff --git a/app/views/app/case/divorce/summary.html b/app/views/app/case/divorce/summary.html index 42cb1181..a7ac5f65 100644 --- a/app/views/app/case/divorce/summary.html +++ b/app/views/app/case/divorce/summary.html @@ -34,6 +34,14 @@

Case details

"rows": detailsRows }) }} +

Linked cases

+ + {{ govukTable({ + "classes": "govuk-!-margin-bottom-7 jui-table jui-table--fixed", + "firstCellIsHeader": true, + "rows": linkedCaseRows + }) }} +

Representatives

{{ govukTable({ @@ -56,7 +64,7 @@

Recent events

"events": recentEvents })}} -

View all events

+

View full timeline

{% else %} diff --git a/app/views/app/case/fr/decision/upload-2.html b/app/views/app/case/fr/decision/upload-2.html index eb982c08..1e4546ab 100644 --- 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: 'Download latest version' + html: 'Download latest version' } }) }} diff --git a/app/views/app/case/fr/documents/1.html b/app/views/app/case/fr/documents/1.html index 55212896..30189ab3 100644 --- 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 %} -
- -
- HM Courts & Tribunals Service -
- -
- -

Consent order

- -

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.

- -
- -
- -
- -
- HM Courts & Tribunals Service -
- -
- - {{ 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
Personal Independence Payment (9)
Mall Handling Site 29
Liverpool, WV78 1AA"} - ], - [ - {"text": "Name and addresses of any other respondents and their representatives."}, - {"html": "Joseph Fontainour
123 The Way
London
B4 4FF"} - ], - [ - {"text": "Name and address of Appoinetee"}, - {"html": "N/A"} - ] - ] - }) }} - -
- -
+ {% endblock %} \ No newline at end of file diff --git a/app/views/app/case/fr/documents/2.html b/app/views/app/case/fr/documents/2.html index 5115c5ae..c56197b4 100644 --- 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 %} -
- -
- HM Courts & Tribunals Service -
- -
- -

Form A

- -

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.

- -

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.

- -
- -
+ {% endblock %} \ No newline at end of file diff --git a/app/views/app/case/fr/documents/3.html b/app/views/app/case/fr/documents/3.html new file mode 100644 index 00000000..c62d188c --- /dev/null +++ b/app/views/app/case/fr/documents/3.html @@ -0,0 +1,58 @@ +{% extends "layouts/admin/casefile-3.html" %} + +{% block file_content %} + + + + +{% endblock %} \ No newline at end of file diff --git a/app/views/app/case/fr/history.html b/app/views/app/case/fr/history.html index 895317ff..0a0c6101 100644 --- a/app/views/app/case/fr/history.html +++ b/app/views/app/case/fr/history.html @@ -25,33 +25,29 @@

Consent order version history

{{ govukTable({ head: [ - { text: 'Version'}, + { text: 'Version' }, { text: 'Date'}, { text: 'Time'}, - { text: 'Author'}, - { text: 'Download'} + { text: 'Created by'} ], rows: [ [ - { text: 'Version 3'}, + { html: 'Version 3' }, { text: '11 Jan 2018'}, { text: '9am'}, - { text: 'Judge Prita Shah'}, - { html: 'Download'} + { text: 'Judge Prita Shah'} ], [ - { text: 'Version 2'}, + { html: 'Version 2' }, { text: '11 Jan 2018'}, { text: '8.54am'}, - { text: 'Judge Prita Shah'}, - { html: 'Download'} + { text: 'Judge Prita Shah'} ], [ - { text: 'Version 1'}, + { html: 'Version 1' }, { text: '1 Jan 2018'}, { text: '10.31am'}, - { text: 'Someone else'}, - { html: 'Download'} + { text: 'Someone else'} ] ] }) }} diff --git a/app/views/app/case/fr/summary.html b/app/views/app/case/fr/summary.html index e37834f1..4be5a2a6 100644 --- a/app/views/app/case/fr/summary.html +++ b/app/views/app/case/fr/summary.html @@ -56,7 +56,7 @@

Recent events

"events": recentEvents })}} -

View all events

+

View full timeline

{% else %} diff --git a/app/views/app/case/pip/summary.html b/app/views/app/case/pip/summary.html index adc55f63..68cf56c8 100644 --- a/app/views/app/case/pip/summary.html +++ b/app/views/app/case/pip/summary.html @@ -68,7 +68,7 @@

Recent events

"events": recentEvents })}} -

View all events

+

View full timeline

{% else %} diff --git a/app/views/fr-consent-order.html b/app/views/fr-consent-order.html index 2d2453df..ddacd7f6 100644 --- a/app/views/fr-consent-order.html +++ b/app/views/fr-consent-order.html @@ -14,7 +14,7 @@
- SC1231612322 Warren Sutton versus Susan Sutton + SC1231612322 Warren Sutton v Susan Sutton
diff --git a/app/views/includes/header.html b/app/views/includes/header.html index 1d2992e6..fd0793bb 100644 --- a/app/views/includes/header.html +++ b/app/views/includes/header.html @@ -11,7 +11,7 @@ diff --git a/app/views/layouts/admin/casefile-3.html b/app/views/layouts/admin/casefile-3.html index d741a08d..d35982e8 100644 --- a/app/views/layouts/admin/casefile-3.html +++ b/app/views/layouts/admin/casefile-3.html @@ -25,7 +25,7 @@

Case file

diff --git a/gulp/watch.js b/gulp/watch.js index 43dfa46a..f61d3a19 100644 --- a/gulp/watch.js +++ b/gulp/watch.js @@ -16,6 +16,7 @@ gulp.task('watch-sass', function () { gulp.task('watch-assets', function () { return gulp.watch([ config.paths.assets + 'images/**', + config.paths.assets + 'downloads/**', config.paths.components + '/**', config.paths.assets + 'javascripts/**'], {cwd: './'}, ['copy-assets', 'copy-component-js']); });