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('app.table_no') }} | -{{ trans('task.name') }} | -{{ trans('task.route_name') }} | +{{ trans('app.table_no') }} | +{{ trans('task.name') }} | {{ trans('task.progress') }} | {{ trans('app.action') }} | @forelse($job->tasks as $key => $task)|||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ 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') }} | |||||||||||||||||||||||||||||||||
| Total | +Total | {{ 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')) !!}
-
-
-
| ||||||||||||||||||||||||||||||