Changeset d9c4096 for app

Timestamp:

02/10/24 17:58:54 (11 months ago)

Author:

bube-ristovska <ristovska725@…>

Branches:

main

Children:

92df8cd

Parents:

6dec591

Message:

Bug with embg

Location:

app/Http/Controllers

Files:

• CrimeCaseController.php (modified) (1 diff)
• OfficerController.php (modified) (2 diffs)
• PeopleController.php (modified) (3 diffs)
• SessionsController.php (modified) (2 diffs)

app/Http/Controllers/CrimeCaseController.php

@@ -9 +9 @@
 {
     function cases(){
+        if(Session::get('pe_id') == null) {
+            return view('login');
+        }
 
-        $police_station= DB::select('select * from police_station where pe_id=:pe_id;',['pe_id'=> Session::get('pe_id')]);
+
+        if(Session::get('is_policeman')){
+            $police_station = DB::select('select * from police_station where p_id=:p_id;',['p_id'=>  Session::get('p_id')]);
+        } else {
+            $police_station = DB::select('select * from police_station where pe_id=:pe_id;',['pe_id'=>  Session::get('pe_id')]);
+        }
+
         $cases = DB::select('select * from crime_case where p_id=:p_id;',['p_id'=> $police_station[0]->p_id]);
 
+
         return view('cases', [
-            'cases' => $cases
+            'cases' => $cases,
+            'p_address'=>$police_station[0]->p_address
         ]);
 
     }
-    function case(){
-        return view('case');
+    function case($wildcard){
+        $case = DB::select('select * from crime_case where c_id=:c_id;',['c_id'=> $wildcard]);
+        $p_address = DB::select('select p_address from police_station where p_id=:p_id;',['p_id'=> $case[0]->p_id]);
+        $statements = DB::select('select * from statements where c_id=:c_id;',['c_id'=> $wildcard]);
+        $evidence = DB::select('select * from evidence_of_case where c_id=:c_id;',['c_id'=> $wildcard]);
+        return view('case', [
+            'case' => $case[0],
+            'p_address'=>$p_address[0]->p_address,
+            'statements'=>$statements,
+            'evidence'=>$evidence,
+        ]);
     }
 }

app/Http/Controllers/OfficerController.php

@@ -7 +7 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Session;
 
 class OfficerController extends Controller
@@ -12 +13 @@
     function employees()
     {
+        if(Session::get('pe_id') == null) {
+            return view('login');
+        }
         $results = DB::select('select * from policeman join people on policeman.pe_id = people.pe_id;');
         return view('employees', [

app/Http/Controllers/PeopleController.php

@@ -5 +5 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Session;
 
 class PeopleController extends Controller
 {
     function filter(){
+        if(Session::get('pe_id') == null) {
+            return view('login');
+        }
         $peoples = DB::select('select * from people;');
 
@@ -16 +20 @@
     }
     function filter_post(){
+        if(Session::get('pe_id') == null) {
+            return view('login');
+        }
         $credentials = request()->validate([
             'embg' => 'required'
@@ -27 +34 @@
         ]);
     }
+    function get_person($embg){
+        $person = DB::select('SELECT * FROM people WHERE embg=:embg', ['embg' => $embg]);
+        dd($person);
+        return view('register-policeman', [
+            'person' => $person[0]
+        ]);
+    }
 }

app/Http/Controllers/SessionsController.php

@@ -28 +28 @@
         }
         if($exists == null) {
-            return back()->withErrors(['badge_no' => 'Invalid credentials']);
+            return back()->withErrors(['badge_no' => 'Invalid badge_no']);
         }
 
@@ -41 +41 @@
             Session::put('badge_no', $badge_no);
             Session::put('is_policeman', $policeman);
-            Session::put('pe_id', $exists[0]->pe_id);
+            if($policeman){
+                Session::put('p_id', $exists[0]->p_id);
+            } else {
+                Session::put('pe_id', $exists[0]->pe_id);
+            }
             return redirect()->intended('/');
         }