Skip to content

Commit a7469d7

Browse files
SMEWebifySMEWebify
committed
1 parent 018fda8 commit a7469d7

File tree

4 files changed

+51
-102
lines changed

4 files changed

+51
-102
lines changed

‎app/Http/Controllers/Planning/TaskController.php

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
namespace App\Http\Controllers\Planning;
44

5-
use Carbon\Carbon;
65
use Illuminate\Http\Request;
76
use App\Models\Planning\Task;
7+
use App\Services\TaskService;
88
use App\Events\TaskChangeStatu;
99
use App\Models\Planning\Status;
1010
use App\Models\Workflow\Orders;
@@ -15,19 +15,19 @@
1515
use App\Models\Workflow\QuoteLines;
1616
use App\Http\Controllers\Controller;
1717
use App\Models\Planning\SubAssembly;
18-
use Illuminate\Support\Facades\Auth;
1918
use App\Models\Methods\MethodsServices;
20-
use App\Models\Planning\TaskActivities;
2119
use App\Models\Methods\MethodsStandardNomenclature;
2220

2321
class TaskController extends Controller
2422
{
2523

2624
protected $taskKPIService;
25+
protected $taskService;
2726

28-
public function __construct(TaskKPIService $taskKPIService)
27+
public function __construct(TaskKPIService $taskKPIService, TaskService $taskService)
2928
{
3029
$this->taskKPIService = $taskKPIService;
30+
$this->taskService = $taskService;
3131
}
3232

3333
/**
@@ -125,23 +125,11 @@ public function sync(Request $request)
125125

126126
if($status['id'] == $StatusInProgessId->id){
127127
// Create Line
128-
TaskActivities::create([
129-
'task_id'=> $task['id'],
130-
'user_id'=> Auth::user()->id,
131-
'type'=>'1',
132-
'timestamp' =>Carbon::now(),
133-
'comment'=>'',
134-
]);
128+
$this->taskService->recordTaskActivity($task['id'], 1, 0, 0);
135129
}
136130
elseif($status['id'] == $StatusFinishId->id){
137131
// Create Line
138-
TaskActivities::create([
139-
'task_id'=> $task['id'],
140-
'user_id'=> Auth::user()->id,
141-
'type'=>'3',
142-
'timestamp' =>Carbon::now(),
143-
'comment'=>'',
144-
]);
132+
$this->taskService->recordTaskActivity($task['id'], 3, 0, 0);
145133
}
146134

147135
event(new TaskChangeStatu($task['id']));

‎app/Livewire/PurchasesWaintingReceipt.php

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
use App\Models\User;
66
use Livewire\Component;
77
use App\Models\Planning\Task;
8+
use App\Services\TaskService;
89
use App\Models\Planning\Status;
910
use App\Models\Companies\Companies;
11+
use Illuminate\Support\Facades\App;
1012
use Illuminate\Support\Facades\Auth;
1113
use App\Events\PurchaseReceiptCreated;
12-
use App\Models\Planning\TaskActivities;
1314
use App\Models\Purchases\PurchaseLines;
1415
use App\Models\Purchases\PurchaseReceipt;
1516
use App\Models\Purchases\PurchaseReceiptLines;
@@ -33,6 +34,15 @@ class PurchasesWaintingReceipt extends Component
3334

3435
private $ordre = 10;
3536

37+
protected $taskService;
38+
39+
public function __construct()
40+
{
41+
// Résoudre le service via le container Laravel
42+
$this->taskService = App::make(TaskService::class);
43+
}
44+
45+
3646
// Validation Rules
3747
protected function rules()
3848
{
@@ -43,7 +53,6 @@ protected function rules()
4353
'user_id'=>'required',
4454
];
4555
}
46-
4756

4857
public function sortBy($field)
4958
{
@@ -144,13 +153,7 @@ public function storeReciep(){
144153
}
145154

146155
//create entry qty int task
147-
TaskActivities::create([
148-
'task_id'=> $PurchaseLines->tasks_id,
149-
'user_id'=>$this->user_id,
150-
'type'=>'4',
151-
'good_qt'=>$PurchaseLines->qty,
152-
'comment'=>'',
153-
]);
156+
$this->taskService->recordTaskActivity($PurchaseLines->tasks_id, 4, $PurchaseLines->qty, 0);
154157
}
155158

156159

‎app/Livewire/TaskStatu.php

Lines changed: 22 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,16 @@
77
use Livewire\Component;
88
use Livewire\WithPagination;
99
use App\Models\Planning\Task;
10+
use App\Services\TaskService;
1011
use App\Events\TaskChangeStatu;
1112
use App\Models\Planning\Status;
1213
use App\Models\Products\StockMove;
1314
use Illuminate\Support\Facades\App;
1415
use Illuminate\Support\Facades\Auth;
1516
use App\Services\NotificationService;
1617
use App\Models\Planning\TaskActivities;
17-
use App\Models\Quality\QualityNonConformity;
18-
use Illuminate\Support\Facades\Notification;
1918
use App\Services\QualityNonConformityService;
2019
use App\Models\Products\StockLocationProducts;
21-
use App\Notifications\NonConformityNotification;
2220

2321
class TaskStatu extends Component
2422
{
@@ -51,12 +49,14 @@ class TaskStatu extends Component
5149
public $userSelect;
5250
protected $notificationService;
5351
protected $qualityNonConformityService;
54-
52+
protected $taskService;
53+
5554
public function __construct()
5655
{
5756
// Résoudre le service via le container Laravel
5857
$this->notificationService = App::make(NotificationService::class);
5958
$this->qualityNonConformityService = App::make(QualityNonConformityService::class);
59+
$this->taskService = App::make(TaskService::class);
6060
}
6161

6262
// Validation Rules
@@ -236,14 +236,8 @@ public function render()
236236

237237
public function StartTimeTask($taskId)
238238
{
239-
// Create Line
240-
TaskActivities::create([
241-
'task_id'=> $taskId,
242-
'user_id'=>$this->user_id,
243-
'type'=>'1',
244-
'timestamp' =>Carbon::now(),
245-
'comment'=>'',
246-
]);
239+
//create entry qty int task
240+
$this->taskService->recordTaskActivity( $taskId, 1, 0, 0);
247241

248242
$StatusUpdate = Status::select('id')->where('title', 'In progress')->first();
249243

@@ -261,14 +255,8 @@ public function StartTimeTask($taskId)
261255

262256
public function EndTimeTask($taskId)
263257
{
264-
// Create Line
265-
TaskActivities::create([
266-
'task_id'=> $taskId,
267-
'user_id'=>$this->user_id,
268-
'type'=>'2',
269-
'timestamp' =>Carbon::now(),
270-
'comment'=>'',
271-
]);
258+
//create entry qty int task
259+
$this->taskService->recordTaskActivity( $taskId, 2, 0, 0);
272260

273261
$this->render();
274262

@@ -278,14 +266,9 @@ public function EndTimeTask($taskId)
278266

279267
public function EndTask($taskId)
280268
{
281-
// Create Line
282-
TaskActivities::create([
283-
'task_id'=> $taskId,
284-
'user_id'=>$this->user_id,
285-
'type'=>'3',
286-
'timestamp' =>Carbon::now(),
287-
'comment'=>'',
288-
]);
269+
//create entry qty int task
270+
$this->taskService->recordTaskActivity( $taskId, 3, 0, 0);
271+
289272
$StatusUpdate = Status::select('id')->where('title', 'Finished')->first();
290273

291274
/* // update task statu on Kanban*/
@@ -303,14 +286,8 @@ public function EndTask($taskId)
303286
public function addGoodQtFromUser()
304287
{
305288
$this->validate();
306-
// Create Line
307-
TaskActivities::create([
308-
'task_id'=> $this->search,
309-
'user_id'=>$this->user_id,
310-
'type'=>'4',
311-
'good_qt'=>$this->addGoodQt,
312-
'comment'=>'',
313-
]);
289+
//create entry qty int task
290+
$this->taskService->recordTaskActivity( $this->search, 4, $this->addGoodQt, 0);
314291

315292
$this->render();
316293

@@ -321,14 +298,8 @@ public function addGoodQtFromUser()
321298
public function FastaddGoodQt($qty)
322299
{
323300
$this->addGoodQt += $qty;
324-
// Create Line
325-
TaskActivities::create([
326-
'task_id'=> $this->search,
327-
'user_id'=>$this->user_id,
328-
'type'=>'4',
329-
'good_qt'=>$qty,
330-
'comment'=>'',
331-
]);
301+
//create entry qty int task
302+
$this->taskService->recordTaskActivity( $this->search, 4, $qty, 0);
332303

333304
$this->render();
334305

@@ -367,14 +338,9 @@ public function addGoodQtFromStock($composantId, $taskId)
367338
}
368339

369340
$this->validate();
370-
// Create Line
371-
TaskActivities::create([
372-
'task_id'=> $this->search,
373-
'user_id'=>$this->user_id,
374-
'type'=>'4',
375-
'good_qt'=>$this->addGoodQt,
376-
'comment'=>'',
377-
]);
341+
342+
//create entry qty int task
343+
$this->taskService->recordTaskActivity( $this->search, 4, $this->addGoodQt, 0);
378344

379345
$this->render();
380346

@@ -390,14 +356,8 @@ public function addGoodQtFromStock($composantId, $taskId)
390356
public function addRejectedQt()
391357
{
392358
$this->validate();
393-
// Create Line
394-
TaskActivities::create([
395-
'task_id'=> $this->search,
396-
'user_id'=>$this->user_id,
397-
'type'=>'5',
398-
'bad_qt'=>$this->addBadQt,
399-
'comment'=>'',
400-
]);
359+
//create entry qty int task
360+
$this->taskService->recordTaskActivity( $this->search, 5, 0, $this->addBadQt);
401361

402362
$this->render();
403363

@@ -408,14 +368,8 @@ public function addRejectedQt()
408368
public function FastaddBadQt($qty)
409369
{
410370
$this->addGoodQt -= $qty;
411-
// Create Line
412-
TaskActivities::create([
413-
'task_id'=> $this->search,
414-
'user_id'=>$this->user_id,
415-
'type'=>'5',
416-
'bad_qt'=>$qty,
417-
'comment'=>'',
418-
]);
371+
//create entry qty int task
372+
$this->taskService->recordTaskActivity( $this->search, 5, 0, $qty);
419373

420374
$this->render();
421375

‎app/Services/TaskService.php

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
namespace App\Services;
44

55

6-
use App\Models\Planning\Status;
6+
use Carbon\Carbon;
77
use App\Models\Planning\Task;
8-
use App\Models\Planning\TaskActivities;
9-
use Illuminate\Support\Facades\Event;
108
use App\Events\TaskChangeStatu;
11-
use Carbon\Carbon;
9+
use App\Models\Planning\Status;
10+
use Illuminate\Support\Facades\Auth;
11+
use Illuminate\Support\Facades\Event;
12+
use App\Models\Planning\TaskActivities;
1213

1314
class TaskService
1415
{
@@ -25,20 +26,23 @@ public function closeTasks($orderLineId)
2526
$task->update(['status_id' => $statusUpdate->id]);
2627

2728
// Enregistrer une activité de fermeture
28-
$this->recordTaskActivity($task->id);
29+
$this->recordTaskActivity($task->id, 3, 0, 0);
2930

3031
// Déclencher un événement pour notifier le changement de statut
3132
Event::dispatch(new TaskChangeStatu($task->id));
3233
}
3334
}
3435
}
3536

36-
public function recordTaskActivity($taskId)
37+
public function recordTaskActivity($taskId, $type, $goodQty, $addBadQt)
3738
{
3839
TaskActivities::create([
3940
'task_id' => $taskId,
40-
'type' => '3',
41+
'user_id'=> Auth::user()->id,
42+
'type' => $type,
4143
'timestamp' => Carbon::now(),
44+
'good_qt'=> $goodQty,
45+
'bad_qt'=> $addBadQt,
4246
'comment' => '',
4347
]);
4448
}

0 commit comments

Comments
 (0)