Small project update
This commit is contained in:
parent
e9165fd5d3
commit
1bbbdc279e
|
|
@ -78,11 +78,6 @@ public function receiveQuestionsEquipment($equipmentID)
|
||||||
|
|
||||||
return response()->json($answersWithYes);
|
return response()->json($answersWithYes);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public function receiveAnswersEquipment(Request $request, $control_equipment_workstation_id)
|
public function receiveAnswersEquipment(Request $request, $control_equipment_workstation_id)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -69,12 +69,20 @@ public function refreshDataEquipments($datasProject)
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->receiveElementalTasksAll = $elementalTasksCountsAll;
|
$this->receiveElementalTasksAll = $elementalTasksCountsAll;
|
||||||
|
|
||||||
|
// Obtém a contagem das tarefas considerando os critérios especificados
|
||||||
$tasksCount = ControlEquipmentWorkstation::whereIn('elemental_tasks_id', $elementalTasks)
|
$tasksCount = ControlEquipmentWorkstation::whereIn('elemental_tasks_id', $elementalTasks)
|
||||||
->whereIn('equipmentWorkHistorys_id', $receiveEquipmentsProject->pluck('equipmentWorkHistorys_id'))
|
->whereIn('equipmentWorkHistorys_id', $receiveEquipmentsProject->pluck('equipmentWorkHistorys_id'))
|
||||||
->get(['equipmentWorkHistorys_id', 'elemental_tasks_id'])
|
->get(['equipmentWorkHistorys_id', 'elemental_tasks_id', 'departure_date', 'status'])
|
||||||
->groupBy('elemental_tasks_id')
|
->groupBy('elemental_tasks_id')
|
||||||
->map(function ($group) {
|
->map(function ($group, $taskId) {
|
||||||
|
if ($taskId == 9) {
|
||||||
|
return $group->filter(function ($item) {
|
||||||
|
return $item->departure_date !== null && $item->status == 1;
|
||||||
|
})->unique('equipmentWorkHistorys_id')->count();
|
||||||
|
} else {
|
||||||
return $group->unique('equipmentWorkHistorys_id')->count();
|
return $group->unique('equipmentWorkHistorys_id')->count();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
$newArray = [];
|
$newArray = [];
|
||||||
|
|
@ -95,6 +103,7 @@ public function refreshDataEquipments($datasProject)
|
||||||
}
|
}
|
||||||
$this->receiveElementalTasksAll = $newArray1;
|
$this->receiveElementalTasksAll = $newArray1;
|
||||||
$this->countElementalTasksAll = array_sum($this->receiveElementalTasksAll);
|
$this->countElementalTasksAll = array_sum($this->receiveElementalTasksAll);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function render()
|
public function render()
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
<section class="content">
|
<section class="content">
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<div class="row justify-content-center">
|
<div class="row justify-content-center">
|
||||||
|
<div class="col-12">
|
||||||
<div class="card card-primary" id="cardAssetsTable">
|
<div class="card card-primary" id="cardAssetsTable">
|
||||||
|
|
||||||
<div class="card-header">
|
<div class="card-header">
|
||||||
|
|
|
||||||
|
|
@ -6084,5 +6084,4 @@ class="form-control" placeholder=""
|
||||||
</div>
|
</div>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
|
|
||||||
@endisset
|
@endisset
|
||||||
Loading…
Reference in New Issue
Block a user