diff --git a/app/Http/Controllers/CreateProjectController.php b/app/Http/Controllers/CreateProjectController.php index 88a74d21..e7c67531 100644 --- a/app/Http/Controllers/CreateProjectController.php +++ b/app/Http/Controllers/CreateProjectController.php @@ -332,7 +332,7 @@ public function CreateNewEquipmentFromPendingEquipment(Request $request, $id) public function processStep1(Request $request) { - dd($request); + // dd($request); // Validação... $installationId = $request->input('installation_id'); @@ -366,6 +366,7 @@ public function processStep1(Request $request) $project->date_started = $request->input('date_started'); $project->plant_id = $installationId; + $project->order_project = 1; $project->save(); diff --git a/app/Http/Controllers/CustomRegistrationController.php b/app/Http/Controllers/CustomRegistrationController.php index 2ba13fa2..dd5a57db 100644 --- a/app/Http/Controllers/CustomRegistrationController.php +++ b/app/Http/Controllers/CustomRegistrationController.php @@ -31,7 +31,6 @@ public function store(Request $request): RedirectResponse // Chame sendEmailVerificationNotification para enviar o e-mail de verificação $user->sendEmailVerificationNotification(); - // // Auth::login($user); $pendingUser = PendingUser::where('pending_email', $user->email)->first(); if ($pendingUser) { diff --git a/app/Http/Controllers/ExecutionProjectController.php b/app/Http/Controllers/ExecutionProjectController.php new file mode 100644 index 00000000..ab450b37 --- /dev/null +++ b/app/Http/Controllers/ExecutionProjectController.php @@ -0,0 +1,91 @@ +with('DatasProject', $DatasProject) + ->with('equipmentsTypes', $equipmentsTypes); + } + + 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('-'); + // }) + ->toJson(); + } + + public function receiveEquipmentIdForShowModal($EquipmentID) + { + $equipment = Equipment::find($EquipmentID); + + $task_codes = $equipment->orderEquipmentTasks->map(function ($task) { + return $task->elementalTask->elemental_tasks_code; + })->toArray(); + + return response()->json(['task_codes' => $task_codes]); + } + + 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); + + // 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); + } + } + + 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(); + } +} diff --git a/app/Http/Controllers/PreparedProjectController.php b/app/Http/Controllers/PreparedProjectController.php index 5a084411..8d7af6e4 100644 --- a/app/Http/Controllers/PreparedProjectController.php +++ b/app/Http/Controllers/PreparedProjectController.php @@ -34,7 +34,7 @@ public function PreparedProject($ProjectId) ->get(); return view('projectsClients/preparedProject') - ->with('equipmentsProjects', $equipmentsProjects) + // ->with('equipmentsProjects', $equipmentsProjects) ->with('equipmentsTypes', $equipmentsTypes) ->with('units', $checkUnits) ->with('numberProject', $numberProject); diff --git a/app/Models/ConstructionWorkstation.php b/app/Models/ConstructionWorkstation.php index 85ab1070..e5b13013 100644 --- a/app/Models/ConstructionWorkstation.php +++ b/app/Models/ConstructionWorkstation.php @@ -15,5 +15,12 @@ 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'); + } } diff --git a/app/Models/ElementalTasks.php b/app/Models/ElementalTasks.php new file mode 100644 index 00000000..622dfc26 --- /dev/null +++ b/app/Models/ElementalTasks.php @@ -0,0 +1,21 @@ +hasMany(OrderEquipmentTasks::class,'elemental_tasks_id','elemental_tasks_id'); + } +} diff --git a/app/Models/OrderEquipmentTasks.php b/app/Models/OrderEquipmentTasks.php index fcd786f8..1d02fe95 100644 --- a/app/Models/OrderEquipmentTasks.php +++ b/app/Models/OrderEquipmentTasks.php @@ -16,4 +16,9 @@ public function equipment() { return $this->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/WorkstationsAssociationTasks.php b/app/Models/WorkstationsAssociationTasks.php index 3ed94892..987d93cd 100644 --- a/app/Models/WorkstationsAssociationTasks.php +++ b/app/Models/WorkstationsAssociationTasks.php @@ -12,5 +12,14 @@ class WorkstationsAssociationTasks extends Model public $timestamps = false; 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'); + } } diff --git a/app/Providers/FortifyServiceProvider.php b/app/Providers/FortifyServiceProvider.php index 3593a280..6d322a67 100644 --- a/app/Providers/FortifyServiceProvider.php +++ b/app/Providers/FortifyServiceProvider.php @@ -11,12 +11,16 @@ use Illuminate\Support\Facades\RateLimiter; use Illuminate\Support\ServiceProvider; +use App\Models\User; +use Illuminate\Support\Facades\Hash; + + use Laravel\Fortify\Contracts\ResetPasswordViewResponse; use App\Http\Controllers\Auth\ResetPasswordController; use App\Http\Controllers\Auth\PasswordResetLinkController; -// use App\http\Controllers\userController; + use Laravel\Fortify\Fortify; @@ -51,23 +55,32 @@ public function boot(): void return view('auth.verify-email'); }); - // Fortify::authenticateUsing(function (Request $request) { - // return UserController::authenticateAndRedirect($request); - // }); + Fortify::authenticateUsing(function (Request $request) { + $email = $request->input('email'); - + // Verifica se "@" já está presente no e-mail. Se não, adiciona "@isptgroup.com" ao final. + if (!str_contains($email, '@')) { + $email .= '@isptgroup.com'; + } + + $password = $request->input('password'); + + $user = User::where('email', $email)->first(); + + if ($user && Hash::check($password, $user->password)) { + return $user; + } + }); Fortify::createUsersUsing(CreateNewUser::class); - Fortify::updateUserProfileInformationUsing(UpdateUserProfileInformation::class); Fortify::updateUserPasswordsUsing(UpdateUserPassword::class); - RateLimiter::for('login', function (Request $request) { $email = (string) $request->email; - return Limit::perMinute(5)->by($email . $request->ip()); + return Limit::perMinute(5)->by($email . $request->ip()); }); RateLimiter::for('two-factor', function (Request $request) { diff --git a/public/StyleAdmin/css/styleProgressBar.css b/public/StyleAdmin/css/styleProgressBar.css new file mode 100755 index 00000000..39114473 --- /dev/null +++ b/public/StyleAdmin/css/styleProgressBar.css @@ -0,0 +1,78 @@ +body{ + overflow-x: hidden; +} +#employer-post-new-job .res-steps-container .res-steps { + width: 25%; + text-align: center; + float: left; + cursor: pointer +} + +#employer-post-new-job .res-steps-container .res-steps .res-step-bar { + -webkit-border-radius: 50% !important; + -moz-border-radius: 50% !important; + -ms-border-radius: 50% !important; + border-radius: 50% !important; + background: #0aa7e1; + display: inline-block; + height: 40px; + width: 40px; + margin-top: 10px; + text-align: center; + color: #fff; + padding-top: 7px; + font-size: 20px +} + +#employer-post-new-job .res-steps-container .res-steps .res-progress-title { + text-align: center; + font-size: 15px; + padding-top: 10px; + display: block +} + +#employer-post-new-job .res-steps-container .res-steps .res-progress-bar { + height: 5px; + background: #0aa7e1; + width: 50%; + margin: -22px 0 0 50%; + float: left +} + +#employer-post-new-job .res-steps-container .res-step-two .res-progress-bar, #employer-post-new-job .res-steps-container .res-step-three .res-progress-bar, #employer-post-new-job .res-steps-container .res-step-four .res-progress-bar { + width: 100%; + margin-left: 0% +} + +#employer-post-new-job .res-steps-container .res-step-four .res-progress-bar { + width: 50%; + margin-right: 50% +} + +#employer-post-new-job .res-step-form { + border: 1px solid #d2d2d2; + box-shadow: 0px 6px 4px -2px silver; + position: absolute +} + +#employer-post-new-job .res-step-form h3 { + margin: 10px 0; + color: #0aa7e1; + font-size: 18px +} + +#employer-post-new-job .res-step-form .form-horizontal label { + font-weight: normal +} + +#employer-post-new-job .res-form-two, #employer-post-new-job .res-form-three, #employer-post-new-job .res-form-four .res-form-five{ + left: 150% +} + +#employer-post-new-job .active .res-step-bar { + background: #f19b20 !important +} + +#employer-post-new-job .active .res-progress-title { + color: #0aa7e1 +} \ No newline at end of file diff --git a/resources/views/Admin/index.blade.php b/resources/views/Admin/index.blade.php index 9d3e9ed7..f1b5984f 100644 --- a/resources/views/Admin/index.blade.php +++ b/resources/views/Admin/index.blade.php @@ -157,7 +157,7 @@ class="btn btn-tool">
{{ $project->company_project_description }}
- diff --git a/resources/views/Templates/templateAdmin.blade.php b/resources/views/Templates/templateAdmin.blade.php index b6e15309..b1604cdb 100644 --- a/resources/views/Templates/templateAdmin.blade.php +++ b/resources/views/Templates/templateAdmin.blade.php @@ -6,6 +6,7 @@ + @@ -62,16 +63,108 @@ .spin { animation: spin 1s infinite linear; } - + @keyframes spin { from { transform: rotate(0deg); } + to { transform: rotate(360deg); } } - + + /* ***************************** */ + .accordion { + overflow-anchor: none; + } + + .accordion>.card { + overflow: hidden; + } + + .accordion>.card:not(:last-of-type) { + border-bottom: 0; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; + } + + .accordion>.card:not(:first-of-type) { + border-top-left-radius: 0; + border-top-right-radius: 0; + } + + .accordion>.card>.card-header { + border-radius: 0; + margin-bottom: 0; + } + + /* Nome de baixo do circulo */ + .steps { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 2rem; + position: relative; + + } + + /* Nome dentro do circulo de ainda não de chegar o progress bar */ + .step-button { + width: 50px; + height: 50px; + border-radius: 50%; + border: none; + background-color: var(--prm-gray); + transition: .4s; + display: flex; + align-items: center; + text-align: center; + justify-content: center; + + } + + .step-button[aria-expanded="true"] { + width: 60px; + height: 60px; + background-color: var(--prm-color); + color: #fff; + } + + .done { + background-color: var(--prm-color); + color: #fff; + + + } + + + .step-item { + z-index: 10; + text-align: center; + } + + #progress { + -webkit-appearance: none; + position: absolute; + width: 95%; + z-index: 5; + height: 10px; + margin-left: 18px; + margin-bottom: 18px; + } + + /* to customize progress bar */ + #progress::-webkit-progress-value { + background-color: var(--prm-color); + transition: .5s ease; + } + + #progress::-webkit-progress-bar { + background-color: var(--prm-gray); + + } + diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 30ba4281..50f3cb6a 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -37,7 +37,7 @@ @csrf
- + {{-- --}}
diff --git a/resources/views/projectsClients/executionProject.blade.php b/resources/views/projectsClients/executionProject.blade.php index c11ee4dc..b0168de6 100644 --- a/resources/views/projectsClients/executionProject.blade.php +++ b/resources/views/projectsClients/executionProject.blade.php @@ -1,13 +1,655 @@ @extends('Templates/templateAdmin') @section('Main-content') + +
+
+
+
+

{{ $DatasProject->company_project_description }}

+ +
+
+
    +
  1. Dashboard
    2. +
  2. Em Execucao
    3. +
  3. {{ $DatasProject->company_project_description }}
    4. +
+
+
+
+
+ + +
+
+
+
+ +
+
+ + + +
+

+ +
+
+

Detalhes da Obra

+
+
+ +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Descrição da obra:{{ $DatasProject->company_project_description }}
N.ºobra ISPT:{{ $DatasProject->project_ispt_number }}
Resp.ISPT:{{ $DatasProject->project_ispt_responsible }}
Cliente :Cliente1
N.ºobra Cliente :{{ $DatasProject->project_company_number }}
Resp.Cliente:{{ $DatasProject->project_company_responsible }}
Obra Iniciada em :{{ $DatasProject->date_started }}
+
+ + +
+
+ + {{-- Editar --}} +

test

+
    + +
+
+
+
+ +
+ + + +
+ +
+
+

Articulado

+
+ +
+ +
+ + + +
+ +
+
+

Equipamentos da obra

+
+ +
+
+
+ +
+ + +
+ +
+
+ + +
+
+ +
+
+ + +
+
+
+
+ + + + + + + + + + + + + + + +
TagTipo EquipamentoAmbitoTarefasTarefa AtualData EntradaData ConclusaoInspecaoDetalhes
+ +
+ +
+ + +
+ +
+ {{-- card-body --}} + + +
+ +
+ + + +
+
+
+

Postos de Trabalho

+ +
+ +
+ +
+ +
+ + +
+ + +
+
+
+
+
+ + +
+
+ + + + + + + + + + +
Postos de Trabalho
+
+
+
+ + +
+ +
+
+

Listas de Postos de Obra

+
+
+
+ + + + + + + + + +
Postos de TrabalhoNome PostoTarefas ElementaresTarefas Complementares
+
+ +
+ +
+ + +
+ + +
+
+
+ + +
+ + + {{-- Modal-showProgressEquipment --}} + + {{-- ./Modal-showProgressEquipment --}} @endsection @section('scriptsTemplateAdmin') + + + -@endsection \ No newline at end of file + + + + + + + + +@endsection diff --git a/resources/views/projectsClients/preparedProject.blade.php b/resources/views/projectsClients/preparedProject.blade.php index a1fb8fc2..24f32656 100644 --- a/resources/views/projectsClients/preparedProject.blade.php +++ b/resources/views/projectsClients/preparedProject.blade.php @@ -273,7 +273,8 @@ class="form-control">
- + +
@@ -281,18 +282,6 @@ class="form-control"> - - - - - - - - - - - -
Postos de TrabalhoTarefas Complementares
workstation1-69TE2 - TE5 - TE11 - TC1 -
workstation2-69TE1 - TE2 - TE6 -
@@ -634,17 +623,11 @@ class="checkboxChoseTasksOficesCV" //Cards das div : Destricao - Articulado - Postos de Trabalho // ******** Estrutura do Layout da Página : - - - // $("#CardDetalhesObra").hide(); $("#CardArticuladoObra").hide(); $("#CardPostosDeTrabalhoObra").hide(); - //Botoes : Destricao - Articulado - Postos de Trabalho $('#BotaoDetalhesObra').hide(); - // $('#BotaoArticulado').hide(); - // $('BotaoPostosDeTrabalho').hide(); $('#BotaoArticulado').on('click', function() { // Mostra o Card do Articulado e o Botao de detalhes @@ -678,327 +661,10 @@ class="checkboxChoseTasksOficesCV" $("#CardDetalhesObra").hide(); $("#CardArticuladoObra").hide(); }); - - // A Propriedade do Botao começa desabilitada - // Chamamos os 3 selects e verificamos - $("#tipo_valvulasList").change(function() { - var tipo_valvulas = $("#tipo_valvulasList").val(); - - // will show the scopes of each valve according to the selection of the type field in "create a new task" - if (tipo_valvulas == "PSV") { - $("#Val_PSV").show(); - } else { - $("#Val_PSV").hide(); - } - if (tipo_valvulas == "ISV") { - $("#Val_ISV").show(); - } else { - $("#Val_ISV").hide(); - } - if (tipo_valvulas == "CV") { - $("#Val_CV").show(); - } else { - $("#Val_CV").hide(); - } - if (tipo_valvulas == "Init") { - $("#DivAmbitos").show(); - } else { - $("#DivAmbitos").hide(); - } - - }) - - - // Tabelas de cada Valvula - $("#Val_PSV").hide(); - $("#Val_ISV").hide(); - $("#Val_CV").hide(); - - // Ambitos de PSV - $("#boxPSVSubs").hide(); - $("#boxPSVCalib").hide(); - $("#boxPSVRep_Local").hide(); - $("#boxPSVRep_Oficina").hide(); - - // Ambitos de ISV - $("#boxISVRep_Local").hide(); - $("#boxISVRep_Oficina").hide(); - $("#boxISVSubs").hide(); - $("#boxISVEmpan").hide(); - $("#boxISVTestPress").hide(); - - // Ambitos de CV - $("#Amb_Oficina_Val_CV").hide(); - $("#Amb_local_Val_CV").hide(); - - // Ambitos de CV Local - $("#boxCVLocalBenef_tip1").hide(); - $("#boxCVLocalBenef_tip2B").hide(); - - - - // A Propriedade do Botao começa desabilitada - // Chamamos os 3 selects e verificamos - $("#tipo_valvulas").change(function() { - var tipo_valvulas = $("#tipo_valvulas").val(); - - if (tipo_valvulas == "PSV") { - $("#Val_PSV").show(); - } else { - $("#Val_PSV").hide(); - } - - if (tipo_valvulas == "ISV") { - $("#Val_ISV").show(); - } else { - $("#Val_ISV").hide(); - } - - if (tipo_valvulas == "CV") { - $("#Val_CV").show(); - } else { - $("#Val_CV").hide(); - } - }) - - // **** Para uma lista de tarefas elementares pre selecionadas de acordo com o ambito - $("#selectPSV").change(function() { - var Amb_PSV = $('#selectPSV').val(); - - if (Amb_PSV == "Subs") { - $("#boxPSVSubs").show(); - } else { - $("#boxPSVSubs").hide(); - } - - if (Amb_PSV == "Calib") { - $("#boxPSVCalib").show(); - } else { - $("#boxPSVCalib").hide(); - } - - if (Amb_PSV == "Rep_Local") { - $("#boxPSVRep_Local").show(); - } else { - $("#boxPSVRep_Local").hide(); - } - - if (Amb_PSV == "Rep_Oficina") { - $("#boxPSVRep_Oficina").show(); - } else { - $("#boxPSVRep_Oficina").hide(); - } - }) - - // **** Para uma lista de tarefas elementares pre selecionadas de acordo com o ambito - $("#selectISV").change(function() { - var Amb_ISV = $('#selectISV').val(); - - if (Amb_ISV == "Rep_Local") { - $("#boxISVRep_Local").show(); - } else { - $("#boxISVRep_Local").hide(); - } - - if (Amb_ISV == "Rep_Oficina") { - $("#boxISVRep_Oficina").show(); - } else { - $("#boxISVRep_Oficina").hide(); - } - - if (Amb_ISV == "Subs") { - $("#boxISVSubs").show(); - } else { - $("#boxISVSubs").hide(); - } - - if (Amb_ISV == "Empan") { - $("#boxISVEmpan").show(); - } else { - $("#boxISVEmpan").hide(); - } - - if (Amb_ISV == "TestPress") { - $("#boxISVTestPress").show(); - } else { - $("#boxISVTestPress").hide(); - } - }) - - - - // **** Para uma lista de tarefas elementares pre selecionadas de acordo com o ambito - $("#selectCV").change(function() { - var Amb_CV = $('#selectCV').val(); - - if (Amb_CV == "Amb_Local") { - $("#Amb_local_Val_CV").show(); - } else { - $("#Amb_local_Val_CV").hide(); - } - if (Amb_CV == "Amb_Ofice") { - $("#Amb_Oficina_Val_CV").show(); - } else { - $("#Amb_Oficina_Val_CV").hide(); - } - }) - - - // Ambitos locais, válvulas CV - $("#select_amb_local_CV").change(function() { - var Amb_CV_Local = $('#select_amb_local_CV').val(); - - if (Amb_CV_Local == "Benef_tip1") { - $("#boxCVLocalBenef_tip1").show(); - } else { - $("#boxCVLocalBenef_tip1").hide(); - } - if (Amb_CV_Local == "Benef_tip2B") { - $("#boxCVLocalBenef_tip2B").show(); - } else { - $("#boxCVLocalBenef_tip2B").hide(); - } - }) - - - - // Ambitos oficina, válvulas CV - $("#Amb_Oficina_Val_CV").change(function() { - var Amb_CVOficina = $('#Amb_Oficina_Val_CV').val(); - - if (Amb_CVOficina == "Benef_tip1") { - $("#boxCVLocalBenef_tip1").show(); - } else { - $("#boxCVLocalBenef_tip1").hide(); - } - if (Amb_CVOficina == "Benef_tip2B") { - $("#boxCVLocalBenef_tip2B").show(); - } else { - $("#boxCVLocalBenef_tip2B").hide(); - } - }) - - - - // Funcao onde recebemos os valores que esta em check nas tarefas elementares - updateValues_PSV_Subs(); - $('.checkbox_PSV_Subs').change(updateValues_PSV_Subs); - - updateValues_Inspec_PSV_Subs(); - $('.checkbox_Inspec_PSV_Subs').change(updateValues_Inspec_PSV_Subs); - - // Funções das tarefas dos Postos - - updateTasksOfcicesCV(); - $('.checkboxChoseTasksOficesCV').change(updateTasksOfcicesCV); - - updateTasksOfcicesPSV(); - $('.checkboxChoseTasksOficesPSV').change(updateTasksOfcicesPSV); - - updateTasksOfcicesISV(); - $('.checkboxChoseTasksOficesISV').change(updateTasksOfcicesISV); - }) - - function updateValues_PSV_Subs() { - var Values_PSV_Subs = []; - $('.checkbox_PSV_Subs:checked').each(function() { - Values_PSV_Subs.push($(this).val()) - }); - var list = "
    "; - for (var i = 0; i < Values_PSV_Subs.length; i++) { - list += "
  • " + Values_PSV_Subs[i] + "
    • "; - } - // Valor para a lista nao ordenada das tarefas selecionadas - $("#receiveValues_PSV_Subs").html(list); - // Valor para o campo de "Inspecionar" - $("#receiveValues_Inspec_PSV_Subs").val() - // $("#receiveValues_PSV_Subs").text(Values_PSV_Subs.join('
    ')); - } - - function updateValues_Inspec_PSV_Subs() { - var receiveValuesInspec = []; - var list = []; - $('.checkbox_Inspec_PSV_Subs:checked').each(function() { - receiveValuesInspec.push($(this).val()) - }); - for (var i = 1; i <= receiveValuesInspec.length; i++) { - list = i; - } - $('#receiveValues_Inspec_PSV_Subs').val(list); - } - - // Atualizar os valores - - function updateTasksOfcicesCV() { - var receivetasksOfices = []; - // Para criar uma lista, só funciona se for "Classe" na Checkbox!! - $('.checkboxChoseTasksOficesCV:checked').each(function() { - receivetasksOfices.push($(this).val()) - }); - var list; - if (receivetasksOfices.length == 0) { - list = ""; - } else { - list = "

    Válvula CV

      "; - } - for (var i = 0; i < receivetasksOfices.length; i++) { - list += "
    • " + receivetasksOfices[i] + "
      • "; - } - $("#ReceiveCheckboxChoseTasksOficesCV").html(list); - } - - function updateTasksOfcicesPSV() { - var receivetasksOfices = []; - // Para criar uma lista, só funciona se for "Classe" na Checkbox!! - $('.checkboxChoseTasksOficesPSV:checked').each(function() { - receivetasksOfices.push($(this).val()) - }); - var list; - - if (receivetasksOfices.length == 0) { - list = ""; - } else { - list = "

      Válvula PSV

        "; - } - for (var i = 0; i < receivetasksOfices.length; i++) { - list += "
      • " + receivetasksOfices[i] + "
        • "; - } - $("#ReceiveCheckboxChoseTasksOficesPSV").html(list); - } - - function updateTasksOfcicesISV() { - var receivetasksOfices = []; - // Para criar uma lista, só funciona se for "Classe" na Checkbox!! - $('.checkboxChoseTasksOficesISV:checked').each(function() { - receivetasksOfices.push($(this).val()) - }); - var list; - if (receivetasksOfices.length == 0) { - list = ""; - } else { - list = "

        Válvula ISV

          "; - } - for (var i = 0; i < receivetasksOfices.length; i++) { - list += "
        • " + receivetasksOfices[i] + "
          • "; - } - $("#ReceiveCheckboxChoseTasksOficesISV").html(list); - } - - - - - - - - - - + @endsection diff --git a/resources/views/projectsClients/test1.blade.php b/resources/views/projectsClients/test1.blade.php new file mode 100644 index 00000000..98fea1bd --- /dev/null +++ b/resources/views/projectsClients/test1.blade.php @@ -0,0 +1,207 @@ +@extends('Templates/templateAdmin') + +@section('Main-content') + +
          + + {{--
          +
          +

          Equipamentos da obra

          +
          + +
          +
          +
          + +
          + + +
          + +
          +
          + + +
          +
          + +
          +
          + + +
          +
          + +
          +
          + + + + + + + + + + + + + + +
          TagTipo EquipamentoAmbitoTarefasTarefa AtualData EntradaData ConclusaoInspecao
          + +
          + +
          + + +
          --}} + +
          + +
          + +
          +
          +

          Equipamentos da obra

          +
          + +
          +
          +
          + + + + + + + + + + + + + + +
          TagTipo EquipamentoAmbitoTarefasTarefa AtualData EntradaData ConclusaoInspecaoDetalhes
          + +
          + +
          + +
          + +
          + {{-- card-body --}} +@endsection + + +@section('scriptsTemplateAdmin') + + + +@endsection diff --git a/resources/views/recebeIdiota.blade.php b/resources/views/recebeIdiota.blade.php index ade3f3e5..abb22402 100644 --- a/resources/views/recebeIdiota.blade.php +++ b/resources/views/recebeIdiota.blade.php @@ -36,16 +36,6 @@ @endsection @section('idiotaScripts') - {{-- --}} +@endsection diff --git a/resources/views/testIdiota.blade.php b/resources/views/testIdiota.blade.php index 38d51557..377265f7 100644 --- a/resources/views/testIdiota.blade.php +++ b/resources/views/testIdiota.blade.php @@ -9,7 +9,8 @@ - + + - - - @yield('idiota') - {{-- - - - - - --}} - @@ -96,11 +87,7 @@ - - {{-- - - --}} - + diff --git a/routes/web.php b/routes/web.php index 3dbf35c6..35ca4c4f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -26,8 +26,17 @@ use App\Http\Controllers\ProjectoDatacontroller; use App\Http\Controllers\PreparedProjectController; +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/receiveWorkstationExecutionProject/{receiveNumberProject}',[ExecutionProjectController::class,'receiveWorkstationExecutionProject' ]); + Route::get('user-data', [PreparedProjectController::class, 'getData1'])->name('getData'); Route::get('/api/ambits/prepared{equipmentType}', [PreparedProjectController::class,'getAmbits']); @@ -53,7 +62,7 @@ route::get('idiota',function(){ - return view('recebeIdiota'); + return view('recebeTestProgressBar'); }); Route::get('/api/equipment/{id}', [CreateProjectController::class,'showJson']); @@ -162,13 +171,11 @@ | */ Route::middleware(['auth', 'verified'])->group(function () { + // Rotas protegidas que exigem verificação de e-mail + Route::get('/', [ProjectoDatacontroller::class,('HomePage')])->name('home'); + }); - // Rotas protegidas que exigem verificação de e-mail - Route::get('/', [ProjectoDatacontroller::class,('HomePage')])->name('home'); - - // -}); /* |--------------------------------------------------------------------------