From 3b157e8007b354ef8b27a692c8f53986c0daa72b Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Mon, 28 May 2018 17:44:44 +0800
Subject: [PATCH] Add project overall progress on "on progress" project list

---
 app/Entities/Projects/ProjectsRepository.php              | 8 ++++----
 resources/lang/de/project.php                             | 1 +
 resources/lang/en/project.php                             | 1 +
 resources/lang/id/project.php                             | 1 +
 resources/views/projects/index.blade.php                  | 8 +++++++-
 resources/views/projects/partials/project-stats.blade.php | 2 +-
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/app/Entities/Projects/ProjectsRepository.php b/app/Entities/Projects/ProjectsRepository.php
index fe88368..fc2d95a 100755
--- a/app/Entities/Projects/ProjectsRepository.php
+++ b/app/Entities/Projects/ProjectsRepository.php
@@ -2,11 +2,11 @@
 
 namespace App\Entities\Projects;
 
-use App\Entities\BaseRepository;
-use App\Entities\Partners\Customer;
-use App\Entities\Users\User;
 use DB;
 use ProjectStatus;
+use App\Entities\Users\User;
+use App\Entities\BaseRepository;
+use App\Entities\Partners\Customer;
 
 /**
  * Projects Repository Class.
@@ -34,7 +34,7 @@ class ProjectsRepository extends BaseRepository
                     }
                 })
                 ->latest()
-                ->with(['customer'])
+                ->with(['customer', 'jobs'])
                 ->paginate($this->_paginate);
         }
 
diff --git a/resources/lang/de/project.php b/resources/lang/de/project.php
index de47cfd..1024727 100644
--- a/resources/lang/de/project.php
+++ b/resources/lang/de/project.php
@@ -19,6 +19,7 @@ return [
     'payment_remaining'    => 'Verbleibende Zahlung',
     'earnings_calculation' => 'Ergebnisberechnung',
     'additional_jobs'      => 'Zusätzliche Beschäftigungsliste',
+    'overall_progress'     => 'Overall Progress',
 
     // Payments
     'view_payments'    => 'View All Project Payments',
diff --git a/resources/lang/en/project.php b/resources/lang/en/project.php
index cb1c18c..406e329 100644
--- a/resources/lang/en/project.php
+++ b/resources/lang/en/project.php
@@ -19,6 +19,7 @@ return [
     'payment_remaining'    => 'Payment Remaining',
     'earnings_calculation' => 'Earnings Calculation',
     'additional_jobs'      => 'Additional Job List',
+    'overall_progress'     => 'Overall Progress',
 
     // Payments
     'view_payments'    => 'View All Project Payments',
diff --git a/resources/lang/id/project.php b/resources/lang/id/project.php
index 802b912..50dcd7a 100644
--- a/resources/lang/id/project.php
+++ b/resources/lang/id/project.php
@@ -19,6 +19,7 @@ return [
     'payment_remaining'    => 'Sisa',
     'earnings_calculation' => 'Rumus Pendapatan',
     'additional_jobs'      => 'Daftar Job Tambahan',
+    'overall_progress'     => 'Overall Progress',
 
     // Payments
     'view_payments'    => 'Lihat Semua Pembayaran Project',
diff --git a/resources/views/projects/index.blade.php b/resources/views/projects/index.blade.php
index 23726f1..4fcf2bf 100755
--- a/resources/views/projects/index.blade.php
+++ b/resources/views/projects/index.blade.php
@@ -15,7 +15,7 @@
     {!! FormField::select('status_id', ProjectStatus::toArray(), ['value' => $statusId, 'placeholder' => trans('project.all')]) !!}
     {!! Form::text('q', Request::get('q'), ['class' => 'form-control index-search-field', 'placeholder' => trans('project.search'), 'style' => 'width:100%;max-width:350px']) !!}
     {!! Form::submit(trans('project.search'), ['class' => 'btn btn-info btn-sm']) !!}
-    {!! link_to_route('projects.index', __('app.reset'), [], ['class' => 'btn btn-default btn-sm']) !!}
+    {!! link_to_route('projects.index', __('app.reset'), Request::only(['status_id']), ['class' => 'btn btn-default btn-sm']) !!}
     {!! Form::close() !!}
 </div>
 <div class="table-responsive">
@@ -25,6 +25,9 @@
             <th>{{ trans('project.name') }}</th>
             <th class="text-center">{{ trans('project.start_date') }}</th>
             <th class="text-center">{{ trans('project.work_duration') }}</th>
+            @if (request('status_id') == 2)
+            <th class="text-right">{{ trans('project.overall_progress') }}</th>
+            @endif
             @can('see-pricings', new App\Entities\Projects\Project)
             <th class="text-right">{{ trans('project.project_value') }}</th>
             @endcan
@@ -39,6 +42,9 @@
                 <td>{{ $project->nameLink() }}</td>
                 <td class="text-center">{{ $project->start_date }}</td>
                 <td class="text-right">{{ $project->present()->workDuration }}</td>
+                @if (request('status_id') == 2)
+                <td class="text-right">{{ formatDecimal($project->getJobOveralProgress()) }} %</td>
+                @endif
                 @can('see-pricings', new App\Entities\Projects\Project)
                 <td class="text-right">{{ formatRp($project->project_value) }}</td>
                 @endcan
diff --git a/resources/views/projects/partials/project-stats.blade.php b/resources/views/projects/partials/project-stats.blade.php
index be26b97..16a52b3 100644
--- a/resources/views/projects/partials/project-stats.blade.php
+++ b/resources/views/projects/partials/project-stats.blade.php
@@ -7,7 +7,7 @@
                     <div class="col-xs-3"><i class="fa fa-tasks fa-4x"></i></div>
                     <div class="col-xs-9 text-right">
                         <div class="huge" style="font-size: 38px;">{{ formatDecimal($project->getJobOveralProgress()) }} %</div>
-                        <div class="lead">Overall Progress</div>
+                        <div class="lead">{{ __('project.overall_progress') }}</div>
                     </div>
                 </div>
             </div>