From 9387a3e4e6d128d3d1f548edff17e317320b45dc Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Tue, 20 Mar 2018 17:23:58 +0800 Subject: [PATCH] Update job views and remove unused scripts Update add job from other project page to use lang Use __() helper instead of trans() Update link_to_route parameters --- resources/lang/en/job.php | 2 + resources/lang/id/job.php | 2 + .../views/jobs/add-from-other-project.blade.php | 44 +++++++--------------- resources/views/jobs/create.blade.php | 22 +++++------ resources/views/jobs/delete.blade.php | 16 ++++---- resources/views/jobs/edit.blade.php | 24 ++++++------ resources/views/jobs/partials/breadcrumb.blade.php | 2 +- resources/views/jobs/partials/job-show.blade.php | 14 +++---- .../jobs/partials/job-tasks-operation.blade.php | 42 ++++++++++----------- resources/views/jobs/partials/job-tasks.blade.php | 28 +++++++------- resources/views/jobs/show.blade.php | 10 ++--- resources/views/jobs/unfinished.blade.php | 26 ++++++------- tests/Feature/ManageJobsTest.php | 2 +- 13 files changed, 111 insertions(+), 123 deletions(-) diff --git a/resources/lang/en/job.php b/resources/lang/en/job.php index 5312984..c5bd9e3 100644 --- a/resources/lang/en/job.php +++ b/resources/lang/en/job.php @@ -17,6 +17,7 @@ return [ // Actions 'create' => 'Create new Job', + 'add' => 'Add Jobs', 'created' => 'New Job has been created.', 'show' => 'View Job Detail', 'edit' => 'Edit Job', @@ -26,6 +27,7 @@ return [ 'deleted' => 'Job has been deleted.', 'undeleted' => 'Job not deleted.', 'add_from_other_project' => 'Add Job from another Project', + 'select_project' => 'Select a project.', 'sort_tasks' => 'Sort Task Priority', // Attributes diff --git a/resources/lang/id/job.php b/resources/lang/id/job.php index 4973285..b47dfcf 100644 --- a/resources/lang/id/job.php +++ b/resources/lang/id/job.php @@ -26,10 +26,12 @@ return [ 'deleted' => 'Hapus data Job telah berhasil.', 'undeleted' => 'Data Job gagal dihapus.', 'add_from_other_project' => 'Tambah Job dari Project Lain', + 'select_project' => 'Pilih salah satu project.', 'sort_tasks' => 'Urutkan Prioritas Task', // Attributes 'name' => 'Nama Job', + 'add' => 'Tambahkan Job', 'description' => 'Deskripsi', 'progress' => 'Progress', 'worker' => 'Pekerja', diff --git a/resources/views/jobs/add-from-other-project.blade.php b/resources/views/jobs/add-from-other-project.blade.php index f64b006..5d07c90 100755 --- a/resources/views/jobs/add-from-other-project.blade.php +++ b/resources/views/jobs/add-from-other-project.blade.php @@ -1,24 +1,24 @@ @extends('layouts.app') -@section('title', trans('job.add_from_other_project') . ' | ' . $project->name) +@section('title', __('job.add_from_other_project').' | '.$project->name) @section('content') -@include('projects.partials.breadcrumb',['title' => trans('job.add_from_other_project')]) +@include('projects.partials.breadcrumb',['title' => __('job.add_from_other_project')])
-

{{ trans('job.add_from_other_project') }}

+

{{ __('job.add_from_other_project') }}

- {!! Form::open(['method'=>'get']) !!} + {!! Form::open(['method' => 'get']) !!}
- +
{!! Form::select('project_id', $projects, request('project_id'), [ - 'class' => 'form-control customer-select', - 'placeholder' => '-- Pilih Project --' + 'class' => 'form-control customer-select', + 'placeholder' => '-- '.__('project.select').' --' ]) !!} - +
{!! Form::close() !!} @@ -28,31 +28,31 @@ @forelse($selectedProject->jobs as $key => $job)
    • @foreach($job->tasks as $task)
      • @endforeach
    • @empty -
  • Tidak ada fitur
    • +
  • {{ __('job.not_found') }}
    • @endforelse @else -
    Pilih salah satu project
    +
    {{ __('job.select_project') }}
    @endif - {!! Form::submit(trans('job.create'), ['class'=>'btn btn-primary']) !!} + {!! Form::submit(__('job.add'), ['class' => 'btn btn-primary']) !!} {!! Form::close() !!}
    - {!! link_to_route('projects.jobs.index', trans('app.cancel'), [$project->id], ['class'=>'btn btn-default']) !!} + {{ link_to_route('projects.jobs.index', __('app.cancel'), [$project], ['class' => 'btn btn-default']) }}
    @@ -61,19 +61,3 @@
    @endsection - -@section('ext_js') - {!! Html::script(url('assets/js/plugins/autoNumeric.min.js')) !!} -@endsection - -@section('script') - -@endsection diff --git a/resources/views/jobs/create.blade.php b/resources/views/jobs/create.blade.php index 335ce70..7eb7e0d 100755 --- a/resources/views/jobs/create.blade.php +++ b/resources/views/jobs/create.blade.php @@ -1,38 +1,38 @@ @extends('layouts.app') -@section('title', trans('job.create')) +@section('title', __('job.create')) @section('content') -@include('projects.partials.breadcrumb', ['title' => trans('job.create')]) +@include('projects.partials.breadcrumb', ['title' => __('job.create')])
    {!! Form::open(['route' => ['projects.jobs.store', $project->id]]) !!}
    -

    {{ trans('job.create') }}

    +

    {{ __('job.create') }}

    - {!! FormField::text('name', ['label' => trans('job.name')]) !!} + {!! FormField::text('name', ['label' => __('job.name')]) !!}
    {!! FormField::price('price', [ - 'label' => trans('job.price'), + 'label' => __('job.price'), 'currency' => Option::get('money_sign', 'Rp'), - 'value' => 0, + 'value' => 0, ]) !!}
    - {!! FormField::select('worker_id', $workers, ['label' => trans('job.worker'), 'value' => 1]) !!} + {!! FormField::select('worker_id', $workers, ['label' => __('job.worker'), 'value' => 1]) !!}
    - {!! FormField::radios('type_id', [1 => trans('job.main'), trans('job.additional')], ['value' => 1, 'label' => trans('job.type'), 'list_style' => 'unstyled']) !!} + {!! FormField::radios('type_id', [1 => __('job.main'), __('job.additional')], ['value' => 1, 'label' => __('job.type'), 'list_style' => 'unstyled']) !!}
    - {!! FormField::textarea('description', ['label' => trans('job.description')]) !!} + {!! FormField::textarea('description', ['label' => __('job.description')]) !!}
    - {!! Form::submit(trans('job.create'), ['class' => 'btn btn-primary']) !!} - {!! link_to_route('projects.jobs.index', trans('app.cancel'), [$project->id], ['class' => 'btn btn-default']) !!} + {!! Form::submit(__('job.create'), ['class' => 'btn btn-primary']) !!} + {{ link_to_route('projects.jobs.index', __('app.cancel'), [$project], ['class' => 'btn btn-default']) }}
    {!! Form::close() !!} diff --git a/resources/views/jobs/delete.blade.php b/resources/views/jobs/delete.blade.php index 4802dd5..f90cce8 100755 --- a/resources/views/jobs/delete.blade.php +++ b/resources/views/jobs/delete.blade.php @@ -1,21 +1,21 @@ @extends('layouts.app') -@section('title', trans('job.delete')) +@section('title', __('job.delete')) @section('content')

    {!! FormField::delete([ - 'route'=>['jobs.destroy',$job->id]], - trans('app.delete_confirm_button'), - ['class'=>'btn btn-danger'], + 'route' => ['jobs.destroy', $job]], + __('app.delete_confirm_button'), + ['class' => 'btn btn-danger'], [ - 'job_id'=>$job->id, - 'project_id'=>$job->project_id, + 'job_id' => $job->id, + 'project_id' => $job->project_id, ]) !!}
    - {{ trans('app.delete_confirm') }} - {!! link_to_route('jobs.show', trans('app.cancel'), [$job->id], ['class' => 'btn btn-default']) !!} + {{ __('app.delete_confirm') }} + {{link_to_route('jobs.show', __('app.cancel'), [$job], ['class' => 'btn btn-default']) }}

    diff --git a/resources/views/jobs/edit.blade.php b/resources/views/jobs/edit.blade.php index 71b3d2b..291b138 100755 --- a/resources/views/jobs/edit.blade.php +++ b/resources/views/jobs/edit.blade.php @@ -1,35 +1,35 @@ @extends('layouts.app') -@section('title', trans('job.edit')) +@section('title', __('job.edit')) @section('content')

    - {!! Form::model($job, ['route' =>['jobs.update', $job->id], 'method' => 'patch']) !!} + {!! Form::model($job, ['route' => ['jobs.update', $job], 'method' => 'patch']) !!}
    -

    {{ $job->name }} {{ trans('job.edit') }}

    +

    {{ $job->name }} {{ __('job.edit') }}

    - {!! FormField::text('name', ['label' => trans('job.name')]) !!} + {!! FormField::text('name', ['label' => __('job.name')]) !!}
    - {!! FormField::price('price', ['label' => trans('job.price'), 'currency' => Option::get('money_sign', 'Rp')]) !!} + {!! FormField::price('price', ['label' => __('job.price'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
    - {!! FormField::select('worker_id', $workers, ['label' => trans('job.worker')]) !!} + {!! FormField::select('worker_id', $workers, ['label' => __('job.worker')]) !!}
    - {!! FormField::radios('type_id', [1 => trans('job.main'), trans('job.additional')], ['value' => 1, 'label' => trans('job.type'), 'list_style' => 'unstyled']) !!} + {!! FormField::radios('type_id', [1 => __('job.main'), __('job.additional')], ['value' => 1, 'label' => __('job.type'), 'list_style' => 'unstyled']) !!}
    - {!! FormField::textarea('description', ['label' => trans('job.description')]) !!} + {!! FormField::textarea('description', ['label' => __('job.description')]) !!}
    {!! 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.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']) !!} + {!! Form::submit(__('job.update'), ['class' => 'btn btn-primary']) !!} + {{ link_to_route('jobs.show', __('app.show'), [$job], ['class' => 'btn btn-info']) }} + {{ link_to_route('projects.jobs.index', __('job.back_to_index'), [$job->project_id], ['class' => 'btn btn-default']) }} + {{ link_to_route('jobs.delete', __('job.delete'), [$job], ['class' => 'btn btn-danger pull-right']) }}
    {!! Form::close() !!} diff --git a/resources/views/jobs/partials/breadcrumb.blade.php b/resources/views/jobs/partials/breadcrumb.blade.php index 0c2d6b3..abb4f8e 100644 --- a/resources/views/jobs/partials/breadcrumb.blade.php +++ b/resources/views/jobs/partials/breadcrumb.blade.php @@ -1,5 +1,5 @@
      -
    • {{ link_to_route('projects.index',trans('project.projects')) }}
      • +
    • {{ link_to_route('projects.index', __('project.projects')) }}
    • {{ $job->present()->projectLink }}
    • {{ $job->present()->projectJobsLink }}
    • {{ isset($title) ? $title : $job->name }}
      • diff --git a/resources/views/jobs/partials/job-show.blade.php b/resources/views/jobs/partials/job-show.blade.php index aceee15..cd52b6b 100644 --- a/resources/views/jobs/partials/job-show.blade.php +++ b/resources/views/jobs/partials/job-show.blade.php @@ -1,15 +1,15 @@
      -

      {{ trans('job.detail') }}

      +

      {{ __('job.detail') }}

      - - + + @can('see-pricings', $job) - + @endcan - - - + + +
      {{ trans('job.name') }}{{ $job->name }}
      {{ trans('job.type') }}{{ $job->type() }}
      {{ __('job.name') }}{{ $job->name }}
      {{ __('job.type') }}{{ $job->type() }}
      {{ trans('job.price') }}{{ formatRp($job->price) }}
      {{ __('job.price') }}{{ formatRp($job->price) }}
      {{ trans('job.progress') }}{{ formatDecimal($job->tasks->avg('progress')) }}%
      {{ trans('job.worker') }}{{ $job->worker->name }}
      {{ trans('job.description') }}{!! nl2br($job->description) !!}
      {{ __('job.progress') }}{{ formatDecimal($job->tasks->avg('progress')) }}%
      {{ __('job.worker') }}{{ $job->worker->name }}
      {{ __('job.description') }}{!! nl2br($job->description) !!}
      diff --git a/resources/views/jobs/partials/job-tasks-operation.blade.php b/resources/views/jobs/partials/job-tasks-operation.blade.php index d4a868d..05304f2 100644 --- a/resources/views/jobs/partials/job-tasks-operation.blade.php +++ b/resources/views/jobs/partials/job-tasks-operation.blade.php @@ -2,12 +2,12 @@ @can('create', new App\Entities\Projects\Task) {!! Form::open(['route' => ['tasks.store', $job->id]])!!}
      -

      {{ trans('task.create') }}

      +

      {{ __('task.create') }}

      -
      {!! FormField::text('name', ['label' => trans('task.name')]) !!}
      +
      {!! FormField::text('name', ['label' => __('task.name')]) !!}
      - {!! Form::label('progress', trans('task.progress'), ['class' => 'control-label']) !!} + {!! Form::label('progress', __('task.progress'), ['class' => 'control-label']) !!} {!! Form::input('range', 'progress', 0, [ 'min' => '0', 'max' => '100', 'step' => '10', ]) !!} @@ -16,8 +16,8 @@ 0%
      - {!! FormField::textarea('description', ['label' => trans('task.description')]) !!} - {!! Form::submit(trans('task.create'), ['class' => 'btn btn-primary']) !!} + {!! FormField::textarea('description', ['label' => __('task.description')]) !!} + {!! Form::submit(__('task.create'), ['class' => 'btn btn-primary']) !!} {!! Form::close() !!}
      @@ -26,14 +26,14 @@ @if (Request::get('action') == 'task_edit' && $editableTask) @can('update', $editableTask) -{!! Form::model($editableTask, ['route' => ['tasks.update', $editableTask->id],'method' => 'patch'])!!} +{!! Form::model($editableTask, ['route' => ['tasks.update', $editableTask], 'method' => 'patch'])!!}
      -

      {{ trans('task.edit') }}

      +

      {{ __('task.edit') }}

      {!! FormField::text('name') !!}
      - {!! Form::label('progress', trans('task.progress'), ['class' => 'control-label']) !!} + {!! Form::label('progress', __('task.progress'), ['class' => 'control-label']) !!} {!! Form::input('range', 'progress', null, [ 'min' => '0', @@ -48,11 +48,11 @@ {!! FormField::textarea('description') !!}
      - {!! FormField::select('job_id', $job->project->jobs->pluck('name','id'), ['label' => trans('task.move_to_other_job')]) !!} + {!! FormField::select('job_id', $job->project->jobs->pluck('name', 'id'), ['label' => __('task.move_to_other_job')]) !!}
      - {!! Form::submit(trans('task.update'), ['class' => 'btn btn-warning']) !!} - {!! link_to_route('jobs.show', trans('app.cancel'), [$job->id], ['class' => 'btn btn-default']) !!} + {!! Form::submit(__('task.update'), ['class' => 'btn btn-warning']) !!} + {{ link_to_route('jobs.show', __('app.cancel'), [$job], ['class' => 'btn btn-default']) }} {!! Form::close() !!}
      @@ -62,25 +62,25 @@ @if (Request::get('action') == 'task_delete' && $editableTask) @can('delete', $editableTask)
      -

      {{ trans('task.delete') }}

      +

      {{ __('task.delete') }}

      {{ $editableTask->name }}
      {!! nl2br($editableTask->description) !!}
      - {{ trans('app.delete_confirm') }} - {!! link_to_route('jobs.show', trans('app.cancel'), [$job->id], ['class' => 'btn btn-default']) !!} + {{ __('app.delete_confirm') }} + {{ link_to_route('jobs.show', __('app.cancel'), [$job], ['class' => 'btn btn-default']) }}
      - {!! FormField::delete([ - 'route'=>['tasks.destroy',$editableTask->id]], - trans('app.delete_confirm_button'), + {!! FormField::delete(['route' => ['tasks.destroy', $editableTask]], + __('app.delete_confirm_button'), ['class' => 'btn btn-danger'], [ - 'task_id' => $editableTask->id, - 'job_id' => $editableTask->job_id, - ]) !!} -
      + 'task_id' => $editableTask->id, + 'job_id' => $editableTask->job_id, + ] + ) !!}
      +
      @endcan @endif diff --git a/resources/views/jobs/partials/job-tasks.blade.php b/resources/views/jobs/partials/job-tasks.blade.php index 53bc269..f47faa6 100644 --- a/resources/views/jobs/partials/job-tasks.blade.php +++ b/resources/views/jobs/partials/job-tasks.blade.php @@ -1,18 +1,18 @@
      @if (request('action') == 'sort_tasks') - {{ link_to_route('jobs.show', trans('app.done'), [$job->id], ['class' => 'btn btn-default btn-xs pull-right', 'style' => 'margin: -2px -8px']) }} + {{ link_to_route('jobs.show', __('app.done'), [$job], ['class' => 'btn btn-default btn-xs pull-right', 'style' => 'margin: -2px -8px']) }} @else - {{ link_to_route('jobs.show', trans('job.sort_tasks'), [$job->id, 'action' => 'sort_tasks', '#job-tasks'], ['class' => 'btn btn-default btn-xs pull-right', 'style' => 'margin: -2px -8px']) }} + {{ link_to_route('jobs.show', __('job.sort_tasks'), [$job, 'action' => 'sort_tasks', '#job-tasks'], ['class' => 'btn btn-default btn-xs pull-right', 'style' => 'margin: -2px -8px']) }} @endif -

      {{ trans('job.tasks') }}

      +

      {{ __('job.tasks') }}

      - - - - + + + + @forelse($job->tasks as $key => $task) @@ -26,24 +26,24 @@ @empty - + @endforelse @@ -60,9 +60,9 @@ diff --git a/resources/views/jobs/show.blade.php b/resources/views/jobs/show.blade.php index 73db391..27038f7 100755 --- a/resources/views/jobs/show.blade.php +++ b/resources/views/jobs/show.blade.php @@ -1,6 +1,6 @@ @extends('layouts.app') -@section('title', trans('job.detail') . ' | ' . $job->name . ' | ' . $job->project->name) +@section('title', __('job.detail') . ' | ' . $job->name . ' | ' . $job->project->name) @section('content') @include('jobs.partials.breadcrumb') @@ -8,14 +8,14 @@

      @can('create', new App\Entities\Projects\Job) - {!! html_link_to_route('projects.jobs.create', trans('job.create'), [$job->project_id], ['class' => 'btn btn-success','icon' => 'plus']) !!} + {!! html_link_to_route('projects.jobs.create', __('job.create'), [$job->project_id], ['class' => 'btn btn-success','icon' => 'plus']) !!} @endcan @can('update', $job) - {!! link_to_route('jobs.edit', trans('job.edit'), [$job->id], ['class' => 'btn btn-warning']) !!} + {{ link_to_route('jobs.edit', __('job.edit'), [$job], ['class' => 'btn btn-warning']) }} @endcan - {!! link_to_route('projects.jobs.index', trans('job.back_to_index'), [$job->project_id, '#' . $job->id], ['class' => 'btn btn-default']) !!} + {{ link_to_route('projects.jobs.index', __('job.back_to_index'), [$job->project_id, '#' . $job->id], ['class' => 'btn btn-default']) }}
      - {{ $job->name }} {{ trans('job.detail') }} + {{ $job->name }} {{ __('job.detail') }}

      diff --git a/resources/views/jobs/unfinished.blade.php b/resources/views/jobs/unfinished.blade.php index 10962ce..24e58ff 100755 --- a/resources/views/jobs/unfinished.blade.php +++ b/resources/views/jobs/unfinished.blade.php @@ -1,23 +1,23 @@ @extends('layouts.app') -@section('title', trans('job.on_progress')) +@section('title', __('job.on_progress')) @section('content') -

      {{ trans('job.on_progress') }}

      +

      {{ __('job.on_progress') }}

      {{ trans('app.table_no') }}{{ trans('task.name') }}{{ trans('task.progress') }}{{ trans('app.action') }}{{ __('app.table_no') }}{{ __('task.name') }}{{ __('task.progress') }}{{ __('app.action') }}
      @can('update', $task) {!! html_link_to_route('jobs.show', '', [ - $job->id, + $job, 'action' => 'task_edit', 'task_id' => $task->id ],[ 'class' => 'btn btn-warning btn-xs', - 'title' => trans('task.edit'), + 'title' => __('task.edit'), 'id' => $task->id . '-tasks-edit', 'icon' => 'edit' ]) !!} @endcan @can('delete', $task) {!! html_link_to_route('jobs.show', '', [ - $job->id, + $job, 'action' => 'task_delete', 'task_id' => $task->id ],[ 'class' => 'btn btn-danger btn-xs', - 'title' => trans('task.delete'), + 'title' => __('task.delete'), 'id' => $task->id . '-tasks-delete', 'icon' => 'close' ]) !!} @@ -51,7 +51,7 @@
      {{ trans('task.empty') }}
      {{ __('task.empty') }}
      {{ formatDecimal($job->tasks->avg('progress')) }} % @if (request('action') == 'sort_tasks') - {{ link_to_route('jobs.show', trans('app.done'), [$job->id], ['class' => 'btn btn-default btn-xs pull-right']) }} + {{ link_to_route('jobs.show', __('app.done'), [$job], ['class' => 'btn btn-default btn-xs pull-right']) }} @else - {{ link_to_route('jobs.show', trans('job.sort_tasks'), [$job->id, 'action' => 'sort_tasks', '#job-tasks'], ['class' => 'btn btn-default btn-xs pull-right']) }} + {{ link_to_route('jobs.show', __('job.sort_tasks'), [$job, 'action' => 'sort_tasks', '#job-tasks'], ['class' => 'btn btn-default btn-xs pull-right']) }} @endif
      - - - - - + + + + + @can('see-pricings', new App\Entities\Projects\Job) - + @endcan - - + + @forelse($jobs as $key => $job) @@ -44,16 +44,16 @@ @endcan @empty - + @endforelse - + @can('see-pricings', new App\Entities\Projects\Job) diff --git a/tests/Feature/ManageJobsTest.php b/tests/Feature/ManageJobsTest.php index a0ef479..d1843da 100644 --- a/tests/Feature/ManageJobsTest.php +++ b/tests/Feature/ManageJobsTest.php @@ -150,7 +150,7 @@ class ManageJobsTest extends TestCase $this->press(trans('project.show_jobs')); $this->seePageIs(route('projects.jobs.add-from-other-project', [$projects[1]->id, 'project_id' => $projects[0]->id])); - $this->submitForm(trans('job.create'), [ + $this->submitForm(trans('job.add'), [ 'job_ids['.$jobs[0]->id.']' => $jobs[0]->id, $jobs[0]->id.'_task_ids['.$tasks1[0]->id.']' => $tasks1[0]->id,
      {{ trans('app.table_no') }}{{ trans('project.name') }}{{ trans('job.name') }}{{ trans('job.tasks_count') }}{{ trans('job.progress') }}{{ __('app.table_no') }}{{ __('project.name') }}{{ __('job.name') }}{{ __('job.tasks_count') }}{{ __('job.progress') }}{{ trans('job.price') }}{{ __('job.price') }}{{ trans('job.worker') }}{{ trans('app.action') }}{{ __('job.worker') }}{{ __('app.action') }}
      {{ $job->worker->name }} - {!! link_to_route('jobs.show', trans('app.show'),[$job->id],['class' => 'btn btn-info btn-xs']) !!} + {{ link_to_route('jobs.show', __('app.show'), [$job], ['class' => 'btn btn-info btn-xs']) }}
      {{ trans('job.empty') }}
      {{ __('job.empty') }}
      Total{{ __('app.total') }} {{ $jobs->sum('tasks_count') }} {{ formatDecimal($jobs->avg('progress')) }} %