Index: app/Http/Controllers/CrimeCaseController.php =================================================================== --- app/Http/Controllers/CrimeCaseController.php (revision f7acd52a92c6716fad79067a6707bbc292d21b1d) +++ app/Http/Controllers/CrimeCaseController.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) @@ -28,4 +28,26 @@ ]); + } + function register_statement(){ + return view('register-statement'); + } + function register_statement_post() + { + //TODO: so kiki i bojan vodete se po logikata na add policeman + } + function finished_cases(){ + + 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 and c_status=\'Z\';', ['p_id' => $police_station[0]->p_id]); + + return view('archive', [ + 'cases' => $cases, + 'p_address'=>$police_station[0]->p_address + ]); } function case($wildcard){ Index: app/Http/Controllers/OfficerController.php =================================================================== --- app/Http/Controllers/OfficerController.php (revision f7acd52a92c6716fad79067a6707bbc292d21b1d) +++ app/Http/Controllers/OfficerController.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) @@ -31,4 +31,20 @@ } + function show($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')]); + } + $result = DB::select('select * from policeman join people on policeman.pe_id = people.pe_id where p_id=:p_id and people.pe_id=:pe_id;',['p_id'=> $police_station[0]->p_id, 'pe_id' => $id]); + $cases = DB::select('select * from statements where pe_id=:pe_id;',['pe_id' => $id]); + + return view('employee', [ + 'employee' => $result[0], + 'p_address'=>$police_station[0]->p_address, + 'cases' => $cases + ]); + } + function register() { Index: app/Http/Controllers/SessionsController.php =================================================================== --- app/Http/Controllers/SessionsController.php (revision f7acd52a92c6716fad79067a6707bbc292d21b1d) +++ app/Http/Controllers/SessionsController.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) @@ -42,5 +42,5 @@ Session::put('is_policeman', $policeman); if($policeman){ - Session::put('p_id', $exists[0]->p_id); + Session::put('pe_id', $exists[0]->p_id); } else { Session::put('pe_id', $exists[0]->pe_id); Index: resources/views/archive.blade.php =================================================================== --- resources/views/archive.blade.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) +++ resources/views/archive.blade.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) @@ -0,0 +1,200 @@ + + + + + + + Laravel + + + + + + + + + + + + + +
+ + + + +
+
+ Началник + +
+ + + + +
+ +
+
+

Ахрива - завршени случаеви

+ + + +
+

+ Случаи од станица {{$p_address}} +

+
+ + + + + + + + + + @foreach($cases as $case) + + + + + + @endforeach + + + +
ИмеДатумОвластен полицаец
{{$case->c_name}}{{$case->opening_date}}{{$case->p_id}}
+
+
+
+ + +
+ +
+ + + + + + + + + + Index: resources/views/case.blade.php =================================================================== --- resources/views/case.blade.php (revision f7acd52a92c6716fad79067a6707bbc292d21b1d) +++ resources/views/case.blade.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) @@ -71,4 +71,7 @@ @if (Session::get('is_policeman')) Полицаец + @else Началник @@ -104,5 +107,5 @@ class="absolute w-full upgrade-btn bottom-0 active-nav-link text-white flex items-center justify-center py-4"> - Поставки за профил + @@ -115,5 +118,16 @@ Index: resources/views/cases.blade.php =================================================================== --- resources/views/cases.blade.php (revision f7acd52a92c6716fad79067a6707bbc292d21b1d) +++ resources/views/cases.blade.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) @@ -31,4 +31,7 @@ @if (Session::get('is_policeman')) Полицаец + @else Началник @@ -62,5 +65,5 @@ - Поставки за профил + @@ -72,5 +75,16 @@
Index: resources/views/employee.blade.php =================================================================== --- resources/views/employee.blade.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) +++ resources/views/employee.blade.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) @@ -0,0 +1,356 @@ + + + + + + + Laravel + + + + + + + + + + + + + +
+ + + + +
+
+ Началник + +
+ + + + +
+ +
+
+

Вработен: {{$employee->first_name}}

+ + + + + +
+
+
+

Детали за вработениот

+
+
+ Фотографија на вработениот +
+
+

Име: {{ $employee->first_name }}

+

Презиме: {{ $employee->last_name }}

+

Пол: {{ $employee->gender }}

+

Адреса: {{ $employee->address }}

+

Контакт: {{ $employee->contact }}

+

ЕМБГ: {{ $employee->embg }}

+

Дата на раѓање: {{ $employee->date_of_birth }}

+

Држава: {{ $employee->country }}

+

Националност: {{ $employee->nationality }}

+

Број на значка: {{ $employee->badge_no }}

+

Дата на вработување: {{ $employee->p_date_of_employment }}

+

Ранг: {{ $employee->rank }}

+

Адреса на полициска станица: {{ $p_address }}

+
+
+ Назад + +
+
+ + +
+ +
+ + +
+ +
+ + + + + + + + + + Index: resources/views/employees.blade.php =================================================================== --- resources/views/employees.blade.php (revision f7acd52a92c6716fad79067a6707bbc292d21b1d) +++ resources/views/employees.blade.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) @@ -46,4 +46,14 @@ background: #3d68ff; } + /* styles.css */ + #clickableTable tr { + cursor: pointer; + transition: background-color 0.2s ease; + } + + #clickableTable tr:hover { + background-color: #d7d4d4; + } + @@ -55,4 +65,7 @@ @if (Session::get('is_policeman')) Полицаец + @else Началник @@ -87,5 +100,5 @@ class="absolute w-full upgrade-btn bottom-0 active-nav-link text-white flex items-center justify-center py-4"> - Поставки за профил + @@ -98,5 +111,16 @@ @@ -173,5 +197,5 @@

- +
@@ -185,5 +209,5 @@ @foreach($employees as $employee) - + @@ -217,4 +241,20 @@ + Index: resources/views/filter.blade.php =================================================================== --- resources/views/filter.blade.php (revision f7acd52a92c6716fad79067a6707bbc292d21b1d) +++ resources/views/filter.blade.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) @@ -111,4 +111,7 @@ @if (Session::get('is_policeman')) Полицаец + @else Началник @@ -142,5 +145,4 @@ - Поставки за профил @@ -152,5 +154,16 @@
Index: resources/views/register-policeman.blade.php =================================================================== --- resources/views/register-policeman.blade.php (revision f7acd52a92c6716fad79067a6707bbc292d21b1d) +++ resources/views/register-policeman.blade.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) @@ -165,5 +165,5 @@ - Поставки за профил + @@ -175,5 +175,16 @@
Index: resources/views/register-statement.blade.php =================================================================== --- resources/views/register-statement.blade.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) +++ resources/views/register-statement.blade.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) @@ -0,0 +1,1 @@ +

TODO

Index: resources/views/welcome.blade.php =================================================================== --- resources/views/welcome.blade.php (revision f7acd52a92c6716fad79067a6707bbc292d21b1d) +++ resources/views/welcome.blade.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) @@ -31,4 +31,7 @@ @if (Session::get('is_policeman')) Полицаец + @else Началник @@ -62,5 +65,5 @@ - Поставки за профил + @@ -72,5 +75,15 @@
Index: routes/web.php =================================================================== --- routes/web.php (revision f7acd52a92c6716fad79067a6707bbc292d21b1d) +++ routes/web.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) @@ -35,11 +35,15 @@ Route::get('employees', [OfficerController::class, 'employees'])->middleware('guest'); +Route::get('/employees/{id}', [OfficerController::class, 'show']); + Route::get('filter', [PeopleController::class, 'filter'])->middleware('guest'); Route::post('filter', [PeopleController::class, 'filter_post'])->middleware('guest'); Route::get('cases', [CrimeCaseController::class, 'cases'])->middleware('guest'); +Route::get('register-statement', [CrimeCaseController::class, 'register_statement'])->middleware('guest'); + Route::get('case/{wildcard}', [CrimeCaseController::class, 'case'])->middleware('guest'); -Route::get('finished_cases', [CrimeCaseController::class, 'index'])->middleware('guest'); +Route::get('finished_cases', [CrimeCaseController::class, 'finished_cases'])->middleware('guest');
{{$employee->first_name}} {{$employee->last_name}}