1
0
forked from s421507/eOSP2

Wyswietlanie strazakow + edycja - in progress

This commit is contained in:
czup 2019-10-02 15:26:30 +02:00
commit cd9b54d42b
7 changed files with 2960 additions and 129 deletions

View File

@ -7,11 +7,13 @@ use DB;
class DataController extends Controller class DataController extends Controller
{ {
/*
public function getVoivodeships() public function getVoivodeships()
{ {
$voivodeships = DB::table('wojewodztwa')->pluck("name","id"); $voivodeships = DB::table('wojewodztwa')->pluck("name","id");
return view('unit',compact('voivodeships')); return view('unit',compact('voivodeships'));
} }
*/
public function getCounties($id) public function getCounties($id)
{ {

View File

@ -7,13 +7,22 @@ use Illuminate\Http\Request;
use App\User; use App\User;
use App\fireStation; use App\fireStation;
use App\Rules\Pesel; use App\Rules\Pesel;
use Illuminate\Support\Facades\DB;
class fireFightersController extends Controller class fireFightersController extends Controller
{ {
public function create(){ public function create(){
if(auth()->user() != null && auth()->user()->fireStationID != null ){
// $users = DB::table('Users')->where("fireStationID", auth()->user()->fireStationID);
$users = user::where("fireStationID", auth()->user()->fireStationID);
return view("fireFighters", ["users" => $users]);
} else{
return view('fireFighters'); return view('fireFighters');
} }
}
public function addForm(){ public function addForm(){
if(auth()->user() != null && auth()->user()->fireStationID != null ){ if(auth()->user() != null && auth()->user()->fireStationID != null ){
$fireStation = fireStation::find(auth()->user()->fireStationID); $fireStation = fireStation::find(auth()->user()->fireStationID);
@ -63,5 +72,9 @@ class fireFightersController extends Controller
return view('fireFighters'); return view('fireFighters');
} }
public function editFireFighter(){
}
} }

View File

@ -5,7 +5,7 @@ namespace App\Http\Controllers;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\fireStation; use App\fireStation;
use DB;
class fireStationController extends Controller class fireStationController extends Controller
{ {
@ -14,7 +14,9 @@ class fireStationController extends Controller
$fireStation = fireStation::find(auth()->user()->fireStationID); $fireStation = fireStation::find(auth()->user()->fireStationID);
return view('unit', ["fireStation" => $fireStation]); return view('unit', ["fireStation" => $fireStation]);
} else{ } else{
return view('unit'); $voivodeships = DB::table('wojewodztwa')->pluck("name","id");
return view('unit',compact('voivodeships'));
//return view('unit');
} }
} }
public function store() public function store()

View File

@ -14,121 +14,25 @@ class JednostkiTerytorialne extends Migration
public function up() public function up()
{ {
Schema::create('wojewodztwa', function (Blueprint $table) { Schema::create('wojewodztwa', function (Blueprint $table) {
$table->increments('id'); // $table->increments('id');
$table->integer('id');
$table->string('name'); $table->string('name');
}); });
Schema::create('powiaty', function (Blueprint $table) { Schema::create('powiaty', function (Blueprint $table) {
$table->increments('id'); $table->integer('id');
$table->integer('wojewodztwo_id'); $table->integer('wojewodztwo_id');
$table->string('name'); $table->string('name');
}); });
Schema::create('gminy', function (Blueprint $table) { Schema::create('gminy', function (Blueprint $table) {
$table->increments('id'); $table->integer('id');
$table->integer('wojewodztwo_id'); $table->integer('wojewodztwo_id');
$table->integer('powiat_id'); $table->integer('powiat_id');
$table->string('name'); $table->string('name');
}); });
// dane testowe
DB::table('wojewodztwa')->insert(
array(
'name' => 'wielkopolskie'
)
);
DB::table('wojewodztwa')->insert(
array(
'name' => 'pomorskie'
)
);
DB::table('powiaty')->insert(
array(
'wojewodztwo_id' => '1',
'name' => 'poznański'
)
);
DB::table('powiaty')->insert(
array(
'wojewodztwo_id' => '1',
'name' => 'koniński'
)
);
DB::table('powiaty')->insert(
array(
'wojewodztwo_id' => '2',
'name' => 'kartuski'
)
);
DB::table('powiaty')->insert(
array(
'wojewodztwo_id' => '2',
'name' => 'kwidzyński'
)
);
DB::table('gminy')->insert(
array(
'wojewodztwo_id' => '1',
'powiat_id' => '1',
'name' => 'Dopiewo'
)
);
DB::table('gminy')->insert(
array(
'wojewodztwo_id' => '1',
'powiat_id' => '1',
'name' => 'Suchy Las'
)
);
DB::table('gminy')->insert(
array(
'wojewodztwo_id' => '1',
'powiat_id' => '2',
'name' => 'Skulsk'
)
);
DB::table('gminy')->insert(
array(
'wojewodztwo_id' => '1',
'powiat_id' => '2',
'name' => 'Wilczyn'
)
);
DB::table('gminy')->insert(
array(
'wojewodztwo_id' => '2',
'powiat_id' => '3',
'name' => 'Sierakowice'
)
);
DB::table('gminy')->insert(
array(
'wojewodztwo_id' => '2',
'powiat_id' => '3',
'name' => 'Chmielno'
)
);
DB::table('gminy')->insert(
array(
'wojewodztwo_id' => '2',
'powiat_id' => '4',
'name' => 'Gardeja'
)
);
DB::table('gminy')->insert(
array(
'wojewodztwo_id' => '2',
'powiat_id' => '4',
'name' => 'Sadlinki'
)
);
} }
/** /**

File diff suppressed because it is too large Load Diff

View File

@ -13,8 +13,12 @@
@section('center-area') @section('center-area')
@parent @parent
<?php @if( auth()->check())
echo "<table class='firefighterViewTable'> @if( auth()->user()->fireStationID == NULL)
Jednostka nie istnieje
@else
<table class='firefighterViewTable'>
<tr class='table-header'> <tr class='table-header'>
<td>Imie i nazwisko</td> <td>Imie i nazwisko</td>
<td>PESEL</td> <td>PESEL</td>
@ -22,17 +26,24 @@
<td>Funkcja</td> <td>Funkcja</td>
<td>Stopień</td> <td>Stopień</td>
<td>Status</td> <td>Status</td>
</tr>"; </tr>
for ($i = 1; $i <= 25; $i++){
echo "<tr> <tr>
<td>name surname</td> @foreach($users as $user)
<td>{{ $user->name }} surname</td>
<td>???????????</td> <td>???????????</td>
<td>przykladowymail@domena.com</td> <td>przykladowymail@domena.com</td>
<td>Zast. Naczelnika</td> <td>Zast. Naczelnika</td>
<td>Dowódca</td> <td>Dowódca</td>
<td>Czynny</td> <td>Czynny</td>
</tr>"; @endforeach
} </tr>"
echo "</table>"; </table>"
?>
@endif
@else
Brak autoryzacji
@endif
@stop @stop

View File

@ -43,16 +43,14 @@ Route::get('/login', 'SessionsController@create');
Route::post('/login', 'SessionsController@store'); Route::post('/login', 'SessionsController@store');
Route::get('/logout', 'SessionsController@destroy'); Route::get('/logout', 'SessionsController@destroy');
Route::get('/jednostka', 'fireStationController@create');
Route::post('/jednostka', 'fireStationController@store');
Route::get('/strazacy', 'fireFightersController@create'); 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', 'fireStationController@create');
Route::post('/jednostka', 'fireStationController@store');
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');