diff --git a/app/DataTables/UsersDataTable.php b/app/DataTables/UsersDataTable.php
new file mode 100644
index 00000000..8d294532
--- /dev/null
+++ b/app/DataTables/UsersDataTable.php
@@ -0,0 +1,110 @@
+addColumn('action', 'users.action')
+ ->setRowId('id');
+ }
+
+ /**
+ * Get the query source of dataTable.
+ */
+ // public function query(User $model): QueryBuilder
+ // {
+ // return $model->newQuery();
+ // }
+
+ public function query()
+ {
+ $query = Equipment::select(['ispt_number', 'unit_id', 'equipment_tag']);
+ return $this->applyScopes($query);
+ }
+
+ /**
+ * Optional method if you want to use the html builder.
+ */
+ // public function html(): HtmlBuilder
+ // {
+ // return $this->builder()
+ // ->setTableId('users-table')
+ // ->columns($this->getColumns())
+ // ->minifiedAjax()
+ // //->dom('Bfrtip')
+ // ->orderBy(1)
+ // ->selectStyleSingle()
+ // ->buttons([
+ // // Button::make('excel'),
+ // // Button::make('csv'),
+ // Button::make('pdf'),
+ // // Button::make('print'),
+ // // Button::make('reset'),
+ // // Button::make('reload')
+ // ]);
+ // }
+ public function html()
+{
+ return $this->builder()
+ ->setTableId('Equipments')
+ ->columns($this->getColumns())
+ // Outras configurações necessárias ...
+ ->minifiedAjax()
+ ->dom('Bfrtip')
+ ->orderBy(1);
+}
+
+ /**
+ * Get the dataTable columns definition.
+ */
+ // public function getColumns(): array
+ // {
+ // return [
+ // Column::computed('action')
+ // ->exportable(false)
+ // ->printable(false)
+ // ->width(60)
+ // ->addClass('text-center'),
+ // Column::make('id'),
+ // Column::make('add your columns'),
+ // Column::make('created_at'),
+ // Column::make('updated_at'),
+ // ];
+ // }
+
+ protected function getColumns()
+{
+ return [
+ 'ispt_number',
+ 'unit_id',
+ 'equipment_tag',
+ ];
+}
+
+ /**
+ * Get the filename for export.
+ */
+ protected function filename(): string
+ {
+ return 'Users_' . date('YmdHis');
+ }
+}
diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php
index 060224d6..8a75873e 100644
--- a/app/Http/Controllers/ClientController.php
+++ b/app/Http/Controllers/ClientController.php
@@ -19,23 +19,66 @@
class ClientController extends Controller
{
- public function showReportingForAmbitsProject($dataAmbit, $projectId)
+
+ public function showReportingForAmbitsProject($ambitId, $projectId)
+ {
+ $dataAmbit = AmbitsEquipment::where('ambits_id', $ambitId)->first();
+ // $receiveDataEquipments = Equipment::where('company_projects_id', $projectId)->get();
+
+ return view('userClient.showReportingAllEquipmentsForAmbitProject', compact('ambitId', 'projectId','dataAmbit'));
+
+ }
+ public function getEquipmentsOfAmbit(Request $request)
+ {
+
+ $projectId = $request->get('projectId');
+ $ambitId = $request->get('ambitId');
+
+ $dataAmbit = AmbitsEquipment::where('ambits_id', $ambitId)->first();
+
+ $receiveDataEquipments = Equipment::where('company_projects_id', $projectId)->get();
+
+ $filteredAssociations = EquipmentAssociationAmbit::where('ambits_id', $dataAmbit->ambits_id)
+ ->whereIn('equipment_id', $receiveDataEquipments->pluck('equipment_id'))
+ ->get();
+
+ $query = Equipment::whereIn('equipment_id', $filteredAssociations->pluck('equipment_id'))->get();
+ // $query = Equipment::select(['ispt_number', 'unit_id', 'equipment_tag'])->get();
+
+ return DataTables::of($query)
+ // Adicione aqui qualquer manipulação de dados ou colunas adicionais que você precise
+ ->make(true);
+ }
+
+
+ public function showReportingForAmbitsProjectPdf($ambitId, $projectId)
{
// Obter o caminho da imagem do usuário ou uma imagem padrão
$userLogoPath = Auth::user()->user_logo ? public_path('user_logos/' . Auth::user()->user_logo) : public_path('user_logos/logoISPT4.0.jpg');
- // $pdf = PDF::loadView('userClient.pdfReportings.showReportingAllEquipmentsForAmbitProject', [
- // 'userLogoPath' => $userLogoPath,
- // 'dataAmbit' => $dataAmbit,
- // 'projectId' => $projectId
- // ])->setPaper('a4', 'landscape');
- // return $pdf->stream('relatorio_teste.pdf');
+ $dataAmbit = AmbitsEquipment::where('ambits_id', $ambitId)->first();
- return view('userClient.pdfReportings.showReportingAllEquipmentsForAmbitProject', [
+ $receiveDataEquipments = Equipment::where('company_projects_id', $projectId)->get();
+
+ $filteredAssociations = EquipmentAssociationAmbit::where('ambits_id', $dataAmbit->ambits_id)
+ ->whereIn('equipment_id', $receiveDataEquipments->pluck('equipment_id'))
+ ->get();
+
+ $equipmentDetails = Equipment::whereIn('equipment_id', $filteredAssociations->pluck('equipment_id'))->get();
+
+ $pdf = PDF::loadView('userClient.pdfReportings.equipmentsForAmbitPdf', [
+ 'equipmentDetails' => $equipmentDetails,
'userLogoPath' => $userLogoPath,
'dataAmbit' => $dataAmbit,
'projectId' => $projectId
- ]);
+ ])->setPaper('a4', 'landscape');
+ return $pdf->stream('relatorio_teste.pdf');
+
+ // return view('userClient.pdfReportings.showReportingAllEquipmentsForAmbitProject', [
+ // 'userLogoPath' => $userLogoPath,
+ // 'dataAmbit' => $dataAmbit,
+ // 'projectId' => $projectId
+ // ]);
}
public function getDataAllEquipmentsForAmbitOfProject(Request $request)
@@ -62,8 +105,8 @@ public function getDataAllEquipmentsForAmbitOfProject(Request $request)
$equipmentsQuery = Equipment::whereIn('equipment_id', $equipmentsOfProject)
->whereHas('equipmentAssociationAmbit', function ($q) use ($dataAmbit) {
$q->where('ambits_id', $dataAmbit);
- })
- ->select(['equipment_id','ispt_number', 'unit_id', 'equipment_tag']); // Selecionar apenas as colunas necessárias
+ })
+ ->select(['equipment_id', 'ispt_number', 'unit_id', 'equipment_tag']); // Selecionar apenas as colunas necessárias
// Utilize o Yajra DataTables para formatar a resposta
return DataTables::of($equipmentsQuery)
@@ -92,7 +135,7 @@ public function getDataAmbitsOfProject(Request $request)
})->count();
})
->addColumn('action', function ($dataAmbitProject) use ($projectId) { // Incluindo $projectId no escopo da função anônima
- $actionBtn = '';
+ $actionBtn = '';
return $actionBtn;
})
->make(true);
@@ -161,7 +204,6 @@ public function showDataDetailsProjectClient($projectID)
// Recebe os dados de cada Ambito
$receiveDataAmbitsProject = AmbitsEquipment::whereIn('ambits_id', $AmbitsId)->get();
-
return view('userClient.showDataDetailsProjectClient', compact('receiveDataProject', 'receiveUnitsOfProject', 'receiveAllTypeEquipments', 'receiveDataAmbitsProject', 'AmbitsIdString'));
}
diff --git a/app/Http/Controllers/CreateProjectController.php b/app/Http/Controllers/CreateProjectController.php
index 088f43c9..85c49cb3 100755
--- a/app/Http/Controllers/CreateProjectController.php
+++ b/app/Http/Controllers/CreateProjectController.php
@@ -849,7 +849,7 @@ public function receiveIdEquipment(Equipment $equipment)
public function processStep2(Request $request)
{
-
+ // dd($request);
// Valide e processe os dados do formulário
$file = $request->file('documento');
@@ -867,12 +867,15 @@ public function processStep2(Request $request)
// Obtenha a primeira planilha, onde fica os nomes chaves para associar a tabela : general_attributes_equipaments
$worksheet = $spreadsheet->getSheet(0);
+
// Transforme os dados da planilha em um array
$data = $worksheet->toArray();
// Retorna um array com todos os names preenchidos na primeira linha do template de Excel
$nomesColunas = $data[0];
+ // dd($nomesColunas);
+
$countPendingEquipments = 0;
$countNewEquipment = 0;
@@ -893,7 +896,7 @@ public function processStep2(Request $request)
continue;
}
- // Em cada um das linhas horizontais do excel, vai se guardar a 'key' vinculada ao valor do campo preenchido ou seja a 'key' vai ter o mesmo nome de um dos dados da tabela : general_attributes_equipaments na coluna : general_attributes_equipment_description, assim sendo mais facil implementar na tabela : specific_attributes_equipament_types
+ // Em cada um das linhas horizontais do excel, vai se guardar a 'key' vinculada ao valor do campo preenchido ou seja a 'key' vai ter o mesmo nome de um dos dados da tabela 'general_attributes_equipaments' na coluna : general_attributes_equipment_description, assim sendo mais facil implementar na tabela : specific_attributes_equipament_types
$juntarArrays = array_combine($nomesColunas, $dadosLinha);
// vai guardar todos os campos de possiveis novos equipamentos, cada um em um array para multiplos inserts, na base de dados
@@ -902,14 +905,14 @@ public function processStep2(Request $request)
}, ARRAY_FILTER_USE_KEY);
//Indentifica qual o tipo de equipamento selecionado de acordo com a tabela EquipmentType
- $equipmentType = EquipmentType::where('equipment_type_name', $datas['tipo_equipamento'])->first();
+ $equipmentType = EquipmentType::where('equipment_type_name', $datas['equipment_type_name'])->first();
- $checkFactory = Unit::where('unit_name', $datas['fabrica'])->first();
+ $checkFactory = Unit::where('unit_name', $datas['unit'])->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'])
+ ->where('equipment_tag', $datas['equipment_tag'])
->first();
if ($existingEquipment) {
@@ -938,10 +941,11 @@ public function processStep2(Request $request)
$newEquipament->unit_id = $checkFactory->unit_id;
$newEquipament->equipment_type_id = $equipmentType->equipment_type_id;
- $newEquipament->equipment_Description = $datas['equipment_Description'];
- $newEquipament->equipment_tag = $datas['tag'];
- $newEquipament->equipment_serial_number = $datas['n_serie'];
- $newEquipament->equipment_model = $datas['modelo'];
+ $newEquipament->equipment_Description = $datas['equipment_description'];
+ $newEquipament->equipment_tag = $datas['equipment_tag'];
+ $newEquipament->equipment_serial_number = $datas['equipment_serial_number'];
+ $newEquipament->equipment_brand = $datas['equipment_brand'];
+ $newEquipament->equipment_model = $datas['equipment_model'];
$newEquipament->ispt_number = $isptNumber;
$newEquipament->company_projects_id = $company_projects_id;
@@ -955,7 +959,8 @@ public function processStep2(Request $request)
$receveEquipment_ID = $newEquipament->equipment_id;
$receveEquipament_type_ID = $newEquipament->equipment_type_id;
- $ambit = AmbitsEquipment::where('ambits_description', $datas['ambito'])->first();
+
+ $ambit = AmbitsEquipment::where('ambits_description', $datas['ambit'])->first();
if ($ambit) {
$ambit_id = $ambit->ambits_id;
@@ -987,18 +992,19 @@ public function processStep2(Request $request)
$generalAttributes = GeneralAttributesEquipment::all();
+
foreach ($generalAttributes as $generalAttribute) {
// Verifica se a chave existe em $datas, comparando com os dados da tabela : GeneralAttributesEquipment assim adicionando todos diferentes de NULL relacionados com o equipamento acabado de cria
if (isset($datas[$generalAttribute->general_attributes_equipment_description])) {
- $specificAttribute = new SpecificAttributesEquipmentType;
+ $specificAttribute = new SpecificAttributesEquipmentType;
$specificAttribute->equipment_id = $receveEquipment_ID;
$specificAttribute->equipment_type_id = $receveEquipament_type_ID;
$specificAttribute->general_attributes_equipment_id = $generalAttribute->general_attributes_equipment_id;
// Atribui o valor da chave correspondente em $datas
$specificAttribute->specific_attributes_value = $datas[$generalAttribute->general_attributes_equipment_description];
- // $specificAttribute->save();
+ $specificAttribute->save();
}
}
}
diff --git a/app/Http/Middleware/CheckUserType.php b/app/Http/Middleware/CheckUserType.php
index 7c8269e8..ac578601 100755
--- a/app/Http/Middleware/CheckUserType.php
+++ b/app/Http/Middleware/CheckUserType.php
@@ -53,8 +53,16 @@ protected function getAllowedRoutesForUserType($userType)
switch ($userType) {
case 5: // Técnico
return ['enterWorkstation', 'getEquipmentData', 'receiveAnswersEquipment'];
- case 3: // Empresa
- return ['dashboardClient', 'manageAssetsClient', 'ExecutionProject','reportingDataClient'];
+ case 3:
+ // Empresa
+ return ['dashboardClient','reportingDataClient', 'manageAssetsClient',
+ // Obras em Execussao
+ 'ExecutionProject',
+ //Relatorios
+ 'showDataDetailsProjectClient','showReportingForAmbitsProject',
+ //Api.s
+ 'getDataAmbitsOfProject','getDataEquipmentsOfProject','getEquipmentsOfAmbit'
+ ];
// Adicione mais casos conforme necessário...
default:
diff --git a/app/Models/EquipmentWorkHistory.php b/app/Models/EquipmentWorkHistory.php
new file mode 100644
index 00000000..37797189
--- /dev/null
+++ b/app/Models/EquipmentWorkHistory.php
@@ -0,0 +1,11 @@
+ [
+ /*
+ * Base namespace/directory to create the new file.
+ * This is appended on default Laravel namespace.
+ * Usage: php artisan datatables:make User
+ * Output: App\DataTables\UserDataTable
+ * With Model: App\User (default model)
+ * Export filename: users_timestamp
+ */
+ 'base' => 'DataTables',
+
+ /*
+ * Base namespace/directory where your model's are located.
+ * This is appended on default Laravel namespace.
+ * Usage: php artisan datatables:make Post --model
+ * Output: App\DataTables\PostDataTable
+ * With Model: App\Post
+ * Export filename: posts_timestamp
+ */
+ 'model' => 'App\\Models',
+ ],
+
+ /*
+ * Set Custom stub folder
+ */
+ //'stub' => '/resources/custom_stub',
+
+ /*
+ * PDF generator to be used when converting the table to pdf.
+ * Available generators: excel, snappy
+ * Snappy package: barryvdh/laravel-snappy
+ * Excel package: maatwebsite/excel
+ */
+ 'pdf_generator' => 'snappy',
+
+ /*
+ * Snappy PDF options.
+ */
+ 'snappy' => [
+ 'options' => [
+ 'no-outline' => true,
+ 'margin-left' => '0',
+ 'margin-right' => '0',
+ 'margin-top' => '10mm',
+ 'margin-bottom' => '10mm',
+ ],
+ 'orientation' => 'landscape',
+ ],
+
+ /*
+ * Default html builder parameters.
+ */
+ 'parameters' => [
+ 'dom' => 'Bfrtip',
+ 'order' => [[0, 'desc']],
+ 'buttons' => [
+ 'excel',
+ 'csv',
+ 'pdf',
+ 'print',
+ 'reset',
+ 'reload',
+ ],
+ ],
+
+ /*
+ * Generator command default options value.
+ */
+ 'generator' => [
+ /*
+ * Default columns to generate when not set.
+ */
+ 'columns' => 'id,add your columns,created_at,updated_at',
+
+ /*
+ * Default buttons to generate when not set.
+ */
+ 'buttons' => 'excel,csv,pdf,print,reset,reload',
+
+ /*
+ * Default DOM to generate when not set.
+ */
+ 'dom' => 'Bfrtip',
+ ],
+];
diff --git a/public/vendor/datatables/buttons.server-side.js b/public/vendor/datatables/buttons.server-side.js
new file mode 100644
index 00000000..e012c9bc
--- /dev/null
+++ b/public/vendor/datatables/buttons.server-side.js
@@ -0,0 +1,284 @@
+(function ($, DataTable) {
+ "use strict";
+
+ var _buildParams = function (dt, action, onlyVisibles) {
+ var params = dt.ajax.params();
+ params.action = action;
+ params._token = $('meta[name="csrf-token"]').attr('content');
+
+ if (onlyVisibles) {
+ params.visible_columns = _getVisibleColumns();
+ } else {
+ params.visible_columns = null;
+ }
+
+ return params;
+ };
+
+ var _getVisibleColumns = function () {
+
+ var visible_columns = [];
+ $.each(DataTable.settings[0].aoColumns, function (key, col) {
+ if (col.bVisible) {
+ visible_columns.push(col.name);
+ }
+ });
+
+ return visible_columns;
+ };
+
+ var _downloadFromUrl = function (url, params) {
+ var postUrl = url + '/export';
+ var xhr = new XMLHttpRequest();
+ xhr.open('POST', postUrl, true);
+ xhr.responseType = 'arraybuffer';
+ xhr.onload = function () {
+ if (this.status === 200) {
+ var filename = "";
+ var disposition = xhr.getResponseHeader('Content-Disposition');
+ if (disposition && disposition.indexOf('attachment') !== -1) {
+ var filenameRegex = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/;
+ var matches = filenameRegex.exec(disposition);
+ if (matches != null && matches[1]) filename = matches[1].replace(/['"]/g, '');
+ }
+ var type = xhr.getResponseHeader('Content-Type');
+
+ var blob = new Blob([this.response], {type: type});
+ if (typeof window.navigator.msSaveBlob !== 'undefined') {
+ // IE workaround for "HTML7007: One or more blob URLs were revoked by closing the blob for which they were created. These URLs will no longer resolve as the data backing the URL has been freed."
+ window.navigator.msSaveBlob(blob, filename);
+ } else {
+ var URL = window.URL || window.webkitURL;
+ var downloadUrl = URL.createObjectURL(blob);
+
+ if (filename) {
+ // use HTML5 a[download] attribute to specify filename
+ var a = document.createElement("a");
+ // safari doesn't support this yet
+ if (typeof a.download === 'undefined') {
+ window.location = downloadUrl;
+ } else {
+ a.href = downloadUrl;
+ a.download = filename;
+ document.body.appendChild(a);
+ a.click();
+ }
+ } else {
+ window.location = downloadUrl;
+ }
+
+ setTimeout(function () {
+ URL.revokeObjectURL(downloadUrl);
+ }, 100); // cleanup
+ }
+ }
+ };
+ xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
+ xhr.send($.param(params));
+ };
+
+ var _buildUrl = function(dt, action) {
+ var url = dt.ajax.url() || '';
+ var params = dt.ajax.params();
+ params.action = action;
+
+ if (url.indexOf('?') > -1) {
+ return url + '&' + $.param(params);
+ }
+
+ return url + '?' + $.param(params);
+ };
+
+ DataTable.ext.buttons.excel = {
+ className: 'buttons-excel',
+
+ text: function (dt) {
+ return ' ' + dt.i18n('buttons.excel', 'Excel');
+ },
+
+ action: function (e, dt, button, config) {
+ var url = _buildUrl(dt, 'excel');
+ window.location = url;
+ }
+ };
+
+ DataTable.ext.buttons.postExcel = {
+ className: 'buttons-excel',
+
+ text: function (dt) {
+ return ' ' + dt.i18n('buttons.excel', 'Excel');
+ },
+
+ action: function (e, dt, button, config) {
+ var url = dt.ajax.url() || window.location.href;
+ var params = _buildParams(dt, 'excel');
+
+ _downloadFromUrl(url, params);
+ }
+ };
+
+ DataTable.ext.buttons.postExcelVisibleColumns = {
+ className: 'buttons-excel',
+
+ text: function (dt) {
+ return ' ' + dt.i18n('buttons.excel', 'Excel (only visible columns)');
+ },
+
+ action: function (e, dt, button, config) {
+ var url = dt.ajax.url() || window.location.href;
+ var params = _buildParams(dt, 'excel', true);
+
+ _downloadFromUrl(url, params);
+ }
+ };
+
+ DataTable.ext.buttons.export = {
+ extend: 'collection',
+
+ className: 'buttons-export',
+
+ text: function (dt) {
+ return ' ' + dt.i18n('buttons.export', 'Export') + ' ';
+ },
+
+ buttons: ['csv', 'excel', 'pdf']
+ };
+
+ DataTable.ext.buttons.csv = {
+ className: 'buttons-csv',
+
+ text: function (dt) {
+ return ' ' + dt.i18n('buttons.csv', 'CSV');
+ },
+
+ action: function (e, dt, button, config) {
+ var url = _buildUrl(dt, 'csv');
+ window.location = url;
+ }
+ };
+
+ DataTable.ext.buttons.postCsvVisibleColumns = {
+ className: 'buttons-csv',
+
+ text: function (dt) {
+ return ' ' + dt.i18n('buttons.csv', 'CSV (only visible columns)');
+ },
+
+ action: function (e, dt, button, config) {
+ var url = dt.ajax.url() || window.location.href;
+ var params = _buildParams(dt, 'csv', true);
+
+ _downloadFromUrl(url, params);
+ }
+ };
+
+ DataTable.ext.buttons.postCsv = {
+ className: 'buttons-csv',
+
+ text: function (dt) {
+ return ' ' + dt.i18n('buttons.csv', 'CSV');
+ },
+
+ action: function (e, dt, button, config) {
+ var url = dt.ajax.url() || window.location.href;
+ var params = _buildParams(dt, 'csv');
+
+ _downloadFromUrl(url, params);
+ }
+ };
+
+ DataTable.ext.buttons.pdf = {
+ className: 'buttons-pdf',
+
+ text: function (dt) {
+ return ' ' + dt.i18n('buttons.pdf', 'PDF');
+ },
+
+ action: function (e, dt, button, config) {
+ var url = _buildUrl(dt, 'pdf');
+ window.location = url;
+ }
+ };
+
+ DataTable.ext.buttons.postPdf = {
+ className: 'buttons-pdf',
+
+ text: function (dt) {
+ return ' ' + dt.i18n('buttons.pdf', 'PDF');
+ },
+
+ action: function (e, dt, button, config) {
+ var url = dt.ajax.url() || window.location.href;
+ var params = _buildParams(dt, 'pdf');
+
+ _downloadFromUrl(url, params);
+ }
+ };
+
+ DataTable.ext.buttons.print = {
+ className: 'buttons-print',
+
+ text: function (dt) {
+ return ' ' + dt.i18n('buttons.print', 'Print');
+ },
+
+ action: function (e, dt, button, config) {
+ var url = _buildUrl(dt, 'print');
+ window.location = url;
+ }
+ };
+
+ DataTable.ext.buttons.reset = {
+ className: 'buttons-reset',
+
+ text: function (dt) {
+ return ' ' + dt.i18n('buttons.reset', 'Reset');
+ },
+
+ action: function (e, dt, button, config) {
+ dt.search('');
+ dt.columns().search('');
+ dt.draw();
+ }
+ };
+
+ DataTable.ext.buttons.reload = {
+ className: 'buttons-reload',
+
+ text: function (dt) {
+ return ' ' + dt.i18n('buttons.reload', 'Reload');
+ },
+
+ action: function (e, dt, button, config) {
+ dt.draw(false);
+ }
+ };
+
+ DataTable.ext.buttons.create = {
+ className: 'buttons-create',
+
+ text: function (dt) {
+ return ' ' + dt.i18n('buttons.create', 'Create');
+ },
+
+ action: function (e, dt, button, config) {
+ window.location = window.location.href.replace(/\/+$/, "") + '/create';
+ }
+ };
+
+ if (typeof DataTable.ext.buttons.copyHtml5 !== 'undefined') {
+ $.extend(DataTable.ext.buttons.copyHtml5, {
+ text: function (dt) {
+ return ' ' + dt.i18n('buttons.copy', 'Copy');
+ }
+ });
+ }
+
+ if (typeof DataTable.ext.buttons.colvis !== 'undefined') {
+ $.extend(DataTable.ext.buttons.colvis, {
+ text: function (dt) {
+ return ' ' + dt.i18n('buttons.colvis', 'Column visibility');
+ }
+ });
+ }
+})(jQuery, jQuery.fn.dataTable);
diff --git a/resources/views/projectsClients/articulated_2_ShowEquipment.blade.php b/resources/views/projectsClients/articulated_2_ShowEquipment.blade.php
index ee08d439..76fcf141 100755
--- a/resources/views/projectsClients/articulated_2_ShowEquipment.blade.php
+++ b/resources/views/projectsClients/articulated_2_ShowEquipment.blade.php
@@ -622,7 +622,7 @@ class="form-control card_inputs"
-
-
-
-
-
-
-
- Documento Rotacionado
-
-
-
-
-
-
-
-
- {{--
-
-
-
-
-  }})
- 
-
- |
-
--}}
-
-
-
-
-
-
-  }})
- 
-
- |
-
-
- | Nº ISPT |
- Unidade |
- Tag Nº |
- Dim |
- # |
- Localizacao |
- PI&D |
- Ambito |
- Obsercoes |
- Andaime |
- Isolamento |
- Grua |
- Conclusao |
-
-
-
-
-
- {{--
-
-
-
- Column
-
-
- Column
-
-
- Column
-
-
-
--}}
-
-
-
-
-
-
diff --git a/resources/views/userClient/pdfReportings/equipmentsForAmbitPdf.blade.php b/resources/views/userClient/pdfReportings/equipmentsForAmbitPdf.blade.php
new file mode 100644
index 00000000..4be63f81
--- /dev/null
+++ b/resources/views/userClient/pdfReportings/equipmentsForAmbitPdf.blade.php
@@ -0,0 +1,199 @@
+
+
+
+
+
+
+
+ Invoice
+
+
+
+
+
+
+
+ {{--
+
+
+
+
+
+
+
{{ $dataAmbit->ambits_description }}
+
+
+
+
+
+
+ @php $count = 0; @endphp
+ @foreach ($equipmentDetails as $equipmentDetail)
+ @if ($count % 23 == 0)
+ @if ($count != 0)
+
+
+ @endif
+
+
+ | Nº ISPT |
+ Unidade |
+ Tag Nº |
+
+ @endif
+
+ | {{ $equipmentDetail->equipment_id }} |
+ {{ $equipmentDetail->unit_id }} |
+ {{ $equipmentDetail->equipment_tag }} |
+
+ @php $count++; @endphp
+ @endforeach
+
+
+
+
+
+ --}}
+
+
+ @php $page = 1; @endphp
+ @php $count = 0; @endphp
+ @foreach ($equipmentDetails as $equipmentDetail)
+ @if ($count % 25 == 0)
+ @if ($count != 0)
+
+
+ @endif
+
+
+
+
+
+
{{ $dataAmbit->ambits_description }}
+
+
+
+
+
+
+ | Nº ISPT |
+ Unidade |
+ Tag Nº |
+
+ @endif
+
+ | {{ $equipmentDetail->equipment_id }} |
+ {{ $equipmentDetail->unit_id }} |
+ {{ $equipmentDetail->equipment_tag }} |
+
+ @php $count++; @endphp
+ @endforeach
+
+ {{-- --}}
+
+
+
+
+
+
+
+
+
diff --git a/resources/views/userClient/pdfReportings/showReportingAllEquipmentsForAmbitProject.blade copy.php b/resources/views/userClient/pdfReportings/showReportingAllEquipmentsForAmbitProject.blade copy.php
deleted file mode 100644
index b51fd9ab..00000000
--- a/resources/views/userClient/pdfReportings/showReportingAllEquipmentsForAmbitProject.blade copy.php
+++ /dev/null
@@ -1,136 +0,0 @@
-
-
-
-
-
-
-
-
Documento Rotacionado
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- | Nº ISPT |
- Unidade |
- Tag Nº |
- Dim |
- # |
- Localizacao |
- PI&D |
- Ambito |
- Obsercoes |
- Andaime |
- Isolamento |
- Grua |
- Conclusao |
-
-
-
-
-
-
-
-
-
-@section('scriptsTemplateAdmin')
-
-@endsection
diff --git a/resources/views/userClient/pdfReportings/showReportingAllEquipmentsForAmbitProject.blade.php b/resources/views/userClient/pdfReportings/showReportingAllEquipmentsForAmbitProject.blade.php
deleted file mode 100644
index 83bb9c3e..00000000
--- a/resources/views/userClient/pdfReportings/showReportingAllEquipmentsForAmbitProject.blade.php
+++ /dev/null
@@ -1,84 +0,0 @@
-@extends('Templates/templateAdmin')
-
-@section('Main-content')
-
-
-
-
-
-
-
-@endsection
-
-
-
-@section('scriptsTemplateAdmin')
-
-@endsection
diff --git a/resources/views/userClient/reportingDataClient.blade.php b/resources/views/userClient/reportingDataClient.blade.php
index 49258953..c8b191e2 100644
--- a/resources/views/userClient/reportingDataClient.blade.php
+++ b/resources/views/userClient/reportingDataClient.blade.php
@@ -1,12 +1,28 @@
@extends('Templates/templateAdmin')
@section('Main-content')
+
+
+