diff --git a/app/Http/Controllers/CreateProjectController.php b/app/Http/Controllers/CreateProjectController.php index e7c67531..921b2a92 100644 --- a/app/Http/Controllers/CreateProjectController.php +++ b/app/Http/Controllers/CreateProjectController.php @@ -249,6 +249,20 @@ public function createWorkStations(Request $request) $workstation->save(); } + preg_match('/workstation(\d+)-/', $workstation->name_workstations, $matches); + $receiveNumberWorkstation = $matches[1]; + + $receveProjectCompanyNumber = CompanyProject::where('company_projects_id',$numberProject)->first(); + + //Apos criar a Workstation vamos criar um login para pode aceder os postos de trabalho na obra + $loginWorkStation = new User; + $loginWorkStation->user_name = $workstation->name_workstations; + $loginWorkStation->email = $receveProjectCompanyNumber->project_company_number.'-'.$receiveNumberWorkstation.'@isptgroup.com'; + $loginWorkStation->password = bcrypt($receveProjectCompanyNumber->project_company_number.'-'.$receiveNumberWorkstation) ; + $loginWorkStation->type_users = 5; + $loginWorkStation->user_nif = $receveProjectCompanyNumber->project_company_number.'-'.$receiveNumberWorkstation; + $loginWorkStation->save(); + // Redireciona para onde você quiser após a criação das workstations return redirect()->route('test3', ['id' => $request->numberProject]) ->with('success', $numberWorkstations . ' Postos de Trabalho criados !!!') @@ -324,6 +338,8 @@ public function CreateNewEquipmentFromPendingEquipment(Request $request, $id) $newEquipmentAssociationAmbits->equipment_id = $receiveEquipmentID; $newEquipmentAssociationAmbits->save(); + + $checkPendingEquipment->delete(); return back()->with('success', 'Equipamento ' . $newEquipment->equipment_tag . ' criado com sucesso'); @@ -332,7 +348,6 @@ public function CreateNewEquipmentFromPendingEquipment(Request $request, $id) public function processStep1(Request $request) { - // dd($request); // Validação... $installationId = $request->input('installation_id'); @@ -345,7 +360,7 @@ public function processStep1(Request $request) $newInstallation->plant_address = $request->input('new_company_address'); $newInstallation->user_id = $request->input('user_id'); - // $newInstallation->save(); + $newInstallation->save(); // Use o id da nova instalação. $installationId = $newInstallation->plant_id; @@ -422,6 +437,7 @@ public function showStep2($company_projects_id) ->where('company_projects_id', $company_projects_id) ->get(); + $pendingEquipments = PendingEquipment::where('pending_company_projects_id', $numberProject)->get(); if (!$pendingEquipments->isEmpty()) { @@ -617,15 +633,12 @@ public function processStep2(Request $request) $checkFactory = Unit::where('unit_name', $datas['fabrica'])->first(); - // Antes de criar o novo equipamento, verifique se já existe um equipamento // com o mesmo factory_id e tag. $existingEquipment = Equipment::where('unit_id', $checkFactory->unit_id) ->where('equipment_tag', $datas['tag']) ->first(); - - if ($existingEquipment) { // Se o equipamento existir, crie o novo equipamento na tabela pending_equipaments. @@ -660,6 +673,7 @@ public function processStep2(Request $request) $newEquipament->save(); + $countNewEquipment++; // Guardo os valores de 'id' e do 'tipo de equipamento' que nosso novo equipamento acabado de criar diff --git a/app/Http/Controllers/ExecutionProjectController.php b/app/Http/Controllers/ExecutionProjectController.php index ab450b37..6af93364 100644 --- a/app/Http/Controllers/ExecutionProjectController.php +++ b/app/Http/Controllers/ExecutionProjectController.php @@ -5,7 +5,9 @@ use Illuminate\Http\Request; use App\Models\CompanyProject; use App\Models\ConstructionWorkstation; +use App\Models\ControlEquipmentWorkstation; use App\Models\Equipment; +use App\Models\EquipmentComments; use App\Models\EquipmentType; use App\Models\OrderEquipmentTasks; @@ -13,9 +15,13 @@ class ExecutionProjectController extends Controller { + public function enterWorkstation() + { + return view('enterWorkstation'); + } + public function receiveExecutionProject($ProjectId) { - $DatasProject = CompanyProject::find($ProjectId); $equipmentsTypes = EquipmentType::all(); @@ -27,65 +33,79 @@ public function receiveExecutionProject($ProjectId) public function receiveWorkstationExecutionProject($receiveNumberProject) { - $model = ConstructionWorkstation::where('company_projects_id', $receiveNumberProject)->with('workstationsAssociationTasks'); return DataTables::of($model) - // ->addColumn('workstations_Association_Tasks', function ($row) { - // return $row->workstationsAssociationTasks->pluck('elemental_tasks_id')->implode('-'); - // }) + ->addColumn('workstations_Association_Tasks', function ($row) { + return $row->workstationsAssociationTasks->map(function ($task) { + return $task->elementalTask->elemental_tasks_code; + })->implode('-'); + }) + ->toJson(); } public function receiveEquipmentIdForShowModal($EquipmentID) { + // Recebe e encontra os dados do Equipamento indicada na Tabela. $equipment = Equipment::find($EquipmentID); + // Recebe todas as tarefas e devolve em um Array $task_codes = $equipment->orderEquipmentTasks->map(function ($task) { return $task->elementalTask->elemental_tasks_code; })->toArray(); - return response()->json(['task_codes' => $task_codes]); + $receveControlEquipment = ControlEquipmentWorkstation::where('equipment_id',$EquipmentID)->get(); + + $receiveCommentsEquipment = EquipmentComments::where('equipment_id',$EquipmentID)->get(); + + // return view('projectsClients/executionProject',['receveControlEquipment'=>$receveControlEquipment]); + return response()->json(['task_codes' => $task_codes,'receveControlEquipment' => $receveControlEquipment, 'receiveCommentsEquipment' => $receiveCommentsEquipment]); } - public function receiveEquipmentsExecutionProject($receiveNumberProject) - { - // Recebe os dados vindos da funcao 'data' criada na view - $equipment_type_id = request('equipment_type_id'); - $ambits_id = request('ambits_id'); + // public function receiveEquipmentsExecutionProject($receiveNumberProject) + // { + // // Recebe os dados vindos da funcao 'data' criada na view + // $equipment_type_id = request('equipment_type_id'); + // $ambits_id = request('ambits_id'); - //Recebe sempre apenas os equipamentos relacionados a obra - $model = Equipment::where('company_projects_id', $receiveNumberProject); + // //Recebe sempre apenas os equipamentos relacionados a obra + // $model = Equipment::where('company_projects_id', $receiveNumberProject); - // Caso 'equipment_type_id' seja '#', mostra todos os equipamentos - if ($equipment_type_id == '#') { - $model = Equipment::query()->with(['equipmentType', 'unit', 'equipmentAssociationAmbit.ambitsEquipment']); - } - // Caso 'equipment_type_id' não seja '#', filtra os equipamentos por tipo e ambito (caso 'ambits_id' não seja '#') - else { - $equipment_type_id = intval($equipment_type_id); - $model = Equipment::where('equipments.equipment_type_id', $equipment_type_id) - ->join('equipment_association_ambits', 'equipments.equipment_id', '=', 'equipment_association_ambits.equipment_id') - ->with(['equipmentType', 'unit', 'equipmentAssociationAmbit.ambitsEquipment']); + // // Caso 'equipment_type_id' seja '#', mostra todos os equipamentos + // if ($equipment_type_id == '#') { + // $model = Equipment::query()->with(['equipmentType', 'unit', 'equipmentAssociationAmbit.ambitsEquipment']); + // } + // // Caso 'equipment_type_id' não seja '#', filtra os equipamentos por tipo e ambito (caso 'ambits_id' não seja '#') + // else { + // $equipment_type_id = intval($equipment_type_id); + // $model = Equipment::where('equipments.equipment_type_id', $equipment_type_id) + // ->join('equipment_association_ambits', 'equipments.equipment_id', '=', 'equipment_association_ambits.equipment_id') + // ->with(['equipmentType', 'unit', 'equipmentAssociationAmbit.ambitsEquipment']); - if ($ambits_id != '#') { - $ambits_id = intval($ambits_id); - $model->where('equipment_association_ambits.ambits_id', $ambits_id); - } - } + // if ($ambits_id != '#') { + // $ambits_id = intval($ambits_id); + // $model->where('equipment_association_ambits.ambits_id', $ambits_id); + // } + // } - return DataTables::of($model) - ->addColumn('equipment_type', function ($row) { - return $row->equipmentType->equipment_type_name; - }) - ->addColumn('Ambits', function ($row) { - return $row->equipmentAssociationAmbit->ambitsEquipment->ambits_description; - }) - ->addColumn('order_tasks', function ($row) { - return $row->orderEquipmentTasks->map(function ($task) { - return $task->elementalTask->elemental_tasks_code; - })->implode('-'); - }) - ->toJson(); - } + // return DataTables::of($model) + // ->addColumn('equipment_type', function ($row) { + // return $row->equipmentType->equipment_type_name; + // }) + // ->addColumn('Ambits', function ($row) { + // return $row->equipmentAssociationAmbit->ambitsEquipment->ambits_description; + // }) + // ->addColumn('order_tasks', function ($row) { + // return $row->orderEquipmentTasks->map(function ($task) { + // return $task->elementalTask->elemental_tasks_code; + // })->implode('-'); + // }) + // ->addColumn('current_task', function ($row) { + // return $row->controlEquipmentWorkstation->map(function ($task) { + // return $task->elementalTask->elemental_tasks_code; + // })->implode('-'); + // }) + // ->toJson(); + // } } diff --git a/app/Http/Controllers/ProjectoDatacontroller.php b/app/Http/Controllers/ProjectoDatacontroller.php index 4640f1e7..1d2fc988 100644 --- a/app/Http/Controllers/ProjectoDatacontroller.php +++ b/app/Http/Controllers/ProjectoDatacontroller.php @@ -2,22 +2,33 @@ namespace App\Http\Controllers; + +use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; + +use Yajra\DataTables\Facades\DataTables; + use App\Models\Equipment; use App\Models\Plant; use App\Models\CompanyProject; -use Illuminate\Support\Facades\DB; -use Illuminate\Http\Request; + + + + + +use App\Models\ConstructionWorkstation; class ProjectoDatacontroller extends Controller { - public function HomePage(){ + public function HomePage() + { $CompanyProject = CompanyProject::all(); return view('Admin/index') - // return view('codePronto'); - ->with("CompanyProject", $CompanyProject); + // return view('codePronto'); + ->with("CompanyProject", $CompanyProject); } public function ManageAssets() @@ -36,7 +47,7 @@ public function ManageAssets() // ->get(); // return view('Admin/DataManagement/manageassets', compact('units','equipaments')); - return view('Admin/DataManagement/manageassets', compact('units','equipments')); + return view('Admin/DataManagement/manageassets', compact('units', 'equipments')); } public function showUnit($id) @@ -45,4 +56,77 @@ public function showUnit($id) $equipaments = Equipment::where('equipment_id', $id)->firstOrFail(); return view('Admin/DataManagement/showEquipament', compact('equipaments')); } + + + + public function receiveEquipmentsProject($receiveNumberProject) + { + // Recebe os dados vindos da funcao 'data' criada na view + $equipment_type_id = request('equipment_type_id'); + $ambits_id = request('ambits_id'); + + //Recebe sempre apenas os equipamentos relacionados a obra + // $model = Equipment::where('company_projects_id', $receiveNumberProject); + + // Caso 'equipment_type_id' seja '#', mostra todos os equipamentos + if ($equipment_type_id == '#') { + $model = Equipment::query() + ->where('company_projects_id', $receiveNumberProject) + ->with(['equipmentType', 'unit', 'equipmentAssociationAmbit.ambitsEquipment']); + + } + // Caso 'equipment_type_id' não seja '#', filtra os equipamentos por tipo e ambito (caso 'ambits_id' não seja '#') + else { + $equipment_type_id = intval($equipment_type_id); + $model = Equipment::where('equipments.equipment_type_id', $equipment_type_id) + ->where('company_projects_id', $receiveNumberProject) + ->join('equipment_association_ambits', 'equipments.equipment_id', '=', 'equipment_association_ambits.equipment_id') + ->with(['equipmentType', 'unit', 'equipmentAssociationAmbit.ambitsEquipment']); + + if ($ambits_id != '#') { + $ambits_id = intval($ambits_id); + $model->where('equipment_association_ambits.ambits_id', $ambits_id) + ->where('company_projects_id', $receiveNumberProject); + } + } + + return DataTables::of($model) + ->addColumn('equipment_type', function ($row) { + return $row->equipmentType->equipment_type_name; + }) + ->addColumn('Unit', function ($row) { + return $row->unit->unit_name; + }) + ->addColumn('Ambits', function ($row) { + return $row->equipmentAssociationAmbit->ambitsEquipment->ambits_description; + }) + ->addColumn('order_tasks', function ($row) { + return $row->orderEquipmentTasks->map(function ($task) { + return $task->elementalTask->elemental_tasks_code; + })->implode('-'); + }) + ->addColumn('current_task', function ($row) { + return $row->controlEquipmentWorkstation->map(function ($task) { + return $task->elementalTask->elemental_tasks_code; + })->implode('-'); + }) + ->addColumn('Inspec', function ($row) { + return $row->hasInspectionYes() ? 'Sim' : 'Nao'; + }) + ->toJson(); + } + + public function receiveWorkstationProject($receiveNumberProject) + { + $model = ConstructionWorkstation::where('company_projects_id', $receiveNumberProject)->with('workstationsAssociationTasks'); + + return DataTables::of($model) + ->addColumn('workstations_Association_Tasks', function ($row) { + return $row->workstationsAssociationTasks->map(function ($task) { + return $task->elementalTask->elemental_tasks_code; + })->implode('-'); + }) + + ->toJson(); + } } diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index cc45f63c..61df7452 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -54,6 +54,7 @@ class Kernel extends HttpKernel */ protected $middlewareAliases = [ 'checksuperadmin' => \App\Http\Middleware\CheckSuperAdmin::class, + 'checkUserType' => \App\Http\Middleware\CheckUserType::class, 'auth' => \App\Http\Middleware\Authenticate::class, 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, 'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class, diff --git a/app/Http/Middleware/CheckSuperAdmin.php b/app/Http/Middleware/CheckSuperAdmin.php index c77afe74..e7cca991 100644 --- a/app/Http/Middleware/CheckSuperAdmin.php +++ b/app/Http/Middleware/CheckSuperAdmin.php @@ -20,6 +20,5 @@ public function handle(Request $request, Closure $next): Response } return abort(403, 'Acesso não autorizado.'); - // return $next($request); } } diff --git a/app/Http/Middleware/CheckUserType.php b/app/Http/Middleware/CheckUserType.php new file mode 100644 index 00000000..882bda81 --- /dev/null +++ b/app/Http/Middleware/CheckUserType.php @@ -0,0 +1,33 @@ +user()) { + $currentRoute = Route::currentRouteName(); + $userType = auth()->user()->userType->type_user; + + if ($userType == 'Super_Administrador' && $currentRoute != 'home') { + return redirect()->route('home'); + } elseif ($userType == 'Tecnicos' && $currentRoute != 'enterWorkstation') { + return redirect()->route('enterWorkstation'); + } + } + + return $next($request); + } +} diff --git a/app/Models/ConstructionWorkstation.php b/app/Models/ConstructionWorkstation.php index e5b13013..f2a27509 100644 --- a/app/Models/ConstructionWorkstation.php +++ b/app/Models/ConstructionWorkstation.php @@ -15,12 +15,8 @@ class ConstructionWorkstation extends Model protected $primaryKey = 'id_workstations'; - // public function workstationsAssociationTasks() - // { - // return $this->hasMany(WorkstationsAssociationTasks::class, 'id_workstations', 'id_workstations'); - // } public function workstationsAssociationTasks() { - return $this->hasMany(WorkstationsAssociationTasks::class, 'id_workstations'); + return $this->hasMany(WorkstationsAssociationTasks::class, 'id_workstations','id_workstations'); } } diff --git a/app/Models/ControlEquipmentWorkstation.php b/app/Models/ControlEquipmentWorkstation.php new file mode 100644 index 00000000..8e935ee1 --- /dev/null +++ b/app/Models/ControlEquipmentWorkstation.php @@ -0,0 +1,27 @@ +belongsTo(Equipment::class, 'equipment_id', 'equipment_id'); + } + + public function elementalTask() + { + return $this->belongsTo(ElementalTasks::class,'elemental_tasks_id','elemental_tasks_id'); + } +} diff --git a/app/Models/ElementalTasks.php b/app/Models/ElementalTasks.php index 622dfc26..07c9b0e9 100644 --- a/app/Models/ElementalTasks.php +++ b/app/Models/ElementalTasks.php @@ -18,4 +18,14 @@ public function orderEquipmentTasks() { return $this->hasMany(OrderEquipmentTasks::class,'elemental_tasks_id','elemental_tasks_id'); } + + public function controlEquipmentWorkstation() + { + return $this->hasMany(ControlEquipmentWorkstation::class, 'elemental_tasks_id', 'elemental_tasks_id'); + } + + public function workstationsAssociationTasks() + { + return $this->hasMany(WorkstationsAssociationTasks::class,'elemental_tasks_id','elemental_tasks_id'); + } } diff --git a/app/Models/Equipment.php b/app/Models/Equipment.php index 9540d9ac..fc7552fa 100644 --- a/app/Models/Equipment.php +++ b/app/Models/Equipment.php @@ -48,8 +48,20 @@ public function orderEquipmentTasks() return $this->hasMany(OrderEquipmentTasks::class, 'equipment_id', 'equipment_id'); } + public function equipmentComments() + { + return $this->hasMany(EquipmentComments::class, 'equipment_id', 'equipment_id'); + } + + public function controlEquipmentWorkstation() + { + return $this->hasMany(ControlEquipmentWorkstation::class, 'equipment_id', 'equipment_id'); + } + public function hasInspectionYes() { return $this->orderEquipmentTasks()->where('inspection', 'Sim')->exists(); } + + } diff --git a/app/Models/EquipmentComments.php b/app/Models/EquipmentComments.php new file mode 100644 index 00000000..63e53372 --- /dev/null +++ b/app/Models/EquipmentComments.php @@ -0,0 +1,23 @@ +belongsTo(Equipment::class, 'equipment_id', 'equipment_id'); + } +} diff --git a/app/Models/WorkstationsAssociationTasks.php b/app/Models/WorkstationsAssociationTasks.php index 987d93cd..4a9ef160 100644 --- a/app/Models/WorkstationsAssociationTasks.php +++ b/app/Models/WorkstationsAssociationTasks.php @@ -14,12 +14,12 @@ class WorkstationsAssociationTasks extends Model protected $table = 'workstations_association_tasks'; - // public function constructionWorkstation() - // { - // return $this->belongsTo(ConstructionWorkstation::class, 'equipment_id', 'equipment_id'); - // } public function constructionWorkstation() { - return $this->belongsTo(ConstructionWorkstation::class, 'id_workstations'); + return $this->belongsTo(ConstructionWorkstation::class, 'id_workstations','id_workstations'); + } + public function elementalTask() + { + return $this->belongsTo(ElementalTasks::class,'elemental_tasks_id','elemental_tasks_id'); } } diff --git a/app/Providers/FortifyServiceProvider.php b/app/Providers/FortifyServiceProvider.php index 6d322a67..f39a60a5 100644 --- a/app/Providers/FortifyServiceProvider.php +++ b/app/Providers/FortifyServiceProvider.php @@ -20,9 +20,6 @@ use App\Http\Controllers\Auth\ResetPasswordController; use App\Http\Controllers\Auth\PasswordResetLinkController; - - - use Laravel\Fortify\Fortify; class FortifyServiceProvider extends ServiceProvider diff --git a/resources/views/enterWorkstation.blade.php b/resources/views/enterWorkstation.blade.php new file mode 100644 index 00000000..127ef28c --- /dev/null +++ b/resources/views/enterWorkstation.blade.php @@ -0,0 +1,7 @@ +@extends('Templates/templateAdmin') + +@section('Main-content') + +

Bem Vindo ...

+ +@endsection \ No newline at end of file diff --git a/resources/views/projectsClients/articulated_2.blade.php b/resources/views/projectsClients/articulated_2.blade.php index 78792783..9f6b1109 100644 --- a/resources/views/projectsClients/articulated_2.blade.php +++ b/resources/views/projectsClients/articulated_2.blade.php @@ -1216,6 +1216,7 @@ class="fas fa-plus"> + @foreach ($listEquipmentsProjects as $listEquipmentsProject) {{ $listEquipmentsProject->unit->unit_name ?? 'Sem Fabrica Associada!!!' }} @@ -1224,7 +1225,7 @@ class="fas fa-plus"> {{ $listEquipmentsProject->equipment_tag }} {{ $listEquipmentsProject->equipment_description }} - {{ $listEquipmentsProject->equipmentAssociationAmbit->first()->ambitsEquipment->ambits_description ?? 'Sem Descrição Ambit Associada!!!' }} + {{ $listEquipmentsProject->equipmentAssociationAmbit->ambitsEquipment->ambits_description ?? 'Sem Descrição Ambit Associada!!!' }}

Ambito : - {{ $listEquipmentsProject->equipmentAssociationAmbit->first()->ambitsEquipment->ambits_description }} + {{ $listEquipmentsProject->equipmentAssociationAmbit->ambitsEquipment->ambits_description }}

@@ -114,8 +114,8 @@ class="btn btn-block bg-gradient-primary btn-lg">Articulado

Articulado

+ class="fas fa-plus"> + -->
@@ -168,7 +168,8 @@ class="form-control">
- +
@@ -208,8 +209,8 @@ class="form-control">
+ + -->
@@ -289,7 +290,7 @@ class="table table-bordered table-striped">
- + @@ -332,12 +333,52 @@ class="table table-bordered table-striped">
+
+ +
+
+

Registros

+
+ +
+ +
+ +
+

Historico de registro :

+
+
Work Entry:
+
+
+
+ +
+ +
+ +
+
+

Comments

+
+
+
+
+
+ + +
+
+ + + {{-- ./Modal-showProgressEquipment --}} @endsection @@ -346,12 +387,19 @@ class="table table-bordered table-striped"> + $('#TableExecutionProjectWorkstation').DataTable({ + autoWidth: false, + processing: true, + serverSide: true, + ajax: { + url: '/api/receiveWorkstationProject/' + $('#receiveNumberProject').val() + }, + columns: [{ + data: 'name_workstations', + name: 'name_workstations' + }, + { + data: 'nomenclature_workstation', + name: 'nomenclature_workstation' + }, + { + data: 'workstations_Association_Tasks', + name: 'workstations_Association_Tasks' + } + + ] + }) + }) + + + + @endsection + +{{-- // ajax: { + // url: "{{ route('getData') }}", + // data: function(d) { + // // Adiciona o 'equipment_type_id' selecionado aos parâmetros da solicitação + // d.equipment_type_id = $('#tipo_valvulasList').val(); + // d.unit_id = $('#UnitsList').val(); + // d.ambits_id = $('#AmbitsEquipments_list').val(); + // d.inspec = $('#inspecValvula').val(); + // }, + // }, --}} \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 35ca4c4f..9a654ca4 100644 --- a/routes/web.php +++ b/routes/web.php @@ -29,13 +29,16 @@ use App\Http\Controllers\ExecutionProjectController; + Route::get('ExecutionProject/{ProjectId}',[ExecutionProjectController::class,'receiveExecutionProject'])->name('ExecutionProject'); Route::get('/ReceiveEquipmentIdForShowModal/{EquipmentID}',[ExecutionProjectController::class,'receiveEquipmentIdForShowModal'])->name('ReceiveEquipmentIdForShowModal '); -Route::get('/api/receiveEquipmentsExecutionProject/{receiveNumberProject}',[ExecutionProjectController::class,'receiveEquipmentsExecutionProject'])->name('receiveEquipmentsExecutionProject'); +// Route::get('/api/receiveEquipmentsExecutionProject/{receiveNumberProject}',[ExecutionProjectController::class,'receiveEquipmentsExecutionProject'])->name('receiveEquipmentsExecutionProject'); +Route::get('/api/receiveEquipmentsProject/{receiveNumberProject}',[ProjectoDatacontroller::class,'receiveEquipmentsProject']); +Route::get('/api/receiveWorkstationProject/{receiveNumberProject}',[ProjectoDatacontroller::class,'receiveWorkstationProject' ]); + -Route::get('/api/receiveWorkstationExecutionProject/{receiveNumberProject}',[ExecutionProjectController::class,'receiveWorkstationExecutionProject' ]); Route::get('user-data', [PreparedProjectController::class, 'getData1'])->name('getData'); Route::get('/api/ambits/prepared{equipmentType}', [PreparedProjectController::class,'getAmbits']); @@ -159,7 +162,6 @@ }); - /* |-------------------------------------------------------------------------- | Create Users with Super Admin @@ -170,10 +172,17 @@ | be assigned to the "web" middleware group. Make something great! | */ -Route::middleware(['auth', 'verified'])->group(function () { - // Rotas protegidas que exigem verificação de e-mail - Route::get('/', [ProjectoDatacontroller::class,('HomePage')])->name('home'); - }); +// Route::middleware(['auth', 'verified','checkUserType'])->group(function () { +// // Rotas protegidas que exigem verificação de e-mail +// Route::get('/', [ProjectoDatacontroller::class,('HomePage')])->name('home'); +// Route::get('enterWorkstation',[ExecutionProjectController::class,'enterWorkstation'])->name('enterWorkstation'); +// }); + + Route::middleware(['auth','checkUserType'])->group(function () { + // Rotas protegidas que exigem verificação de e-mail + Route::get('/', [ProjectoDatacontroller::class,('HomePage')])->name('home'); + Route::get('enterWorkstation',[ExecutionProjectController::class,'enterWorkstation'])->name('enterWorkstation'); +}); @@ -316,53 +325,3 @@ // Route::get('/email/notice', function (EmailVerificationRequest $request) { // return view('auth.verify-email'); // })->middleware(['auth'])->name('verification.notice'); - - - -//
Tag
-// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// @foreach ($equipments as $equipment) -// -// -// -// -// -// -// -// -// -// -// @if (isset($equipment->specific_attributes)) -// @foreach ($equipment->specific_attributes as $attribute) -// @if ($loop->first) -// -// -// @else -// -// -// -// -// @endif -// @endforeach -// @else -// -// @endif -// -// @endforeach -// -//
Equipment IDFactory IDEquipament Type IDTagequipment_descriptionSerial NumberBrandModelIs ActiveAttribute DescriptionAttribute Value
{{ $equipment->equipment_id }}{{ $equipment->factory_id }}{{ $equipment->equipament_type_id }}{{ $equipment->tag }}{{ $equipment->equipment_description }}{{ $equipment->serial_number }}{{ $equipment->brand }}{{ $equipment->model }}{{ $equipment->Is_active }}{{ $attribute['description'] }}{{ $attribute['value'] }}
{{ $attribute['description'] }}{{ $attribute['value'] }}
\ No newline at end of file