diff --git a/app/Http/Controllers/CreateProjectController.php b/app/Http/Controllers/CreateProjectController.php index b776311b..0fc3f53b 100755 --- a/app/Http/Controllers/CreateProjectController.php +++ b/app/Http/Controllers/CreateProjectController.php @@ -260,9 +260,10 @@ public function finishCreatingProject($numberProject) 'further' => $missingFurtherTasksDetails, 'workstation' => $missingWorkstations ]; + // Verificar se todos os arrays internos estão vazios + $isEmpty = empty($allMissingTasks['elemental']) && empty($allMissingTasks['further']) && empty($allMissingTasks['workstation']); - - if (!empty($allMissingTasks)) { + if (!$isEmpty) { return redirect()->back()->with('errors', $allMissingTasks); } else { $project = CompanyProject::find($numberProject); @@ -951,7 +952,8 @@ public function processStep2(Request $request) $JoinsEquipmentsWithTasks->execution_order = $execution_order++; $JoinsEquipmentsWithTasks->elemental_tasks_id = $TasksAssociationAmbit->elemental_tasks_id; $JoinsEquipmentsWithTasks->further_tasks_id = null; - $JoinsEquipmentsWithTasks->inspection = 'Nao'; + // 2 vai significar 'nao' e 1 'sim' + $JoinsEquipmentsWithTasks->inspection = 2; $JoinsEquipmentsWithTasks->save(); } diff --git a/app/Http/Controllers/PreparedProjectController.php b/app/Http/Controllers/PreparedProjectController.php index 9b650100..13990910 100755 --- a/app/Http/Controllers/PreparedProjectController.php +++ b/app/Http/Controllers/PreparedProjectController.php @@ -37,7 +37,8 @@ public function PreparedProject($ProjectId) // ->with('equipmentsProjects', $equipmentsProjects) ->with('equipmentsTypes', $equipmentsTypes) ->with('units', $checkUnits) - ->with('numberProject', $numberProject); + ->with('numberProject', $numberProject) + ->with('equipmentsProjects', $equipmentsProjects); } public function getAmbits($equipmentType) diff --git a/app/Http/Controllers/ProjectoDatacontroller.php b/app/Http/Controllers/ProjectoDatacontroller.php index a77fd08d..f320ded9 100755 --- a/app/Http/Controllers/ProjectoDatacontroller.php +++ b/app/Http/Controllers/ProjectoDatacontroller.php @@ -20,13 +20,13 @@ class ProjectoDatacontroller extends Controller { - public function receivePlants($clientId){ - if($clientId == 'all'){ + public function receivePlants($clientId) + { + if ($clientId == 'all') { $allPlants = Plant::all(); return response()->json($allPlants); } dd($clientId); - } @@ -100,7 +100,7 @@ public function ManageAssets() $allEquipmentType = EquipmentType::all(); $allClients = User::where('type_users', 3)->get(); - return view('Admin/DataManagement/manageassets', compact('units', 'equipments','allEquipmentType','allClients')); + return view('Admin/DataManagement/manageassets', compact('units', 'equipments', 'allEquipmentType', 'allClients')); } public function showUnit($id) @@ -110,7 +110,7 @@ public function showUnit($id) return view('Admin/DataManagement/showEquipament', compact('equipaments')); } - + @@ -118,10 +118,8 @@ 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); + $ambits_id = request('ambits_id'); // Caso 'equipment_type_id' seja '#', mostra todos os equipamentos if ($equipment_type_id == '#') { @@ -153,16 +151,30 @@ public function receiveEquipmentsProject($receiveNumberProject) ->addColumn('Ambits', function ($row) { return $row->equipmentAssociationAmbit->ambitsEquipment->ambits_description; }) + // Este 2 em especial, tem a condicao se a tarefa elementar estiver a null ele deve pegar a valor do campo ao lado ou seja da further task. ->addColumn('order_tasks', function ($row) { - return $row->orderEquipmentTasks->map(function ($task) { - return $task->elementalTask->elemental_tasks_code; + return $row->orderEquipmentTasks->sortBy('execution_order')->map(function ($task) { + // Se elementalTask não for null, retorna elemental_tasks_code + if (!is_null($task->elementalTask)) { + return $task->elementalTask->elemental_tasks_code; + } + // Caso contrário, retorna further_tasks_name + return $task->furtherTasks->further_tasks_name; })->implode(' ||'); }) ->addColumn('current_task', function ($row) { return $row->controlEquipmentWorkstation->map(function ($task) { - return $task->elementalTask->elemental_tasks_code; + // Se elementalTask não for null, retorna elemental_tasks_code + if (!is_null($task->elementalTask)) { + return $task->elementalTask->elemental_tasks_code; + } + // Caso contrário, retorna further_tasks_name + return $task->furtherTasks->further_tasks_name; })->implode(' ||'); }) + + + ->addColumn('Inspec', function ($row) { return $row->hasInspectionYes() ? 'Sim' : 'Nao'; }) @@ -189,13 +201,18 @@ public function receiveWorkstationProject($receiveNumberProject) { $model = ConstructionWorkstation::where('company_projects_id', $receiveNumberProject)->with('workstationsAssociationTasks'); + // Se ao varificar na tabela 'workstationsAssociationTasks' a coluna elementalTask estiver a null, significa que e uma further task, sendo assim ele busca o campo ao lado. return DataTables::of($model) ->addColumn('workstations_Association_Tasks', function ($row) { return $row->workstationsAssociationTasks->map(function ($task) { - return $task->elementalTask->elemental_tasks_code; + // Se elementalTask não for null, retorna elemental_tasks_code + if (!is_null($task->elementalTask)) { + return $task->elementalTask->elemental_tasks_code; + } + // Caso contrário, retorna further_tasks_name + return $task->furtherTask->further_tasks_name; })->implode(' ||'); }) - ->toJson(); } } diff --git a/app/Livewire/Execução/StepByStepEquipmentTasks.php b/app/Livewire/Execução/StepByStepEquipmentTasks.php new file mode 100644 index 00000000..4f473a17 --- /dev/null +++ b/app/Livewire/Execução/StepByStepEquipmentTasks.php @@ -0,0 +1,30 @@ +equipmentId = $equipmentId; + // $this->dispatchBrowserEvent('openModalEvent'); // Emitindo o evento + // } + + public function loadDetails($equipmentId) + { + $this->equipmentId = $equipmentId; + $this->emit('openModalEvent'); + } + + public function render() + { + return view('livewire.execução.step-by-step-equipment-tasks'); + } +} diff --git a/app/Livewire/Preparadas/ShowQrcodeAndDetallsEquipment.php b/app/Livewire/Preparadas/ShowQrcodeAndDetallsEquipment.php new file mode 100644 index 00000000..710ed231 --- /dev/null +++ b/app/Livewire/Preparadas/ShowQrcodeAndDetallsEquipment.php @@ -0,0 +1,23 @@ +equipment = $equipment; + } + + public function render() + { + // $this->equipment = Equipment::find($this->equipment->id); + return view('livewire.preparadas.show-qrcode-and-detalls-equipment'); + } + +} diff --git a/app/Models/ControlEquipmentWorkstation.php b/app/Models/ControlEquipmentWorkstation.php index 8e935ee1..9e8e076a 100755 --- a/app/Models/ControlEquipmentWorkstation.php +++ b/app/Models/ControlEquipmentWorkstation.php @@ -24,4 +24,11 @@ public function elementalTask() { return $this->belongsTo(ElementalTasks::class,'elemental_tasks_id','elemental_tasks_id'); } + + public function furtherTasks() + { + return $this->belongsTo(FurtherTasks::class,'further_tasks_id','further_tasks_id'); + } + + } diff --git a/app/Models/FurtherTasks.php b/app/Models/FurtherTasks.php index 71e8f356..4e735fc6 100755 --- a/app/Models/FurtherTasks.php +++ b/app/Models/FurtherTasks.php @@ -19,4 +19,14 @@ public function orderEquipmentTasks() { return $this->hasMany(OrderEquipmentTasks::class,'further_tasks_id','further_tasks_id'); } + + public function workstationsAssociationTasks() + { + return $this->hasMany(WorkstationsAssociationTasks::class,'further_tasks_id','further_tasks_id'); + } + + public function controlEquipmentWorkstation() + { + return $this->hasMany(ControlEquipmentWorkstation::class, 'further_tasks_id', 'further_tasks_id'); + } } diff --git a/app/Models/WorkstationsAssociationTasks.php b/app/Models/WorkstationsAssociationTasks.php index 4a9ef160..acebf92a 100755 --- a/app/Models/WorkstationsAssociationTasks.php +++ b/app/Models/WorkstationsAssociationTasks.php @@ -22,4 +22,9 @@ public function elementalTask() { return $this->belongsTo(ElementalTasks::class,'elemental_tasks_id','elemental_tasks_id'); } + + public function furtherTask() + { + return $this->belongsTo(FurtherTasks::class,'further_tasks_id','further_tasks_id'); + } } diff --git a/public/assets/dist/css/adminlte.css b/public/assets/dist/css/adminlte.css index 466c03d7..3cf80e7c 100644 --- a/public/assets/dist/css/adminlte.css +++ b/public/assets/dist/css/adminlte.css @@ -55,7 +55,8 @@ :root { } .scrollable-list { - max-height: calc(1.5em + .75rem + 2px + 2px + 1.5em + .75rem + 2px + 2px + 1.5em + .75rem + 2px + 2px + 1.5em + .75rem + 2px); /* Altura de 4 itens de lista */ + max-height: calc(1.5em + .75rem + 2px + 2px + 1.5em + .75rem + 2px + 2px + 1.5em + .75rem + 2px + 2px + 1.5em + .75rem + 2px); + /* Altura de 4 itens de lista */ overflow-y: auto; } @@ -75,6 +76,159 @@ @font-face { /*Substitua pelo caminho para o arquivo da fonte que você extraiu */ } + + + + +/* Estilo para dimencionar o cartao do qrcode */ +.modal-content-center { + display: flex; + justify-content: center; + align-items: center; + height: 100%; + /* Isso garante que o container ocupe toda a altura da modal */ +} + +.card-to-print { + width: 45mm; + height: 95mm; + max-width: 45mm; + max-height: 95mm; + border: 1px solid #09255C; + box-sizing: border-box; + transform-origin: top left; +} + +.custom-row { + display: flex; + flex-direction: row; + flex-wrap: nowrap; + /* Isso garante que os itens não sejam quebrados em várias linhas */ + justify-content: space-between; + /* Isso espaça os itens uniformemente na linha */ + align-items: center; + /* Isso centraliza os itens verticalmente */ + margin-left: 0; + /* Remove a margem negativa padrão da classe row do Bootstrap */ + margin-right: 0; + /* Remove a margem negativa padrão da classe row do Bootstrap */ +} + + +.top { + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; +} + +.card-to-print .row { + margin: 0; + /* Remove a margem negativa */ +} + +.print-container { + display: none; + position: relative; + overflow: hidden; + width: 45mm; + height: 95mm; + border: 1px solid #09255C; + box-sizing: border-box; +} + +.card-to-printAll { + width: 100%; + height: 100%; + box-sizing: border-box; + overflow: hidden; +} + +.custom-rowAll { + display: flex; + flex-wrap: nowrap; + width: 100%; + box-sizing: border-box; +} + +/* Estilos para impressão */ +@media print { + + body * { + visibility: hidden; + } + /* body, + html { + margin: 0; + padding: 0; + } */ + + .print-container, + .print-container * { + visibility: visible !important; + + } + + .print-container { + display: inline-block; + margin-right: 2mm; + margin-bottom: 3mm; + width: 45mm; + height: 95mm; + border: 1px solid #09255C; + box-sizing: border-box; + page-break-inside: avoid; + } + + .card-to-print, + .card-to-print * { + visibility: visible; + } + + .card-to-print { + position: absolute; + left: 0; + top: 0; + } +} + + +#circulo { + background: white; + border-radius: 50%; + width: 20px; + height: 20px; + border: 1px solid black; + flex-shrink: 0; +} + +/* Escala o cartão proporcionalmente com base na largura da janela */ +@media (max-width: 500px) { + + .card-to-print, + .card-to-printAll { + transform: scale(0.8); + } +} + +@media (max-width: 400px) { + + .card-to-print, + .card-to-printAll { + transform: scale(0.7); + } +} + +@media (max-width: 300px) { + + .card-to-print, + .card-to-printAll { + transform: scale(0.6); + } +} + + + *, *::before, *::after { @@ -140,43 +294,51 @@ p { /* STYLES TABLE*/ - .dt-buttons > button, .dt-buttons > .btn-group > button { - background-color: #00B0EA; - color:white; - letter-spacing: 1px; - border: 1px solid #00B0EA; - } - - .dt-buttons > button:hover, .dt-buttons > .btn-group > button:hover { - background-color: #00B0EA; - color: #09255C; - border: 1px solid #09255C; - } - - .dt-button-collection > .dropdown-menu > .dt-button.active{ - background-color: #00B0EA; - color: #09255C; - } - .dt-button-collection > .dropdown-menu > .dt-button.active:hover{ - background-color: #00B0EA; - color: white; - } - - div.dataTables_wrapper div.dataTables_filter label { - font-weight: normal; - white-space: nowrap; - text-align: left; - color: #09255C; - } - - table.dataTable>thead .sorting,table.dataTable>thead .sorting_asc,table.dataTable>thead .sorting_desc,table.dataTable>thead .sorting_asc_disabled,table.dataTable>thead .sorting_desc_disabled { - cursor: pointer; - position: relative; - background-color: #00B0EA; - color: #fff; +.dt-buttons>button, +.dt-buttons>.btn-group>button { + background-color: #00B0EA; + color: white; + letter-spacing: 1px; + border: 1px solid #00B0EA; } -thead > tr, thead > tr > th { +.dt-buttons>button:hover, +.dt-buttons>.btn-group>button:hover { + background-color: #00B0EA; + color: #09255C; + border: 1px solid #09255C; +} + +.dt-button-collection>.dropdown-menu>.dt-button.active { + background-color: #00B0EA; + color: #09255C; +} + +.dt-button-collection>.dropdown-menu>.dt-button.active:hover { + background-color: #00B0EA; + color: white; +} + +div.dataTables_wrapper div.dataTables_filter label { + font-weight: normal; + white-space: nowrap; + text-align: left; + color: #09255C; +} + +table.dataTable>thead .sorting, +table.dataTable>thead .sorting_asc, +table.dataTable>thead .sorting_desc, +table.dataTable>thead .sorting_asc_disabled, +table.dataTable>thead .sorting_desc_disabled { + cursor: pointer; + position: relative; + background-color: #00B0EA; + color: #fff; +} + +thead>tr, +thead>tr>th { padding: 0.75rem; vertical-align: top; border-top: 1px solid #dee2e6; @@ -259,7 +421,7 @@ a { background-color: transparent; } -a:focus{ +a:focus { color: #00B0EA; text-decoration: none; } @@ -4215,7 +4377,7 @@ .input-group-append { display: flex; } -.input-group-prepend{ +.input-group-prepend { width: 100%; } diff --git a/public/assets/dist/js/qrcode.js b/public/assets/dist/js/qrcode.js new file mode 100644 index 00000000..5507c154 --- /dev/null +++ b/public/assets/dist/js/qrcode.js @@ -0,0 +1,614 @@ +/** + * @fileoverview + * - Using the 'QRCode for Javascript library' + * - Fixed dataset of 'QRCode for Javascript library' for support full-spec. + * - this library has no dependencies. + * + * @author davidshimjs + * @see http://www.d-project.com/ + * @see http://jeromeetienne.github.com/jquery-qrcode/ + */ +var QRCode; + +(function () { + //--------------------------------------------------------------------- + // QRCode for JavaScript + // + // Copyright (c) 2009 Kazuhiko Arase + // + // URL: http://www.d-project.com/ + // + // Licensed under the MIT license: + // http://www.opensource.org/licenses/mit-license.php + // + // The word "QR Code" is registered trademark of + // DENSO WAVE INCORPORATED + // http://www.denso-wave.com/qrcode/faqpatent-e.html + // + //--------------------------------------------------------------------- + function QR8bitByte(data) { + this.mode = QRMode.MODE_8BIT_BYTE; + this.data = data; + this.parsedData = []; + + // Added to support UTF-8 Characters + for (var i = 0, l = this.data.length; i < l; i++) { + var byteArray = []; + var code = this.data.charCodeAt(i); + + if (code > 0x10000) { + byteArray[0] = 0xF0 | ((code & 0x1C0000) >>> 18); + byteArray[1] = 0x80 | ((code & 0x3F000) >>> 12); + byteArray[2] = 0x80 | ((code & 0xFC0) >>> 6); + byteArray[3] = 0x80 | (code & 0x3F); + } else if (code > 0x800) { + byteArray[0] = 0xE0 | ((code & 0xF000) >>> 12); + byteArray[1] = 0x80 | ((code & 0xFC0) >>> 6); + byteArray[2] = 0x80 | (code & 0x3F); + } else if (code > 0x80) { + byteArray[0] = 0xC0 | ((code & 0x7C0) >>> 6); + byteArray[1] = 0x80 | (code & 0x3F); + } else { + byteArray[0] = code; + } + + this.parsedData.push(byteArray); + } + + this.parsedData = Array.prototype.concat.apply([], this.parsedData); + + if (this.parsedData.length != this.data.length) { + this.parsedData.unshift(191); + this.parsedData.unshift(187); + this.parsedData.unshift(239); + } + } + + QR8bitByte.prototype = { + getLength: function (buffer) { + return this.parsedData.length; + }, + write: function (buffer) { + for (var i = 0, l = this.parsedData.length; i < l; i++) { + buffer.put(this.parsedData[i], 8); + } + } + }; + + function QRCodeModel(typeNumber, errorCorrectLevel) { + this.typeNumber = typeNumber; + this.errorCorrectLevel = errorCorrectLevel; + this.modules = null; + this.moduleCount = 0; + this.dataCache = null; + this.dataList = []; + } + + QRCodeModel.prototype={addData:function(data){var newData=new QR8bitByte(data);this.dataList.push(newData);this.dataCache=null;},isDark:function(row,col){if(row<0||this.moduleCount<=row||col<0||this.moduleCount<=col){throw new Error(row+","+col);} + return this.modules[row][col];},getModuleCount:function(){return this.moduleCount;},make:function(){this.makeImpl(false,this.getBestMaskPattern());},makeImpl:function(test,maskPattern){this.moduleCount=this.typeNumber*4+17;this.modules=new Array(this.moduleCount);for(var row=0;row=7){this.setupTypeNumber(test);} + if(this.dataCache==null){this.dataCache=QRCodeModel.createData(this.typeNumber,this.errorCorrectLevel,this.dataList);} + this.mapData(this.dataCache,maskPattern);},setupPositionProbePattern:function(row,col){for(var r=-1;r<=7;r++){if(row+r<=-1||this.moduleCount<=row+r)continue;for(var c=-1;c<=7;c++){if(col+c<=-1||this.moduleCount<=col+c)continue;if((0<=r&&r<=6&&(c==0||c==6))||(0<=c&&c<=6&&(r==0||r==6))||(2<=r&&r<=4&&2<=c&&c<=4)){this.modules[row+r][col+c]=true;}else{this.modules[row+r][col+c]=false;}}}},getBestMaskPattern:function(){var minLostPoint=0;var pattern=0;for(var i=0;i<8;i++){this.makeImpl(true,i);var lostPoint=QRUtil.getLostPoint(this);if(i==0||minLostPoint>lostPoint){minLostPoint=lostPoint;pattern=i;}} + return pattern;},createMovieClip:function(target_mc,instance_name,depth){var qr_mc=target_mc.createEmptyMovieClip(instance_name,depth);var cs=1;this.make();for(var row=0;row>i)&1)==1);this.modules[Math.floor(i/3)][i%3+this.moduleCount-8-3]=mod;} + for(var i=0;i<18;i++){var mod=(!test&&((bits>>i)&1)==1);this.modules[i%3+this.moduleCount-8-3][Math.floor(i/3)]=mod;}},setupTypeInfo:function(test,maskPattern){var data=(this.errorCorrectLevel<<3)|maskPattern;var bits=QRUtil.getBCHTypeInfo(data);for(var i=0;i<15;i++){var mod=(!test&&((bits>>i)&1)==1);if(i<6){this.modules[i][8]=mod;}else if(i<8){this.modules[i+1][8]=mod;}else{this.modules[this.moduleCount-15+i][8]=mod;}} + for(var i=0;i<15;i++){var mod=(!test&&((bits>>i)&1)==1);if(i<8){this.modules[8][this.moduleCount-i-1]=mod;}else if(i<9){this.modules[8][15-i-1+1]=mod;}else{this.modules[8][15-i-1]=mod;}} + this.modules[this.moduleCount-8][8]=(!test);},mapData:function(data,maskPattern){var inc=-1;var row=this.moduleCount-1;var bitIndex=7;var byteIndex=0;for(var col=this.moduleCount-1;col>0;col-=2){if(col==6)col--;while(true){for(var c=0;c<2;c++){if(this.modules[row][col-c]==null){var dark=false;if(byteIndex>>bitIndex)&1)==1);} + var mask=QRUtil.getMask(maskPattern,row,col-c);if(mask){dark=!dark;} + this.modules[row][col-c]=dark;bitIndex--;if(bitIndex==-1){byteIndex++;bitIndex=7;}}} + row+=inc;if(row<0||this.moduleCount<=row){row-=inc;inc=-inc;break;}}}}};QRCodeModel.PAD0=0xEC;QRCodeModel.PAD1=0x11;QRCodeModel.createData=function(typeNumber,errorCorrectLevel,dataList){var rsBlocks=QRRSBlock.getRSBlocks(typeNumber,errorCorrectLevel);var buffer=new QRBitBuffer();for(var i=0;itotalDataCount*8){throw new Error("code length overflow. (" + +buffer.getLengthInBits() + +">" + +totalDataCount*8 + +")");} + if(buffer.getLengthInBits()+4<=totalDataCount*8){buffer.put(0,4);} + while(buffer.getLengthInBits()%8!=0){buffer.putBit(false);} + while(true){if(buffer.getLengthInBits()>=totalDataCount*8){break;} + buffer.put(QRCodeModel.PAD0,8);if(buffer.getLengthInBits()>=totalDataCount*8){break;} + buffer.put(QRCodeModel.PAD1,8);} + return QRCodeModel.createBytes(buffer,rsBlocks);};QRCodeModel.createBytes=function(buffer,rsBlocks){var offset=0;var maxDcCount=0;var maxEcCount=0;var dcdata=new Array(rsBlocks.length);var ecdata=new Array(rsBlocks.length);for(var r=0;r=0)?modPoly.get(modIndex):0;}} + var totalCodeCount=0;for(var i=0;i=0){d^=(QRUtil.G15<<(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G15)));} + return((data<<10)|d)^QRUtil.G15_MASK;},getBCHTypeNumber:function(data){var d=data<<12;while(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G18)>=0){d^=(QRUtil.G18<<(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G18)));} + return(data<<12)|d;},getBCHDigit:function(data){var digit=0;while(data!=0){digit++;data>>>=1;} + return digit;},getPatternPosition:function(typeNumber){return QRUtil.PATTERN_POSITION_TABLE[typeNumber-1];},getMask:function(maskPattern,i,j){switch(maskPattern){case QRMaskPattern.PATTERN000:return(i+j)%2==0;case QRMaskPattern.PATTERN001:return i%2==0;case QRMaskPattern.PATTERN010:return j%3==0;case QRMaskPattern.PATTERN011:return(i+j)%3==0;case QRMaskPattern.PATTERN100:return(Math.floor(i/2)+Math.floor(j/3))%2==0;case QRMaskPattern.PATTERN101:return(i*j)%2+(i*j)%3==0;case QRMaskPattern.PATTERN110:return((i*j)%2+(i*j)%3)%2==0;case QRMaskPattern.PATTERN111:return((i*j)%3+(i+j)%2)%2==0;default:throw new Error("bad maskPattern:"+maskPattern);}},getErrorCorrectPolynomial:function(errorCorrectLength){var a=new QRPolynomial([1],0);for(var i=0;i5){lostPoint+=(3+sameCount-5);}}} + for(var row=0;row=256){n-=255;} + return QRMath.EXP_TABLE[n];},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)};for(var i=0;i<8;i++){QRMath.EXP_TABLE[i]=1<>>(7-index%8))&1)==1;},put:function(num,length){for(var i=0;i>>(length-i-1))&1)==1);}},getLengthInBits:function(){return this.length;},putBit:function(bit){var bufIndex=Math.floor(this.length/8);if(this.buffer.length<=bufIndex){this.buffer.push(0);} + if(bit){this.buffer[bufIndex]|=(0x80>>>(this.length%8));} + this.length++;}};var QRCodeLimitLength=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]]; + + function _isSupportCanvas() { + return typeof CanvasRenderingContext2D != "undefined"; + } + + // android 2.x doesn't support Data-URI spec + function _getAndroid() { + var android = false; + var sAgent = navigator.userAgent; + + if (/android/i.test(sAgent)) { // android + android = true; + var aMat = sAgent.toString().match(/android ([0-9]\.[0-9])/i); + + if (aMat && aMat[1]) { + android = parseFloat(aMat[1]); + } + } + + return android; + } + + var svgDrawer = (function() { + + var Drawing = function (el, htOption) { + this._el = el; + this._htOption = htOption; + }; + + Drawing.prototype.draw = function (oQRCode) { + var _htOption = this._htOption; + var _el = this._el; + var nCount = oQRCode.getModuleCount(); + var nWidth = Math.floor(_htOption.width / nCount); + var nHeight = Math.floor(_htOption.height / nCount); + + this.clear(); + + function makeSVG(tag, attrs) { + var el = document.createElementNS('http://www.w3.org/2000/svg', tag); + for (var k in attrs) + if (attrs.hasOwnProperty(k)) el.setAttribute(k, attrs[k]); + return el; + } + + var svg = makeSVG("svg" , {'viewBox': '0 0 ' + String(nCount) + " " + String(nCount), 'width': '100%', 'height': '100%', 'fill': _htOption.colorLight}); + svg.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:xlink", "http://www.w3.org/1999/xlink"); + _el.appendChild(svg); + + svg.appendChild(makeSVG("rect", {"fill": _htOption.colorLight, "width": "100%", "height": "100%"})); + svg.appendChild(makeSVG("rect", {"fill": _htOption.colorDark, "width": "1", "height": "1", "id": "template"})); + + for (var row = 0; row < nCount; row++) { + for (var col = 0; col < nCount; col++) { + if (oQRCode.isDark(row, col)) { + var child = makeSVG("use", {"x": String(col), "y": String(row)}); + child.setAttributeNS("http://www.w3.org/1999/xlink", "href", "#template") + svg.appendChild(child); + } + } + } + }; + Drawing.prototype.clear = function () { + while (this._el.hasChildNodes()) + this._el.removeChild(this._el.lastChild); + }; + return Drawing; + })(); + + var useSVG = document.documentElement.tagName.toLowerCase() === "svg"; + + // Drawing in DOM by using Table tag + var Drawing = useSVG ? svgDrawer : !_isSupportCanvas() ? (function () { + var Drawing = function (el, htOption) { + this._el = el; + this._htOption = htOption; + }; + + /** + * Draw the QRCode + * + * @param {QRCode} oQRCode + */ + Drawing.prototype.draw = function (oQRCode) { + var _htOption = this._htOption; + var _el = this._el; + var nCount = oQRCode.getModuleCount(); + var nWidth = Math.floor(_htOption.width / nCount); + var nHeight = Math.floor(_htOption.height / nCount); + var aHTML = ['']; + + for (var row = 0; row < nCount; row++) { + aHTML.push(''); + + for (var col = 0; col < nCount; col++) { + aHTML.push(''); + } + + aHTML.push(''); + } + + aHTML.push('
'); + _el.innerHTML = aHTML.join(''); + + // Fix the margin values as real size. + var elTable = _el.childNodes[0]; + var nLeftMarginTable = (_htOption.width - elTable.offsetWidth) / 2; + var nTopMarginTable = (_htOption.height - elTable.offsetHeight) / 2; + + if (nLeftMarginTable > 0 && nTopMarginTable > 0) { + elTable.style.margin = nTopMarginTable + "px " + nLeftMarginTable + "px"; + } + }; + + /** + * Clear the QRCode + */ + Drawing.prototype.clear = function () { + this._el.innerHTML = ''; + }; + + return Drawing; + })() : (function () { // Drawing in Canvas + function _onMakeImage() { + this._elImage.src = this._elCanvas.toDataURL("image/png"); + this._elImage.style.display = "block"; + this._elCanvas.style.display = "none"; + } + + // Android 2.1 bug workaround + // http://code.google.com/p/android/issues/detail?id=5141 + if (this._android && this._android <= 2.1) { + var factor = 1 / window.devicePixelRatio; + var drawImage = CanvasRenderingContext2D.prototype.drawImage; + CanvasRenderingContext2D.prototype.drawImage = function (image, sx, sy, sw, sh, dx, dy, dw, dh) { + if (("nodeName" in image) && /img/i.test(image.nodeName)) { + for (var i = arguments.length - 1; i >= 1; i--) { + arguments[i] = arguments[i] * factor; + } + } else if (typeof dw == "undefined") { + arguments[1] *= factor; + arguments[2] *= factor; + arguments[3] *= factor; + arguments[4] *= factor; + } + + drawImage.apply(this, arguments); + }; + } + + /** + * Check whether the user's browser supports Data URI or not + * + * @private + * @param {Function} fSuccess Occurs if it supports Data URI + * @param {Function} fFail Occurs if it doesn't support Data URI + */ + function _safeSetDataURI(fSuccess, fFail) { + var self = this; + self._fFail = fFail; + self._fSuccess = fSuccess; + + // Check it just once + if (self._bSupportDataURI === null) { + var el = document.createElement("img"); + var fOnError = function() { + self._bSupportDataURI = false; + + if (self._fFail) { + self._fFail.call(self); + } + }; + var fOnSuccess = function() { + self._bSupportDataURI = true; + + if (self._fSuccess) { + self._fSuccess.call(self); + } + }; + + el.onabort = fOnError; + el.onerror = fOnError; + el.onload = fOnSuccess; + el.src = "data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg=="; // the Image contains 1px data. + return; + } else if (self._bSupportDataURI === true && self._fSuccess) { + self._fSuccess.call(self); + } else if (self._bSupportDataURI === false && self._fFail) { + self._fFail.call(self); + } + }; + + /** + * Drawing QRCode by using canvas + * + * @constructor + * @param {HTMLElement} el + * @param {Object} htOption QRCode Options + */ + var Drawing = function (el, htOption) { + this._bIsPainted = false; + this._android = _getAndroid(); + + this._htOption = htOption; + this._elCanvas = document.createElement("canvas"); + this._elCanvas.width = htOption.width; + this._elCanvas.height = htOption.height; + el.appendChild(this._elCanvas); + this._el = el; + this._oContext = this._elCanvas.getContext("2d"); + this._bIsPainted = false; + this._elImage = document.createElement("img"); + this._elImage.alt = "Scan me!"; + this._elImage.style.display = "none"; + this._el.appendChild(this._elImage); + this._bSupportDataURI = null; + }; + + /** + * Draw the QRCode + * + * @param {QRCode} oQRCode + */ + Drawing.prototype.draw = function (oQRCode) { + var _elImage = this._elImage; + var _oContext = this._oContext; + var _htOption = this._htOption; + + var nCount = oQRCode.getModuleCount(); + var nWidth = _htOption.width / nCount; + var nHeight = _htOption.height / nCount; + var nRoundedWidth = Math.round(nWidth); + var nRoundedHeight = Math.round(nHeight); + + _elImage.style.display = "none"; + this.clear(); + + for (var row = 0; row < nCount; row++) { + for (var col = 0; col < nCount; col++) { + var bIsDark = oQRCode.isDark(row, col); + var nLeft = col * nWidth; + var nTop = row * nHeight; + _oContext.strokeStyle = bIsDark ? _htOption.colorDark : _htOption.colorLight; + _oContext.lineWidth = 1; + _oContext.fillStyle = bIsDark ? _htOption.colorDark : _htOption.colorLight; + _oContext.fillRect(nLeft, nTop, nWidth, nHeight); + + // 안티 앨리어싱 방지 처리 + _oContext.strokeRect( + Math.floor(nLeft) + 0.5, + Math.floor(nTop) + 0.5, + nRoundedWidth, + nRoundedHeight + ); + + _oContext.strokeRect( + Math.ceil(nLeft) - 0.5, + Math.ceil(nTop) - 0.5, + nRoundedWidth, + nRoundedHeight + ); + } + } + + this._bIsPainted = true; + }; + + /** + * Make the image from Canvas if the browser supports Data URI. + */ + Drawing.prototype.makeImage = function () { + if (this._bIsPainted) { + _safeSetDataURI.call(this, _onMakeImage); + } + }; + + /** + * Return whether the QRCode is painted or not + * + * @return {Boolean} + */ + Drawing.prototype.isPainted = function () { + return this._bIsPainted; + }; + + /** + * Clear the QRCode + */ + Drawing.prototype.clear = function () { + this._oContext.clearRect(0, 0, this._elCanvas.width, this._elCanvas.height); + this._bIsPainted = false; + }; + + /** + * @private + * @param {Number} nNumber + */ + Drawing.prototype.round = function (nNumber) { + if (!nNumber) { + return nNumber; + } + + return Math.floor(nNumber * 1000) / 1000; + }; + + return Drawing; + })(); + + /** + * Get the type by string length + * + * @private + * @param {String} sText + * @param {Number} nCorrectLevel + * @return {Number} type + */ + function _getTypeNumber(sText, nCorrectLevel) { + var nType = 1; + var length = _getUTF8Length(sText); + + for (var i = 0, len = QRCodeLimitLength.length; i <= len; i++) { + var nLimit = 0; + + switch (nCorrectLevel) { + case QRErrorCorrectLevel.L : + nLimit = QRCodeLimitLength[i][0]; + break; + case QRErrorCorrectLevel.M : + nLimit = QRCodeLimitLength[i][1]; + break; + case QRErrorCorrectLevel.Q : + nLimit = QRCodeLimitLength[i][2]; + break; + case QRErrorCorrectLevel.H : + nLimit = QRCodeLimitLength[i][3]; + break; + } + + if (length <= nLimit) { + break; + } else { + nType++; + } + } + + if (nType > QRCodeLimitLength.length) { + throw new Error("Too long data"); + } + + return nType; + } + + function _getUTF8Length(sText) { + var replacedText = encodeURI(sText).toString().replace(/\%[0-9a-fA-F]{2}/g, 'a'); + return replacedText.length + (replacedText.length != sText ? 3 : 0); + } + + /** + * @class QRCode + * @constructor + * @example + * new QRCode(document.getElementById("test"), "http://jindo.dev.naver.com/collie"); + * + * @example + * var oQRCode = new QRCode("test", { + * text : "http://naver.com", + * width : 128, + * height : 128 + * }); + * + * oQRCode.clear(); // Clear the QRCode. + * oQRCode.makeCode("http://map.naver.com"); // Re-create the QRCode. + * + * @param {HTMLElement|String} el target element or 'id' attribute of element. + * @param {Object|String} vOption + * @param {String} vOption.text QRCode link data + * @param {Number} [vOption.width=256] + * @param {Number} [vOption.height=256] + * @param {String} [vOption.colorDark="#000000"] + * @param {String} [vOption.colorLight="#ffffff"] + * @param {QRCode.CorrectLevel} [vOption.correctLevel=QRCode.CorrectLevel.H] [L|M|Q|H] + */ + QRCode = function (el, vOption) { + this._htOption = { + width : 256, + height : 256, + typeNumber : 4, + colorDark : "#000000", + colorLight : "#ffffff", + correctLevel : QRErrorCorrectLevel.H + }; + + if (typeof vOption === 'string') { + vOption = { + text : vOption + }; + } + + // Overwrites options + if (vOption) { + for (var i in vOption) { + this._htOption[i] = vOption[i]; + } + } + + if (typeof el == "string") { + el = document.getElementById(el); + } + + if (this._htOption.useSVG) { + Drawing = svgDrawer; + } + + this._android = _getAndroid(); + this._el = el; + this._oQRCode = null; + this._oDrawing = new Drawing(this._el, this._htOption); + + if (this._htOption.text) { + this.makeCode(this._htOption.text); + } + }; + + /** + * Make the QRCode + * + * @param {String} sText link data + */ + QRCode.prototype.makeCode = function (sText) { + this._oQRCode = new QRCodeModel(_getTypeNumber(sText, this._htOption.correctLevel), this._htOption.correctLevel); + this._oQRCode.addData(sText); + this._oQRCode.make(); + this._el.title = sText; + this._oDrawing.draw(this._oQRCode); + this.makeImage(); + }; + + /** + * Make the Image from Canvas element + * - It occurs automatically + * - Android below 3 doesn't support Data-URI spec. + * + * @private + */ + QRCode.prototype.makeImage = function () { + if (typeof this._oDrawing.makeImage == "function" && (!this._android || this._android >= 3)) { + this._oDrawing.makeImage(); + } + }; + + /** + * Clear the QRCode + */ + QRCode.prototype.clear = function () { + this._oDrawing.clear(); + }; + + /** + * @name QRCode.CorrectLevel + */ + QRCode.CorrectLevel = QRErrorCorrectLevel; +})(); diff --git a/public/img/ispt/4.0/galpLogo1.png b/public/img/ispt/4.0/galpLogo1.png new file mode 100644 index 00000000..1cfda590 Binary files /dev/null and b/public/img/ispt/4.0/galpLogo1.png differ diff --git a/public/img/ispt/4.0/ispt.jpeg b/public/img/ispt/4.0/ispt.jpeg new file mode 100644 index 00000000..0ae8fb12 Binary files /dev/null and b/public/img/ispt/4.0/ispt.jpeg differ diff --git a/public/img/ispt/4.0/isptLogoVertical.png b/public/img/ispt/4.0/isptLogoVertical.png new file mode 100644 index 00000000..91c6a34b Binary files /dev/null and b/public/img/ispt/4.0/isptLogoVertical.png differ diff --git a/resources/views/Admin/index.blade.php b/resources/views/Admin/index.blade.php index f1b5984f..4ac45c15 100755 --- a/resources/views/Admin/index.blade.php +++ b/resources/views/Admin/index.blade.php @@ -1,3 +1,4 @@ + @extends('Templates/templateAdmin') @section('Main-content') diff --git a/resources/views/livewire/articulado/select-elemental-tasks-in-wonkstation.blade.php b/resources/views/livewire/articulado/select-elemental-tasks-in-wonkstation.blade.php index 6a47cebc..2bbc7766 100644 --- a/resources/views/livewire/articulado/select-elemental-tasks-in-wonkstation.blade.php +++ b/resources/views/livewire/articulado/select-elemental-tasks-in-wonkstation.blade.php @@ -181,7 +181,7 @@ {{-- Modal-body --}}
- +
diff --git a/resources/views/livewire/execução/step-by-step-equipment-tasks.blade.php b/resources/views/livewire/execução/step-by-step-equipment-tasks.blade.php new file mode 100644 index 00000000..d7222929 --- /dev/null +++ b/resources/views/livewire/execução/step-by-step-equipment-tasks.blade.php @@ -0,0 +1,26 @@ + + + + + diff --git a/resources/views/livewire/preparadas/show-qrcode-and-detalls-equipment.blade.php b/resources/views/livewire/preparadas/show-qrcode-and-detalls-equipment.blade.php new file mode 100644 index 00000000..15e76e98 --- /dev/null +++ b/resources/views/livewire/preparadas/show-qrcode-and-detalls-equipment.blade.php @@ -0,0 +1,90 @@ +{{-- --}} + +
+ + + + + + +
diff --git a/resources/views/projectsClients/executionProject.blade.php b/resources/views/projectsClients/executionProject.blade.php index 8a28c30d..4ae067e6 100755 --- a/resources/views/projectsClients/executionProject.blade.php +++ b/resources/views/projectsClients/executionProject.blade.php @@ -114,8 +114,8 @@ class="btn btn-block bg-gradient-primary btn-lg">Articulado

Articulado

+ class="fas fa-plus"> + -->
@@ -209,8 +209,8 @@ class="table table-bordered table-striped">
+ + -->
@@ -285,7 +285,7 @@ class="table table-bordered table-striped"> {{-- Modal-showProgressEquipment --}} - - -
-
+ --}} - {{-- Editar --}} - -
-
- - - - {{-- card-body --}} - - - - - - - - -
-
-
-

Postos de Trabalho

- -
- -
- -
- -
- - -
- - -
-
-
-
-
- - -
-
- - + {{-- Por enquanto nao vamos ter o botao imprimir apenas um Qrcode, e ja imprimimos todos de uma vez --}} +
+
- + + + + + - - - -
Postos de TrabalhoTagTipo EquipamentoFabricaÂmbitoAcao
+ + @foreach ($equipmentsProjects as $equipment) + + {{ $equipment->equipment_tag }} + {{ $equipment->equipment_type_id }} + {{ $equipment->unit->unit_name }} + {{ $equipment->equipmentAssociationAmbit->ambitsEquipment->ambits_description }} + + {{-- + --}} + + @livewire('preparadas.show-qrcode-and-detalls-equipment', ['equipment' => $equipment], key($equipment->equipment_id)) + + {{-- Por algum motivo se tirar esta modal, ele nao encontra o qrcode do componente ?????????????? WHY????????? --}} + + @endforeach
+ + + + + + + {{-- --}} + + + + + + + + + + + + +
+
- - +
- -
-
-

Listas de Postos de Obra

+ +
+
+ +
-
-
+
+ +
+
+
+ +
+ {{-- card-body --}} - + + + + + + + + +
+
+

Postos de Trabalho

+ +
+ +
+ +
+ +
+ + +
+ + +
+
+
+
+
+ + +
+
+ +
- - + + +
Postos de TrabalhoTarefas ElementaresTarefas Complementares
-
- -
-
+
+ - {{-- Editar --}} -
+ +
+
+

Listas de Postos de Obra

+
+
+
+ + + + + + + + + +
Postos de TrabalhoTarefas ElementaresTarefas Complementares
+
+ +
+ +
+
+ +
+
+
+ + + +
+ +
+ @@ -518,6 +701,25 @@ class="checkboxChoseTasksOficesCV" + + + {{-- Modal onde vai ficar os QRCODE --}} + @endsection @@ -559,32 +761,33 @@ class="checkboxChoseTasksOficesCV" + $('#TablePreparedProjectWorkstation').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' + } + ] + }) + }) + + - --}} + +