From 4c45d34383ed3ef1276ac9a43425c1587da7b6d5 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Fri, 17 Nov 2017 22:40:16 +0800 Subject: [PATCH] Change projects.jobs route into projects.jobs.index --- app/Entities/Projects/JobPresenter.php | 2 +- app/Http/Controllers/Projects/JobsController.php | 9 +++++++-- resources/views/jobs/add-from-other-project.blade.php | 2 +- resources/views/jobs/create.blade.php | 2 +- resources/views/jobs/edit.blade.php | 2 +- resources/views/jobs/show.blade.php | 2 +- resources/views/projects/jobs/index.blade.php | 8 ++++---- resources/views/projects/partials/nav-tabs.blade.php | 2 +- resources/views/projects/partials/project-stats.blade.php | 6 +++--- routes/web/projects.php | 6 +++--- tests/Feature/ManageJobsTest.php | 15 ++++++++++----- 11 files changed, 33 insertions(+), 23 deletions(-) diff --git a/app/Entities/Projects/JobPresenter.php b/app/Entities/Projects/JobPresenter.php index 95d8f4c..504b3f3 100644 --- a/app/Entities/Projects/JobPresenter.php +++ b/app/Entities/Projects/JobPresenter.php @@ -18,7 +18,7 @@ class JobPresenter extends Presenter public function projectJobsLink() { - return link_to_route('projects.jobs', trans('project.jobs'), [$this->project_id]); + return link_to_route('projects.jobs.index', trans('project.jobs'), [$this->project_id]); } } diff --git a/app/Http/Controllers/Projects/JobsController.php b/app/Http/Controllers/Projects/JobsController.php index 9d0adac..740a41e 100755 --- a/app/Http/Controllers/Projects/JobsController.php +++ b/app/Http/Controllers/Projects/JobsController.php @@ -10,6 +10,11 @@ use App\Http\Requests\Jobs\DeleteRequest; use App\Http\Requests\Jobs\UpdateRequest; use Illuminate\Http\Request; +/** + * Project Jobs Controller + * + * @author Nafies Luthfi + */ class JobsController extends Controller { @@ -57,7 +62,7 @@ class JobsController extends Controller { $this->repo->createJobs($req->except('_token'), $projectId); flash()->success(trans('job.created_from_other_project')); - return redirect()->route('projects.jobs', $projectId); + return redirect()->route('projects.jobs.index', $projectId); } public function show(Request $req, $jobId) @@ -108,7 +113,7 @@ class JobsController extends Controller flash()->error(trans('job.undeleted')); } - return redirect()->route('projects.jobs', $projectId); + return redirect()->route('projects.jobs.index', $projectId); } public function tasksReorder(Request $req, $jobId) diff --git a/resources/views/jobs/add-from-other-project.blade.php b/resources/views/jobs/add-from-other-project.blade.php index c0801ad..eeda08b 100755 --- a/resources/views/jobs/add-from-other-project.blade.php +++ b/resources/views/jobs/add-from-other-project.blade.php @@ -52,7 +52,7 @@
- {!! link_to_route('projects.jobs', trans('app.cancel'), [$project->id], ['class'=>'btn btn-default']) !!} + {!! link_to_route('projects.jobs.index', trans('app.cancel'), [$project->id], ['class'=>'btn btn-default']) !!}
diff --git a/resources/views/jobs/create.blade.php b/resources/views/jobs/create.blade.php index 44a6c58..7a219c9 100755 --- a/resources/views/jobs/create.blade.php +++ b/resources/views/jobs/create.blade.php @@ -28,7 +28,7 @@
{!! Form::submit(trans('job.create'), ['class'=>'btn btn-primary']) !!} - {!! link_to_route('projects.jobs', trans('app.cancel'), [$project->id], ['class'=>'btn btn-default']) !!} + {!! link_to_route('projects.jobs.index', trans('app.cancel'), [$project->id], ['class'=>'btn btn-default']) !!}
{!! Form::close() !!} diff --git a/resources/views/jobs/edit.blade.php b/resources/views/jobs/edit.blade.php index ba5f1ac..c5a187a 100755 --- a/resources/views/jobs/edit.blade.php +++ b/resources/views/jobs/edit.blade.php @@ -28,7 +28,7 @@ {!! Form::hidden('project_id', $job->project_id) !!} {!! Form::submit(trans('job.update'), ['class'=>'btn btn-primary']) !!} {!! link_to_route('jobs.show', trans('app.show'), [$job->id], ['class' => 'btn btn-info']) !!} - {!! link_to_route('projects.jobs', trans('job.back_to_index'), [$job->project_id], ['class' => 'btn btn-default']) !!} + {!! link_to_route('projects.jobs.index', trans('job.back_to_index'), [$job->project_id], ['class' => 'btn btn-default']) !!} {!! link_to_route('jobs.delete', trans('job.delete'), [$job->id], ['class'=>'btn btn-danger pull-right']) !!} diff --git a/resources/views/jobs/show.blade.php b/resources/views/jobs/show.blade.php index 078c1bd..dac68c6 100755 --- a/resources/views/jobs/show.blade.php +++ b/resources/views/jobs/show.blade.php @@ -9,7 +9,7 @@
{!! html_link_to_route('jobs.create', trans('job.create'), [$job->project_id], ['class' => 'btn btn-success','icon' => 'plus']) !!} {!! link_to_route('jobs.edit', trans('job.edit'), [$job->id], ['class' => 'btn btn-warning']) !!} - {!! link_to_route('projects.jobs', trans('job.back_to_index'), [$job->project_id, '#' . $job->id], ['class' => 'btn btn-default']) !!} + {!! link_to_route('projects.jobs.index', trans('job.back_to_index'), [$job->project_id, '#' . $job->id], ['class' => 'btn btn-default']) !!}
{{ $job->name }} {{ trans('job.show') }} diff --git a/resources/views/projects/jobs/index.blade.php b/resources/views/projects/jobs/index.blade.php index ca8d1f1..5cdd445 100755 --- a/resources/views/projects/jobs/index.blade.php +++ b/resources/views/projects/jobs/index.blade.php @@ -21,9 +21,9 @@
@if (request('action') == 'sort_jobs') - {{ link_to_route('projects.jobs', trans('app.done'), [$project->id], ['class' => 'btn btn-default btn-xs pull-right', 'style' => 'margin-top: -2px; margin-left: 6px; margin-right: -8px']) }} + {{ link_to_route('projects.jobs.index', trans('app.done'), [$project->id], ['class' => 'btn btn-default btn-xs pull-right', 'style' => 'margin-top: -2px; margin-left: 6px; margin-right: -8px']) }} @else - {{ link_to_route('projects.jobs', trans('project.sort_jobs'), [$project->id, 'action' => 'sort_jobs', '#project-jobs'], ['class' => 'btn btn-default btn-xs pull-right', 'style' => 'margin-top: -2px; margin-left: 6px; margin-right: -8px']) }} + {{ link_to_route('projects.jobs.index', trans('project.sort_jobs'), [$project->id, 'action' => 'sort_jobs', '#project-jobs'], ['class' => 'btn btn-default btn-xs pull-right', 'style' => 'margin-top: -2px; margin-left: 6px; margin-right: -8px']) }} {!! link_to_route('projects.jobs-export', trans('project.jobs_export_html'), [$project->id, 'html', 'job_type' => $key], ['class' => '','target' => '_blank']) !!} | {!! link_to_route('projects.jobs-export', trans('project.jobs_export_excel'), [$project->id, 'excel', 'job_type' => $key], ['class' => '']) !!} | @@ -86,9 +86,9 @@ {{ formatRp($groupedJobs->sum('price')) }} @if (request('action') == 'sort_jobs') - {{ link_to_route('projects.jobs', trans('app.done'), [$project->id], ['class' => 'btn btn-default btn-xs pull-right']) }} + {{ link_to_route('projects.jobs.index', trans('app.done'), [$project->id], ['class' => 'btn btn-default btn-xs pull-right']) }} @else - {{ link_to_route('projects.jobs', trans('project.sort_jobs'), [$project->id, 'action' => 'sort_jobs', '#project-jobs'], ['class' => 'btn btn-default btn-xs pull-right']) }} + {{ link_to_route('projects.jobs.index', trans('project.sort_jobs'), [$project->id, 'action' => 'sort_jobs', '#project-jobs'], ['class' => 'btn btn-default btn-xs pull-right']) }} @endif diff --git a/resources/views/projects/partials/nav-tabs.blade.php b/resources/views/projects/partials/nav-tabs.blade.php index 50181ef..830c59c 100644 --- a/resources/views/projects/partials/nav-tabs.blade.php +++ b/resources/views/projects/partials/nav-tabs.blade.php @@ -4,7 +4,7 @@ {!! link_to_route('projects.show', trans('project.show'), [$project->id]) !!}
  • - {!! link_to_route('projects.jobs', trans('project.jobs').' ('.$project->jobs->count().')', [$project->id]) !!} + {!! link_to_route('projects.jobs.index', trans('project.jobs').' ('.$project->jobs->count().')', [$project->id]) !!}
  • {!! link_to_route('projects.payments', trans('project.payments').' ('.$project->payments->count().')', [$project->id]) !!} diff --git a/resources/views/projects/partials/project-stats.blade.php b/resources/views/projects/partials/project-stats.blade.php index fa58046..1147b2e 100644 --- a/resources/views/projects/partials/project-stats.blade.php +++ b/resources/views/projects/partials/project-stats.blade.php @@ -1,6 +1,6 @@
    - +
    @@ -15,7 +15,7 @@
    - +
    @@ -30,7 +30,7 @@
    - +
    diff --git a/routes/web/projects.php b/routes/web/projects.php index 5e06098..f573114 100644 --- a/routes/web/projects.php +++ b/routes/web/projects.php @@ -7,7 +7,6 @@ Route::group(['middleware' => ['web', 'auth'], 'namespace' => 'Projects'], funct Route::get('projects/{id}/delete', ['as' => 'projects.delete', 'uses' => 'ProjectsController@delete']); Route::get('projects/{id}/jobs-export/{type?}', ['as' => 'projects.jobs-export', 'uses' => 'ProjectsController@jobsExport']); Route::get('projects/{id}/subscriptions', ['as' => 'projects.subscriptions', 'uses' => 'ProjectsController@subscriptions']); - Route::post('projects/{id}/jobs-reorder', ['as' => 'projects.jobs-reorder', 'uses' => 'ProjectsController@jobsReorder']); Route::patch('projects/{id}/status-update', ['as' => 'projects.status-update', 'uses' => 'ProjectsController@statusUpdate']); Route::resource('projects', 'ProjectsController'); @@ -32,11 +31,12 @@ Route::group(['middleware' => ['web', 'auth'], 'namespace' => 'Projects'], funct */ Route::get('projects/{id}/jobs/create', ['as' => 'jobs.create', 'uses' => 'JobsController@create']); Route::get('projects/{id}/jobs/add-from-other-project', ['as' => 'jobs.add-from-other-project', 'uses' => 'JobsController@addFromOtherProject']); - Route::post('jobs/{id}/tasks-reorder', ['as' => 'jobs.tasks-reorder', 'uses' => 'JobsController@tasksReorder']); Route::post('projects/{id}/jobs', ['as' => 'jobs.store', 'uses' => 'JobsController@store']); Route::post('projects/{id}/jobs/store-from-other-project', ['as' => 'jobs.store-from-other-project', 'uses' => 'JobsController@storeFromOtherProject']); Route::get('jobs/{id}/delete', ['as' => 'jobs.delete', 'uses' => 'JobsController@delete']); - Route::get('projects/{project}/jobs', ['as' => 'projects.jobs', 'uses' => 'JobsController@index']); + Route::post('jobs/{id}/tasks-reorder', ['as' => 'jobs.tasks-reorder', 'uses' => 'JobsController@tasksReorder']); + Route::get('projects/{project}/jobs', ['as' => 'projects.jobs.index', 'uses' => 'JobsController@index']); + Route::post('projects/{id}/jobs-reorder', ['as' => 'projects.jobs-reorder', 'uses' => 'ProjectsController@jobsReorder']); Route::resource('jobs', 'JobsController', ['except' => ['index', 'create', 'store']]); /** diff --git a/tests/Feature/ManageJobsTest.php b/tests/Feature/ManageJobsTest.php index 70dd4be..8ed0044 100644 --- a/tests/Feature/ManageJobsTest.php +++ b/tests/Feature/ManageJobsTest.php @@ -9,6 +9,11 @@ use App\Entities\Projects\Task; use App\Entities\Users\User; use Tests\TestCase; +/** + * Manage Project Feature Test + * + * @author Nafies Luthfi + */ class ManageJobsTest extends TestCase { /** @test */ @@ -21,7 +26,7 @@ class ManageJobsTest extends TestCase $worker = $this->createUser(); - $this->visit(route('projects.jobs', $project->id)); + $this->visit(route('projects.jobs.index', $project->id)); $this->click(trans('job.create')); $this->seePageIs(route('jobs.create', $project->id)); @@ -98,7 +103,7 @@ class ManageJobsTest extends TestCase $this->click(trans('job.delete')); $this->press(trans('app.delete_confirm_button')); - $this->seePageIs(route('projects.jobs', $project->id)); + $this->seePageIs(route('projects.jobs.index', $project->id)); $this->see(trans('job.deleted')); @@ -121,7 +126,7 @@ class ManageJobsTest extends TestCase $project = factory(Project::class)->create(); $job = factory(Job::class)->create(['project_id' => $project->id, 'type_id' => 1]); - $this->visit(route('projects.jobs', $project->id)); + $this->visit(route('projects.jobs.index', $project->id)); $this->click('show-job-'.$job->id); $this->seePageIs(route('jobs.show', $project->id)); $this->see(trans('job.show')); @@ -140,7 +145,7 @@ class ManageJobsTest extends TestCase $tasks1 = factory(Task::class, 3)->create(['job_id' => $jobs[0]->id]); $tasks2 = factory(Task::class, 3)->create(['job_id' => $jobs[1]->id]); - $this->visit(route('projects.jobs', $projects[1]->id)); + $this->visit(route('projects.jobs.index', $projects[1]->id)); $this->click(trans('job.add_from_other_project')); $this->seePageIs(route('jobs.add-from-other-project', $projects[1]->id)); @@ -160,7 +165,7 @@ class ManageJobsTest extends TestCase $form[$jobs[1]->id.'_task_ids'][$tasks2[2]->id]->tick(); $this->makeRequestUsingForm($form); - $this->seePageIs(route('projects.jobs', $projects[1]->id)); + $this->seePageIs(route('projects.jobs.index', $projects[1]->id)); $this->see(trans('job.created_from_other_project'));