s421507/eOSP2
2
0
Fork 2
Code Issues Pull Requests Releases Wiki Activity

Zmiany przed pullem list rozwijanych

Browse Source
This commit is contained in:
czup 2019-10-01 20:03:20 +02:00
commit afa46e960b
5 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/DataController.php
View File

@ -13,15 +13,15 @@ class DataController extends Controller
return view('unit',compact('voivodeships')); return view('unit',compact('voivodeships'));
} }
public function getCounties($id) public function getCounties($id)
{ {
$counties = DB::table("powiaty")->where("wojewodztwo_id",$id)->pluck("name","id"); $counties = DB::table("powiaty")->where("wojewodztwo_id",$id)->pluck("name","id");
return json_encode($counties); return json_encode($counties);
} }
public function getCommunities($id) public function getCommunities($id)
{ {
$communities= DB::table("gminy")->where("powiat_id",$id)->pluck("name","id"); $communities= DB::table("gminy")->where("powiat_id",$id)->pluck("name","id");
return json_encode($communities); return json_encode($communities);
} }
} }

22
app/Http/Controllers/fireStationController.php
View File

@ -20,21 +20,37 @@ class fireStationController extends Controller
public function store() public function store()
{ {
$this->validate(request(),[ $this->validate(request(),[
'name' => 'required|min:3|max:45', 'unitName' => 'required|min:3|max:45',
'number' => 'required|numeric', 'number' => 'required|numeric',
'voivodeship' => 'required',
'county' => 'required',
'community' => 'required',
'postOffice' => 'required|min:3|max:45', 'postOffice' => 'required|min:3|max:45',
'zipCode' => 'required|digits:5', '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', 'address' => 'required|min:3|max:45',
'KRS' => 'required|digits:10', 'KRS' => 'required|digits:10',
'NIP' => 'required|digits:10', 'NIP' => 'required|digits:10',
'phoneNumber' => 'required|numeric|min:9|max:11', 'phoneNumber' => 'required|digits:9',
'email' => 'required|email|unique:fireStations', '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(); $request = request();
$jednostka = fireStation::create([ $jednostka = fireStation::create([
'name' => $request -> name, 'name' => $request -> unitName,
'number' => $request -> number, 'number' => $request -> number,
'voivodeship' => $request -> voivodeship, 'voivodeship' => $request -> voivodeship,
'county' => $request -> county, 'county' => $request -> county,

10
resources/lang/en/validation.php
View File

@ -151,6 +151,16 @@ return [
'password' => 'hasło', 'password' => 'hasło',
'PESEL' => 'numer PESEL', 'PESEL' => 'numer PESEL',
'phoneNumber' => 'numer telefonu', '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',
], ],

2
resources/views/inc/addFireStation.blade.php
View File

@ -16,7 +16,7 @@
{{ csrf_field() }} {{ csrf_field() }}
<div class="form-group"> <div class="form-group">
<label for="name">Nazwa Jednostki:</label> <label for="name">Nazwa Jednostki:</label>
<input type="text" class="form-control" id="name" name="name" value="{{ old('name') }} "> <input type="text" class="form-control" id="unitName" name="unitName" value="{{ old('unitName') }} ">
</div> </div>
<div class="form-group"> <div class="form-group">

2
routes/web.php
View File

@ -51,11 +51,11 @@ Route::get('/strazacy', 'fireFightersController@create');
Route::get('/strazacy/add', 'fireFightersController@addForm'); Route::get('/strazacy/add', 'fireFightersController@addForm');
Route::post('/strazacy', 'fireFightersController@store'); Route::post('/strazacy', 'fireFightersController@store');
Route::get('/jednostka','DataController@getVoivodeships'); Route::get('/jednostka','DataController@getVoivodeships');
Route::get('/jednostka/getcounties/{id}','DataController@getCounties'); Route::get('/jednostka/getcounties/{id}','DataController@getCounties');
Route::get('/jednostka/getcommunities/{id}','DataController@getCommunities'); Route::get('/jednostka/getcommunities/{id}','DataController@getCommunities');
//Auth::routes(); //Auth::routes();
// //
//Route::get('/home', 'HomeController@index')->name('home'); //Route::get('/home', 'HomeController@index')->name('home');