Merge branch 'dev'

application/controllers/ExportXls.php

@@ -1,4 +1,5 @@
 <?php
+
 defined('BASEPATH') or exit('No direct script access allowed');
 
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
@@ -30,6 +31,7 @@ class ExportXls extends CI_Controller
     public function exportDatosCompletos()
     {
         $licitacionesResult = $this->Xlsexport_model->getFullDatosUltimasInsertadas();
+
         $result = array();
 
         //$start = $this->starttime();
@@ -72,8 +74,8 @@ class ExportXls extends CI_Controller
         $spreadsheet = $this->datosCompletosHojaBitacora($spreadsheet, $result);
         $spreadsheet = $this->datosCompletosMediosPublicacion($spreadsheet, $result['validNoticeInfo']);
         $spreadsheet = $this->datosMedioPublicacion($spreadsheet, $result['validNoticeInfoDocumentos']);
-        $spreadsheet = $this->datosCriterioAdjudicacion($spreadsheet, $result['tenderFinancial']);
-        $spreadsheet = $this->datosCriterioEvaluacionFinanciera($spreadsheet, $result['tenderAwarding']);
+        $spreadsheet = $this->datosCriterioAdjudicacion($spreadsheet, $result['tenderAwarding']);
+        $spreadsheet = $this->datosCriterioEvaluacionFinanciera($spreadsheet, $result['tenderFinancial']);
         $spreadsheet = $this->datosCriterioEvaluacionTecnica($spreadsheet, $result['tenderTecnicos']);
         $spreadsheet = $this->datosRequisitosParticipacion($spreadsheet, $result['tenderQualification']);
 
@@ -122,6 +124,7 @@ class ExportXls extends CI_Controller
     public function mapearDatos($licitacionesResult): array
     {
         $result = array();
+
         guardar_log("Excel", "Montando array datos licitacion");
         foreach ($licitacionesResult['datos'] as $licitacion) {
 
@@ -129,6 +132,7 @@ class ExportXls extends CI_Controller
                 'id_licitacion' => $licitacion->id_licitacion,
                 "link_uri" => $licitacion->link_uri,
                 "updated" => $licitacion->updated,
+                'estadoLicitacion' => $licitacion->estadoLicitacion,
             );
             $result['hoja1'][$licitacion->id_licitacion]['contract'] = array(
                 "descripcion" => $licitacion->contrato_status,
@@ -180,46 +184,46 @@ class ExportXls extends CI_Controller
         }
 
         guardar_log("Excel", "Consulta Valid notice info");
-        $result['validNoticeInfo'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_valid_notice_info");
+        $result['validNoticeInfo'] = $this->Xlsexport_model->getDatosRelacionadasTablaWithoutLicitacion("global_valid_notice_info", "codice_valid_notice_info", "code", "noticeTypeCode");
 
         guardar_log("Excel", "Consulta Valid notice info documentos");
-        $result['validNoticeInfoDocumentos'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_valid_notice_info_documento");
+        $result['validNoticeInfoDocumentos'] = $this->Xlsexport_model->getTablaByFechaLog("global_valid_notice_info_documento");
 
         guardar_log("Excel", "Consulta projectLot");
         $result['projectLot'] = $this->Xlsexport_model->getProjectLotItem();
 
         guardar_log("Excel", "Consulta documentos tecnicos");
-        $result['techDocs'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_technical_documents");
+        $result['techDocs'] = $this->Xlsexport_model->getTablaByFechaLog("global_technical_documents");
 
         guardar_log("Excel", "Consulta documentos legales");
-        $result['legalDocs'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_legal_documents");
+        $result['legalDocs'] = $this->Xlsexport_model->getTablaByFechaLog("global_legal_documents");
 
         guardar_log("Excel", "Consulta documentos adicionales");
-        $result['additDocs'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_additional_documents");
+        $result['additDocs'] = $this->Xlsexport_model->getTablaByFechaLog("global_additional_documents");
 
         guardar_log("Excel", "Consulta documentos generales");
-        $result['generalDocs'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_general_documents");
+        $result['generalDocs'] = $this->Xlsexport_model->getTablaByFechaLog("global_general_documents");
 
         guardar_log("Excel", "Consulta tender process");
         $result['tenderProcess'] = $this->Xlsexport_model->getTenderingTermsCodes();
 
         guardar_log("Excel", "Consulta tender terms");
-        $result['tenderingTerms'] = $this->Xlsexport_model->getDatosRelacionadasTablaWithoutLicitacion("maestro_tendering_terms", "relacionada_codigo_tipo_garantia", "code", "guaranteeTypeCode");
+        $result['tenderingTerms'] = $this->Xlsexport_model->getDatosRelacionadasTablaWithoutLicitacion("global_tendering_terms", "codice_codigo_tipo_garantia", "code", "guaranteeTypeCode");
 
         guardar_log("Excel", "Consulta tender result");
-        $result['tenderResult'] = $this->Xlsexport_model->getDatosRelacionadasTablaWithoutLicitacion("maestro_tender_result", "relacionada_tender_result", "code", "resultCode");
+        $result['tenderResult'] = $this->Xlsexport_model->getDatosRelacionadasTablaWithoutLicitacion("global_tender_result", "codice_tender_result", "code", "resultCode");
 
         guardar_log("Excel", "Consulta tender criterio financieros");
-        $result['tenderFinancial'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_tendering_terms_financial_evaluation");
+        $result['tenderFinancial'] = $this->Xlsexport_model->getDatosRelacionadasTablaWithoutLicitacion("global_tendering_terms_financial_evaluation", "codice_tendering_terms_financial", "code", "evaluationCriteriaTypeCode");
 
         guardar_log("Excel", "Consulta tender criterio adjudicacion");
-        $result['tenderAwarding'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_tendering_terms_awarding_terms");
+        $result['tenderAwarding'] = $this->Xlsexport_model->getTablaByFechaLog("global_tendering_terms_awarding_terms");
 
         guardar_log("Excel", "Consulta tender criterios tecnicos");
-        $result['tenderTecnicos'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_tendering_terms_qualification_request");
+        $result['tenderTecnicos'] = $this->Xlsexport_model->getDatosRelacionadasTablaWithoutLicitacion("global_tendering_terms_qualification_request", "codice_tendering_terms_qualification_request", "code", "evaluationCriteriaTypeCode");
 
         guardar_log("Excel", "Consulta tender requisitos participacion");
-        $result['tenderQualification'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_tendering_terms_qualification_request");
+        $result['tenderQualification'] = $this->Xlsexport_model->getDatosRelacionadasTablaWithoutLicitacion("global_tendering_terms_specific_terms", "codice_tendering_terms_specific_terms", "code", "evaluationCriteriaTypeCode");
 
         return $result;
     }
@@ -253,6 +257,7 @@ class ExportXls extends CI_Controller
             $sheet->getStyle('C' . $this->filaDatoLicitacion)
                 ->getNumberFormat()
                 ->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_DATETIME);
+            $sheet->setCellValue('D' . $this->filaDatoLicitacion, $row['licitacion']['estadoLicitacion']);
             $sheet->setCellValue('E' . $this->filaDatoLicitacion, $primeraPublicacion);
             $sheet->getStyle('E' . $this->filaDatoLicitacion)
                 ->getNumberFormat()
@@ -271,36 +276,34 @@ class ExportXls extends CI_Controller
 
             $sheet->setCellValue('K' . $this->filaDatoLicitacion, $row['locatedParty']['itemClassification_attr']);
             $sheet->setCellValue('L' . $this->filaDatoLicitacion, $row['project']['tipo_contrato']);
-            $sheet->setCellValue('M' . $this->filaDatoLicitacion, $row['project']['countrySubentityCode'] . " - " . $row['project']['countrySubentity']);
+            $sheet->setCellValue('M' . $this->filaDatoLicitacion, $row['project']['countrySubentity']);
             $sheet->setCellValue('N' . $this->filaDatoLicitacion, $row['party']['partyName']);
-            $sheet->setCellValue('O' . $this->filaDatoLicitacion, ($row['party']['tipoIdParty'] == "ID_PLATAFORMA") ? $row['party']['partyItem'] : "");
-            $sheet->setCellValue('P' . $this->filaDatoLicitacion, ($row['party']['tipoIdParty'] == "NIF") ? $row['party']['partyItem'] : "");
-            $sheet->setCellValue('Q' . $this->filaDatoLicitacion, ($row['party']['tipoIdParty'] == "DIR3") ? $row['party']['partyItem'] : "");
-            $sheet->setCellValue('R' . $this->filaDatoLicitacion, $row['locatedParty']['buyerProfileURIID']);
-            $sheet->setCellValue('S' . $this->filaDatoLicitacion, $row['locatedParty']['tipo_administracion']);
-            $sheet->setCellValue('T' . $this->filaDatoLicitacion, $row['party']['codpostal']);
-            $sheet->setCellValue('U' . $this->filaDatoLicitacion, $row['tenderProcess']['tipoTender']);
-            $sheet->setCellValue('V' . $this->filaDatoLicitacion, $row['tenderProcess']['contrato_sistema']);
-            $sheet->setCellValue('W' . $this->filaDatoLicitacion, $row['tenderProcess']['urgency']);
-            $sheet->setCellValue('X' . $this->filaDatoLicitacion, $row['tenderProcess']['submision']);
-            $sheet->setCellValue('ZY' . $this->filaDatoLicitacion, $row['tenderTerms']['procurementLegislationDocumentReference']);
-            $sheet->setCellValue('Z' . $this->filaDatoLicitacion, $row['tenderTerms']['allowedSubcontractTerms']);
-            $sheet->setCellValue('AA' . $this->filaDatoLicitacion, $row['project']['durationMesure']);
-            $sheet->setCellValue('AB' . $this->filaDatoLicitacion, $row['project']['medida']);
-            $sheet->setCellValue('AC' . $this->filaDatoLicitacion, $this->formatFechas($row['project']['duracion_inicio']));
-            $sheet->getStyle('AC' . $this->filaDatoLicitacion)
+            $sheet->setCellValue('O' . $this->filaDatoLicitacion, ($row['party']['tipoIdParty'] == "DIR3") ? $row['party']['partyItem'] : "");
+            $sheet->setCellValue('P' . $this->filaDatoLicitacion, $row['locatedParty']['buyerProfileURIID']);
+            $sheet->setCellValue('Q' . $this->filaDatoLicitacion, $row['locatedParty']['tipo_administracion']);
+            $sheet->setCellValue('R' . $this->filaDatoLicitacion, $row['party']['codpostal']);
+            $sheet->setCellValue('S' . $this->filaDatoLicitacion, $row['tenderProcess']['tipoTender']);
+            $sheet->setCellValue('T' . $this->filaDatoLicitacion, $row['tenderProcess']['contrato_sistema']);
+            $sheet->setCellValue('U' . $this->filaDatoLicitacion, $row['tenderProcess']['urgency']);
+            $sheet->setCellValue('V' . $this->filaDatoLicitacion, $row['tenderProcess']['submision']);
+            $sheet->setCellValue('W' . $this->filaDatoLicitacion, $row['tenderTerms']['procurementLegislationDocumentReference']);
+            $sheet->setCellValue('X' . $this->filaDatoLicitacion, $row['tenderTerms']['allowedSubcontractTerms']);
+            $sheet->setCellValue('Y' . $this->filaDatoLicitacion, $row['project']['durationMesure']);
+            $sheet->setCellValue('Z' . $this->filaDatoLicitacion, $row['project']['medida']);
+            $sheet->setCellValue('AA' . $this->filaDatoLicitacion, $this->formatFechas($row['project']['duracion_inicio']));
+            $sheet->getStyle('AA' . $this->filaDatoLicitacion)
                 ->getNumberFormat()
                 ->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_DDMMYYYY);
-            $sheet->setCellValue('AD' . $this->filaDatoLicitacion, $this->formatFechas($row['project']['duracion_fin']));
-            $sheet->getStyle('AD' . $this->filaDatoLicitacion)
+            $sheet->setCellValue('AB' . $this->filaDatoLicitacion, $this->formatFechas($row['project']['duracion_fin']));
+            $sheet->getStyle('AB' . $this->filaDatoLicitacion)
                 ->getNumberFormat()
                 ->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_DDMMYYYY);
-            $sheet->setCellValue('AE' . $this->filaDatoLicitacion, $row['project']['contractExtension']);
-            $sheet->setCellValue('AF' . $this->filaDatoLicitacion, $row['party']['websiteURI']);
-            $sheet->setCellValue('AG' . $this->filaDatoLicitacion, $row['party']['city']);
-            $sheet->setCellValue('AH' . $this->filaDatoLicitacion, $row['party']['direccion']);
-            $sheet->setCellValue('AI' . $this->filaDatoLicitacion, $row['party']['contact_name']);
-            $sheet->setCellValue('AJ' . $this->filaDatoLicitacion, $row['party']['contact_email']);
+            $sheet->setCellValue('AC' . $this->filaDatoLicitacion, $row['project']['contractExtension']);
+            $sheet->setCellValue('AD' . $this->filaDatoLicitacion, $row['party']['websiteURI']);
+            $sheet->setCellValue('AE' . $this->filaDatoLicitacion, $row['party']['city']);
+            $sheet->setCellValue('AF' . $this->filaDatoLicitacion, $row['party']['direccion']);
+            $sheet->setCellValue('AG' . $this->filaDatoLicitacion, $row['party']['contact_name']);
+            $sheet->setCellValue('AH' . $this->filaDatoLicitacion, $row['party']['contact_email']);
             $this->filaDatoLicitacion++;
         }
 
@@ -378,7 +381,7 @@ class ExportXls extends CI_Controller
                 guardar_log("Excel", "Escribir datos medio publicacion--" . $contador);
                 $contador++;
                 $sheet->SetCellValue('A' . $aux, $datos['id_ajena_licitacion']);
-                $sheet->SetCellValue('B' . $aux, $datos['noticeTypeCode']);
+                $sheet->SetCellValue('B' . $aux, $datos['code_desc']);
                 $sheet->SetCellValue('C' . $aux, $datos['publicationMediaName']);
                 $aux++;
             }
@@ -449,6 +452,10 @@ class ExportXls extends CI_Controller
                     ->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_DATETIME);
                 $sheet->SetCellValue('M' . $aux, $datos['partyIdentification']);
                 $sheet->SetCellValue('N' . $aux, $datos['partyName']);
+                $sheet->SetCellValue('O' . $aux, $datos['TaxExclusiveAmount']);
+                $sheet->getStyle('O' . $aux)
+                    ->getNumberFormat()
+                    ->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_ACCOUNTING_EUR);
 
                 $aux++;
             }
@@ -481,10 +488,7 @@ class ExportXls extends CI_Controller
                 $sheet->getStyle('J' . $aux)
                     ->getNumberFormat()
                     ->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_DDMMYYYY);
-                $sheet->SetCellValue('K' . $aux, $this->formatFechas($datos['deadLineEndTime']));
-                $sheet->getStyle('K' . $aux)
-                    ->getNumberFormat()
-                    ->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_DDMMYYYY);
+                $sheet->SetCellValue('K' . $aux, $datos['deadLineEndTime']);
                 $sheet->SetCellValue('L' . $aux, $datos['deadLineDescription']);
                 $sheet->SetCellValue('M' . $aux, $datos['auctionTerms']);
                 $sheet->SetCellValue('N' . $aux, $this->formatFechas($datos['documentAvailablePeriod_EndDate']));
@@ -541,8 +545,8 @@ class ExportXls extends CI_Controller
                 guardar_log("Excel", "Escribir criterio adjucicacion--" . $contador);
                 $contador++;
                 $sheet->SetCellValue('A' . $aux, $datos['id_ajena_licitacion']);
-                $sheet->SetCellValue('B' . $aux, $datos['evaluationCriteriaTypeCode']);
                 $sheet->SetCellValue('B' . $aux, $datos['description']);
+                $sheet->SetCellValue('C' . $aux, $datos['evaluationCriteriaTypeCode']);
                 $aux++;
             }
         }
@@ -562,7 +566,7 @@ class ExportXls extends CI_Controller
                 guardar_log("Excel", "Escribir criterios evaluacion financiera--" . $contador);
                 $contador++;
                 $sheet->SetCellValue('A' . $aux, $datos['id_ajena_licitacion']);
-                $sheet->SetCellValue('B' . $aux, $datos['evaluationCriteriaTypeCode']);
+                $sheet->SetCellValue('B' . $aux, $datos['code_desc']);
                 $sheet->SetCellValue('C' . $aux, $datos['description']);
                 $aux++;
             }
@@ -582,7 +586,7 @@ class ExportXls extends CI_Controller
                 guardar_log("Excel", "Escribir criterio evaluacion tecnica--" . $contador);
                 $contador++;
                 $sheet->SetCellValue('A' . $aux, $datos['id_ajena_licitacion']);
-                $sheet->SetCellValue('B' . $aux, $datos['evaluationCriteriaTypeCode']);
+                $sheet->SetCellValue('B' . $aux, $datos['code_desc']);
                 $sheet->SetCellValue('C' . $aux, $datos['description']);
                 $aux++;
             }
@@ -603,7 +607,7 @@ class ExportXls extends CI_Controller
                 guardar_log("Excel", "Escribir requisitos participacion--" . $contador);
                 $contador++;
                 $sheet->SetCellValue('A' . $aux, $datos['id_ajena_licitacion']);
-                $sheet->SetCellValue('B' . $aux, $datos['evaluationCriteriaTypeCode']);
+                $sheet->SetCellValue('B' . $aux, $datos['code_desc']);
                 $aux++;
             }
 
@@ -697,28 +701,26 @@ class ExportXls extends CI_Controller
         $spreadsheet->getActiveSheet()->SetCellValue('L1', "Tipo de contrato");
         $spreadsheet->getActiveSheet()->SetCellValue('M1', "Lugar de ejecución");
         $spreadsheet->getActiveSheet()->SetCellValue('N1', "Órgano de Contratación");
-        $spreadsheet->getActiveSheet()->SetCellValue('O1', "ID OC en PLACSP");
-        $spreadsheet->getActiveSheet()->SetCellValue('P1', "NIF OC");
-        $spreadsheet->getActiveSheet()->SetCellValue('Q1', "DIR3");
-        $spreadsheet->getActiveSheet()->SetCellValue('R1', "Enlace al Perfil de Contratante del OC");
-        $spreadsheet->getActiveSheet()->SetCellValue('S1', "Tipo de Administración");
-        $spreadsheet->getActiveSheet()->SetCellValue('T1', "Código Postal");
-        $spreadsheet->getActiveSheet()->SetCellValue('U1', "Tipo de procedimiento");
-        $spreadsheet->getActiveSheet()->SetCellValue('V1', "Sistema de contratación");
-        $spreadsheet->getActiveSheet()->SetCellValue('W1', "Tramitación");
-        $spreadsheet->getActiveSheet()->SetCellValue('X1', "Forma de presentación de la oferta");
-        $spreadsheet->getActiveSheet()->SetCellValue('Y1', "Directiva de aplicación");
-        $spreadsheet->getActiveSheet()->SetCellValue('Z1', "Subcontratación permitida");
-        $spreadsheet->getActiveSheet()->SetCellValue('AA1', "Duración Contrato");
-        $spreadsheet->getActiveSheet()->SetCellValue('AB1', "Tipo de duración");
-        $spreadsheet->getActiveSheet()->SetCellValue('AC1', "Inicio contrato");
-        $spreadsheet->getActiveSheet()->SetCellValue('AD1', "Fin contrato");
-        $spreadsheet->getActiveSheet()->SetCellValue('AE1', "Extension Contrato");
-        $spreadsheet->getActiveSheet()->SetCellValue('AF1', "URL Organo Contratación");
-        $spreadsheet->getActiveSheet()->SetCellValue('AG1', "Ciudad Organo Contratación");
-        $spreadsheet->getActiveSheet()->SetCellValue('AH1', "Dirección Organo Contratación");
-        $spreadsheet->getActiveSheet()->SetCellValue('AI1', "Nombre Contacto Organo Contratación");
-        $spreadsheet->getActiveSheet()->SetCellValue('AJ1', "Email contacto Organo Contratación");
+        $spreadsheet->getActiveSheet()->SetCellValue('O1', "DIR3");
+        $spreadsheet->getActiveSheet()->SetCellValue('P1', "Enlace al Perfil de Contratante del OC");
+        $spreadsheet->getActiveSheet()->SetCellValue('Q1', "Tipo de Administración");
+        $spreadsheet->getActiveSheet()->SetCellValue('R1', "Código Postal");
+        $spreadsheet->getActiveSheet()->SetCellValue('S1', "Tipo de procedimiento");
+        $spreadsheet->getActiveSheet()->SetCellValue('T1', "Sistema de contratación");
+        $spreadsheet->getActiveSheet()->SetCellValue('U1', "Tramitación");
+        $spreadsheet->getActiveSheet()->SetCellValue('V1', "Forma de presentación de la oferta");
+        $spreadsheet->getActiveSheet()->SetCellValue('W1', "Directiva de aplicación");
+        $spreadsheet->getActiveSheet()->SetCellValue('X1', "Subcontratación permitida");
+        $spreadsheet->getActiveSheet()->SetCellValue('Y1', "Duración Contrato");
+        $spreadsheet->getActiveSheet()->SetCellValue('Z1', "Tipo de duración");
+        $spreadsheet->getActiveSheet()->SetCellValue('AA1', "Inicio contrato");
+        $spreadsheet->getActiveSheet()->SetCellValue('AB1', "Fin contrato");
+        $spreadsheet->getActiveSheet()->SetCellValue('AC1', "Extension Contrato");
+        $spreadsheet->getActiveSheet()->SetCellValue('AD1', "URL Organo Contratación");
+        $spreadsheet->getActiveSheet()->SetCellValue('AE1', "Ciudad Organo Contratación");
+        $spreadsheet->getActiveSheet()->SetCellValue('AF1', "Dirección Organo Contratación");
+        $spreadsheet->getActiveSheet()->SetCellValue('AG1', "Nombre Contacto Organo Contratación");
+        $spreadsheet->getActiveSheet()->SetCellValue('AH1', "Email contacto Organo Contratación");
         return $spreadsheet;
     }
 
@@ -759,7 +761,7 @@ class ExportXls extends CI_Controller
         $spreadsheet->getActiveSheet()->SetCellValue('C1', "Número de lote");
         $spreadsheet->getActiveSheet()->SetCellValue('D1', "Importe sin Impuestos");
         $spreadsheet->getActiveSheet()->SetCellValue('E1', "Lugar de ejecución del lote");
-        $spreadsheet->getActiveSheet()->SetCellValue('E1', "CPV");
+        $spreadsheet->getActiveSheet()->SetCellValue('F1', "CPV");
 
         return $spreadsheet;
     }
@@ -826,7 +828,7 @@ class ExportXls extends CI_Controller
         $spreadsheet->getActiveSheet()->SetCellValue('L1', 'Fecha de formalización');
         $spreadsheet->getActiveSheet()->SetCellValue('M1', 'Adjudicatario CIF');
         $spreadsheet->getActiveSheet()->SetCellValue('N1', 'Nombre Adjudicatario');
-
+        $spreadsheet->getActiveSheet()->SetCellValue('O1', 'Importe de adjudicación sin impuestos');
         return $spreadsheet;
     }
 
@@ -895,8 +897,8 @@ class ExportXls extends CI_Controller
         );
         $sheet->getStyle("A1:C1")->applyFromArray($styleArr);
         $spreadsheet->getActiveSheet()->SetCellValue('A1', 'Identificador');
-        $spreadsheet->getActiveSheet()->SetCellValue('B1', 'Tipo criterio de adjudicación');
-        $spreadsheet->getActiveSheet()->SetCellValue('C1', 'Descripción textual del criterio de adjudicación');
+        $spreadsheet->getActiveSheet()->SetCellValue('B1', 'Descripción textual del criterio de adjudicación');
+        $spreadsheet->getActiveSheet()->SetCellValue('C1', 'Ponderación');
 
         return $spreadsheet;
     }

application/controllers/Parser.php

@@ -45,8 +45,6 @@ class Parser extends CI_Controller
 
                     if ($this->newFolder($rutaPerfil . "/" . $fechaCarpeta)) {
                         $this->rutaDiariaFecha = $rutaPerfil . "/" . $fechaCarpeta . "/";
-
-                        //$this->downloadProcess($row->url_descarga);
                         $this->downloadZip($row->url_descarga);
                     }
 
@@ -75,31 +73,11 @@ class Parser extends CI_Controller
     } */
     }
 
-    private function downloadProcess($urlXML)
-    {
-
-        $fileName = basename($urlXML);
-        $this->downloadFile($fileName, $urlXML, $this->rutaDiariaFecha);
-        $archivoAtom = $this->getFile($this->rutaDiariaFecha . $fileName, $fileName);
-        $nuevoAtomAttrNext = $this->readNextAttribute($archivoAtom);
-
-        while ($nuevoAtomAttrNext !== "") {
-            //$aux = 0;
-            //while ($aux <= 3) {
-
-            $fileName = basename($nuevoAtomAttrNext);
-            $this->downloadFile($fileName, $nuevoAtomAttrNext, $this->rutaDiariaFecha);
-            $archivoAtom = $this->getFile($this->rutaDiariaFecha . $fileName, $fileName);
-
-            $nuevoAtomAttrNext = $this->readNextAttribute($archivoAtom);
-            //$aux++;
-        }
-    }
-
     private function downloadZip($urlXML)
     {
+        $fechaDescarga = $this->getFechaForDownloadZip();
         $fileName = basename($urlXML);
-        $downladedZip = $this->downloadFile($fileName, $urlXML, $this->rutaDiariaFecha);
+        $downladedZip = $this->downloadFile($fileName, $urlXML . $fechaDescarga, $this->rutaDiariaFecha);
 
         if ($downladedZip) {
             $zip = new ZipArchive;
@@ -112,10 +90,30 @@ class Parser extends CI_Controller
                 foreach ($archivosTotales as $file) {
                     $this->getFile($this->rutaDiariaFecha . $file, $file);
                 }
-
             }
+        }
+    }
 
+    private function getFechaForDownloadZip(): String
+    {
+        $result = "_";
+        $anyo = date("Y");
+        $mes = date("m");
+        $mesPrevious = date("m", strtotime("-1 months"));
+        $yearPrevious = date("Y", strtotime("-1 year"));
+        $dia = date("d");
+
+        if (date("m") == "01") {
+            $result .= $yearPrevious . $mesPrevious . ".zip";
+        } else {
+            if ($dia == "01") {
+                $result .= $anyo . $mesPrevious . ".zip";
+            } else {
+                $result .= $anyo . $mes . ".zip";
+            }
         }
+
+        return $result;
     }
 
     private function getFile($url, $fileName)
@@ -148,26 +146,6 @@ class Parser extends CI_Controller
         file_put_contents($this->rutaDiariaFecha . "/format/" . $fileName, $closureFormat);
     }
 
-    private function readNextAttribute($archivo)
-    {
-        $enlace = "";
-        foreach ($archivo['link'] as $row) {
-            $attrNext = $row['@attributes']['rel'];
-            $attrHref = $row['@attributes']['href'];
-
-            if ($attrNext === "next") {
-                if (!strpos($attrHref, "licitacionesPerfilesContratanteCompleto3_2021")) { //"20220127_")) {
-                    $enlace = $attrHref;
-                } else {
-                    $enlace = "";
-                }
-                //$enlace = $attrHref;
-            }
-        }
-
-        return $enlace;
-    }
-
     private function downloadFile($fileName, $url, $ruta)
     {
         if (file_put_contents($ruta . $fileName, file_get_contents($url))) {
@@ -179,7 +157,7 @@ class Parser extends CI_Controller
 
     private function regExIniciosEsquema($xml)
     {
-        $pattern = "/(<cac:)|(<cbc:)|(<cac-place-ext:)|(<cbc-place-ext:)/";
+        $pattern = "/(<cac:)|(<cbc:)|(<cac-place-ext:)|(<cbc-place-ext:)|(<at:)/";
         $result = preg_replace($pattern, "<", $xml);
 
         return $result;
@@ -187,7 +165,7 @@ class Parser extends CI_Controller
 
     private function regExFinalesEsquema($xml)
     {
-        $pattern = "/(<\/cac:)|(<\/cbc:)|(<\/cac-place-ext:)|(<\/cbc-place-ext:)/";
+        $pattern = "/(<\/cac:)|(<\/cbc:)|(<\/cac-place-ext:)|(<\/cbc-place-ext:)|(<\/at:)/";
         $result = preg_replace($pattern, "</", $xml);
 
         return $result;
@@ -195,8 +173,6 @@ class Parser extends CI_Controller
 
     private function tablasCalculadas($idUltimaImportacion)
     {
-        $this->Parser_model->truncateTables("import_licitaciones_temp");
-
         $this->Parser_model->truncateTables("vista_datos_licitacion");
 
         $licitaciones = $this->Xlsexport_model->getLicitaciones($idUltimaImportacion);

application/controllers/ParserCompleto.php

@@ -0,0 +1,198 @@
+<?php
+defined('BASEPATH') or exit('No direct script access allowed');
+
+/**
+ *
+ * Controller ParserCompleto
+ *
+ * This controller for ...
+ *
+ * @package   CodeIgniter
+ * @category  Controller CI
+ * @author    Setiawan Jodi <jodisetiawan@fisip-untirta.ac.id>
+ * @author    Raul Guerrero <r.g.c@me.com>
+ * @link      https://github.com/setdjod/myci-extension/
+ * @param     ...
+ * @return    ...
+ *
+ */
+
+class ParserCompleto extends CI_Controller
+{
+
+    //TODO: PARAMETRIZAR BBDD -> SI EXISTE UN PROCESO EN MARCHA, NO INICIAR SIGUIENTE DESCARGA, AVISAR
+    protected $rutaDiaria = FCPATH . "DOWNLOADS/DAILY/";
+    protected $rutaDiariaFecha = "";
+
+    protected $rutaMensual = FCPATH . "DOWNLOADS/MONTH/";
+    protected $enlaceAtom = "";
+    protected $fechaCreacionLog = "";
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->load->helper('file');
+        $this->load->helper('xml');
+        $this->load->library('parserfile');
+
+        $this->load->model("Parser_model");
+    }
+
+    public function index()
+    {
+        $existCronRun = $this->Parser_model->existCronRun();
+        $fechaCarpeta = "";
+        if ($existCronRun['num_rows'] > 0) {
+            if ($existCronRun['datos']->cron_ejecucion == 0) {
+
+                $this->Parser_model->inicioParser();
+
+                $resultSetPerfiles = $this->Parser_model->getUrlArchivos();
+                $fechaCarpeta = date("Y-m-d_H-i-s");
+                $fechaImportacionLog = date("Y-m-d H:i:s");
+
+                foreach ($resultSetPerfiles['datos'] as $row) {
+
+                    $idUltimaImportacion = $this->Parser_model->setFechaNuevaImportacion($fechaImportacionLog);
+                    $this->fechaCreacionLog = $fechaCarpeta;
+                    $rutaPerfil = $this->rutaDiaria . "/" . $row->prefijos_tablas;
+
+                    $this->newFolder($rutaPerfil);
+
+                    if ($this->newFolder($rutaPerfil . "/" . $fechaCarpeta)) {
+                        $this->rutaDiariaFecha = $rutaPerfil . "/" . $fechaCarpeta . "/";
+                        $this->downloadProcess($row->url_descarga . ".atom");
+                    }
+
+                    $files = get_filenames($this->rutaDiariaFecha . "/format");
+                    emailInicioProcesoDescarga($fechaImportacionLog, $files);
+
+                    $this->parserfile->index($this->rutaDiariaFecha, $fechaCarpeta, $row, $idUltimaImportacion);
+                }
+
+                $this->tablasCalculadas($idUltimaImportacion);
+
+                emailFinProcesoDescarga($fechaImportacionLog);
+
+            } else {
+                echo "EXISTE UN CRON EN MARCHA.";
+            }
+        } else {
+            echo "No existe parametro que iniciar.";
+        }
+
+        $this->Parser_model->stopParser();
+
+        /* $resultSetPerfiles = $this->Parser_model->getUrlArchivos();
+    foreach ($resultSetPerfiles['datos'] as $row) {
+    $this->parserfile->index($this->rutaDiaria . "PER_PCSP_EX/2022-02-17_20-38-16", date("Y-m-d"), $row);
+    } */
+    }
+
+    private function downloadProcess($urlXML)
+    {
+
+        $fileName = basename($urlXML);
+        $this->downloadFile($fileName, $urlXML, $this->rutaDiariaFecha);
+        $archivoAtom = $this->getFile($this->rutaDiariaFecha . $fileName, $fileName);
+        $nuevoAtomAttrNext = $this->readNextAttribute($archivoAtom);
+
+        while ($nuevoAtomAttrNext !== "") {
+
+            $fileName = basename($nuevoAtomAttrNext);
+            $this->downloadFile($fileName, $nuevoAtomAttrNext, $this->rutaDiariaFecha);
+            $archivoAtom = $this->getFile($this->rutaDiariaFecha . $fileName, $fileName);
+
+            $nuevoAtomAttrNext = $this->readNextAttribute($archivoAtom);
+        }
+    }
+
+    private function readNextAttribute($archivo)
+    {
+        $enlace = "";
+        foreach ($archivo['link'] as $row) {
+            $attrNext = $row['@attributes']['rel'];
+            $attrHref = $row['@attributes']['href'];
+
+            if ($attrNext === "next") {
+                if (!strpos($attrHref, "licitacionesPerfilesContratanteCompleto3_2021")) { //"20220127_")) {
+                    $enlace = $attrHref;
+                } else {
+                    $enlace = "";
+                }
+                //$enlace = $attrHref;
+            }
+        }
+
+        return $enlace;
+    }
+
+    private function getFile($url, $fileName)
+    {
+
+        $feed = implode(file($url));
+        $xml = simplexml_load_string($feed);
+        $json = json_encode($xml);
+        $array = json_decode($json, true);
+
+        $this->formatXml($feed, $fileName);
+        return $array;
+    }
+
+    private function newFolder($rutaFinal)
+    {
+        $result = false;
+        if (!is_dir($rutaFinal)) {
+            $result = mkdir($rutaFinal);
+            mkdir($rutaFinal . "/format");
+        }
+
+        return $result;
+    }
+
+    private function formatXml($xml, $fileName)
+    {
+        $openingFormat = $this->regExIniciosEsquema($xml);
+        $closureFormat = $this->regExFinalesEsquema($openingFormat);
+        file_put_contents($this->rutaDiariaFecha . "/format/" . $fileName, $closureFormat);
+    }
+
+    private function downloadFile($fileName, $url, $ruta)
+    {
+        if (file_put_contents($ruta . $fileName, file_get_contents($url))) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    private function regExIniciosEsquema($xml)
+    {
+        $pattern = "/(<cac:)|(<cbc:)|(<cac-place-ext:)|(<cbc-place-ext:)/";
+        $result = preg_replace($pattern, "<", $xml);
+
+        return $result;
+    }
+
+    private function regExFinalesEsquema($xml)
+    {
+        $pattern = "/(<\/cac:)|(<\/cbc:)|(<\/cac-place-ext:)|(<\/cbc-place-ext:)/";
+        $result = preg_replace($pattern, "</", $xml);
+
+        return $result;
+    }
+
+    private function tablasCalculadas($idUltimaImportacion)
+    {
+        $this->Parser_model->truncateTables("vista_datos_licitacion");
+
+        $licitaciones = $this->Xlsexport_model->getLicitaciones($idUltimaImportacion);
+
+        insertBucleDuplicateOnKey($licitaciones['datos'], "vista_datos_licitacion", "");
+
+    }
+
+}
+
+/* End of file ParserCompleto.php */
+/* Location: ./application/controllers/ParserCompleto.php */

application/helpers/email_templates_helper.php

@@ -26,7 +26,7 @@ if (!function_exists("emailInicioProcesoDescarga")) {
 		</html>";
 
         $email = "chcalvoleon@mindden.com";
-        enviarEmail($asunto, $cuerpo, $email, false);
+        enviarEmail($asunto, $cuerpo, $email, true);
     }
 }
 

application/helpers/funciones_helper.php

@@ -167,12 +167,12 @@ if (!function_exists("enviarEmail")) {
 
         $CI->load->library('email');
 
-        $config['protocol'] = 'smtp';
+        $config['protocol'] = 'mail';
         $config['smtp_host'] = 'smtp.gmail.com';
         $config['smtp_user'] = 'chcalvoleon@mindden.com';
         $config['smtp_pass'] = '4lb1R2014';
         $config['smtp_crypto'] = 'ssl';
-        $config['smtp_port'] = 465;
+        $config['smtp_port'] = 25;
         $config['mailtype'] = 'html';
         $config['wordwrap'] = 'TRUE';
         $config['newline'] = "\r\n";
@@ -188,15 +188,11 @@ if (!function_exists("enviarEmail")) {
         $CI->email->subject($asunto);
         $CI->email->message($body);
 
-        foreach ($adjuntos as $row) {
-            $CI->email->attach($row);
-        }
-
         if ($print_result) {
-            $CI->email->send(false);
+            $CI->email->send(true);
             $CI->email->print_debugger();
         } else {
-            $CI->email->send(false);
+            $CI->email->send(true);
         }
     }
 }

application/libraries/ParserFile.php

@@ -40,17 +40,13 @@ class ParserFile
         $files = get_filenames($this->rutaDiaria, true);
         $filename = "";
         $xml = "";
-        $json = "";
         $array = "";
         $aux = 0;
         $resultEntries = array();
-        $contador = 0;
-
         $stats = array();
 
         foreach ($files as $file) {
             $filename = basename($file);
-            $contador++;
             $entrada = file_get_contents($file);
             $xml = simplexml_load_string($entrada, "SimpleXMLElement", LIBXML_NOCDATA);
             $array = json_decode(json_encode($xml), true);
@@ -61,18 +57,16 @@ class ParserFile
             foreach ($tablasTruncate['datos'] as $row) {
                 $this->CI->Parser_model->truncateTables($row->tabla_sucia);
             }
-
-            gc_mem_caches();
-            gc_collect_cycles();
+            $arrayDeletedEntries = array();
+            $arrayDeletedEntries = $array['deleted-entry'];
 
             foreach ($array['entry'] as $clave => $row) {
 
                 $existLicitacionActualizada = $this->getDatosLicitacion($row);
 
                 if (!$existLicitacionActualizada) {
-                    //$arrayDeletedEntries = $xml->children('at', true);
 
-                    $resultEntries[$filename]['general'][$aux] = $this->nodoEntry($row, $xml->entry[$clave], $datosPerfil->id, $idUltimaImportacion);
+                    $resultEntries[$filename]['general'][$aux] = $this->nodoEntry($row, $xml->entry[$clave], $datosPerfil->id, $idUltimaImportacion, $arrayDeletedEntries);
 
                     $contractFolder = $this->nodoContractFolderStatus($row, $xml->entry[$clave]);
 
@@ -179,7 +173,7 @@ class ParserFile
         return $result;
     }
 
-    private function nodoEntry($xml, $xmlPrimitivo, $tipoPerfil, $idUltimaImportacion)
+    private function nodoEntry($xml, $xmlPrimitivo, $tipoPerfil, $idUltimaImportacion, $deletedEntry)
     {
         $resultEntries = array();
         $id_licitacion = (string) substr($xml['id'], strrpos($xml['id'], '/') + 1);
@@ -193,6 +187,26 @@ class ParserFile
         $resultEntries['tipo_perfil_licitacion'] = $tipoPerfil;
         $resultEntries['fecha_creacion_log'] = $this->fechaInicioParser;
         $resultEntries['id_importacion'] = $idUltimaImportacion;
+
+        $resultEntries['estadoLicitacion'] = "VIGENTE";
+        if ($deletedEntry) {
+            foreach ($deletedEntry as $row) {
+                $idBorrado = (string) substr($row['@attributes']["ref"], strrpos($row['@attributes']["ref"], '/') + 1);
+                if ($id_licitacion == $idBorrado) {
+                    $anyo1 = date_create($row['@attributes']['when']);
+                    $anyo2 = date_create($resultEntries['updated']);
+                    $diferencia = $anyo2->diff($anyo1);
+                    $diferenciaFormat = $diferencia->y;
+                    if ($diferenciaFormat > 5) {
+                        $resultEntries['estadoLicitacion'] = "ARCHIVADA";
+                    } else {
+                        $resultEntries['estadoLicitacion'] = "ANULADA";
+                    }
+                }
+            }
+
+        }
+
         return $resultEntries;
     }
 
@@ -437,8 +451,8 @@ class ParserFile
                 if (array_key_exists("AwardedTenderedProject", $tenderResult[$i])) {
                     $awardedTenderedProject = $tenderResult[$i]['AwardedTenderedProject'];
                     $resultEntries[$i]['procurementProjectLotID'] = $this->existNodo($awardedTenderedProject, 'ProcurementProjectLotID', 'string');
-                    $resultEntries[$i]['TaxExclusiveAmount'] = $this->existNodo($awardedTenderedProject->LegalMonetaryTotal, 'TaxExclusiveAmount', 'string');
-                    $resultEntries[$i]['PayableAmount'] = $this->existNodo($awardedTenderedProject->LegalMonetaryTotal, 'PayableAmount', 'string');
+                    $resultEntries[$i]['TaxExclusiveAmount'] = $this->existNodo($awardedTenderedProject['LegalMonetaryTotal'], 'TaxExclusiveAmount', 'string');
+                    $resultEntries[$i]['PayableAmount'] = $this->existNodo($awardedTenderedProject['LegalMonetaryTotal'], 'PayableAmount', 'string');
                 }
             }
         }
@@ -470,11 +484,15 @@ class ParserFile
             $resultEntries['tenderingTerm']['procurementLegislationDocumentReference'] = $this->existNodo($TenderingTerms['ProcurementLegislationDocumentReference'], 'ID', 'string');
             $resultEntries['tenderingTerm']['allowedSubcontractTerms'] = $this->existNodo($TenderingTerms['AllowedSubcontractTerms'], 'Description', 'string');
 
+            //Criterio de adjudicación
             if (array_key_exists("AwardingTerms", $TenderingTerms)) {
                 $tendererAwardingTerms = $TenderingTerms['AwardingTerms']['AwardingCriteria'];
+                if (array_key_first($tendererAwardingTerms) !== 0) {
+                    $tendererAwardingTerms = array(0 => $tendererAwardingTerms);
+                }
                 for ($i = 0; $i < count($tendererAwardingTerms); $i++) {
-                    $resultEntries["awardingCriteria"][$i]['evaluationCriteriaTypeCode'] = $this->existNodo($tendererAwardingTerms[$i], 'Description', 'string');
-                    $resultEntries["awardingCriteria"][$i]['description'] = $this->existNodo($tendererAwardingTerms[$i], 'WeightNumeric', 'string');
+                    $resultEntries["awardingCriteria"][$i]['description'] = $this->existNodo($tendererAwardingTerms[$i], 'Description', 'string');
+                    $resultEntries["awardingCriteria"][$i]['evaluationCriteriaTypeCode'] = $this->existNodo($tendererAwardingTerms[$i], 'WeightNumeric', 'string');
                     $resultEntries["awardingCriteria"][$i]['id_ajena_licitacion'] = $this->idLicitacion;
                     $resultEntries["awardingCriteria"][$i]['id_compuesta'] = $this->idLicitacion . "_07_" . $i;
                     $resultEntries["awardingCriteria"][$i]['id_compuesta_padre'] = $this->idLicitacion . "_07";
@@ -482,15 +500,21 @@ class ParserFile
                 }
             }
 
+            //Criterio de evluación tecnica
             if (array_key_exists("TendererQualificationRequest", $TenderingTerms)) {
                 $tendererQualificationRequest = $TenderingTerms['TendererQualificationRequest'];
                 $resultEntries['tenderingTerm']['description'] = $this->existNodo($tendererQualificationRequest, 'Description', 'string');
                 $resultEntries['tenderingTerm']['personalSituation'] = $this->existNodo($tendererQualificationRequest, 'PersonalSituation', 'string');
-                for ($i = 0; $i < count($tendererQualificationRequest); $i++) {
-                    if (isset($tendererQualificationRequest[$i]['EvaluationCriteriaTypeCode'])) {
-                        $resultEntries["TendererQualificationRequest"][$i]['evaluationCriteriaTypeCode'] = $this->existNodo($tendererQualificationRequest[$i]['TechnicalEvaluationCriteria'], 'EvaluationCriteriaTypeCode', 'string');
-                        $resultEntries["TendererQualificationRequest"][$i]['evaluationCriteriaTypeCode_attr'] = $this->existAttribute($tendererQualificationRequest[$i]['TechnicalEvaluationCriteria'], "EvaluationCriteriaTypeCode", "sting", 'listURI');
-                        $resultEntries["TendererQualificationRequest"][$i]['description'] = $this->existNodo($tendererQualificationRequest[$i]['TechnicalEvaluationCriteria'], 'Description', 'string');
+                if (isset($tendererQualificationRequest['TechnicalEvaluationCriteria'])) {
+                    $techicnalQualifitacion = $tendererQualificationRequest['TechnicalEvaluationCriteria'];
+                    if (array_key_first($techicnalQualifitacion) !== 0) {
+                        $techicnalQualifitacion = array(0 => $techicnalQualifitacion);
+                    }
+                    for ($i = 0; $i < count($techicnalQualifitacion); $i++) {
+
+                        $resultEntries["TendererQualificationRequest"][$i]['evaluationCriteriaTypeCode'] = $this->existNodo($tendererQualificationRequest['TechnicalEvaluationCriteria'][$i], 'EvaluationCriteriaTypeCode', 'string');
+                        $resultEntries["TendererQualificationRequest"][$i]['evaluationCriteriaTypeCode_attr'] = $this->existAttribute($tendererQualificationRequest['TechnicalEvaluationCriteria'][$i], "EvaluationCriteriaTypeCode", "sting", 'listURI');
+                        $resultEntries["TendererQualificationRequest"][$i]['description'] = $this->existNodo($tendererQualificationRequest['TechnicalEvaluationCriteria'][$i], 'Description', 'string');
                         $resultEntries["TendererQualificationRequest"][$i]['id_ajena_licitacion'] = $this->idLicitacion;
                         $resultEntries["TendererQualificationRequest"][$i]['id_compuesta'] = $this->idLicitacion . "_07_" . $i;
                         $resultEntries["TendererQualificationRequest"][$i]['id_compuesta_padre'] = $this->idLicitacion . "_07";
@@ -499,6 +523,7 @@ class ParserFile
 
                 }
 
+                //Criterios de evaluacion financiera
                 if (array_key_exists("FinancialEvaluationCriteria", $TenderingTerms['TendererQualificationRequest'])) {
                     $financialEvaluationCriteria = $TenderingTerms['TendererQualificationRequest']['FinancialEvaluationCriteria'];
                     for ($i = 0; $i < count($financialEvaluationCriteria); $i++) {
@@ -512,12 +537,16 @@ class ParserFile
                     }
                 }
 
+                //Requisitos de participación
                 if (array_key_exists("SpecificTendererRequirement", $TenderingTerms['TendererQualificationRequest'])) {
                     $specificTendererRequirement = $TenderingTerms['TendererQualificationRequest']['SpecificTendererRequirement'];
+                    if (array_key_first($specificTendererRequirement) !== 0) {
+                        $specificTendererRequirement = array(0 => $specificTendererRequirement);
+                    }
                     for ($i = 0; $i < count($specificTendererRequirement); $i++) {
 
-                        $resultEntries["SpecificTendererRequirement"][$i]['evaluationCriteriaTypeCode'] = $this->existNodo($specificTendererRequirement[$i]['SpecificTendererRequirement'], 'RequirementTypeCode', 'string');
-                        $resultEntries["SpecificTendererRequirement"][$i]['evaluationCriteriaTypeCode_attr'] = $this->existAttribute($specificTendererRequirement[$i]['SpecificTendererRequirement'], "RequirementTypeCode", "string", 'listURI');
+                        $resultEntries["SpecificTendererRequirement"][$i]['evaluationCriteriaTypeCode'] = $this->existNodo($specificTendererRequirement[$i], 'RequirementTypeCode', 'string');
+                        $resultEntries["SpecificTendererRequirement"][$i]['evaluationCriteriaTypeCode_attr'] = $this->existAttribute($specificTendererRequirement[$i], "RequirementTypeCode", "string", 'listURI');
                         $resultEntries["SpecificTendererRequirement"][$i]['id_ajena_licitacion'] = $this->idLicitacion;
                         $resultEntries["SpecificTendererRequirement"][$i]['id_compuesta'] = $this->idLicitacion . "_07_" . $i;
                         $resultEntries["SpecificTendererRequirement"][$i]['id_compuesta_padre'] = $this->idLicitacion . "_07";

application/models/Parser_model.php

@@ -62,7 +62,7 @@ class Parser_model extends CI_Model
 
     public function getUrlArchivos()
     {
-        $sql = "SELECT * FROM config_tipo_licitacion_tablas";
+        $sql = "SELECT * FROM config_tipo_licitacion_tablas WHERE activo = 1";
         $result = $this->db->query($sql);
         $datos['datos'] = $result->result();
         $datos['num_rows'] = $result->num_rows();

application/models/Xlsexport_model.php

@@ -19,11 +19,20 @@ defined('BASEPATH') or exit('No direct script access allowed');
 class Xlsexport_model extends CI_Model
 {
 
-    protected $fechaLog = "2022-02-28 08:42:06";
+    protected $fechaLog = "";
 
     public function __construct()
     {
         parent::__construct();
+        $this->fechaLog = $this->getLastDateLog()->fecha_maxima;
+    }
+
+    public function getLastDateLog()
+    {
+        $sql = "SELECT MAX(fecha) as fecha_maxima FROM config_fecha_importaciones LIMIT 1";
+        $result = $this->db->query($sql);
+        return $result->row();
+
     }
 
     // ------------------------------------------------------------------------
@@ -37,6 +46,7 @@ class Xlsexport_model extends CI_Model
                     GROUP_CONCAT( PROJI.itemClassification_value ) AS itemClassification_attr,
                     LI.link_uri,
                     LI.updated,
+                    LI.estadoLicitacion,
                     CF.contractFolderID,
                     CF.contractFolderStatusCode,
                     LP.buyerProfileURIID,