diff --git a/app/Entities/Projects/Job.php b/app/Entities/Projects/Job.php index 291b3b8..65d41c9 100755 --- a/app/Entities/Projects/Job.php +++ b/app/Entities/Projects/Job.php @@ -6,6 +6,11 @@ use App\Entities\Users\User; use Illuminate\Database\Eloquent\Model; use Laracasts\Presenter\PresentableTrait; +/** + * Job Model. + * + * @author Nafies Luthfi + */ class Job extends Model { use PresentableTrait; @@ -32,4 +37,14 @@ class Job extends Model { return $this->type_id == 1 ? 'Project' : 'Additional'; } + + public function getProgressAttribute() + { + return $this->tasks->isEmpty() ? 0 : $this->tasks->avg('progress'); + } + + public function getReceiveableEarningAttribute() + { + return $this->price * ($this->progress / 100); + } } diff --git a/app/Http/Controllers/Projects/JobsController.php b/app/Http/Controllers/Projects/JobsController.php index 7aece9d..7df14fa 100755 --- a/app/Http/Controllers/Projects/JobsController.php +++ b/app/Http/Controllers/Projects/JobsController.php @@ -71,6 +71,13 @@ class JobsController extends Controller { $jobs = $project->getJobList(request('job_type', 1)); - return view('projects.jobs-export-html', compact('project', 'jobs')); + return view('projects.jobs.export-html', compact('project', 'jobs')); + } + + public function jobProgressExport(Project $project, $exportType = 'html') + { + $jobs = $project->getJobList(request('job_type', 1)); + + return view('projects.jobs.progress-export-html', compact('project', 'jobs')); } } diff --git a/resources/lang/id/app.php b/resources/lang/id/app.php index 6a16b7d..3906fd0 100644 --- a/resources/lang/id/app.php +++ b/resources/lang/id/app.php @@ -16,6 +16,7 @@ return [ 'type' => 'Jenis', 'total' => 'Total', 'count' => 'Jumlah', + 'remark' => 'Keterangan', // Action 'add' => 'Tambah', diff --git a/resources/lang/id/project.php b/resources/lang/id/project.php index 7734c0b..e6c305c 100644 --- a/resources/lang/id/project.php +++ b/resources/lang/id/project.php @@ -2,17 +2,19 @@ return [ // Labels - 'project' => 'Project', - 'projects' => 'Daftar Project', - 'work_duration' => 'Durasi', - 'cash_in_total' => 'Total Pemasukan', - 'cash_out_total' => 'Total Pengeluaran', - 'search' => 'Cari Project', - 'found' => 'Project ditemukan', - 'not_found' => 'Project tidak ditemukan', - 'select' => 'Pilih Project', - 'empty' => 'Belum ada Project', - 'back_to_index' => 'Kembali ke daftar Project', + 'project' => 'Project', + 'projects' => 'Daftar Project', + 'work_duration' => 'Durasi', + 'cash_in_total' => 'Total Pemasukan', + 'cash_out_total' => 'Total Pengeluaran', + 'search' => 'Cari Project', + 'found' => 'Project ditemukan', + 'not_found' => 'Project tidak ditemukan', + 'select' => 'Pilih Project', + 'empty' => 'Belum ada Project', + 'back_to_index' => 'Kembali ke daftar Project', + 'receiveable_earnings' => 'Pendapatan', + 'earnings_calculation' => 'Rumus Pendapatan', // Actions 'create' => 'Input Project Baru', @@ -26,10 +28,10 @@ return [ 'undeleted' => 'Data Project gagal dihapus.', 'show_jobs' => 'Lihat Job', - 'jobs_export_html' => 'Export HTML', - 'jobs_export_excel' => 'Export Excel', - 'jobs_export_progress_excel' => 'Export Progress', - 'sort_jobs' => 'Urutkan Prioritas Job', + 'jobs_list_export_html' => 'Export HTML', + 'jobs_export_excel' => 'Export Excel', + 'jobs_progress_export_html' => 'Export Progress', + 'sort_jobs' => 'Urutkan Prioritas Job', // Attributes 'name' => 'Nama Project', diff --git a/resources/views/invoices/pdf.blade.php b/resources/views/invoices/pdf.blade.php index 888f72d..8c51748 100755 --- a/resources/views/invoices/pdf.blade.php +++ b/resources/views/invoices/pdf.blade.php @@ -5,7 +5,8 @@ {{ trans('invoice.print') }} - {{ $invoice->number }}