From 766eda4e18ad9e61788b5cc114a6869133be12bb Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Sun, 21 Jan 2024 03:24:02 +0000 Subject: [PATCH] Apply fixes from StyleCI --- .../Permissions/fitting.permissions.php | 12 +- src/Config/fitting.config.php | 2 +- src/Config/fitting.exportlinks.php | 18 +-- src/Config/fitting.sidebar.php | 18 +-- src/FittingServiceProvider.php | 3 +- src/Helpers/CalculateConstants.php | 53 ++++----- src/Helpers/CalculateEft.php | 27 ++--- src/Http/Controllers/ApiFittingController.php | 10 +- src/Http/Controllers/FittingController.php | 112 +++++++++--------- src/Http/routes.php | 76 ++++++------ src/Models/Doctrine.php | 2 - src/Models/Fitting.php | 1 - src/Validation/DoctrineValidation.php | 4 +- src/Validation/FittingValidation.php | 2 +- ...01_08_185014_create_seat-fitting_table.php | 4 +- ...5_18_154747_create_seat_doctrine_table.php | 4 +- src/lang/en/fitting.php | 3 +- 17 files changed, 168 insertions(+), 183 deletions(-) diff --git a/src/Config/Permissions/fitting.permissions.php b/src/Config/Permissions/fitting.permissions.php index 3691c58..400ee75 100644 --- a/src/Config/Permissions/fitting.permissions.php +++ b/src/Config/Permissions/fitting.permissions.php @@ -2,33 +2,33 @@ /** * User: Warlof Tutsimo * Date: 15/06/2016 - * Time: 22:02 + * Time: 22:02. */ return [ 'view' => [ 'label' => 'View Fittings', 'description' => 'Ability to see the fittings page', - 'division' => 'military' + 'division' => 'military', ], 'create' => [ 'label' => 'Create Fittings', 'description' => 'Ability to submit new fittings/doctrines', - 'division' => 'military' + 'division' => 'military', ], 'doctrineview' => [ 'label' => 'View Doctrines', 'description' => 'Ability to see the doctrines page', - 'division' => 'military' + 'division' => 'military', ], 'reportview' => [ 'label' => 'View Reports', 'description' => 'View Reports', - 'division' => 'military' + 'division' => 'military', ], 'settings' => [ 'label' => 'Settings', 'description' => 'Settings', - 'division' => 'military' + 'division' => 'military', ], ]; diff --git a/src/Config/fitting.config.php b/src/Config/fitting.config.php index 52e0f34..2128570 100644 --- a/src/Config/fitting.config.php +++ b/src/Config/fitting.config.php @@ -1,7 +1,7 @@ - * Date: 2017/11/03 + * Date: 2017/11/03. */ return [ diff --git a/src/Config/fitting.exportlinks.php b/src/Config/fitting.exportlinks.php index ade02fc..b790d80 100644 --- a/src/Config/fitting.exportlinks.php +++ b/src/Config/fitting.exportlinks.php @@ -1,12 +1,12 @@ -[ -// "route"=>"cryptafitting::about",//receives the id as argument -// "name"=>"open in seat-alliance-industry" -// ], -// 'example2'=>[ -// "url"=>"https://example.com",//receives the id as argument -// "name"=>"open in seat-inventory" -// ] + // 'example'=>[ + // "route"=>"cryptafitting::about",//receives the id as argument + // "name"=>"open in seat-alliance-industry" + // ], + // 'example2'=>[ + // "url"=>"https://example.com",//receives the id as argument + // "name"=>"open in seat-inventory" + // ] ]; diff --git a/src/Config/fitting.sidebar.php b/src/Config/fitting.sidebar.php index 3eafec0..2d45310 100644 --- a/src/Config/fitting.sidebar.php +++ b/src/Config/fitting.sidebar.php @@ -1,4 +1,4 @@ - [ @@ -6,42 +6,42 @@ 'permission' => 'fitting.doctrineview', 'route_segment' => 'fitting', 'icon' => 'fas fa-rocket', - 'entries' => [ + 'entries' => [ 'fitting' => [ 'name' => 'Fittings', 'icon' => 'fas fa-rocket', 'route_segment' => 'fitting', 'route' => 'cryptafitting::view', - 'permission' => 'fitting.view' + 'permission' => 'fitting.view', ], 'doctrine' => [ 'name' => 'Doctrine', 'icon' => 'fas fa-list', 'route_segment' => 'fitting', 'route' => 'cryptafitting::doctrineview', - 'permission' => 'fitting.doctrineview' + 'permission' => 'fitting.doctrineview', ], 'doctrinereport' => [ 'name' => 'Doctrine Report', 'icon' => 'fas fa-chart-pie', 'route_segment' => 'fitting', 'route' => 'cryptafitting::doctrinereport', - 'permission' => 'fitting.reportview' + 'permission' => 'fitting.reportview', ], 'about' => [ 'name' => 'About', 'icon' => 'fas fa-info', 'route_segment' => 'fitting', 'route' => 'cryptafitting::about', - 'permission' => 'fitting.view' + 'permission' => 'fitting.view', ], 'settings' => [ 'name' => 'Settings', 'icon' => 'fas fa-cog', 'route_segment' => 'fitting', 'route' => 'fitting.settings', - 'permission' => 'fitting.settings' + 'permission' => 'fitting.settings', ], - ] - ] + ], + ], ]; diff --git a/src/FittingServiceProvider.php b/src/FittingServiceProvider.php index a7ca030..0752c9a 100644 --- a/src/FittingServiceProvider.php +++ b/src/FittingServiceProvider.php @@ -18,7 +18,7 @@ public function boot() $this->add_translations(); $this->publishes([ - __DIR__.'/Config/fitting.exportlinks.php' => config_path('fitting.exportlinks.php')],["config","seat"] + __DIR__ . '/Config/fitting.exportlinks.php' => config_path('fitting.exportlinks.php')], ['config', 'seat'] ); $this->addMigrations(); @@ -87,7 +87,6 @@ public function getName(): string return 'Fitting'; } - /** * Return the plugin repository address. * diff --git a/src/Helpers/CalculateConstants.php b/src/Helpers/CalculateConstants.php index 3bcf48e..944fc6d 100644 --- a/src/Helpers/CalculateConstants.php +++ b/src/Helpers/CalculateConstants.php @@ -1,4 +1,4 @@ - 1288, ]; - const DG_PGOUTPUT = 11; - const DG_PGLOAD = 15; + const DG_PGOUTPUT = 11; + const DG_PGLOAD = 15; const DG_CPUOUTPUT = 48; - const DG_CPULOAD = 49; + const DG_CPULOAD = 49; const RAISE_ALREADY_FULLFILLED = 0; - const RAISE_SKILL_RAISED = 1; - const RAISE_CANNOT_RAISE = 2; + const RAISE_SKILL_RAISED = 1; + const RAISE_CANNOT_RAISE = 2; const CPU_SKILL_ORDER = [ // CPU Management @@ -48,25 +48,24 @@ interface CalculateConstants [3318 => 5], ]; const PG_SKILL_ORDER = [ - // Power Grid Management - // Shield Upgrades - // Advanced Weapon Upgrades - [3413 => 1], - [3413 => 2], - [3413 => 3], - [3413 => 4], - [3413 => 5], - [3425 => 1], - [11207 => 1], - [3425 => 2], - [11207 => 2], - [3425 => 3], - [11207 => 3], - [3425 => 4], - [11207 => 4], - [3425 => 5], - [11207 => 5], - ]; + // Power Grid Management + // Shield Upgrades + // Advanced Weapon Upgrades + [3413 => 1], + [3413 => 2], + [3413 => 3], + [3413 => 4], + [3413 => 5], + [3425 => 1], + [11207 => 1], + [3425 => 2], + [11207 => 2], + [3425 => 3], + [11207 => 3], + [3425 => 4], + [11207 => 4], + [3425 => 5], + [11207 => 5], + ]; } - diff --git a/src/Helpers/CalculateEft.php b/src/Helpers/CalculateEft.php index bb495f0..602bbb0 100644 --- a/src/Helpers/CalculateEft.php +++ b/src/Helpers/CalculateEft.php @@ -1,11 +1,11 @@ -cpu_raise_index; + $index = &$this->cpu_raise_index; $skillsOrder = self::CPU_SKILL_ORDER; break; case 'powergrid': - $index =& $this->pg_raise_index; + $index = &$this->pg_raise_index; $skillsOrder = self::PG_SKILL_ORDER; break; } - if (!isset($skillsOrder[$index])) { + if (! isset($skillsOrder[$index])) { return self::RAISE_CANNOT_RAISE; } @@ -166,7 +166,7 @@ private function parseEftFitting($fitting) $fitsplit = explode("\n", $fitting); // get shipname of first line by removing brackets - list($shipname, $fitname) = explode(", ", substr(array_shift($fitsplit), 1, -1)); + [$shipname, $fitname] = explode(', ', substr(array_shift($fitsplit), 1, -1)); $fit_all_items = []; $fit_calc_items = []; @@ -176,7 +176,7 @@ private function parseEftFitting($fitting) foreach ($fitsplit as $key => $line) { // split line to get charge - $linesplit = explode(",", $line); + $linesplit = explode(',', $line); if (isset($linesplit[1])) { $fit_all_items[] = $linesplit[1]; @@ -213,16 +213,15 @@ private function convertToTypeIDs($items) private function sanatizeFittingBlock($fitting) { // remove useless empty lines and whatnot - $fitting = preg_replace("/\[Empty .+ slot\]/", "", $fitting); + $fitting = preg_replace("/\[Empty .+ slot\]/", '', $fitting); - return ltrim(rtrim(preg_replace("/^[ \t]*[\r\n]+/m", "", $fitting))); + return ltrim(rtrim(preg_replace("/^[ \t]*[\r\n]+/m", '', $fitting))); } private function sanatizeTypeName($item) { // remove amount for charges // sample: Scourge Rage Heavy Assault Missile x66 - return ltrim(rtrim(preg_replace("/ x\d+/", "", $item))); + return ltrim(rtrim(preg_replace("/ x\d+/", '', $item))); } - -}; +} diff --git a/src/Http/Controllers/ApiFittingController.php b/src/Http/Controllers/ApiFittingController.php index a6f294b..3abf9af 100644 --- a/src/Http/Controllers/ApiFittingController.php +++ b/src/Http/Controllers/ApiFittingController.php @@ -3,33 +3,31 @@ namespace CryptaTech\Seat\Fitting\Http\Controllers; use Seat\Api\Http\Controllers\Api\v2\ApiController; -use CryptaTech\Seat\Fitting\Http\Controllers\FittingController; /** * Class ApiFittingController. + * * @package CryptaTech\Seat\Fitting\Http\Controllers */ class ApiFittingController extends ApiController { - public function getFittingList() { return FittingController::getFittingList(); } - + public function getFittingById($id) { return FittingController::getFittingById($id); } - + public function getDoctrineList() { return FittingController::getDoctrineList(); } - + public function getDoctrineList($id) { return FittingController::getDoctrineById($id); } - } diff --git a/src/Http/Controllers/FittingController.php b/src/Http/Controllers/FittingController.php index fab902e..2d4b329 100644 --- a/src/Http/Controllers/FittingController.php +++ b/src/Http/Controllers/FittingController.php @@ -2,25 +2,23 @@ namespace CryptaTech\Seat\Fitting\Http\Controllers; -use Illuminate\Support\Facades\Gate; -use Seat\Web\Http\Controllers\Controller; -use Seat\Web\Models\Acl\Role; -use Illuminate\Http\Request; +use CryptaTech\Seat\Fitting\Helpers\CalculateConstants; +use CryptaTech\Seat\Fitting\Helpers\CalculateEft; +use CryptaTech\Seat\Fitting\Models\Doctrine; +use CryptaTech\Seat\Fitting\Models\Fitting; +use CryptaTech\Seat\Fitting\Validation\DoctrineValidation; +use CryptaTech\Seat\Fitting\Validation\FittingValidation; use GuzzleHttp\Client; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Gate; use Seat\Eveapi\Models\Alliances\Alliance; -use Seat\Eveapi\Models\Alliances\AllianceMember; -use Seat\Eveapi\Models\Character\CharacterInfo; use Seat\Eveapi\Models\Character\CharacterAffiliation; -use Seat\Eveapi\Models\Character\CharacterSkill; +use Seat\Eveapi\Models\Character\CharacterInfo; use Seat\Eveapi\Models\Corporation\CorporationInfo; -use Seat\Eveapi\Models\Sde\InvType; use Seat\Eveapi\Models\Sde\DgmTypeAttribute; -use CryptaTech\Seat\Fitting\Helpers\CalculateConstants; -use CryptaTech\Seat\Fitting\Helpers\CalculateEft; -use CryptaTech\Seat\Fitting\Models\Fitting; -use CryptaTech\Seat\Fitting\Models\Doctrine; -use CryptaTech\Seat\Fitting\Validation\FittingValidation; -use CryptaTech\Seat\Fitting\Validation\DoctrineValidation; +use Seat\Eveapi\Models\Sde\InvType; +use Seat\Web\Http\Controllers\Controller; +use Seat\Web\Models\Acl\Role; class FittingController extends Controller implements CalculateConstants { @@ -28,16 +26,16 @@ class FittingController extends Controller implements CalculateConstants private $requiredSkills = []; - public function getSettings(){ - return view("fitting::settings"); + public function getSettings() { + return view('fitting::settings'); } - public function saveSettings(Request $request){ + public function saveSettings(Request $request) { $request->validate([ - "evepraisal" => "required|string" + 'evepraisal' => 'required|string', ]); - setting(["fitting.evepraisal.domain", $request->evepraisal], true); + setting(['fitting.evepraisal.domain', $request->evepraisal], true); // $request->validate([ // "price_source" => "required|integer" @@ -45,7 +43,7 @@ public function saveSettings(Request $request){ // setting(["cryptatech_seat_fitting_price_provider", $request->price_source], true); - return redirect()->back()->with("success","Updated settings"); + return redirect()->back()->with('success', 'Updated settings'); } public function getDoctrineEdit($doctrine_id) @@ -130,14 +128,14 @@ public function delDoctrineById($id) { Doctrine::destroy($id); - return "Success"; + return 'Success'; } public function deleteFittingById($id) { Fitting::destroy($id); - return "Success"; + return 'Success'; } public function getSkillsByFitId($id) @@ -153,7 +151,7 @@ public function getSkillsByFitId($id) $index = $character->character_id; - $skillsToons['characters'][$index]['id'] = $character->character_id; + $skillsToons['characters'][$index]['id'] = $character->character_id; $skillsToons['characters'][$index]['name'] = $character->name; foreach ($character->skills as $skill) { @@ -161,7 +159,7 @@ public function getSkillsByFitId($id) $rank = DgmTypeAttribute::where('typeID', $skill->skill_id)->where('attributeID', '275')->first(); $skillsToons['characters'][$index]['skill'][$skill->skill_id]['level'] = $skill->trained_skill_level; - $skillsToons['characters'][$index]['skill'][$skill->skill_id]['rank'] = $rank->valueFloat; + $skillsToons['characters'][$index]['skill'][$skill->skill_id]['rank'] = $rank->valueFloat; } // Fill in missing skills so Javascript doesn't barf and you have the correct rank @@ -203,7 +201,7 @@ public function getFittingList() 'id' => $fit->id, 'shiptype' => $fit->shiptype, 'fitname' => $fit->fitname, - 'typeID' => $ship->typeID + 'typeID' => $ship->typeID, ]); } @@ -222,7 +220,7 @@ public function getFittingCostById($id) $fit = Fitting::find($id); $eft = implode("\n", $fit->eftfitting); - $evepraisal = setting("fitting.evepraisal.domain", true); + $evepraisal = setting('fitting.evepraisal.domain', true); $response = (new Client()) ->request('POST', "https://$evepraisal/appraisal.json?market=jita&persist=no", [ @@ -233,10 +231,10 @@ public function getFittingCostById($id) 'filename' => 'notme', 'headers' => [ 'Content-Type' => 'text/plain', - 'User-Agent' => 'seat-srp' - ] + 'User-Agent' => 'seat-srp', + ], ], - ] + ], ]); return response()->json(json_decode($response->getBody()->getContents())); @@ -248,10 +246,10 @@ public function getFittingById($id) $response = $this->fittingParser($fitting->eftfitting); - $response["exportLinks"] = collect(config("fitting.exportlinks"))->map(function ($link) use ($fitting) { + $response['exportLinks'] = collect(config('fitting.exportlinks'))->map(function ($link) use ($fitting) { return [ - "name"=>$link["name"], - "url"=>isset($link["url"]) ? $link["url"]."?id=$fitting->id" : route($link["route"],["id"=>$fitting->id]) + 'name' => $link['name'], + 'url' => isset($link['url']) ? $link['url'] . "?id=$fitting->id" : route($link['route'], ['id' => $fitting->id]), ]; })->values(); @@ -298,7 +296,7 @@ public function saveFitting(FittingValidation $request) } $eft = explode("\n", $request->eftfitting); - list($fitting->shiptype, $fitting->fitname) = explode(", ", substr($eft[0], 1, -2)); + [$fitting->shiptype, $fitting->fitname] = explode(', ', substr($eft[0], 1, -2)); $fitting->eftfitting = $request->eftfitting; $fitting->save(); @@ -314,7 +312,6 @@ public function postFitting(FittingValidation $request) return response()->json($this->fittingParser($eft)); } - private function fittingParser($eft) { $jsfit = []; @@ -323,11 +320,11 @@ private function fittingParser($eft) $header = preg_split("/\r?\n/", $data[0]); - list($jsfit['shipname'], $jsfit['fitname']) = explode(",", substr($header[0], 1, -1)); + [$jsfit['shipname'], $jsfit['fitname']] = explode(',', substr($header[0], 1, -1)); array_shift($header); $data[0] = implode("\r\n", $header); - // Deal with a blank line between the name and the first low slot + // Deal with a blank line between the name and the first low slot $lowslot = array_filter(preg_split("/\r?\n/", $data[0])); if (empty($lowslot)) { $data = array_splice($data, 1, count($data)); @@ -360,27 +357,28 @@ private function fittingParser($eft) } } - $this->loadSlot($jsfit, "LoSlot", $lowslot); - $this->loadSlot($jsfit, "MedSlot", $midslot); - $this->loadSlot($jsfit, "HiSlot", $highslot); + $this->loadSlot($jsfit, 'LoSlot', $lowslot); + $this->loadSlot($jsfit, 'MedSlot', $midslot); + $this->loadSlot($jsfit, 'HiSlot', $highslot); if (isset($subslot)) { - $this->loadSlot($jsfit, "SubSlot", $subslot); + $this->loadSlot($jsfit, 'SubSlot', $subslot); } - $this->loadSlot($jsfit, "RigSlot", $rigs); + $this->loadSlot($jsfit, 'RigSlot', $rigs); if (isset($drones)) { foreach ($drones as $slot) { - list($drone, $qty) = explode(" x", $slot); + [$drone, $qty] = explode(' x', $slot); $item = InvType::where('typeName', $drone)->first(); $jsfit['dronebay'][$item->typeID] = [ 'name' => $drone, - 'qty' => $qty, + 'qty' => $qty, ]; } } + return $jsfit; } @@ -389,9 +387,9 @@ private function loadSlot(&$jsfit, $slotname, $slots) $index = 0; foreach ($slots as $slot) { - $module = explode(",", $slot); + $module = explode(',', $slot); - if (!preg_match("/\[Empty .+ slot\]/", $module[0])) { + if (! preg_match("/\[Empty .+ slot\]/", $module[0])) { $item = InvType::where('typeName', $module[0])->first(); if (empty($item)) { @@ -399,16 +397,15 @@ private function loadSlot(&$jsfit, $slotname, $slots) } $jsfit[$slotname . $index] = [ - 'id' => $item->typeID, + 'id' => $item->typeID, 'name' => $module[0], ]; $index++; } } - return; - } + } public function postSkills(FittingValidation $request) { @@ -422,7 +419,7 @@ public function postSkills(FittingValidation $request) $index = $character->characterID; $skillsToons['characters'][$index] = [ - 'id' => $character->characterID, + 'id' => $character->characterID, 'name' => $character->characterName, ]; @@ -434,7 +431,7 @@ public function postSkills(FittingValidation $request) $skillsToons['characters'][$index]['skill'][$skill->typeID] = [ 'level' => $skill->level, - 'rank' => $rank->valueFloat, + 'rank' => $rank->valueFloat, ]; } @@ -449,7 +446,7 @@ public function postSkills(FittingValidation $request) $skillsToons['characters'][$index]['skill'][$skill['typeId']] = [ 'level' => 0, - 'rank' => $rank->valueFloat, + 'rank' => $rank->valueFloat, ]; } } @@ -503,12 +500,12 @@ public function viewDoctrineReport() { $doctrines = Doctrine::all(); $corps = CorporationInfo::all(); - $alliances = array(); + $alliances = []; - $allids = array(); + $allids = []; foreach ($corps as $corp) { - if (!is_null($corp->alliance_id)) { + if (! is_null($corp->alliance_id)) { array_push($allids, $corp->alliance_id); } } @@ -534,7 +531,6 @@ public function runReport($alliance_id, $corp_id, $doctrine_id) })->get(); } - $doctrine = Doctrine::where('id', $doctrine_id)->first(); $fittings = $doctrine->fittings; $charData = []; @@ -557,7 +553,7 @@ public function runReport($alliance_id, $corp_id, $doctrine_id) array_push($data['fittings'], $fit->fitname); $this->requiredSkills = []; - $shipSkills = $this->calculate("[" . $fit->shiptype . ", a]"); + $shipSkills = $this->calculate('[' . $fit->shiptype . ', a]'); foreach ($shipSkills as $shipSkill) { $fitData[$fitting->id]['shipskills'][$shipSkill['typeId']] = $shipSkill['level']; @@ -598,10 +594,10 @@ public function runReport($alliance_id, $corp_id, $doctrine_id) } } - if (!isset($data['totals'][$fit['name']]['ship'])) { + if (! isset($data['totals'][$fit['name']]['ship'])) { $data['totals'][$fit['name']]['ship'] = 0; } - if (!isset($data['totals'][$fit['name']]['fit'])) { + if (! isset($data['totals'][$fit['name']]['fit'])) { $data['totals'][$fit['name']]['fit'] = 0; } diff --git a/src/Http/routes.php b/src/Http/routes.php index 475de46..b9c57a9 100644 --- a/src/Http/routes.php +++ b/src/Http/routes.php @@ -25,111 +25,111 @@ Route::group([ 'namespace' => 'CryptaTech\Seat\Fitting\Http\Controllers', - 'prefix' => 'fitting' + 'prefix' => 'fitting', ], function () { Route::group([ 'middleware' => ['web', 'auth'], ], function () { Route::get('/', [ - 'as' => 'cryptafitting::view', + 'as' => 'cryptafitting::view', 'uses' => 'FittingController@getFittingView', - 'middleware' => 'can:fitting.view' + 'middleware' => 'can:fitting.view', ]); Route::get('/about', [ - 'as' => 'cryptafitting::about', + 'as' => 'cryptafitting::about', 'uses' => 'FittingController@getAboutView', - 'middleware' => 'can:fitting.view' + 'middleware' => 'can:fitting.view', ]); Route::get('/settings', [ - 'as' => 'fitting.settings', + 'as' => 'fitting.settings', 'uses' => 'FittingController@getSettings', - 'middleware' => 'can:fitting.settings' + 'middleware' => 'can:fitting.settings', ]); Route::post('/settings', [ - 'as' => 'fitting.saveSettings', + 'as' => 'fitting.saveSettings', 'uses' => 'FittingController@saveSettings', - 'middleware' => 'can:fitting.settings' + 'middleware' => 'can:fitting.settings', ]); Route::post('/postfitting', [ - 'as' => 'cryptafitting::postFitting', + 'as' => 'cryptafitting::postFitting', 'uses' => 'FittingController@postFitting', - 'middleware' => 'can:fitting.view' + 'middleware' => 'can:fitting.view', ]); Route::post('/postskills', [ - 'as' => 'cryptafitting::postSkills', + 'as' => 'cryptafitting::postSkills', 'uses' => 'FittingController@postSkills', - 'middleware' => 'can:fitting.view' + 'middleware' => 'can:fitting.view', ]); Route::post('/savefitting', [ - 'as' => 'cryptafitting::saveFitting', + 'as' => 'cryptafitting::saveFitting', 'uses' => 'FittingController@saveFitting', - 'middleware' => 'can:fitting.create' + 'middleware' => 'can:fitting.create', ]); Route::get('/getfittingbyid/{id}', [ 'uses' => 'FittingController@getFittingById', - 'middleware' => 'can:fitting.doctrineview' + 'middleware' => 'can:fitting.doctrineview', ]); Route::get('/getfittingcostbyid/{id}', [ 'as' => 'cryptafitting::appraiseFitting', 'uses' => 'FittingController@getFittingCostById', - 'middleware' => 'can:fitting.doctrineview' + 'middleware' => 'can:fitting.doctrineview', ]); Route::get('/getdoctrinebyid/{id}', [ - 'as' => 'cryptafitting::getDoctrineById', + 'as' => 'cryptafitting::getDoctrineById', 'uses' => 'FittingController@getDoctrineById', - 'middleware' => 'can:fitting.doctrineview' + 'middleware' => 'can:fitting.doctrineview', ]); Route::get('/geteftfittingbyid/{id}', [ 'uses' => 'FittingController@getEftFittingById', - 'middleware' => 'can:fitting.view' + 'middleware' => 'can:fitting.view', ]); Route::get('/getskillsbyfitid/{id}', [ 'uses' => 'FittingController@getSkillsByFitId', - 'middleware' => 'can:fitting.doctrineview' + 'middleware' => 'can:fitting.doctrineview', ]); Route::get('/delfittingbyid/{id}', [ 'uses' => 'FittingController@deleteFittingById', - 'middleware' => 'can:fitting.create' + 'middleware' => 'can:fitting.create', ]); Route::get('/doctrine', [ - 'as' => 'cryptafitting::doctrineview', + 'as' => 'cryptafitting::doctrineview', 'uses' => 'FittingController@getDoctrineView', - 'middleware' => 'can:fitting.doctrineview' + 'middleware' => 'can:fitting.doctrineview', ]); Route::get('/fittinglist', [ - 'as' => 'cryptafitting::fitlist', + 'as' => 'cryptafitting::fitlist', 'uses' => 'FittingController@getFittingList', - 'middleware' => 'can:fitting.view' + 'middleware' => 'can:fitting.view', ]); Route::get('/rolelist', [ - 'as' => 'cryptafitting::rolelist', + 'as' => 'cryptafitting::rolelist', 'uses' => 'FittingController@getRoleList', - 'middleware' => 'can:fitting.view' + 'middleware' => 'can:fitting.view', ]); Route::post('/addDoctrine', [ - 'as' => 'cryptafitting::addDoctrine', + 'as' => 'cryptafitting::addDoctrine', 'uses' => 'FittingController@saveDoctrine', - 'middleware' => 'can:fitting.create' + 'middleware' => 'can:fitting.create', ]); Route::get('/getdoctrineedit/{id}', [ - 'as' => 'cryptafitting::getDoctrineEdit', + 'as' => 'cryptafitting::getDoctrineEdit', 'uses' => 'FittingController@getDoctrineEdit', - 'middleware' => 'can:fitting.create' + 'middleware' => 'can:fitting.create', ]); Route::get('/deldoctrinebyid/{id}', [ - 'as' => 'cryptafitting::delDoctrineById', + 'as' => 'cryptafitting::delDoctrineById', 'uses' => 'FittingController@delDoctrineById', - 'middleware' => 'can:fitting.create' + 'middleware' => 'can:fitting.create', ]); Route::get('/doctrineReport', [ - 'as' => 'cryptafitting::doctrinereport', + 'as' => 'cryptafitting::doctrinereport', 'uses' => 'FittingController@viewDoctrineReport', - 'middleware' => 'can:fitting.reportview' + 'middleware' => 'can:fitting.reportview', ]); Route::get('/runReport/{allianceid}/{corpid}/{doctrineid}', [ - 'as' => 'cryptafitting::runreport', + 'as' => 'cryptafitting::runreport', 'uses' => 'FittingController@runReport', - 'middleware' => 'can:fitting.reportview' + 'middleware' => 'can:fitting.reportview', ]); }); }); diff --git a/src/Models/Doctrine.php b/src/Models/Doctrine.php index 499f048..5ec50a4 100644 --- a/src/Models/Doctrine.php +++ b/src/Models/Doctrine.php @@ -4,7 +4,6 @@ use Illuminate\Database\Eloquent\Model; use Seat\Web\Models\Acl\Role; -use CryptaTech\Seat\Fitting\Models\Fitting; class Doctrine extends Model { @@ -23,5 +22,4 @@ public function roles() { return $this->belongsToMany(Role::class, 'seat_doctrine_role'); } - } diff --git a/src/Models/Fitting.php b/src/Models/Fitting.php index b249d79..d723e49 100644 --- a/src/Models/Fitting.php +++ b/src/Models/Fitting.php @@ -12,7 +12,6 @@ class Fitting extends Model protected $fillable = ['id', 'shiptype', 'fitname', 'eftfitting']; - public function doctrines() { diff --git a/src/Validation/DoctrineValidation.php b/src/Validation/DoctrineValidation.php index 72790b1..45f7d79 100644 --- a/src/Validation/DoctrineValidation.php +++ b/src/Validation/DoctrineValidation.php @@ -15,9 +15,7 @@ public function rules() { return [ 'doctrinename' => 'required|string', - 'selectedFits' => 'required|array|min:1' + 'selectedFits' => 'required|array|min:1', ]; } } - -?> diff --git a/src/Validation/FittingValidation.php b/src/Validation/FittingValidation.php index 9c7b19b..d0b1465 100644 --- a/src/Validation/FittingValidation.php +++ b/src/Validation/FittingValidation.php @@ -15,7 +15,7 @@ public function rules() { return [ 'fitSelection' => 'nullable', - 'eftfitting' => 'required' + 'eftfitting' => 'required', ]; } } diff --git a/src/database/migrations/2018_01_08_185014_create_seat-fitting_table.php b/src/database/migrations/2018_01_08_185014_create_seat-fitting_table.php index fdd8a51..3aee009 100644 --- a/src/database/migrations/2018_01_08_185014_create_seat-fitting_table.php +++ b/src/database/migrations/2018_01_08_185014_create_seat-fitting_table.php @@ -1,8 +1,8 @@ 'About', 'fitting' => 'Fitting', - 'settings' => 'Settings' + 'settings' => 'Settings', ]; -