Merge pull request #68 from neilhavoc/master

incident reports changes vaw/police
elkapre · Jan 17, 2023 · 90d29b8 · 90d29b8
2 parents 2719132 + 2433e2b
commit 90d29b8
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 12 deletions.
diff --git a/app/Http/Controllers/PoliceCreateReportController.php b/app/Http/Controllers/PoliceCreateReportController.php
@@ -112,6 +112,9 @@ public function store(Request $request)
             'barangay'                  => $brgy,
             'creatorType'               => 'police',
             'report_status'             => 'Ongoing',
+            'reportDetails2'            => $request->input('reportDetails2'),
+            'reportDetails3'            => $request->input('reportDetails3'),
+            'type_of_incident'            => $request->input('incident_type'),
         ];
 
         $database->collection('incident_reports')->document($newIncidentID)->set($data);

diff --git a/app/Http/Controllers/VawCreateReportController.php b/app/Http/Controllers/VawCreateReportController.php
@@ -123,6 +123,9 @@ public function store(Request $request)
             'report_status'             => 'Ongoing',
             'month_sent'                => $month_sent_var,
             'year_sent'                =>  $year_sent_var,
+            'reportDetails2'            => $request->input('reportDetails2'),
+            'reportDetails3'            => $request->input('reportDetails3'),
+            'type_of_incident'            => $request->input('incident_type'),
         ];
 
         $database->collection('incident_reports')->document($newIncidentID)->set($data);

diff --git a/resources/views/pages/police_createReports.blade.php b/resources/views/pages/police_createReports.blade.php
@@ -53,10 +53,21 @@
             </div>
         </div>
         <div class="row mt-5">
-            <div class="col-md-8 fw-bold">
-                Report Details:
+        <div class="col-md-8 fw-bold">
+                Narrative Incident Report Details:
                 <textarea class="form-control" name="reportDetails" id="exampleFormControlTextarea2" rows="3"></textarea>
-            </div>
+                Person's Involve in the Incident/Specific Identification:
+                <textarea class="form-control" name="reportDetails2" id="exampleFormControlTextarea3" rows="4"></textarea>
+                Exact time and Location of the Incident(Time, Road, Zone, Barangay):
+                <textarea class="form-control" name="reportDetails3" id="exampleFormControlTextarea4" rows="4"></textarea>
+                Type of Incident:
+                <select class="form-select" name="incident_type" aria-label="Default select example">
+                                        <option selected value="Physical Abuse">Physical Violence</option>
+                                        <option value="Sexual Violence">Sexual Violence</option>
+                                        <option value="Emotional Violence">Emotional Violence</option>
+                                        <option value="Child Abuse">Child Abuse</option>
+                                    </select>
+        </div>
             <div class="col-md-4">
                 <div class="row">
                     <div class="row">

diff --git a/resources/views/pages/police_reportsview.blade.php b/resources/views/pages/police_reportsview.blade.php
@@ -50,10 +50,15 @@
                 </div>
             </div>
             <div class="row mt-5">
-                <div class="col-md-10 fw-bold">
-                    Report Details:
-                    <textarea class="form-control" id="exampleFormControlTextarea2" rows="3" disabled="disabled">{{ $incident['reportDetails'] }}
-                    </textarea>
+            <div class="col-md-8 fw-bold">
+                    Narrative Incident Report Details:
+                    <textarea class="form-control" name="reportDetails" id="exampleFormControlTextarea2" disabled="disabled">{{ $incident['reportDetails'] }}</textarea>
+                    Person's Involve in the Incident:
+                    <textarea class="form-control" name="reportDetails2" id="exampleFormControlTextarea3" disabled="disabled">{{ $incident['reportDetails2'] }}</textarea>
+                    Exact time and Location of the Incident(Time, Road, Zone, Barangay):
+                    <textarea class="form-control" name="reportDetails3" id="exampleFormControlTextarea4" disabled="disabled">{{ $incident['reportDetails3'] }}</textarea>
+                    Type of Incident:
+                    <textarea class="form-control" name="reportDetails4" id="exampleFormControlTextarea5" disabled="disabled">{{ $incident['type_of_incident'] }}</textarea>
                 </div>
                     <div class="col-md-2">
                         <div class="row">

diff --git a/resources/views/pages/vaw_createReports.blade.php b/resources/views/pages/vaw_createReports.blade.php
@@ -52,9 +52,20 @@
             </div>
         </div>
         <div class="row mt-5">
-            <div class="col-md-8 fw-bold">
-                Report Details:
+        <div class="col-md-8 fw-bold">
+                Narrative Incident Report Details:
                 <textarea class="form-control" name="reportDetails" id="exampleFormControlTextarea2" rows="3"></textarea>
+                Person's Involve in the Incident/Specific Identification:
+                <textarea class="form-control" name="reportDetails2" id="exampleFormControlTextarea3" rows="4"></textarea>
+                Exact time and Location of the Incident(Time, Road, Zone, Barangay):
+                <textarea class="form-control" name="reportDetails3" id="exampleFormControlTextarea4" rows="4"></textarea>
+                Type of Incident:
+                <select class="form-select" name="incident_type" aria-label="Default select example">
+                                        <option selected value="Physical Abuse">Physical Violence</option>
+                                        <option value="Sexual Violence">Sexual Violence</option>
+                                        <option value="Emotional Violence">Emotional Violence</option>
+                                        <option value="Child Abuse">Child Abuse</option>
+                                    </select>
             </div>
             <div class="col-md-4">
                 <div class="row">

diff --git a/resources/views/pages/vaw_incidentreportsview.blade.php b/resources/views/pages/vaw_incidentreportsview.blade.php
@@ -58,9 +58,15 @@
                 </div>
             </div>
             <div class="row mt-5">
-                <div class="col-md-8 fw-bold">
-                    Report Details:
-                    <textarea class="form-control" id="exampleFormControlTextarea2" rows="3" disabled="disabled">{{ $incident['reportDetails'] }}</textarea>
+            <div class="col-md-8 fw-bold">
+                    Narrative Incident Report Details:
+                    <textarea class="form-control" name="reportDetails" id="exampleFormControlTextarea2" disabled="disabled">{{ $incident['reportDetails'] }}</textarea>
+                    Person's Involve in the Incident:
+                    <textarea class="form-control" name="reportDetails2" id="exampleFormControlTextarea3" disabled="disabled">{{ $incident['reportDetails2'] }}</textarea>
+                    Exact time and Location of the Incident(Time, Road, Zone, Barangay):
+                    <textarea class="form-control" name="reportDetails3" id="exampleFormControlTextarea4" disabled="disabled">{{ $incident['reportDetails3'] }}</textarea>
+                    Type of Incident:
+                    <textarea class="form-control" name="reportDetails4" id="exampleFormControlTextarea5" disabled="disabled">{{ $incident['type_of_incident'] }}</textarea>
                 </div>
                 <div class="col-md-4">
                     <div class="row">