Skip to content

Commit 20093ec

Browse files
SMEWebifySMEWebify
committed
1 parent ec24b86 commit 20093ec

File tree

5 files changed

+95
-12
lines changed

5 files changed

+95
-12
lines changed

‎app/Livewire/TaskStatu.php

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,24 @@ public function addGoodQtFromUser()
307307
session()->flash('success','Log activitie added successfully');
308308
}
309309

310+
public function FastaddGoodQt($qty)
311+
{
312+
$this->addGoodQt += $qty;
313+
// Create Line
314+
TaskActivities::create([
315+
'task_id'=> $this->search,
316+
'user_id'=>$this->user_id,
317+
'type'=>'4',
318+
'good_qt'=>$qty,
319+
'comment'=>'',
320+
]);
321+
322+
$this->render();
323+
324+
// Set Flash Message
325+
session()->flash('success','Log activitie added successfully');
326+
}
327+
310328
public function addGoodQtFromStock($composantId, $taskId)
311329
{
312330

@@ -376,6 +394,24 @@ public function addRejectedQt()
376394
session()->flash('success','Log activitie added successfully');
377395
}
378396

397+
public function FastaddBadQt($qty)
398+
{
399+
$this->addGoodQt -= $qty;
400+
// Create Line
401+
TaskActivities::create([
402+
'task_id'=> $this->search,
403+
'user_id'=>$this->user_id,
404+
'type'=>'5',
405+
'bad_qt'=>$qty,
406+
'comment'=>'',
407+
]);
408+
409+
$this->render();
410+
411+
// Set Flash Message
412+
session()->flash('success','Log activitie added successfully');
413+
}
414+
379415
public function updateDateTask(){
380416
if($this->not_recalculate) $this->RecalculateBooleanValue = 1;
381417
Task::find($this->search)->fill([

‎app/Models/Planning/Task.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
use Illuminate\Database\Eloquent\Builder;
2222
use Spatie\Activitylog\Traits\LogsActivity;
2323
use App\Models\Quality\QualityNonConformity;
24-
use Symfony\Component\Validator\Constraints\NotNull;
2524
use Illuminate\Database\Eloquent\Factories\HasFactory;
2625

2726
class Task extends Model
@@ -212,6 +211,11 @@ public function getTotalLogBadQt()
212211
->sum('bad_qt');
213212
}
214213

214+
public function getTotalNetGoodQt()
215+
{
216+
return $this->getTotalLogGoodQt()-$this->getTotalLogBadQt();
217+
}
218+
215219
public function getFormattedEndDateAttribute()
216220
{
217221
if(!is_null($this->end_date)){

‎resources/lang/en/general_content.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,7 @@
695695
'end_trans_key' => 'End',
696696
'finish_part_qty_trans_key' => 'Finish parts qty',
697697
'bad_part_qty_trans_key' => 'Bad part qty',
698+
'net_production_qty_trans_key' => 'Net production',
698699
'search_task_trans_key' => 'Search Task',
699700
'calculate_task_trans_key' => 'Calculate Task(s)',
700701
'calculate_date_task_trans_key' => 'Task Calculation Date',

‎resources/lang/fr/general_content.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -694,6 +694,7 @@
694694
'end_trans_key' => 'Fin',
695695
'finish_part_qty_trans_key' => 'Nombre de pièce finie',
696696
'bad_part_qty_trans_key' => 'Nombre de pièce mauvaise',
697+
'net_production_qty_trans_key' => 'Production net',
697698
'search_task_trans_key' => 'Recherche une tâche',
698699
'calculate_task_trans_key' => 'Calculer les tâches',
699700
'calculate_date_task_trans_key' => 'Calcul des dates des tâches',

‎resources/views/livewire/task-statu.blade.php

Lines changed: 52 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,16 @@
144144
</div>
145145
@endif
146146
<div class="row">
147-
<x-adminlte-info-box title="{{ __('general_content.finish_part_qty_trans_key') }}" text="{{ $Task->getTotalLogGoodQt() }} item(s)" icon="fa fa-database" theme="success"/>
147+
<x-adminlte-info-box title="{{ __('general_content.finish_part_qty_trans_key') }}" text="{{ $Task->getTotalLogGoodQt() }} item(s)" icon="fa fa-database" theme="info"/>
148148
</div>
149149
<div class="row">
150150
<x-adminlte-info-box title="{{ __('general_content.bad_part_qty_trans_key') }}" text="{{ $Task->getTotalLogBadQt() }} item(s)" icon="fa fa-arrow-down" theme="danger "/>
151151
</div>
152+
<div class="row">
153+
<x-adminlte-info-box title="{{ __('general_content.net_production_qty_trans_key') }}" text="{{ $Task->getTotalNetGoodQt() }} item(s)" icon="fa fa-check" theme="success "/>
154+
</div>
155+
156+
152157
<div class="text-muted">
153158
<p class="text-sm">{{ __('general_content.statu_trans_key') }}
154159
<b class="d-block">{{ $Task->status['title'] }}</b>
@@ -273,34 +278,36 @@
273278
<div class="row">
274279
@if($Task->service->type == 1 )
275280
@if($lastTaskActivities)
276-
<div class="form-group col-md-2 ">
281+
<div class="form-group col-md-4 ">
277282
<a class="btn btn-app bg-success @if($lastTaskActivities->type == 1 || $lastTaskActivities->type == 3) disabled @endif " wire:click="StartTimeTask({{$Task->id}})">
278-
<i class="fas fa-{{ __('general_content.play_trans_key') }}"></i> {{ __('general_content.play_trans_key') }}
283+
<i class="fas fa-play"></i> {{ __('general_content.play_trans_key') }}
279284
</a>
280285
</div>
281-
<div class="form-group col-md-2 ">
286+
<div class="form-group col-md-4 ">
282287
<a class="btn btn-app bg-warning @if($lastTaskActivities->type == 2 || $lastTaskActivities->type == 3) disabled @endif " wire:click="EndTimeTask({{$Task->id}})">
283-
<i class="fas fa-{{ __('general_content.pause_trans_key') }}"></i> {{ __('general_content.pause_trans_key') }}
288+
<i class="fas fa-pause"></i> {{ __('general_content.pause_trans_key') }}
284289
</a>
285290
</div>
286-
<div class="form-group col-md-2 ">
291+
<div class="form-group col-md-4 ">
287292
<a class="btn btn-app bg-danger @if($lastTaskActivities->type == 3) disabled @endif " wire:click="EndTask({{$Task->id}})">
288293
<i class="fas fa-stop"></i> {{ __('general_content.end_trans_key') }}
289294
</a>
290295
</div>
291296
@else
292-
<div class="form-group col-md-2 ">
297+
<div class="form-group col-md-4 ">
293298
<a class="btn btn-app bg-success" wire:click="StartTimeTask({{$Task->id}})">
294-
<i class="fas fa-{{ __('general_content.play_trans_key') }}"></i> {{ __('general_content.play_trans_key') }}
299+
<i class="fas fa-play"></i> {{ __('general_content.play_trans_key') }}
295300
</a>
296301
</div>
297302
@endif
298303
@else
299-
<div class="form-group col-md-2 ">
300-
<a class="btn btn-app bg-success" href="{{ route('purchases.request') }}" >{{ __('general_content.new_purchase_document_trans_key') }}</a>
304+
<div class="form-group col-md-4 ">
305+
<a class="btn btn-app bg-success" href="{{ route('purchases.request') }}" >
306+
<i class="fas fa-cash-register"></i>{{ __('general_content.new_purchase_document_trans_key') }}
307+
</a>
301308
</div>
302309

303-
<div class="form-group col-md-2 ">
310+
<div class="form-group col-md-4 ">
304311
<a class="btn btn-app bg-danger " wire:click="EndTask({{$Task->id}})">
305312
<i class="fas fa-stop"></i> {{ __('general_content.end_trans_key') }}
306313
</a>
@@ -332,6 +339,23 @@
332339
<div class="col-12 ">
333340
<form wire:submit.prevent="addGoodQtFromUser">
334341
<label for="addGoodQt">{{ __('general_content.good_rejected_trans_key') }} :</label>
342+
<div class="row">
343+
<div class="form-group col-md-4 ">
344+
<a class="btn btn-app bg-info " wire:click="FastaddGoodQt(1)">
345+
<i class="fas fa-thumbs-up"></i> +1
346+
</a>
347+
</div>
348+
<div class="form-group col-md-4 ">
349+
<a class="btn btn-app bg-info " wire:click="FastaddGoodQt(10)">
350+
<i class="fas fa-thumbs-up"></i> +10
351+
</a>
352+
</div>
353+
<div class="form-group col-md-4 ">
354+
<a class="btn btn-app bg-info " wire:click="FastaddGoodQt(100)">
355+
<i class="fas fa-thumbs-up"></i> +100
356+
</a>
357+
</div>
358+
</div>
335359
<div class="input-group input-group-sm">
336360
<div class="input-group-prepend">
337361
<span class="input-group-text"><i class="fas fa-times"></i></span>
@@ -349,6 +373,23 @@
349373
<div class="col-12 ">
350374
<form wire:submit.prevent="addRejectedQt">
351375
<label for="addBadQt">{{ __('general_content.quantity_rejected_trans_key') }} :</label>
376+
<div class="row">
377+
<div class="form-group col-md-4 ">
378+
<a class="btn btn-app bg-orange " wire:click="FastaddBadQt(1)">
379+
<i class="fas fa-thumbs-down"></i> -1
380+
</a>
381+
</div>
382+
<div class="form-group col-md-4 ">
383+
<a class="btn btn-app bg-orange " wire:click="FastaddBadQt(10)">
384+
<i class="fas fa-thumbs-down"></i> -10
385+
</a>
386+
</div>
387+
<div class="form-group col-md-4 ">
388+
<a class="btn btn-app bg-orange " wire:click="FastaddBadQt(100)">
389+
<i class="fas fa-thumbs-down"></i> -100
390+
</a>
391+
</div>
392+
</div>
352393
<div class="input-group input-group-sm">
353394
<div class="input-group-prepend">
354395
<span class="input-group-text"><i class="fas fa-times"></i></span>

0 commit comments

Comments
 (0)