Index: app/Http/Controllers/CrimeCaseController.php =================================================================== --- app/Http/Controllers/CrimeCaseController.php (revision 6dec591cfad31fdb54669591faf1e2b0a02bcb64) +++ app/Http/Controllers/CrimeCaseController.php (revision d9c4096de7953d5e70a82371c687700cdc2c1346) @@ -9,15 +9,35 @@ { 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, + ]); } } Index: app/Http/Controllers/OfficerController.php =================================================================== --- app/Http/Controllers/OfficerController.php (revision 6dec591cfad31fdb54669591faf1e2b0a02bcb64) +++ app/Http/Controllers/OfficerController.php (revision d9c4096de7953d5e70a82371c687700cdc2c1346) @@ -7,4 +7,5 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Session; class OfficerController extends Controller @@ -12,4 +13,7 @@ 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', [ Index: app/Http/Controllers/PeopleController.php =================================================================== --- app/Http/Controllers/PeopleController.php (revision 6dec591cfad31fdb54669591faf1e2b0a02bcb64) +++ app/Http/Controllers/PeopleController.php (revision d9c4096de7953d5e70a82371c687700cdc2c1346) @@ -5,8 +5,12 @@ 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,4 +20,7 @@ } function filter_post(){ + if(Session::get('pe_id') == null) { + return view('login'); + } $credentials = request()->validate([ 'embg' => 'required' @@ -27,3 +34,10 @@ ]); } + function get_person($embg){ + $person = DB::select('SELECT * FROM people WHERE embg=:embg', ['embg' => $embg]); + dd($person); + return view('register-policeman', [ + 'person' => $person[0] + ]); + } } Index: app/Http/Controllers/SessionsController.php =================================================================== --- app/Http/Controllers/SessionsController.php (revision 6dec591cfad31fdb54669591faf1e2b0a02bcb64) +++ app/Http/Controllers/SessionsController.php (revision d9c4096de7953d5e70a82371c687700cdc2c1346) @@ -28,5 +28,5 @@ } if($exists == null) { - return back()->withErrors(['badge_no' => 'Invalid credentials']); + return back()->withErrors(['badge_no' => 'Invalid badge_no']); } @@ -41,5 +41,9 @@ 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('/'); } Index: resources/views/case.blade.php =================================================================== --- resources/views/case.blade.php (revision 6dec591cfad31fdb54669591faf1e2b0a02bcb64) +++ resources/views/case.blade.php (revision d9c4096de7953d5e70a82371c687700cdc2c1346) @@ -22,4 +22,19 @@ .nav-item:hover { background: #1947ee; } .account-link:hover { background: #3d68ff; } + .card { + /* Add shadows to create the "card" effect */ + box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2); + transition: 0.3s; + } + + /* On mouse-over, add a deeper shadow */ + .card:hover { + box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2); + } + + /* Add some padding inside the card container */ + .kontainer { + padding: 2px 16px; + } @@ -29,8 +44,12 @@