diff --git a/.idea/xtextAutoBuilderState.xml b/.idea/xtextAutoBuilderState.xml index f8f33682..7e7285fa 100644 --- a/.idea/xtextAutoBuilderState.xml +++ b/.idea/xtextAutoBuilderState.xml @@ -3,6 +3,6 @@ xtend;xtext rO0ABXNyADtvcmcuZWNsaXBzZS54dGV4dC5yZXNvdXJjZS5pbXBsLkNodW5rZWRSZXNvdXJjZURlc2NyaXB0aW9uc4nX+GBmyGixDAAAeHB3BAAAAAB4 - rO0ABXNyABFqYXZhLnV0aWwuSGFzaE1hcAUH2sHDFmDRAwACRgAKbG9hZEZhY3RvckkACXRocmVzaG9sZHhwP0AAAAAAAAx3CAAAABAAAAAAeA== + rO0ABXNyABFqYXZhLnV0aWwuSGFzaE1hcAUH2sHDFmDRAwACRgAKbG9hZEZhY3RvckkACXRocmVzaG9sZHhwP0AAAAAAAAB3CAAAABAAAAAAeA== \ No newline at end of file diff --git a/app/Http/Controllers/Admin/RankController.php b/app/Http/Controllers/Admin/RankController.php index b177efbb..559be564 100644 --- a/app/Http/Controllers/Admin/RankController.php +++ b/app/Http/Controllers/Admin/RankController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers\Admin; -use App\Http\Requests\CreateRankingRequest; -use App\Http\Requests\UpdateRankingRequest; +use App\Http\Requests\CreateRankRequest; +use App\Http\Requests\UpdateRankRequest; use App\Repositories\RankRepository; use App\Http\Controllers\AppBaseController as InfyOmBaseController; use Illuminate\Http\Request; @@ -49,18 +49,20 @@ class RankController extends BaseController /** * Store a newly created Ranking in storage. * - * @param CreateRankingRequest $request + * @param CreateRankRequest $request * * @return Response */ - public function store(CreateRankingRequest $request) + public function store(Request $request) { $input = $request->all(); - $rank = $this->rankRepository->create($input); + $model = $this->rankRepository->create($input); Flash::success('Ranking saved successfully.'); - return redirect(route('admin.ranks.index')); + $ranks = $this->rankRepository->all(); + return view('admin.ranks.table') + ->with('ranks', $ranks); } /** @@ -105,11 +107,11 @@ class RankController extends BaseController * Update the specified Ranking in storage. * * @param int $id - * @param UpdateRankingRequest $request + * @param UpdateRankRequest $request * * @return Response */ - public function update($id, UpdateRankingRequest $request) + public function update($id, UpdateRankRequest $request) { $rank = $this->rankRepository->findWithoutFail($id); diff --git a/app/Http/Requests/CreateRankingRequest.php b/app/Http/Requests/CreateRankRequest.php similarity index 91% rename from app/Http/Requests/CreateRankingRequest.php rename to app/Http/Requests/CreateRankRequest.php index 7c2b33ef..fb11fa7d 100644 --- a/app/Http/Requests/CreateRankingRequest.php +++ b/app/Http/Requests/CreateRankRequest.php @@ -5,7 +5,7 @@ namespace App\Http\Requests; use App\Http\Requests\Request; use App\Models\Rank; -class CreateRankingRequest extends Request +class CreateRankRequest extends Request { /** diff --git a/app/Http/Requests/UpdateRankingRequest.php b/app/Http/Requests/UpdateRankRequest.php similarity index 91% rename from app/Http/Requests/UpdateRankingRequest.php rename to app/Http/Requests/UpdateRankRequest.php index 7c7971cb..fb0a7462 100644 --- a/app/Http/Requests/UpdateRankingRequest.php +++ b/app/Http/Requests/UpdateRankRequest.php @@ -5,7 +5,7 @@ namespace App\Http\Requests; use App\Http\Requests\Request; use App\Models\Rank; -class UpdateRankingRequest extends Request +class UpdateRankRequest extends Request { /** diff --git a/app/Models/Rank.php b/app/Models/Rank.php index e4fb57e0..1ddc1083 100644 --- a/app/Models/Rank.php +++ b/app/Models/Rank.php @@ -28,7 +28,10 @@ class Rank extends Model */ protected $casts = [ 'name' => 'string', - 'hours' => 'integer' + 'hours' => 'integer', + 'auto_approve_acars' => 'boolean', + 'auto_approve_manual' => 'boolean', + 'auto_promote' => 'boolean', ]; /** @@ -37,6 +40,6 @@ class Rank extends Model * @var array */ public static $rules = [ - + 'name' => 'unique', ]; } diff --git a/composer.lock b/composer.lock index 799b3ecd..2a886bfe 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "aceb14d1910187737873cd904aec5630", + "content-hash": "abd8dd8b12ea7f677c5bf93da12e0948", "packages": [ { "name": "anlutro/l4-settings", @@ -1553,16 +1553,16 @@ }, { "name": "maatwebsite/excel", - "version": "2.1.17", + "version": "2.1.18", "source": { "type": "git", "url": "https://github.com/Maatwebsite/Laravel-Excel.git", - "reference": "14d5abf8e20563c80dd074fd7c8cf1c05bf51f1d" + "reference": "a43db59e621e8e8d72321e885d1610509cc7b096" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/14d5abf8e20563c80dd074fd7c8cf1c05bf51f1d", - "reference": "14d5abf8e20563c80dd074fd7c8cf1c05bf51f1d", + "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/a43db59e621e8e8d72321e885d1610509cc7b096", + "reference": "a43db59e621e8e8d72321e885d1610509cc7b096", "shasum": "" }, "require": { @@ -1589,6 +1589,16 @@ "illuminate/view": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*" }, "type": "library", + "extra": { + "laravel": { + "providers": [ + "Maatwebsite\\Excel\\ExcelServiceProvider" + ], + "aliases": { + "Excel": "Maatwebsite\\Excel\\Facades\\Excel" + } + } + }, "autoload": { "classmap": [ "src/Maatwebsite/Excel" @@ -1617,7 +1627,7 @@ "import", "laravel" ], - "time": "2017-04-04T18:28:12+00:00" + "time": "2017-06-21T20:39:34+00:00" }, { "name": "monolog/monolog", @@ -4238,46 +4248,6 @@ } ], "packages-dev": [ - { - "name": "bpocallaghan/generators", - "version": "4.0.9", - "source": { - "type": "git", - "url": "https://github.com/bpocallaghan/generators.git", - "reference": "53b7e42bcda2409996bb611e3893335d42509830" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/bpocallaghan/generators/zipball/53b7e42bcda2409996bb611e3893335d42509830", - "reference": "53b7e42bcda2409996bb611e3893335d42509830", - "shasum": "" - }, - "require": { - "php": ">=5.4.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Bpocallaghan\\Generators\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Ben-Piet O'Callaghan", - "email": "bpocallaghan@gmail.com" - } - ], - "description": "Custom Laravel 5 File Generators with config and publishable stubs.", - "keywords": [ - "generators", - "laravel" - ], - "time": "2017-05-15T11:04:00+00:00" - }, { "name": "doctrine/instantiator", "version": "1.0.5", diff --git a/database/migrations/2017_06_21_165410_create_ranks_table.php b/database/migrations/2017_06_21_165410_create_ranks_table.php index 9b28849a..f99c40fc 100644 --- a/database/migrations/2017_06_21_165410_create_ranks_table.php +++ b/database/migrations/2017_06_21_165410_create_ranks_table.php @@ -17,10 +17,12 @@ class CreateRanksTable extends Migration $table->increments('id'); $table->string('name'); $table->integer('hours')->default(0); - $table->boolean('auto_approval_acars')->default(false); - $table->boolean('auto_approval_manual')->default(false); + $table->boolean('auto_approve_acars')->default(false); + $table->boolean('auto_approve_manual')->default(false); $table->boolean('auto_promote')->default(true); $table->timestamps(); + + $table->unique('name'); }); Schema::create('flight_rank', function(Blueprint $table) { diff --git a/phpvms.iml b/phpvms.iml index 89de5f16..eaeb0baf 100644 --- a/phpvms.iml +++ b/phpvms.iml @@ -3,7 +3,6 @@ - @@ -32,7 +31,6 @@ - @@ -48,7 +46,6 @@ - diff --git a/resources/views/admin/ranks/create.blade.php b/resources/views/admin/ranks/create.blade.php index 75535c54..06def6a9 100644 --- a/resources/views/admin/ranks/create.blade.php +++ b/resources/views/admin/ranks/create.blade.php @@ -7,7 +7,7 @@
- {!! Form::open(['route' => 'admin.ranks.store', 'class' => 'add_rank']) !!} + {!! Form::open(['route' => 'admin.ranks.store', 'class' => 'add_rank', 'method'=>'POST']) !!} @include('admin.ranks.fields') diff --git a/resources/views/admin/ranks/index.blade.php b/resources/views/admin/ranks/index.blade.php index aea51e1f..64c5bbd5 100644 --- a/resources/views/admin/ranks/index.blade.php +++ b/resources/views/admin/ranks/index.blade.php @@ -19,12 +19,11 @@
-
- @include('admin.ranks.create') -
+ + @include('admin.ranks.create') @endsection - +@section('scripts') diff --git a/resources/views/admin/ranks/table.blade.php b/resources/views/admin/ranks/table.blade.php index 02c16f24..d2ef698c 100644 --- a/resources/views/admin/ranks/table.blade.php +++ b/resources/views/admin/ranks/table.blade.php @@ -1,33 +1,35 @@ - - - - - - - - - - - @foreach($ranks as $rank) - - - - - - - - - @endforeach - -
NameHoursAuto Approve AcarsAuto Approve ManualAuto PromoteAction
{!! $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::button('', ['type' => 'submit', 'class' => 'btn btn-danger btn-xs', 'onclick' => "return confirm('Are you sure?')"]) !!} -
- {!! Form::close() !!} -
+
+ + + + + + + + + + + @foreach($ranks as $rank) + + + + + + + + + @endforeach + +
NameHoursAuto Approve AcarsAuto Approve ManualAuto PromoteAction
{!! $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::button('', ['type' => 'submit', 'class' => 'btn btn-danger btn-xs', 'onclick' => "return confirm('Are you sure?')"]) !!} +
+ {!! Form::close() !!} +
+
diff --git a/routes/web.php b/routes/web.php index 2c05d70f..7ecd4e0c 100755 --- a/routes/web.php +++ b/routes/web.php @@ -3,7 +3,6 @@ Route::get('/', 'HomeController@index'); Route::get('/home', 'HomeController@index'); - /** * These are only visible to a logged in user */