diff --git a/app/data/cps-locations.json b/app/data/cps-locations.json new file mode 100644 index 00000000..8a5a52a5 --- /dev/null +++ b/app/data/cps-locations.json @@ -0,0 +1,118 @@ +[ + "1 Hudson Quay", + "Aquis House", + "Ash House", + "Barnstaple Crown and Mags Crt", + "Barrow Police Station", + "Basildon Crown Court", + "Bedlington Police Station", + "Birmingham Crown Court", + "Black Horse House", + "Blackfriars Crown Court", + "Bodmin Magistrates Court", + "Brighton Police Station", + "Bristol Crown Court", + "Cambridge Crown Court", + "Campbell Square Police Station", + "Capital Tower", + "Carmelite House", + "Central Criminal Court", + "Central Devon Magistrates Court", + "Central Police Station", + "Century Buildings", + "Cheltenham Magistrates Court", + "Chesterfield Magistrates Court", + "Colmore Gate", + "County House", + "Crown House", + "Croydon Crown Court", + "Derby Combined Court Centre", + "Derby Magistrates Court", + "Earle House", + "Etruria Valley", + "Exeter Crown and County Court", + "Foss House", + "Gloucester Crown Court", + "Glyndwr House", + "Greenfield House", + "Guildhall House", + "Harrow Crown Court", + "Heol Penlanffos", + "Heron House", + "HMRC Custom House", + "Home Worker", + "Horsham Police Station", + "Hove Trial Centre", + "Inner London Crown Court", + "Ipswich Crown Court", + "Isleworth Crown Court", + "ISM House", + "Jefferson House", + "Kendal Police Station", + "Kingston Crown Court", + "Maidstone Crown Court", + "Millmead House", + "Navigation Walk", + "Newton Abbot Mags Crt", + "North Somerset Mags Crt", + "Northampton Crown Court", + "Northumbria Police", + "Olympic House", + "Overseas", + "Overseas Abuja Nigeria", + "Overseas Barbados", + "Overseas Ethiopia", + "Overseas Eurojust", + "Overseas Islamabad", + "Overseas Madrid", + "Overseas Panama", + "Overseas Rome", + "Overseas Tanzania", + "Penhaligon House", + "Peterborough Crown Court", + "Petty France", + "Plymouth Crown Court", + "Plymouth Magistrates Court", + "Polaris House", + "Princes Court", + "Probation Office Lincoln", + "Queens House", + "RART WALES", + "Renaissance House", + "Riding Gate House", + "Sheffield Crown Court", + "Shrewsbury Justice Centre", + "Snaresbrook Crown Court", + "South Harrow Police Station", + "South Somerset Mags Crt", + "Southern House", + "Southwark Crown Court", + "Spectrum House", + "St Anns Quay", + "Stafford Crown Court", + "Steelhouse Lane Police Station", + "Stevenage Police Station", + "Stocklund House", + "Stoke-on-Trent Crown Court", + "Sunlight House", + "Sutton Coldfield Police Station", + "Swansea Civic Centre", + "Taunton Crown Court", + "Taunton Deane Magistrates Court", + "Teesside Combine Court Centre", + "Temple Quay House", + "The Court House", + "The Regatta", + "Thorpewood Police Station", + "Truro Crown Court", + "Truro Magistrates Court", + "Unity Square", + "Vantage Point", + "Verulam Point", + "Walker House", + "Warwickshire Justice Centre", + "Wolverhampton Combined Court", + "Wood Green Crown Court", + "Woolwich Crown Court", + "Worcester Combined Court" +] diff --git a/app/data/crown-courts.json b/app/data/crown-courts.json new file mode 100644 index 00000000..5df1748c --- /dev/null +++ b/app/data/crown-courts.json @@ -0,0 +1,87 @@ +[ + "Aylesbury Crown Court", + "Basildon Crown Court", + "Birmingham Crown Court", + "Bolton Crown Court", + "Bournemouth Crown Court", + "Bradford Crown Court", + "Bristol Crown Court", + "Burnley Crown Court", + "Caernarfon Crown Court", + "Cambridge Crown Court", + "Canterbury Crown Court", + "Cardiff Crown Court", + "Carlisle Crown Court", + "Carmarthen Crown Court", + "Central Criminal Court", + "Chelmsford Crown Court", + "Chester Crown Court", + "Coventry Crown Court", + "Manchester (Crown Square) Crown Court", + "Croydon Crown Court", + "Derby Crown Court", + "Durham Crown Court", + "Exeter Crown Court", + "Gloucester Crown Court", + "Great Grimsby Crown Court", + "Guildford Crown Court", + "Harrow Crown Court", + "Hereford Crown Court", + "Hove Crown Court", + "Kingston upon Hull Crown Court", + "Inner London Crown Court", + "Ipswich Crown Court", + "Isleworth Crown Court", + "Lancaster Crown Court", + "Leeds Crown Court", + "Leicester Crown Court", + "Lewes Crown Court", + "Lincoln Crown Court", + "Luton Crown Court", + "Maidstone Crown Court", + "Merthyr Tydfil Crown Court", + "Manchester (Minshull Street) Crown Court", + "Mold Crown Court", + "Newcastle upon Tyne Crown Court", + "Northampton Crown Court", + "Norwich Crown Court", + "Nottingham Crown Court", + "Oxford Crown Court", + "Peterborough Crown Court", + "Plymouth Crown Court", + "Portsmouth Crown Court", + "Preston Crown Court", + "Reading Crown Court", + "Salisbury Crown Court", + "Sheffield Crown Court", + "Shrewsbury Crown Court", + "Snaresbrook Crown Court", + "Southampton Crown Court", + "Southwark Crown Court", + "St Albans Crown Court", + "Stafford Crown Court", + "Stoke-on-Trent Crown Court", + "Swansea Crown Court", + "Swindon Crown Court", + "Taunton Crown Court", + "Teesside Crown Court", + "Truro Crown Court", + "Warrington Crown Court", + "Warwick Crown Court", + "Winchester Crown Court", + "Wolverhampton Crown Court", + "Wood Green Crown Court", + "Woolwich Crown Court", + "Worcester Crown Court", + "York Crown Court", + "Doncaster Crown Court", + "Amersham Crown Court", + "Brighton Crown Court", + "Dorchester Crown Court", + "King's Lynn Crown Court", + "Kingston-upon-Thames Crown Court", + "Newport (Isle of Wight) Crown Court", + "Newport (South Wales) Crown Court", + "Southend Crown Court", + "Chichester Crown Court" +] diff --git a/app/data/magistrates-courts.json b/app/data/magistrates-courts.json new file mode 100644 index 00000000..97dafee3 --- /dev/null +++ b/app/data/magistrates-courts.json @@ -0,0 +1,156 @@ +[ + "Aberystwyth Justice Centre", + "Aldershot Justice Centre", + "Barkingside Magistrates' Court", + "Barnsley Law Courts", + "Barnstaple Magistrates', County and Family Court", + "Barrow-in-Furness Magistrates' Court", + "Basildon Magistrates' Court and Family Court", + "Basingstoke Law Courts", + "Bath Law Courts (Civil, Family and Magistrates)", + "Belmarsh Magistrates Court", + "Berwick upon Tweed Magistrates' Court", + "Beverley Magistrates' Court and Family Court", + "Bexley Magistrates' Court", + "Birmingham Magistrates Court", + "Blackburn Magistrates' Court", + "Blackpool Magistrates' and Civil Court", + "Bodmin Law Courts", + "Bolton Combined Court", + "Boston Magistrate's Court", + "Bradford and Keighley Magistrates' Court and Family Court", + "Bridlington Magistrates' Court and Family", + "Brighton Magistrates' Court", + "Bristol Magistrates' Court and Tribunals Hearing Centre", + "Bromley Magistrates' Court", + "Burnley Magistrates' Court", + "Caernarfon Justice Centre", + "Cambridge Magistrates' Court", + "Cannock Magistrates' Court", + "Canterbury Magistrates' Court", + "Cardiff Magistrates' Court and Employment Tribunal", + "Carlisle Magistrates' Court", + "Chelmsford Magistrates' Court and Family Court", + "Cheltenham Magistrates' Court", + "Chester Magistrates' Court", + "Chesterfield Justice Centre", + "City of London Magistrates' Court", + "Colchester Magistrates' Court", + "Coventry Magistrates' Court", + "Crawley Magistrates' Court", + "Crewe (South Cheshire) Magistrates' Court", + "Croydon Magistrates' Court", + "Cwmbran Magistrates' Court", + "Darlington Magistrates' Court and Family Court", + "Derby Magistrates' Court", + "Doncaster Justice Centre North", + "Dudley Magistrates' Court", + "Ealing Magistrates' Court", + "East Berkshire Magistrates' Court, Slough", + "Exeter Magistrates' Court - North and East Devon", + "Folkestone Magistrates' Court", + "Gateshead Law Courts (Gateshead Magistrates and County)", + "Great Yarmouth Magistrates' Court and Family Court", + "Grimsby Magistrates' Court and Family Court", + "Guildford Magistrates' Court and Family Court", + "Harrogate Justice Centre", + "Hastings Magistrate Court", + "Hatefield Magistrates' Court", + "Haverfordwest Magistrates' Court", + "Hendon Magistrates' Court", + "Hereford Justice Centre", + "High Wycombe Law Courts", + "Highbury Corner Magistrates' Court", + "Horsham Magistrates' Court", + "Hull and Holderness Magistrates' Court and Hearing Centre", + "Huntingdon Law Courts", + "Ipswich Magistrates' Court", + "Isle of Wight Combined Court", + "Kidderminster Magistrates' Court", + "King's Lynn Magistrates' Court and Family Court", + "Kirklees (Huddersfield) Magistrates' Court and Family Court", + "Lancaster Courthouse (Magistrates and County Court)", + "Lavender Hill Magistrates' Court", + "Leamington Spa Magistrate / Warwickshire Justice Centre", + "Leeds Magistrates' Court and Family Court", + "Leicester Magistrates' Court", + "Lincoln Magistrates' Court", + "Liverpool & Knowsley Magistrates' Court", + "Llandrindod Wells Magistrates' and Family Court", + "Llandudno Magistrates' Court", + "Llanelli Law Courts", + "Loughborough Magistrates' Court", + "Luton and South Bedfordshire Magistrates' Court", + "Maidstone Magistrates' Court", + "Manchester Magistrates' Court", + "Mansfield Magistrates' and County Court", + "Margate Magistrates' Court (and Thanet County)", + "Medway (Chatham) Magistrates' Court", + "Merthyr Tydfil Combined Court Centre", + "Mid and South East Northumberland Law Courts (Bedlington)", + "Milton Keynes Magistrates' Court and Family Court", + "Mold Justice Centre (Mold Law Courts)", + "Newcastle upon Tyne Magistrates' Court", + "Newport (South Wales) Magistrates' Court", + "Newton Abbot Magistrates' Court", + "Newton Aycliffe Magistrates' Court", + "North Somerset Magistrates' Court", + "North Staffordshire Justice Centre / Newcastle-Under-Lyme Magistrates Court", + "North Tyneside Magistrates' Court", + "Northampton Magistrates' Court", + "Norwich Magistrates' Court", + "Nottingham Magistrates' Court", + "Nuneaton Magistrates Court / Warwickshire Justice Centre South", + "Oxford and Southern Oxfordshire Magistrates' Court", + "Peterborough Magistrates' Court", + "Peterlee Magistrates' Court", + "Plymouth Magistrates' Court", + "Poole Magistrates' Court", + "Portsmouth Magistrates' Court", + "Preston Magistrates' Court", + "Reading Magistrates' Court and Family Court", + "Redditch Magistrates' Court", + "Romford Magistrates' Court (formerly Havering Magistrates' Court)", + "Salisbury Law Courts", + "Scarborough Justice Centre", + "Sefton Magistrates' Court", + "Sevenoaks Magistrates' Court and Family Court", + "Sheffield Magistrates' Court", + "Skipton Magistrates' Court", + "South Tyneside Magistrates' Court", + "South Worcestershire Magistrates' Court", + "Southend Court House: County Court and Family Court and Magistrates Court", + "St Albans Magistrates' Court", + "Staines Magistrates' Court and Family Court", + "Stevenage Magistrates' Court", + "Stockport County Court, Family Court and Magistrates Court", + "Stratford Magistrates Court (and Stratford Housing Centre)", + "Sunderland County, Family, Magistrates and Tribunal Hearings", + "Swansea Magistrates' Court", + "Swindon Magistrates' Court", + "Tameside Magistrates' Court", + "Taunton Magistrates' Court, Tribunals and Family Hearing Centre", + "Teesside Magistrates' Court", + "Telford Magistrates' Court", + "Thames Magistrates Court", + "Truro Magistrates' Court", + "Uxbridge Magistrates' Court", + "Walsall Magistrates' Court", + "Warrington Crown and Magistrates' Court", + "Wellingborough Magistrates' Court", + "Welshpool Magistrates' Court", + "West Cumbria Courthouse", + "West Hampshire Magistrates' Court", + "Westminster Magistrates' Court", + "Weymouth Combined Court", + "Wigan and Leigh Magistrates' Court", + "Willesden Magistrates' Court", + "Wimbledon Magistrates' Court", + "Wirral Magistrates' Court", + "Wolverhampton Magistrates' Court", + "Worthing Magistrates' Court", + "Wrexham Law Courts", + "Yeovil County, Family and Magistrates Court", + "York Magistrates' Court and Family Court", + "Cirencester Magistrates Court" +] diff --git a/app/data/police-forces.json b/app/data/police-forces.json new file mode 100644 index 00000000..d87a368f --- /dev/null +++ b/app/data/police-forces.json @@ -0,0 +1,56 @@ +[ + "Avon and Somerset", + "Bedfordshire", + "British Transport Police", + "Cambridgeshire", + "Cheshire", + "City of London", + "Cleveland", + "Cumbria", + "Department of Working Pensions", + "Derbyshire", + "Devon and Cornwall", + "Dorset", + "Durham", + "Dyfed Powys", + "Essex", + "Gloucestershire", + "Greater Manchester", + "Gwent", + "Hampshire and IOW", + "Hertfordshire", + "Home Office", + "Humberside", + "Immigration", + "Kent", + "Kent Ports", + "Lancashire", + "Leicestershire", + "Lincolnshire", + "London North", + "London South", + "Merseyside", + "Metropolitan Police_LN", + "Metropolitan Police_LS", + "Ministry of Defence", + "National Crime Squad - England and Wales", + "Norfolk", + "North Wales", + "North Yorkshire", + "Northamptonshire", + "Northumbria", + "Nottinghamshire", + "South Wales", + "South Yorkshire", + "Staffordshire", + "Suffolk", + "Surrey", + "Sussex", + "Thames Valley", + "Warwickshire", + "Welfare, Rural and Health Division", + "West Mercia", + "West Midlands", + "West Yorkshire", + "Wiltshire" +] diff --git a/app/routes.js b/app/routes.js index 0075ab35..d0973660 100644 --- a/app/routes.js +++ b/app/routes.js @@ -11,6 +11,10 @@ const taskRecords = require('./data/task-records') const taskAssignees = require('./data/task-assignees') const vloOfficers = require('./data/vlo-officers') const cpsAreas = require('./data/cps-areas') +const cpsLocations = require('./data/cps-locations.json') +const magistratesCourts = require('./data/magistrates-courts.json') +const crownCourts = require('./data/crown-courts.json') +const policeForces = require('./data/police-forces.json') router.use(function (req, res, next) { res.locals.victimRecords = victimRecords @@ -18,6 +22,10 @@ router.use(function (req, res, next) { res.locals.taskAssignees = taskAssignees res.locals.vloOfficers = vloOfficers res.locals.cpsAreas = cpsAreas + res.locals.cpsLocations = cpsLocations + res.locals.magistratesCourts = magistratesCourts + res.locals.crownCourts = crownCourts + res.locals.policeForces = policeForces next() }) diff --git a/app/views/bfs/meetings-2/confirm-arrangements/meeting-location.html b/app/views/bfs/meetings-2/confirm-arrangements/meeting-location.html index 6729ff9d..8893d742 100644 --- a/app/views/bfs/meetings-2/confirm-arrangements/meeting-location.html +++ b/app/views/bfs/meetings-2/confirm-arrangements/meeting-location.html @@ -17,6 +17,7 @@ {% from "govuk/components/radios/macro.njk" import govukRadios %} {% from "govuk/components/input/macro.njk" import govukInput %} + {% from "govuk/components/select/macro.njk" import govukSelect %} {% from "govuk/components/textarea/macro.njk" import govukTextarea %} {% set typeError = data['meetingLocationTypeError'] == 'yes' %} @@ -35,59 +36,71 @@
+ {% set cpsItems = [{ value: "", text: "Select a CPS location" }] %} + {% for loc in cpsLocations %} + {% set cpsItems = cpsItems.concat({ value: loc, text: loc, selected: (data['cpsLocation'] == loc) if data['changeMode'] == 'true' else false }) %} + {% endfor %} {% set cpsHtml %} - {{ govukInput({ + {{ govukSelect({ id: "cps-location", name: "cpsLocation", - type: "text", classes: "govuk-input--width-20", - value: data['cpsLocation'] if data['changeMode'] == 'true', - errorMessage: { text: "Enter which CPS location the meeting will be held" } if (detailError and selectedType == "cps") else undefined, + errorMessage: { text: "Select which CPS location the meeting will be held" } if (detailError and selectedType == "cps") else undefined, label: { text: "Which CPS location will the meeting be held?" - } + }, + items: cpsItems }) }} {% endset -%} + {% set magistratesItems = [{ value: "", text: "Select a magistrates' court" }] %} + {% for loc in magistratesCourts %} + {% set magistratesItems = magistratesItems.concat({ value: loc, text: loc, selected: (data['magistratesLocation'] == loc) if data['changeMode'] == 'true' else false }) %} + {% endfor %} {% set magistratesHtml %} - {{ govukInput({ + {{ govukSelect({ id: "magistrates-location", name: "magistratesLocation", - type: "text", classes: "govuk-input--width-20", - value: data['magistratesLocation'] if data['changeMode'] == 'true', - errorMessage: { text: "Enter which magistrates' court the meeting will be held" } if (detailError and selectedType == "magistrates") else undefined, + errorMessage: { text: "Select which magistrates' court the meeting will be held" } if (detailError and selectedType == "magistrates") else undefined, label: { text: "Which magistrates' court will the meeting be held?" - } + }, + items: magistratesItems }) }} {% endset -%} + {% set crownItems = [{ value: "", text: "Select a crown court" }] %} + {% for loc in crownCourts %} + {% set crownItems = crownItems.concat({ value: loc, text: loc, selected: (data['crownLocation'] == loc) if data['changeMode'] == 'true' else false }) %} + {% endfor %} {% set crownHtml %} - {{ govukInput({ + {{ govukSelect({ id: "crown-location", name: "crownLocation", - type: "text", classes: "govuk-input--width-20", - value: data['crownLocation'] if data['changeMode'] == 'true', - errorMessage: { text: "Enter which crown court the meeting will be held" } if (detailError and selectedType == "crown") else undefined, + errorMessage: { text: "Select which crown court the meeting will be held" } if (detailError and selectedType == "crown") else undefined, label: { text: "Which crown court will the meeting be held?" - } + }, + items: crownItems }) }} {% endset -%} + {% set policeItems = [{ value: "", text: "Select a police force" }] %} + {% for loc in policeForces %} + {% set policeItems = policeItems.concat({ value: loc, text: loc, selected: (data['policeStationLocation'] == loc) if data['changeMode'] == 'true' else false }) %} + {% endfor %} {% set policeHtml %} - {{ govukInput({ + {{ govukSelect({ id: "police-station-location", name: "policeStationLocation", - type: "text", classes: "govuk-input--width-20", - value: data['policeStationLocation'] if data['changeMode'] == 'true', - errorMessage: { text: "Enter which police station the meeting will be held" } if (detailError and selectedType == "police") else undefined, + errorMessage: { text: "Select which police station the meeting will be held" } if (detailError and selectedType == "police") else undefined, label: { text: "Which police station will the meeting be held?" - } + }, + items: policeItems }) }} {% endset -%} @@ -156,3 +169,25 @@ {% endblock %} + +{% block pageScripts %} + + +{% endblock %} diff --git a/app/views/v50/meetings-2/confirm-arrangements/meeting-location.html b/app/views/v50/meetings-2/confirm-arrangements/meeting-location.html index 9f83ee7a..81bfc94d 100644 --- a/app/views/v50/meetings-2/confirm-arrangements/meeting-location.html +++ b/app/views/v50/meetings-2/confirm-arrangements/meeting-location.html @@ -16,6 +16,7 @@ {% from "govuk/components/radios/macro.njk" import govukRadios %} {% from "govuk/components/input/macro.njk" import govukInput %} + {% from "govuk/components/select/macro.njk" import govukSelect %} {% from "govuk/components/textarea/macro.njk" import govukTextarea %} {% set typeError = data['meetingLocationTypeError'] == 'yes' %} @@ -34,59 +35,71 @@ + {% set cpsItems = [{ value: "", text: "Select a CPS location" }] %} + {% for loc in cpsLocations %} + {% set cpsItems = cpsItems.concat({ value: loc, text: loc, selected: data['cpsLocation'] == loc }) %} + {% endfor %} {% set cpsHtml %} - {{ govukInput({ + {{ govukSelect({ id: "cps-location", name: "cpsLocation", - type: "text", classes: "govuk-input--width-20", - value: data['cpsLocation'], - errorMessage: { text: "Enter which CPS location the meeting will be held" } if (detailError and selectedType == "cps") else undefined, + errorMessage: { text: "Select which CPS location the meeting will be held" } if (detailError and selectedType == "cps") else undefined, label: { text: "Which CPS location will the meeting be held?" - } + }, + items: cpsItems }) }} {% endset -%} + {% set magistratesItems = [{ value: "", text: "Select a magistrates' court" }] %} + {% for loc in magistratesCourts %} + {% set magistratesItems = magistratesItems.concat({ value: loc, text: loc, selected: data['magistratesLocation'] == loc }) %} + {% endfor %} {% set magistratesHtml %} - {{ govukInput({ + {{ govukSelect({ id: "magistrates-location", name: "magistratesLocation", - type: "text", classes: "govuk-input--width-20", - value: data['magistratesLocation'], - errorMessage: { text: "Enter which magistrates' court the meeting will be held" } if (detailError and selectedType == "magistrates") else undefined, + errorMessage: { text: "Select which magistrates' court the meeting will be held" } if (detailError and selectedType == "magistrates") else undefined, label: { text: "Which magistrates' court will the meeting be held?" - } + }, + items: magistratesItems }) }} {% endset -%} + {% set crownItems = [{ value: "", text: "Select a crown court" }] %} + {% for loc in crownCourts %} + {% set crownItems = crownItems.concat({ value: loc, text: loc, selected: data['crownLocation'] == loc }) %} + {% endfor %} {% set crownHtml %} - {{ govukInput({ + {{ govukSelect({ id: "crown-location", name: "crownLocation", - type: "text", classes: "govuk-input--width-20", - value: data['crownLocation'], - errorMessage: { text: "Enter which crown court the meeting will be held" } if (detailError and selectedType == "crown") else undefined, + errorMessage: { text: "Select which crown court the meeting will be held" } if (detailError and selectedType == "crown") else undefined, label: { text: "Which crown court will the meeting be held?" - } + }, + items: crownItems }) }} {% endset -%} + {% set policeItems = [{ value: "", text: "Select a police force" }] %} + {% for loc in policeForces %} + {% set policeItems = policeItems.concat({ value: loc, text: loc, selected: data['policeStationLocation'] == loc }) %} + {% endfor %} {% set policeHtml %} - {{ govukInput({ + {{ govukSelect({ id: "police-station-location", name: "policeStationLocation", - type: "text", classes: "govuk-input--width-20", - value: data['policeStationLocation'], - errorMessage: { text: "Enter which police station the meeting will be held" } if (detailError and selectedType == "police") else undefined, + errorMessage: { text: "Select which police station the meeting will be held" } if (detailError and selectedType == "police") else undefined, label: { text: "Which police station will the meeting be held?" - } + }, + items: policeItems }) }} {% endset -%} @@ -155,3 +168,25 @@ {% endblock %} + +{% block pageScripts %} + + +{% endblock %} diff --git a/app/views/v51/meetings-2/confirm-arrangements/meeting-location.html b/app/views/v51/meetings-2/confirm-arrangements/meeting-location.html index 5f14df2c..6eefd949 100644 --- a/app/views/v51/meetings-2/confirm-arrangements/meeting-location.html +++ b/app/views/v51/meetings-2/confirm-arrangements/meeting-location.html @@ -16,6 +16,7 @@ {% from "govuk/components/radios/macro.njk" import govukRadios %} {% from "govuk/components/input/macro.njk" import govukInput %} + {% from "govuk/components/select/macro.njk" import govukSelect %} {% from "govuk/components/textarea/macro.njk" import govukTextarea %} {% set typeError = data['meetingLocationTypeError'] == 'yes' %} @@ -34,59 +35,71 @@ + {% set cpsItems = [{ value: "", text: "Select a CPS location" }] %} + {% for loc in cpsLocations %} + {% set cpsItems = cpsItems.concat({ value: loc, text: loc, selected: data['cpsLocation'] == loc }) %} + {% endfor %} {% set cpsHtml %} - {{ govukInput({ + {{ govukSelect({ id: "cps-location", name: "cpsLocation", - type: "text", classes: "govuk-input--width-20", - value: data['cpsLocation'], - errorMessage: { text: "Enter which CPS location the meeting will be held" } if (detailError and selectedType == "cps") else undefined, + errorMessage: { text: "Select which CPS location the meeting will be held" } if (detailError and selectedType == "cps") else undefined, label: { text: "Which CPS location will the meeting be held?" - } + }, + items: cpsItems }) }} {% endset -%} + {% set magistratesItems = [{ value: "", text: "Select a magistrates' court" }] %} + {% for loc in magistratesCourts %} + {% set magistratesItems = magistratesItems.concat({ value: loc, text: loc, selected: data['magistratesLocation'] == loc }) %} + {% endfor %} {% set magistratesHtml %} - {{ govukInput({ + {{ govukSelect({ id: "magistrates-location", name: "magistratesLocation", - type: "text", classes: "govuk-input--width-20", - value: data['magistratesLocation'], - errorMessage: { text: "Enter which magistrates' court the meeting will be held" } if (detailError and selectedType == "magistrates") else undefined, + errorMessage: { text: "Select which magistrates' court the meeting will be held" } if (detailError and selectedType == "magistrates") else undefined, label: { text: "Which magistrates' court will the meeting be held?" - } + }, + items: magistratesItems }) }} {% endset -%} + {% set crownItems = [{ value: "", text: "Select a crown court" }] %} + {% for loc in crownCourts %} + {% set crownItems = crownItems.concat({ value: loc, text: loc, selected: data['crownLocation'] == loc }) %} + {% endfor %} {% set crownHtml %} - {{ govukInput({ + {{ govukSelect({ id: "crown-location", name: "crownLocation", - type: "text", classes: "govuk-input--width-20", - value: data['crownLocation'], - errorMessage: { text: "Enter which crown court the meeting will be held" } if (detailError and selectedType == "crown") else undefined, + errorMessage: { text: "Select which crown court the meeting will be held" } if (detailError and selectedType == "crown") else undefined, label: { text: "Which crown court will the meeting be held?" - } + }, + items: crownItems }) }} {% endset -%} + {% set policeItems = [{ value: "", text: "Select a police force" }] %} + {% for loc in policeForces %} + {% set policeItems = policeItems.concat({ value: loc, text: loc, selected: data['policeStationLocation'] == loc }) %} + {% endfor %} {% set policeHtml %} - {{ govukInput({ + {{ govukSelect({ id: "police-station-location", name: "policeStationLocation", - type: "text", classes: "govuk-input--width-20", - value: data['policeStationLocation'], - errorMessage: { text: "Enter which police station the meeting will be held" } if (detailError and selectedType == "police") else undefined, + errorMessage: { text: "Select which police station the meeting will be held" } if (detailError and selectedType == "police") else undefined, label: { text: "Which police station will the meeting be held?" - } + }, + items: policeItems }) }} {% endset -%} @@ -155,3 +168,25 @@ {% endblock %} + +{% block pageScripts %} + + +{% endblock %}