From 56dc88987940e089cc3aae4f8e7e0ac76d664806 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 25 Dec 2017 12:39:00 +0200
Subject: [PATCH] Working on projects

---
 app/Http/Controllers/BaseController.php | 2 +-
 app/Http/Controllers/TaskController.php | 3 ++-
 resources/views/projects/show.blade.php | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index 378f3e3072c2..ab3ed1891645 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -39,7 +39,7 @@ class BaseController extends Controller
         if ($action == 'restore' && count($ids) == 1) {
             return redirect("{$entityTypes}/" . $ids[0]);
         // when viewing from a datatable list
-        } elseif (strpos($referer, '/clients/')) {
+        } elseif (strpos($referer, '/clients/') || strpos($referer, '/projects/')) {
             return redirect($referer);
         } elseif ($isDatatable || ($action == 'archive' || $action == 'delete')) {
             return redirect("{$entityTypes}");
diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php
index 785991a2a8f4..b9017db2e4fe 100644
--- a/app/Http/Controllers/TaskController.php
+++ b/app/Http/Controllers/TaskController.php
@@ -263,7 +263,8 @@ class TaskController extends BaseController
 
         if (in_array($action, ['resume', 'stop'])) {
             $this->taskRepo->save($ids, ['action' => $action]);
-            return Redirect::to('tasks')->withMessage(trans($action == 'stop' ? 'texts.stopped_task' : 'texts.resumed_task'));
+            Session::flash('message', trans($action == 'stop' ? 'texts.stopped_task' : 'texts.resumed_task'));
+            return $this->returnBulk($this->entityType, $action, $ids);
         } elseif ($action == 'invoice' || $action == 'add_to_invoice') {
             $tasks = Task::scope($ids)->with('account', 'client', 'project')->orderBy('project_id', 'id')->get();
             $clientPublicId = false;
diff --git a/resources/views/projects/show.blade.php b/resources/views/projects/show.blade.php
index 1dd6c5a0f201..684588868431 100644
--- a/resources/views/projects/show.blade.php
+++ b/resources/views/projects/show.blade.php
@@ -81,11 +81,11 @@
 			<table class="table" style="width:100%">
 				<tr>
 					<td><small>{{ trans('texts.tasks') }}</small></td>
-					<td style="text-align: right">3</td>
+					<td style="text-align: right">{{ $chartData->count }}</td>
 				</tr>
 				<tr>
 					<td><small>{{ trans('texts.duration') }}</small></td>
-					<td style="text-align: right">04:15:00</td>
+					<td style="text-align: right">{{ Utils::formatTime($chartData->duration) }}</td>
 				</tr>
 			</table>
 			</h3>