Add police and solicitor questions to release form

cbranch · Nov 1, 2021 · 8d8062b · 8d8062b
1 parent 718fab9
commit 8d8062b
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 0 deletions.
diff --git a/backend/api/controllers/ReleaseController.js b/backend/api/controllers/ReleaseController.js
@@ -19,6 +19,8 @@ module.exports = {
         policeStation,
         nearestCity,
         anyInjuries,
+        interviewedByPolice,
+        spokeToSolicitor,
         adverseEvents,
         heldMoreThan24Hours,
         helpNeeded,
@@ -54,6 +56,8 @@ module.exports = {
           policeStation: policeStation || "",
           nearestCity: nearestCity || "",
           injuries: anyInjuries || "",
+          interviewedByPolice: interviewedByPolice || false,
+          spokeToSolicitor: spokeToSolicitor || "",
           adverseEvents: adverseEvents || "",
           heldMoreThan24Hours: heldMoreThan24Hours || false,
           helpNeeded: helpNeeded || "",

diff --git a/backend/api/models/Release.js b/backend/api/models/Release.js
@@ -17,6 +17,8 @@ module.exports = {
       nearestCity: { type: 'string' },
       injuries: { type: 'string' },
       adverseEvents: { type: 'string' },
+      interviewedByPolice: { type: 'boolean', defaultsTo: false },
+      spokeToSolicitor: { type: 'string' },
       heldMoreThan24Hours: { type: 'boolean', defaultsTo: false },
       helpNeeded: { type: 'string' },
       specialRequest: { type: 'string' },

diff --git a/backend/migrations/20211101225701_release_questions.sql b/backend/migrations/20211101225701_release_questions.sql
@@ -0,0 +1,2 @@
+ALTER TABLE release ADD COLUMN "interviewedByPolice" boolean NOT NULL DEFAULT FALSE;
+ALTER TABLE release ADD COLUMN "spokeToSolicitor" text NOT NULL DEFAULT '';
diff --git a/backoffice-frontend/src/components/Release.vue b/backoffice-frontend/src/components/Release.vue
@@ -125,6 +125,10 @@
             <b-form-group label="Injuries:" label-for="input-anyInjuries" label-cols-md="3">
               <b-form-input id="input-anyInjuries" v-model="editReleaseModal.injuries"></b-form-input>
             </b-form-group>
+            <b-form-checkbox v-model="editReleaseModal.interviewedByPolice">Interviewed by police?</b-form-checkbox>
+            <b-form-group label="Speak to a solicitor?" label-for="input-spokeToSolicitor" label-cols-md="3">
+              <b-form-input id="input-spokeToSolicitor" v-model="editReleaseModal.spokeToSolicitor"></b-form-input>
+            </b-form-group>
             <b-form-group label="Adverse events:" label-for="input-adverseEvents" label-cols-md="3">
               <b-form-input id="input-adverseEvents" v-model="editReleaseModal.adverseEvents"></b-form-input>
             </b-form-group>
@@ -190,6 +194,8 @@ export default {
         policeStation: null,
         nearestCity: null,
         injuries: null,
+        interviewedByPolice: null,
+        spokeToSolicitor: null,
         adverseEvents: null,
         heldMoreThan24Hours: null,
         helpNeeded: null,

diff --git a/public-frontend/src/pages/ArresteeReport/App.vue b/public-frontend/src/pages/ArresteeReport/App.vue
@@ -82,6 +82,11 @@
         <b-form-group v-if="hasAnyInjuries" label="Name injuries:" label-for="input-anyInjuries">
           <b-form-input id="input-anyInjuries" v-model="anyInjuries"></b-form-input>
         </b-form-group>
+        <b-form-checkbox v-model="interviewedByPolice">Interviewed by police?</b-form-checkbox>
+        <b-form-checkbox v-model="hasSolicitor">Speak to a solicitor?</b-form-checkbox>
+        <b-form-group v-if="hasSolicitor" label="Name of solicitor? Did you speak to them on the phone or did they visit you?" label-for="input-spokeToSolicitor">
+          <b-form-input id="input-spokeToSolicitor" v-model="spokeToSolicitor"></b-form-input>
+        </b-form-group>
         <b-form-checkbox v-model="hasAdverseEvents">Adverse events?</b-form-checkbox>  
         <b-form-group v-if="hasAdverseEvents" label="Name adverse events:" label-for="input-adverseEvents">
           <b-form-input id="input-adverseEvents" v-model="adverseEvents"></b-form-input>
@@ -186,6 +191,9 @@ export default {
       adverseEvents: null,
       hasAnyInjuries: false,
       anyInjuries: null,
+      interviewedByPolice: false,
+      hasSolicitor: false,
+      spokeToSolicitor: null,
       heldMoreThan24Hours: false,
       hasHelpNeeded: false,
       helpNeeded: null,
@@ -285,6 +293,9 @@ export default {
         adverseEvents: this.adverseEvents,
         hasAnyInjuries: this.hasAnyInjuries,
         anyInjuries: this.anyInjuries,
+        interviewedByPolice: this.interviewedByPolice,
+        hasSolicitor: this.hasSolicitor,
+        spokeToSolicitor: this.spokeToSolicitor,
         heldMoreThan24Hours: this.heldMoreThan24Hours,
         hasHelpNeeded: this.hasHelpNeeded,
         helpNeeded: this.helpNeeded,