diff --git a/app/Http/Controllers/DataController.php b/app/Http/Controllers/DataController.php index 1a75fa7..9b1d828 100644 --- a/app/Http/Controllers/DataController.php +++ b/app/Http/Controllers/DataController.php @@ -13,15 +13,15 @@ class DataController extends Controller return view('unit',compact('voivodeships')); } - public function getCounties($id) + public function getCounties($id) { $counties = DB::table("powiaty")->where("wojewodztwo_id",$id)->pluck("name","id"); return json_encode($counties); } - public function getCommunities($id) + public function getCommunities($id) { $communities= DB::table("gminy")->where("powiat_id",$id)->pluck("name","id"); return json_encode($communities); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/fireStationController.php b/app/Http/Controllers/fireStationController.php index b03838a..854bcb2 100644 --- a/app/Http/Controllers/fireStationController.php +++ b/app/Http/Controllers/fireStationController.php @@ -20,21 +20,37 @@ class fireStationController extends Controller public function store() { $this->validate(request(),[ - 'name' => 'required|min:3|max:45', + 'unitName' => 'required|min:3|max:45', 'number' => 'required|numeric', + 'voivodeship' => 'required', + 'county' => 'required', + 'community' => 'required', 'postOffice' => 'required|min:3|max:45', 'zipCode' => 'required|digits:5', + 'latitude' => ['required', 'regex:/^[-]?(([0-8]?[0-9])\.(\d+))|(90(\.0+)?)$/'], + 'longitude' => ['required', 'regex:/^[-]?((((1[0-7][0-9])|([0-9]?[0-9]))\.(\d+))|180(\.0+)?)$/'], 'address' => 'required|min:3|max:45', 'KRS' => 'required|digits:10', 'NIP' => 'required|digits:10', - 'phoneNumber' => 'required|numeric|min:9|max:11', + 'phoneNumber' => 'required|digits:9', 'email' => 'required|email|unique:fireStations', + ], + [ + 'required' => ':attribute jest wymagany(e).', + 'min' => ':attribute musi mieć przynajmniej :min znaki.', + 'max' => ':attribute musi mieć nie więcej niż :max znaków.', + 'numeric' => ':attribute może zawierać tylko cyfry.', + 'digits' => ':attribute musi składać się z :digits cyfr.', + 'unique' =>':attribute jest już zajęty.', + 'email' => 'Niepoprawny adres e-mail.', + 'latitude.regex' =>':attribute ma zakres od -90.0 do 90.0', + 'longitude.regex' =>':attribute ma zakres od -180.0 do 180.0' ]); $request = request(); $jednostka = fireStation::create([ - 'name' => $request -> name, + 'name' => $request -> unitName, 'number' => $request -> number, 'voivodeship' => $request -> voivodeship, 'county' => $request -> county, diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 80713bf..2369461 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -151,6 +151,16 @@ return [ 'password' => 'hasło', 'PESEL' => 'numer PESEL', 'phoneNumber' => 'numer telefonu', + 'number' => 'numer jednostki', + 'zipCode' => 'kod pocztowy', + 'postOffice' => 'urząd pocztowy', + 'address' => 'adres', + 'voivodeship' => 'województwo', + 'county' => 'powiat', + 'community' => 'gmina', + 'unitName' => 'nazwa jednostki', + 'longitude' => 'długość geograficzna', + 'latitude' => 'szerokość geograficzna', ], diff --git a/resources/views/inc/addFireStation.blade.php b/resources/views/inc/addFireStation.blade.php index de6ace7..ce73335 100644 --- a/resources/views/inc/addFireStation.blade.php +++ b/resources/views/inc/addFireStation.blade.php @@ -16,7 +16,7 @@ {{ csrf_field() }}
- +
diff --git a/routes/web.php b/routes/web.php index 5f66e13..f77a58c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -51,11 +51,11 @@ Route::get('/strazacy', 'fireFightersController@create'); Route::get('/strazacy/add', 'fireFightersController@addForm'); Route::post('/strazacy', 'fireFightersController@store'); + Route::get('/jednostka','DataController@getVoivodeships'); Route::get('/jednostka/getcounties/{id}','DataController@getCounties'); Route::get('/jednostka/getcommunities/{id}','DataController@getCommunities'); - //Auth::routes(); // //Route::get('/home', 'HomeController@index')->name('home');