From 115a1b817f9eaec5b96c93e35da33770276cc740 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Thu, 23 Nov 2017 07:08:10 +0800 Subject: [PATCH] Update job and task related views Restructure task lang file Remove unused views --- resources/lang/id/job.php | 3 +- resources/lang/id/task.php | 46 ++++---- .../jobs/partials/job-tasks-operation.blade.php | 31 ++++-- resources/views/jobs/partials/job-tasks.blade.php | 12 +- resources/views/jobs/show.blade.php | 3 - resources/views/jobs/unfinished.blade.php | 4 +- .../views/projects/jobs-export-excel.blade.php | 71 ------------ .../views/projects/jobs-export-html-2.blade.php | 58 ---------- .../views/projects/jobs-export-html.blade.php | 2 +- .../projects/jobs-export-progress-excel.blade.php | 75 ------------- resources/views/projects/jobs.blade.php | 121 --------------------- resources/views/projects/jobs/index.blade.php | 2 +- 12 files changed, 57 insertions(+), 371 deletions(-) delete mode 100755 resources/views/projects/jobs-export-excel.blade.php delete mode 100755 resources/views/projects/jobs-export-html-2.blade.php delete mode 100755 resources/views/projects/jobs-export-progress-excel.blade.php delete mode 100755 resources/views/projects/jobs.blade.php diff --git a/resources/lang/id/job.php b/resources/lang/id/job.php index 85c1aa9..8d81749 100644 --- a/resources/lang/id/job.php +++ b/resources/lang/id/job.php @@ -3,7 +3,8 @@ return [ // Labels 'job' => 'Job', - 'jobs' => 'Daftar Job', + 'list' => 'Daftar Job', + 'additional' => 'Daftar Job Tambahan', 'on_progress' => 'Job on Progress', 'search' => 'Cari Job', 'found' => 'Job ditemukan', diff --git a/resources/lang/id/task.php b/resources/lang/id/task.php index 8f8bf12..28e79eb 100644 --- a/resources/lang/id/task.php +++ b/resources/lang/id/task.php @@ -1,23 +1,29 @@ 'Task', - 'tasks' => 'Daftar Task', - 'name' => 'Nama Task', - 'create' => 'Input Task Baru', - 'created' => 'Input Task baru telah berhasil.', - 'show' => 'Detail Task', - 'edit' => 'Edit Task', - 'update' => 'Update Task', - 'updated' => 'Update data Task telah berhasil.', - 'delete' => 'Hapus Task', - 'deleted' => 'Hapus data Task telah berhasil.', - 'undeleted' => 'Data Task gagal dihapus.', - 'search' => 'Cari Task', - 'found' => 'Task ditemukan', - 'not_found' => 'Task tidak ditemukan', - 'progress' => 'Progress', - 'empty' => 'Belum ada Task', - 'route_name' => 'Route Aplikasi', - 'back_to_index' => 'Kembali ke daftar Task', -]; \ No newline at end of file + // Labels + 'task' => 'Task', + 'list' => 'Daftar Task', + 'empty' => 'Belum ada Task', + 'search' => 'Cari Task', + 'found' => 'Task ditemukan', + 'not_found' => 'Task tidak ditemukan', + 'back_to_index' => 'Kembali ke daftar Task', + 'move_to_other_job' => 'Pindahkan ke Job lain', + + // Actions + 'create' => 'Input Task Baru', + 'created' => 'Input Task baru telah berhasil.', + 'show' => 'Detail Task', + 'edit' => 'Edit Task', + 'update' => 'Update Task', + 'updated' => 'Update data Task telah berhasil.', + 'delete' => 'Hapus Task', + 'deleted' => 'Hapus data Task telah berhasil.', + 'undeleted' => 'Data Task gagal dihapus.', + + // Attributes + 'name' => 'Nama Task', + 'progress' => 'Progress', + 'description' => 'Deskripsi Task', +]; diff --git a/resources/views/jobs/partials/job-tasks-operation.blade.php b/resources/views/jobs/partials/job-tasks-operation.blade.php index 8a8c4c7..e0c5cea 100644 --- a/resources/views/jobs/partials/job-tasks-operation.blade.php +++ b/resources/views/jobs/partials/job-tasks-operation.blade.php @@ -4,27 +4,35 @@

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

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

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

{!! FormField::text('name') !!}
-
- {!! FormField::textarea('description') !!} -
- {!! Form::label('progress', 'Progress', ['class' => 'control-label']) !!} + {!! Form::label('progress', trans('task.progress'), ['class' => 'control-label']) !!} {!! Form::input('range', 'progress', null, [ 'min' => '0', @@ -35,8 +43,11 @@
{{ $editableTask->progress }}%
+
+ {!! FormField::textarea('description') !!} +
- {!! FormField::select('job_id', $job->project->jobs->pluck('name','id'), ['label' => 'Pindahkan ke Fitur lain']) !!} + {!! FormField::select('job_id', $job->project->jobs->pluck('name','id'), ['label' => trans('task.move_to_other_job')]) !!}
{!! Form::submit(trans('task.update'), ['class' => 'btn btn-warning']) !!} @@ -59,7 +70,7 @@ {!! FormField::delete([ 'route'=>['tasks.destroy',$editableTask->id]], trans('app.delete_confirm_button'), - ['class'=>'btn btn-danger'], + ['class' => 'btn btn-danger'], [ 'task_id' => $editableTask->id, 'job_id' => $editableTask->job_id, diff --git a/resources/views/jobs/partials/job-tasks.blade.php b/resources/views/jobs/partials/job-tasks.blade.php index 7268985..a2d1b5a 100644 --- a/resources/views/jobs/partials/job-tasks.blade.php +++ b/resources/views/jobs/partials/job-tasks.blade.php @@ -9,21 +9,19 @@
- - - + + @forelse($job->tasks as $key => $task) - + - @empty - + @endforelse - + - + @foreach($job->tasks as $task) diff --git a/resources/views/projects/jobs-export-progress-excel.blade.php b/resources/views/projects/jobs-export-progress-excel.blade.php deleted file mode 100755 index f7bbeb8..0000000 --- a/resources/views/projects/jobs-export-progress-excel.blade.php +++ /dev/null @@ -1,75 +0,0 @@ -name) . '.xls'; - // header("Content-Disposition: attachment; filename=\"$filename\""); - // header("Content-Type: application/vnd.ms-excel"); -?> - - - - - {{-- --}} - - {{ $project->name }} - - - -
{{ trans('app.table_no') }}{{ trans('task.name') }}{{ trans('task.route_name') }}{{ trans('app.table_no') }}{{ trans('task.name') }} {{ trans('task.progress') }} {{ trans('app.action') }}
{{ 1 + $key }}{{ 1 + $key }}
{{ $task->name }}
{!! nl2br($task->description) !!}
{{ $task->route_name }} {{ $task->progress }} % {!! html_link_to_route('jobs.show', '', [ @@ -49,12 +47,12 @@
{{ trans('task.empty') }}
{{ trans('task.empty') }}
TotalTotal {{ formatDecimal($job->tasks->avg('progress')) }} % @if (request('action') == 'sort_tasks') diff --git a/resources/views/jobs/show.blade.php b/resources/views/jobs/show.blade.php index 014ad92..3438127 100755 --- a/resources/views/jobs/show.blade.php +++ b/resources/views/jobs/show.blade.php @@ -24,7 +24,6 @@ @include('jobs.partials.job-tasks') @endsection -@if (Request::get('action') == 'task_edit' && $editableTask) @section('ext_css') {!! Html::style(url('assets/css/plugins/rangeslider.css')) !!} - - - - - - - - - - - - - - - - @forelse($jobs as $key => $job) - - - - - - - - @if ($job->tasks->count()) - @foreach($job->tasks as $task) - - - - - - - @endforeach - @endif - @empty - - @endforelse - - - - - - - - -
- {{ trans('project.jobs') }} {{ $project->name }} -
{{ trans('app.table_no') }}{{ trans('job.name') }}{{ trans('job.price') }}{{ trans('app.description') }}
{{ 1 + $key }} - {{ $job->name }} - {{ $job->price }}{!! nl2br($job->description) !!}
{{ $task->name }}{!! nl2br($task->description) !!}
{{ trans('job.empty') }}
Total{{ $jobs->sum('price') }}
- - diff --git a/resources/views/projects/jobs-export-html-2.blade.php b/resources/views/projects/jobs-export-html-2.blade.php deleted file mode 100755 index aabf746..0000000 --- a/resources/views/projects/jobs-export-html-2.blade.php +++ /dev/null @@ -1,58 +0,0 @@ -name) . '.xls'; - // header("Content-Disposition: attachment; filename=\"$filename\""); - // header("Content-Type: application/vnd.ms-excel"); -?> - - - - - {{-- --}} - - {{ trans('project.jobs') }} {{ $project->name }} - {!! Html::style('assets/css/app.s.css') !!} - - -
-

{{ trans('project.jobs') }} {{ $project->name }}

- - @foreach($jobs as $key => $job) -

{{ ++$key }}. {{ $job->name }}

-

{!! nl2br($job->description) !!}

- @if ($job->tasks->count()) -
-

Sub Fitur

- @foreach($job->tasks as $taskKey => $task) -

{{ ++$taskKey }}) {{ $task->name }}

-

{!! nl2br($task->description) !!}

- @endforeach -
- @endif - @endforeach - -

{{ trans('project.cost_proposal') }}

- - - - - - - - @foreach($jobs as $key => $job) - - - - - - @endforeach - - - - - - - -
{{ trans('app.table_no') }}{{ trans('job.name') }}{{ trans('job.price') }}
{{ 1 + $key }}{{ $job->name }}{{ formatRp($job->price) }}
Total{{ formatRp($jobs->sum('price')) }}
-
- - diff --git a/resources/views/projects/jobs-export-html.blade.php b/resources/views/projects/jobs-export-html.blade.php index 39a3d89..60e5216 100755 --- a/resources/views/projects/jobs-export-html.blade.php +++ b/resources/views/projects/jobs-export-html.blade.php @@ -26,7 +26,7 @@ @if ($job->tasks->count())
 
Sub Fitur{{ trans('task.list') }} {{ trans('app.description') }}
- - - - - - - - - - {{-- --}} - - - - @forelse($jobs as $key => $job) - - - - - - {{-- --}} - - - @if ($job->tasks->count()) - @foreach($job->tasks as $task) - - - - - - {{-- --}} - - @endforeach - @endif - - @empty - - @endforelse - - - - - {{-- --}} - - - {{-- --}} - - -
-

{{ trans('project.jobs') }} {{ $project->name }}

-
{{ trans('app.table_no') }}{{ trans('job.name') }}{{ trans('job.progress') }}{{ trans('job.price') }}{{ trans('app.description') }}
{{ 1 + $key }} - {{ $job->name }} - {{ formatDecimal($job->progress = $job->tasks->avg('progress')) }}{{ $job->price }}{!! nl2br($job->description) !!}
{{ $task->name }}{{ $task->progress }}{!! nl2br($task->description) !!}
{{ trans('job.empty') }}
Total{{ formatDecimal($jobs->sum('progress') / count($jobs)) }}{{ formatDecimal($project->getJobOveralProgress()) }} %{{ $jobs->sum('price') }}
- - \ No newline at end of file diff --git a/resources/views/projects/jobs.blade.php b/resources/views/projects/jobs.blade.php deleted file mode 100755 index f51d25a..0000000 --- a/resources/views/projects/jobs.blade.php +++ /dev/null @@ -1,121 +0,0 @@ -@extends('layouts.project') - -@section('subtitle', trans('project.jobs')) - -@section('action-buttons') -{!! html_link_to_route('jobs.create', trans('job.create'), [$project->id], ['class' => 'btn btn-success','icon' => 'plus']) !!} -{!! html_link_to_route('jobs.add-from-other-project', trans('job.add_from_other_project'), [$project->id], ['class' => 'btn btn-default','icon' => 'plus']) !!} -@endsection - -@section('content-project') - -@if ($jobs->isEmpty()) -

{{ trans('project.no_jobs') }}, - {{ link_to_route('jobs.create', trans('job.create'), [$project->id]) }}. -

-@else - -@foreach($jobs->groupBy('type_id') as $key => $groupedJobs) - -
-
-
- @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']) }} - @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-export', trans('project.jobs_export_html'), [$project->id, 'html', 'job_type' => $key], ['class' => '','target' => '_blank']) !!} - @endif -
-

- {{ $key == 1 ? 'Daftar Fitur' : 'Fitur Tambahan' }} -

-
- - - - - - - - {{-- --}} - - - - @forelse($groupedJobs as $key => $job) - @php - $no = 1 + $key; - $job->progress = $job->tasks->avg('progress'); - @endphp - progress <= 50 ? 'style="background-color: #faebcc"' : '' !!}> - - - - - - {{-- --}} - - - @empty - - @endforelse - - - - - - - - - - -
{{ trans('app.table_no') }}{{ trans('job.name') }}{{ trans('job.tasks_count') }}{{ trans('job.progress') }}{{ trans('job.price') }}{{ trans('job.worker') }}{{ trans('app.action') }}
{{ $no }} - {{ $job->name }} - @if ($job->tasks->isEmpty() == false) -
    - @foreach($job->tasks as $task) -
  • {{ $task->name }}
    • - @endforeach -
- @endif - 		{{ $job->tasks_count = $job->tasks->count() }}{{ formatDecimal($job->progress) }} %{{ formatRp($job->price) }}{{ $job->worker->name }} - {!! html_link_to_route('jobs.show', '',[$job->id],['icon' => 'search', 'title' => 'Lihat ' . trans('job.show'), 'class' => 'btn btn-info btn-xs','id' => 'show-job-' . $job->id]) !!} - {!! html_link_to_route('jobs.edit', '',[$job->id],['icon' => 'edit', 'title' => trans('job.edit'), 'class' => 'btn btn-warning btn-xs']) !!} -
{{ trans('job.empty') }}
Total{{ $groupedJobs->sum('tasks_count') }} - {{ formatDecimal($groupedJobs->sum('progress') / $groupedJobs->count()) }} % - ({{ formatDecimal($project->getJobOveralProgress()) }} %) - {{ 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']) }} - @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']) }} - @endif -
-
-@endforeach - -@endif -@endsection - -@if (request('action') == 'sort_jobs') - -@section('ext_js') - {!! Html::script(url('assets/js/plugins/jquery-ui.min.js')) !!} -@endsection - -@section('script') - - -@endsection - -@endif diff --git a/resources/views/projects/jobs/index.blade.php b/resources/views/projects/jobs/index.blade.php index 6473cfa..f59854d 100755 --- a/resources/views/projects/jobs/index.blade.php +++ b/resources/views/projects/jobs/index.blade.php @@ -28,7 +28,7 @@ @endif

- {{ $key == 1 ? 'Daftar Fitur' : 'Fitur Tambahan' }} + {{ $key == 1 ? trans('job.list') : trans('job.additional') }}