diff --git a/app/Http/Controllers/RankingController.php b/app/Http/Controllers/Admin/RankController.php similarity index 54% rename from app/Http/Controllers/RankingController.php rename to app/Http/Controllers/Admin/RankController.php index e534a3de..b177efbb 100644 --- a/app/Http/Controllers/RankingController.php +++ b/app/Http/Controllers/Admin/RankController.php @@ -1,25 +1,24 @@ rankingRepository = $rankingRepo; + $this->rankRepository = $rankingRepo; } /** @@ -30,11 +29,11 @@ class RankingController extends InfyOmBaseController */ public function index(Request $request) { - $this->rankingRepository->pushCriteria(new RequestCriteria($request)); - $rankings = $this->rankingRepository->all(); + $this->rankRepository->pushCriteria(new RequestCriteria($request)); + $ranks = $this->rankRepository->all(); - return view('admin.rankings.index') - ->with('rankings', $rankings); + return view('admin.ranks.index') + ->with('ranks', $ranks); } /** @@ -44,7 +43,7 @@ class RankingController extends InfyOmBaseController */ public function create() { - return view('admin.rankings.create'); + return view('admin.ranks.create'); } /** @@ -57,12 +56,11 @@ class RankingController extends InfyOmBaseController public function store(CreateRankingRequest $request) { $input = $request->all(); - - $ranking = $this->rankingRepository->create($input); + $rank = $this->rankRepository->create($input); Flash::success('Ranking saved successfully.'); - return redirect(route('admin.rankings.index')); + return redirect(route('admin.ranks.index')); } /** @@ -74,15 +72,14 @@ class RankingController extends InfyOmBaseController */ public function show($id) { - $ranking = $this->rankingRepository->findWithoutFail($id); + $rank = $this->rankRepository->findWithoutFail($id); - if (empty($ranking)) { + if (empty($rank)) { Flash::error('Ranking not found'); - - return redirect(route('admin.rankings.index')); + return redirect(route('admin.ranks.index')); } - return view('admin.rankings.show')->with('ranking', $ranking); + return view('admin.ranks.show')->with('rank', $rank); } /** @@ -94,15 +91,14 @@ class RankingController extends InfyOmBaseController */ public function edit($id) { - $ranking = $this->rankingRepository->findWithoutFail($id); + $rank = $this->rankRepository->findWithoutFail($id); - if (empty($ranking)) { + if (empty($rank)) { Flash::error('Ranking not found'); - - return redirect(route('admin.rankings.index')); + return redirect(route('admin.ranks.index')); } - return view('admin.rankings.edit')->with('ranking', $ranking); + return view('admin.ranks.edit')->with('rank', $rank); } /** @@ -115,19 +111,18 @@ class RankingController extends InfyOmBaseController */ public function update($id, UpdateRankingRequest $request) { - $ranking = $this->rankingRepository->findWithoutFail($id); + $rank = $this->rankRepository->findWithoutFail($id); - if (empty($ranking)) { + if (empty($rank)) { Flash::error('Ranking not found'); - - return redirect(route('admin.rankings.index')); + return redirect(route('admin.ranks.index')); } - $ranking = $this->rankingRepository->update($request->all(), $id); + $rank = $this->rankRepository->update($request->all(), $id); Flash::success('Ranking updated successfully.'); - return redirect(route('admin.rankings.index')); + return redirect(route('admin.ranks.index')); } /** @@ -139,18 +134,17 @@ class RankingController extends InfyOmBaseController */ public function destroy($id) { - $ranking = $this->rankingRepository->findWithoutFail($id); + $rank = $this->rankRepository->findWithoutFail($id); - if (empty($ranking)) { + if (empty($rank)) { Flash::error('Ranking not found'); - - return redirect(route('admin.rankings.index')); + return redirect(route('admin.ranks.index')); } - $this->rankingRepository->delete($id); + $this->rankRepository->delete($id); Flash::success('Ranking deleted successfully.'); - return redirect(route('admin.rankings.index')); + return redirect(route('admin.ranks.index')); } } diff --git a/app/Http/Requests/CreateRankingRequest.php b/app/Http/Requests/CreateRankingRequest.php index b9cb8a40..7c2b33ef 100644 --- a/app/Http/Requests/CreateRankingRequest.php +++ b/app/Http/Requests/CreateRankingRequest.php @@ -3,7 +3,7 @@ namespace App\Http\Requests; use App\Http\Requests\Request; -use App\Models\Ranking; +use App\Models\Rank; class CreateRankingRequest extends Request { @@ -25,6 +25,6 @@ class CreateRankingRequest extends Request */ public function rules() { - return Ranking::$rules; + return Rank::$rules; } } diff --git a/app/Http/Requests/UpdateRankingRequest.php b/app/Http/Requests/UpdateRankingRequest.php index 7d5c7943..7c7971cb 100644 --- a/app/Http/Requests/UpdateRankingRequest.php +++ b/app/Http/Requests/UpdateRankingRequest.php @@ -3,7 +3,7 @@ namespace App\Http\Requests; use App\Http\Requests\Request; -use App\Models\Ranking; +use App\Models\Rank; class UpdateRankingRequest extends Request { @@ -25,6 +25,6 @@ class UpdateRankingRequest extends Request */ public function rules() { - return Ranking::$rules; + return Rank::$rules; } } diff --git a/app/Models/Ranking.php b/app/Models/Rank.php similarity index 90% rename from app/Models/Ranking.php rename to app/Models/Rank.php index d24943ef..e4fb57e0 100644 --- a/app/Models/Ranking.php +++ b/app/Models/Rank.php @@ -8,10 +8,10 @@ use Eloquent as Model; * Class Ranking * @package App\Models */ -class Ranking extends Model +class Rank extends Model { - public $table = 'rankings'; + public $table = 'ranks'; public $fillable = [ 'name', diff --git a/app/Repositories/RankingRepository.php b/app/Repositories/RankRepository.php similarity index 68% rename from app/Repositories/RankingRepository.php rename to app/Repositories/RankRepository.php index a6d649da..063f15d4 100644 --- a/app/Repositories/RankingRepository.php +++ b/app/Repositories/RankRepository.php @@ -2,16 +2,16 @@ namespace App\Repositories; -use App\Models\Ranking; +use App\Models\Rank; use InfyOm\Generator\Common\BaseRepository; -class RankingRepository extends BaseRepository +class RankRepository extends BaseRepository { /** * @var array */ protected $fieldSearchable = [ - + ]; /** @@ -19,6 +19,6 @@ class RankingRepository extends BaseRepository **/ public function model() { - return Ranking::class; + return Rank::class; } } diff --git a/database/migrations/2017_06_08_0000_create_users_table.php b/database/migrations/2017_06_08_0000_create_users_table.php index 3a5ff54e..fe88d606 100755 --- a/database/migrations/2017_06_08_0000_create_users_table.php +++ b/database/migrations/2017_06_08_0000_create_users_table.php @@ -19,6 +19,7 @@ class CreateUsersTable extends Migration $table->string('email')->unique(); $table->string('password'); $table->integer('airline_id')->nullable()->unsigned(); + $table->integer('rank_id')->nullable()->unsigned(); $table->integer('home_airport_id')->nullable()->unsigned(); $table->integer('curr_airport_id')->nullable()->unsigned(); $table->bigInteger('last_pirep_id')->nullable()->unsigned(); diff --git a/database/migrations/2017_06_21_165410_create_rankings_table.php b/database/migrations/2017_06_21_165410_create_ranks_table.php similarity index 56% rename from database/migrations/2017_06_21_165410_create_rankings_table.php rename to database/migrations/2017_06_21_165410_create_ranks_table.php index 99ec6347..9b28849a 100644 --- a/database/migrations/2017_06_21_165410_create_rankings_table.php +++ b/database/migrations/2017_06_21_165410_create_ranks_table.php @@ -3,7 +3,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; -class CreateRankingsTable extends Migration +class CreateRanksTable extends Migration { /** @@ -13,7 +13,7 @@ class CreateRankingsTable extends Migration */ public function up() { - Schema::create('rankings', function (Blueprint $table) { + Schema::create('ranks', function (Blueprint $table) { $table->increments('id'); $table->string('name'); $table->integer('hours')->default(0); @@ -22,6 +22,14 @@ class CreateRankingsTable extends Migration $table->boolean('auto_promote')->default(true); $table->timestamps(); }); + + Schema::create('flight_rank', function(Blueprint $table) { + $table->increments('id'); + $table->integer('flight_id')->unsigned(); + $table->integer('rank_id')->unsigned(); + $table->double('manual_pay', 19, 2)->default(0.0)->unsigned(); + $table->double('acars_pay', 19, 2)->default(0.0)->unsigned(); + }); } /** @@ -31,6 +39,7 @@ class CreateRankingsTable extends Migration */ public function down() { - Schema::drop('rankings'); + Schema::drop('ranks'); + Schema::drop('flight_rank'); } } diff --git a/database/seeds/DevelopmentSeeder.php b/database/seeds/DevelopmentSeeder.php index a0ff9518..657db1fa 100644 --- a/database/seeds/DevelopmentSeeder.php +++ b/database/seeds/DevelopmentSeeder.php @@ -20,7 +20,7 @@ class DevelopmentSeeder extends Seeder return Carbon::now('UTC')->format('Y-m-d H:i:s'); } - protected function seed_from_yaml(): void + protected function seed_from_yaml(): { $time_fields = ['created_at', 'updated_at']; diff --git a/resources/views/admin/menu.blade.php b/resources/views/admin/menu.blade.php index 6355f6f7..04242827 100644 --- a/resources/views/admin/menu.blade.php +++ b/resources/views/admin/menu.blade.php @@ -16,3 +16,4 @@
| Name | -Hours | -Auto Approve Acars | -Auto Approve Manual | -Auto Promote | -Action | - - - @foreach($rankings as $ranking) -
|---|---|---|---|---|---|
| {!! $ranking->name !!} | -{!! $ranking->hours !!} | -{!! $ranking->auto_approve_acars !!} | -{!! $ranking->auto_approve_manual !!} | -{!! $ranking->auto_promote !!} | -- {!! Form::open(['route' => ['admin.rankings.destroy', $ranking->$PRIMARY_KEY_NAME$], 'method' => 'delete']) !!} - - {!! Form::close() !!} - | -
{!! $ranking->id !!}
+{!! $rank->id !!}
{!! $ranking->name !!}
+{!! $rank->name !!}
{!! $ranking->hours !!}
+{!! $rank->hours !!}
{!! $ranking->auto_approve_acars !!}
+{!! $rank->auto_approve_acars !!}
{!! $ranking->auto_approve_manual !!}
+{!! $rank->auto_approve_manual !!}
{!! $ranking->auto_promote !!}
+{!! $rank->auto_promote !!}
{!! $ranking->created_at !!}
+{!! $rank->created_at !!}
{!! $ranking->updated_at !!}
+{!! $rank->updated_at !!}
| Name | +Hours | +Auto Approve Acars | +Auto Approve Manual | +Auto Promote | +Action | + + + @foreach($ranks as $rank) +
|---|---|---|---|---|---|
| {!! $rank->name !!} | +{!! $rank->hours !!} | +{!! $rank->auto_approve_acars !!} | +{!! $rank->auto_approve_manual !!} | +{!! $rank->auto_promote !!} | ++ {!! Form::open(['route' => ['admin.ranks.destroy', $rank->id], 'method' => 'delete']) !!} + + {!! Form::close() !!} + | +