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

fix nazw tabel bd

Browse Source
This commit is contained in:
Krzysztof Strzelecki 2020-07-12 16:11:49 +02:00
parent aa5a8df45f
commit a6ce63a6d3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/documentApplicationController.php
View File

@ -44,7 +44,7 @@ class documentApplicationController extends Controller
->select('users.id','users.name', 'users.surname', 'users.PESEL', 'users.fireStationID','users.phoneNumber', 'users.email', 'ranks.rank', 'unitFunctions.unitFunction', 'users.number') ->select('users.id','users.name', 'users.surname', 'users.PESEL', 'users.fireStationID','users.phoneNumber', 'users.email', 'ranks.rank', 'unitFunctions.unitFunction', 'users.number')
->first(); ->first();
$fireStation = DB::table('firestations')->where("id", '=', $userData->fireStationID)->first(); $fireStation = DB::table('fireStations')->where("id", '=', $userData->fireStationID)->first();
$test->wniosekNadaniePDF($userData, $request->decoration, $fireStation); $test->wniosekNadaniePDF($userData, $request->decoration, $fireStation);
} }
@ -62,11 +62,11 @@ class documentApplicationController extends Controller
->select('users.id','users.name', 'users.surname', 'users.PESEL', 'users.fireStationID','users.phoneNumber', 'users.email', 'ranks.rank', 'unitFunctions.unitFunction', 'users.number') ->select('users.id','users.name', 'users.surname', 'users.PESEL', 'users.fireStationID','users.phoneNumber', 'users.email', 'ranks.rank', 'unitFunctions.unitFunction', 'users.number')
->first(); ->first();
$userTrainings = DB::table('trainingsfirefighters')->where("trainingsfirefighters.firefighterID", '=', $request->fireFighterID) $userTrainings = DB::table('trainingsFirefighters')->where("trainingsFirefighters.firefighterID", '=', $request->fireFighterID)
->leftJoin('trainings', 'trainingsfirefighters.trainingID', '=', 'trainings.id') ->leftJoin('trainings', 'trainingsFirefighters.trainingID', '=', 'trainings.id')
->get(); ->get();
$fireStation = DB::table('firestations')->where("id", '=', $userData->fireStationID)->first(); $fireStation = DB::table('fireStations')->where("id", '=', $userData->fireStationID)->first();
$test->kartaEwidencyjnaPDF($userData, $fireStation, $userTrainings); $test->kartaEwidencyjnaPDF($userData, $fireStation, $userTrainings);
} }