diff --git a/app/Entities/Projects/Project.php b/app/Entities/Projects/Project.php index 2d51f3d..47be994 100755 --- a/app/Entities/Projects/Project.php +++ b/app/Entities/Projects/Project.php @@ -64,6 +64,7 @@ class Project extends Model { public function getFeatureOveralProgress() { $overalProgress = 0; + $this->features->load('tasks'); $totalPrice = $this->features->sum('price'); foreach ($this->features as $feature) { diff --git a/app/Http/Controllers/Projects/ProjectsController.php b/app/Http/Controllers/Projects/ProjectsController.php index 156683b..cd56239 100755 --- a/app/Http/Controllers/Projects/ProjectsController.php +++ b/app/Http/Controllers/Projects/ProjectsController.php @@ -109,7 +109,7 @@ class ProjectsController extends Controller { $excel->sheet('testng', function($sheet) use ($project, $features) { $sheet->loadView('projects.features-export-excel',compact('project','features')); }); - })->download('xlsx'); + })->download('xls'); } else { return view('projects.features-export-html', compact('project','features')); } diff --git a/resources/views/projects/features-export-excel.blade.php b/resources/views/projects/features-export-excel.blade.php index 5f0111d..d8123e5 100755 --- a/resources/views/projects/features-export-excel.blade.php +++ b/resources/views/projects/features-export-excel.blade.php @@ -61,7 +61,7 @@ Total - {{ $features->avg('progress')/100 }} + {{ $project->getFeatureOveralProgress() }} % {{-- {{ $features->sum('price') }} --}}