diff --git a/app/Http/Controllers/fireFightersController.php b/app/Http/Controllers/fireFightersController.php index 3a3fecb..37afd87 100644 --- a/app/Http/Controllers/fireFightersController.php +++ b/app/Http/Controllers/fireFightersController.php @@ -15,7 +15,11 @@ class fireFightersController extends Controller if(auth()->user() != null && auth()->user()->fireStationID != null ){ // $users = user::where("fireStationID", auth()->user()->fireStationID)->get(); - $users = DB::table('users')->where("fireStationID", '=', auth()->user()->fireStationID)->get(); +// $users = DB::table('users')->where("fireStationID", '=', auth()->user()->fireStationID)->get(); + $users = DB::table('users')->where("fireStationID", '=', auth()->user()->fireStationID) + ->leftJoin('ranks', 'users.degreeID', '=', 'ranks.id') + ->leftJoin('unitFunctions', 'users.functionID', '=', 'unitFunctions.id') + ->get(); return view("fireFighters", ["users" => $users]); } else{ return view('fireFighters'); diff --git a/app/fireStation.php b/app/fireStation.php index 8e3d4c7..570dd80 100644 --- a/app/fireStation.php +++ b/app/fireStation.php @@ -10,6 +10,6 @@ class fireStation extends Model protected $table = 'fireStations'; protected $fillable = [ - 'name', 'number', 'voivodeship', 'county', 'community', 'postOffice', 'zipCode', 'address', 'latitude', 'longitude', 'KRS', 'NIP', 'phoneNumber', 'email', 'deleted', 'creatorID', 'changingID', 'remember_token', 'created_at', 'updated_at' + 'name', 'number', 'voivodeship', 'county', 'community', 'postOffice', 'zipCode', 'address', 'latitude', 'long itude', 'KRS', 'NIP', 'phoneNumber', 'email', 'deleted', 'creatorID', 'changingID', 'remember_token', 'created_at', 'updated_at' ]; } diff --git a/app/ranks.php b/app/ranks.php new file mode 100644 index 0000000..18cde60 --- /dev/null +++ b/app/ranks.php @@ -0,0 +1,13 @@ +id }}">{{ $user->surname }}