Index: app/Http/Controllers/CrimeCaseController.php =================================================================== --- app/Http/Controllers/CrimeCaseController.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) +++ app/Http/Controllers/CrimeCaseController.php (revision 768f47335966ba1c9293c4e78941c76edd43c239) @@ -3,4 +3,5 @@ namespace App\Http\Controllers; +use Carbon\Carbon; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; @@ -34,5 +35,51 @@ function register_statement_post() { - //TODO: so kiki i bojan vodete se po logikata na add policeman + $role = request()->input('role'); + + + $statement = request()->validate([ + 'embg' => 'required', + 'description' => 'required', + 'incident_timestamp' => 'required', + 'incident_place'=>'required' + ]); + $statement["statement_date"] = Carbon::now()->format('Y-m-d'); + $covek = DB::select('select pe_id from people where embg=:embg;',['embg'=> $statement["embg"]]); + $s_id_b = DB::select('select MAX(s_id) from statements'); + $s_id = $s_id_b[0]->max; + $s_id = $s_id +1 ; + $policaec = DB::select('select pe_id from policeman where badge_no=:badge_no;',['badge_no'=> Session::get("badge_no")]); + + if ($role === 'witness') { + DB::insert('INSERT INTO statements (s_id, statement_date, description, incident_timestamp, incident_place, c_id, pe_id, victim_pe_id, witness_pe_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)', + [ + $s_id, + $statement["statement_date"], + $statement["description"], + $statement["incident_timestamp"], + $statement["incident_place"], + Session::get("c_id"), + $policaec[0]->pe_id, + NULL, + $covek[0]->pe_id + + ]); + } elseif ($role === 'victim') { + DB::insert('INSERT INTO statements (s_id, statement_date, description, incident_timestamp, incident_place, c_id, pe_id, victim_pe_id, witness_pe_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)', + [ + $s_id, + $statement["statement_date"], + $statement["description"], + $statement["incident_timestamp"], + $statement["incident_place"], + Session::get("c_id"), + $policaec[0]->pe_id, + $covek[0]->pe_id, + NULL + ]); + } + return redirect()->route('case', ['wildcard' => Session::get("c_id"),]); + + } function finished_cases(){ @@ -52,4 +99,5 @@ } function case($wildcard){ + Session::put('c_id', $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]); @@ -73,11 +121,16 @@ } foreach ($statements as $st){ - $victim=DB::select('select * from people where pe_id=:pe_id;',['pe_id'=> $st->victim_pe_id]); - $victims[] = $victim[0]; + if (!($st->victim_pe_id)==NULL){ + $victim=DB::select('select * from people where pe_id=:pe_id;',['pe_id'=> $st->victim_pe_id]); + $victims[] = $victim[0]; + } } foreach ($statements as $st){ - $witnes=DB::select('select * from people where pe_id=:pe_id;',['pe_id'=> $st->witness_pe_id]); - $witness[] = $witnes[0]; + if (!($st->witness_pe_id)==NULL) { + $witnes = DB::select('select * from people where pe_id=:pe_id;', ['pe_id' => $st->witness_pe_id]); + $witness[] = $witnes[0]; + } } + return view('case', [ @@ -86,6 +139,6 @@ 'statements'=>$statements, 'evidence'=>$evidence, - 'victims'=> $victims, - 'witness'=> $witness + 'victims' => $victims, + 'witness' =>$witness ]); Index: app/Http/Controllers/SessionsController.php =================================================================== --- app/Http/Controllers/SessionsController.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) +++ app/Http/Controllers/SessionsController.php (revision 768f47335966ba1c9293c4e78941c76edd43c239) @@ -42,5 +42,5 @@ Session::put('is_policeman', $policeman); if($policeman){ - Session::put('pe_id', $exists[0]->p_id); + Session::put('p_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 768f47335966ba1c9293c4e78941c76edd43c239) @@ -31,7 +31,5 @@ @if (Session::get('is_policeman')) Полицаец - + @else Началник Index: resources/views/case.blade.php =================================================================== --- resources/views/case.blade.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) +++ resources/views/case.blade.php (revision 768f47335966ba1c9293c4e78941c76edd43c239) @@ -71,7 +71,5 @@ @if (Session::get('is_policeman')) Полицаец - + @else Началник @@ -131,4 +129,5 @@ +
@@ -209,5 +208,13 @@
+ @if (Session::get('is_policeman')) + + @else + + @endif +
@@ -255,4 +262,5 @@
+
@@ -267,4 +275,5 @@
+ @if (!empty($victims)) @foreach($victims as $victim) @endforeach - @foreach($witness as $w) + @endif + @if (!empty($witness)) + + @foreach($witness as $w) @@ -293,4 +305,5 @@ @endforeach + @endif
Index: resources/views/cases.blade.php =================================================================== --- resources/views/cases.blade.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) +++ resources/views/cases.blade.php (revision 768f47335966ba1c9293c4e78941c76edd43c239) @@ -31,7 +31,5 @@ @if (Session::get('is_policeman')) Полицаец - + @else Началник Index: resources/views/employee.blade.php =================================================================== --- resources/views/employee.blade.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) +++ resources/views/employee.blade.php (revision 768f47335966ba1c9293c4e78941c76edd43c239) @@ -152,7 +152,5 @@ @if (Session::get('is_policeman')) Полицаец - + @else Началник Index: resources/views/employees.blade.php =================================================================== --- resources/views/employees.blade.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) +++ resources/views/employees.blade.php (revision 768f47335966ba1c9293c4e78941c76edd43c239) @@ -65,7 +65,4 @@ @if (Session::get('is_policeman')) Полицаец - @else Началник @@ -122,4 +119,5 @@ + Index: resources/views/filter.blade.php =================================================================== --- resources/views/filter.blade.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) +++ resources/views/filter.blade.php (revision 768f47335966ba1c9293c4e78941c76edd43c239) @@ -111,7 +111,5 @@ @if (Session::get('is_policeman')) Полицаец - + @else Началник Index: resources/views/register-statement.blade.php =================================================================== --- resources/views/register-statement.blade.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) +++ resources/views/register-statement.blade.php (revision 768f47335966ba1c9293c4e78941c76edd43c239) @@ -1,1 +1,368 @@ -

TODO

+ + + + + + + Laravel + + + + + + + + + + + + + +
+ + + + +
+
+ Началник + +
+ + + + +
+ + +
+ +

Контролна табла

+ + + +
+

+ Додавање на изјава за случај со контролен број {{ session('c_id') }} +

+ +
+
+ @csrf +
+ + + +
+
+ + + +
+ + @error('incident_timestamp') +

{{$message}}

+ @enderror + +
+ + + +
+ @error('incident_place') +

{{$message}}

+ @enderror + + +
+ + + +
+ + + + + + +
+ +
+
+ + +
+
+
+
+ + + + + + + + + + + + + + + Index: resources/views/welcome.blade.php =================================================================== --- resources/views/welcome.blade.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) +++ resources/views/welcome.blade.php (revision 768f47335966ba1c9293c4e78941c76edd43c239) @@ -31,7 +31,5 @@ @if (Session::get('is_policeman')) Полицаец - + @else Началник Index: routes/web.php =================================================================== --- routes/web.php (revision 249bf91ed01b2668de0b85629744c0ae1c0ba930) +++ routes/web.php (revision 768f47335966ba1c9293c4e78941c76edd43c239) @@ -41,7 +41,6 @@ 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('case/{wildcard}', [CrimeCaseController::class, 'case'])->name('case')->middleware('guest'); Route::get('finished_cases', [CrimeCaseController::class, 'finished_cases'])->middleware('guest'); @@ -51,3 +50,8 @@ Route::post('register-policeman', [OfficerController::class, 'register_post'])->middleware('guest'); +Route::get('register-statement', [CrimeCaseController::class, 'register_statement'])->middleware('guest'); +Route::post('register-statement', [CrimeCaseController::class, 'register_statement_post'])->middleware('guest'); + + + Route::post('/get-person', [PeopleController::class, 'getPerson']);