update files

This commit is contained in:
ygbanzato 2023-11-30 14:18:56 +00:00
parent dbd3063868
commit 9112766a74
4442 changed files with 67 additions and 70 deletions

View File

@ -18,10 +18,12 @@
class ExecutionProjectController extends Controller class ExecutionProjectController extends Controller
{ {
public function test11($projectID,$equipmentID) public function test11($equipmentID)
{ {
$dataEquipment =Equipment::find($equipmentID); $dataEquipment =Equipment::find($equipmentID);
// dd($dataEquipment);
$attributes = SpecificAttributesEquipmentType::where('equipment_id', $equipmentID)->get(); // recebe todos os atributos espesificos do equipamento $attributes = SpecificAttributesEquipmentType::where('equipment_id', $equipmentID)->get(); // recebe todos os atributos espesificos do equipamento
$OrdemTasks = OrderEquipmentTasks::where('equipment_id', $equipmentID)->get(); // Todas as tarefas que o equipamento vai realizar : $OrdemTasks = OrderEquipmentTasks::where('equipment_id', $equipmentID)->get(); // Todas as tarefas que o equipamento vai realizar :
$OrdemTasksIds = $OrdemTasks->pluck('elemental_tasks_id')->all(); // Array de IDs $OrdemTasksIds = $OrdemTasks->pluck('elemental_tasks_id')->all(); // Array de IDs
@ -34,9 +36,22 @@ public function getDataEquipment(Request $request)
$numberProject = $request->get('numberProject'); $numberProject = $request->get('numberProject');
$equipment = Equipment::with('equipmentType') // Certifique-se de que o método 'equipmentType' existe no modelo 'Equipment' // Inicia a consulta
->select(['equipment_id', 'equipment_tag', 'unit_id', 'equipment_type_id']) $query = Equipment::with('equipmentType')
->where('company_projects_id', $numberProject); ->select(['equipment_id', 'equipment_tag', 'unit_id', 'equipment_type_id']);
// Adiciona a cláusula where se numberProject for fornecido
if ($numberProject) {
$query->where('company_projects_id', $numberProject);
}
// Executa a consulta e obtém os resultados
$equipment = $query->get();
// $equipment = Equipment::with('equipmentType') // Certifique-se de que o método 'equipmentType' existe no modelo 'Equipment'
// ->select(['equipment_id', 'equipment_tag', 'unit_id', 'equipment_type_id'])
// ->where('company_projects_id', $numberProject);
return DataTables::of($equipment) return DataTables::of($equipment)
->addColumn('unit_name', function ($equipment) { ->addColumn('unit_name', function ($equipment) {

0
app/Http/Controllers/LanguageController.php Normal file → Executable file
View File

0
app/Http/Controllers/WorkstationsJobsController.php Normal file → Executable file
View File

0
app/Http/Middleware/CheckAdmin.php Normal file → Executable file
View File

0
app/Http/Middleware/CheckTechnical.php Normal file → Executable file
View File

0
app/Http/Middleware/Language.php Normal file → Executable file
View File

0
app/Http/ViewComposers/WorkstationComposer.php Normal file → Executable file
View File

0
app/Livewire/Articulado/AdditonalTask.php Normal file → Executable file
View File

View File

0
app/Livewire/Execução/EquipmentsDashboard.php Normal file → Executable file
View File

0
app/Livewire/Execução/StepByStepEquipmentTasks.php Normal file → Executable file
View File

0
app/Livewire/Execução/TasksDashboard.php Normal file → Executable file
View File

0
app/Livewire/Execução/WorkstationDashboard.php Normal file → Executable file
View File

0
app/Livewire/ManagementDashboard/WorkManagement.php Normal file → Executable file
View File

View File

0
app/Models/QrcodesAssociatedEquipment.php Normal file → Executable file
View File

0
app/Models/workstationsTaskAnswers.php Normal file → Executable file
View File

0
app/Repositories/ReceiveTasksRepository.php Normal file → Executable file
View File

0
config/livewire.php Normal file → Executable file
View File

0
public/assets/dist/css/adminlte.css vendored Normal file → Executable file
View File

0
public/assets/dist/css/adminlte.min.css vendored Normal file → Executable file
View File

0
public/assets/dist/css/adminlte1.css vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.components.css vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.components.css.map vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.components.min.css vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.components.min.css.map vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.core.css vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.core.css.map vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.core.min.css vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.core.min.css.map vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.extra-components.css vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.extra-components.css.map vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.extra-components.min.css vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.extra-components.min.css.map vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.light.css vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.light.css.map vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.light.min.css vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.light.min.css.map vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.pages.css vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.pages.css.map vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.pages.min.css vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.pages.min.css.map vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.plugins.css vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.plugins.css.map vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.plugins.min.css vendored Normal file → Executable file
View File

0
public/assets/dist/css/alt/adminlte.plugins.min.css.map vendored Normal file → Executable file
View File

0
public/assets/dist/css/bootstrap.min.css vendored Normal file → Executable file
View File

0
public/assets/dist/css/mystyles.css vendored Normal file → Executable file
View File

0
public/assets/dist/img/AdminLTELogo.png vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

0
public/assets/dist/img/avatar.png vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

0
public/assets/dist/img/avatar2.png vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

0
public/assets/dist/img/avatar3.png vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

0
public/assets/dist/img/avatar4.png vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

0
public/assets/dist/img/avatar5.png vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

0
public/assets/dist/img/boxed-bg.jpg vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 121 KiB

After

Width:  |  Height:  |  Size: 121 KiB

0
public/assets/dist/img/boxed-bg.png vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 43 KiB

0
public/assets/dist/img/credit/american-express.png vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

0
public/assets/dist/img/credit/cirrus.png vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
public/assets/dist/img/credit/mastercard.png vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
public/assets/dist/img/credit/paypal.png vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
public/assets/dist/img/credit/paypal2.png vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
public/assets/dist/img/credit/visa.png vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
public/assets/dist/img/default-150x150.png vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 339 B

After

Width:  |  Height:  |  Size: 339 B

0
public/assets/dist/img/favicon.ico vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

0
public/assets/dist/img/icons.png vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
public/assets/dist/img/ispt.jpg vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
public/assets/dist/img/ispt40.jpg vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

0
public/assets/dist/img/photo1.png vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 647 KiB

After

Width:  |  Height:  |  Size: 647 KiB

0
public/assets/dist/img/photo2.png vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 413 KiB

After

Width:  |  Height:  |  Size: 413 KiB

0
public/assets/dist/img/photo3.jpg vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 362 KiB

After

Width:  |  Height:  |  Size: 362 KiB

0
public/assets/dist/img/photo4.jpg vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

0
public/assets/dist/img/prod-1.jpg vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

0
public/assets/dist/img/prod-2.jpg vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

0
public/assets/dist/img/prod-3.jpg vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

0
public/assets/dist/img/prod-4.jpg vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

0
public/assets/dist/img/prod-5.jpg vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

0
public/assets/dist/img/user1-128x128.jpg vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

0
public/assets/dist/img/user2-160x160.jpg vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

0
public/assets/dist/img/user3-128x128.jpg vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

0
public/assets/dist/img/user4-128x128.jpg vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

0
public/assets/dist/img/user5-128x128.jpg vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

0
public/assets/dist/img/user6-128x128.jpg vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

0
public/assets/dist/img/user7-128x128.jpg vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

0
public/assets/dist/img/user8-128x128.jpg vendored Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

0
public/assets/dist/js/.eslintrc.json vendored Normal file → Executable file
View File

0
public/assets/dist/js/adminlte.js vendored Normal file → Executable file
View File

0
public/assets/dist/js/adminlte.js.map vendored Normal file → Executable file
View File

0
public/assets/dist/js/adminlte.min.js vendored Normal file → Executable file
View File

0
public/assets/dist/js/adminlte.min.js.map vendored Normal file → Executable file
View File

0
public/assets/dist/js/demo.js vendored Normal file → Executable file
View File

0
public/assets/dist/js/pages/dashboard.js vendored Normal file → Executable file
View File

0
public/assets/dist/js/pages/dashboard2.js vendored Normal file → Executable file
View File

0
public/assets/dist/js/pages/dashboard3.js vendored Normal file → Executable file
View File

0
public/assets/dist/js/qrcode.js vendored Normal file → Executable file
View File

0
public/assets/fonts/PTSans-Regular.ttf Normal file → Executable file
View File

View File

View File

View File

Some files were not shown because too many files have changed in this diff Show More