Nermosis vor 3 Jahren
Ursprung
Commit
eb60f7df3a
1 geänderte Dateien mit 9 neuen und 10 gelöschten Zeilen
  1. 9 10
      application/controllers/ExportXls.php

+ 9 - 10
application/controllers/ExportXls.php Datei anzeigen

@@ -58,6 +58,15 @@ class ExportXls extends CI_Controller
58 58
         $spreadsheet = $this->cabecerasOpenPlacspDocumentos($spreadsheet, 12);
59 59
         $spreadsheet = $this->cabecerasOpenPlacspDocumentos($spreadsheet, 13);
60 60
         $spreadsheet = $this->cabecerasOpenPlacspDocumentos($spreadsheet, 14);
61
+        $spreadsheet = $this->cabeceraMediosComunicacion($spreadsheet);
62
+        $spreadsheet = $this->cabeceraMediosComunicacionDocumentos($spreadsheet);
63
+        $spreadsheet = $this->cabeceraTenderResult($spreadsheet);
64
+        $spreadsheet = $this->cabeceraTipoProcedimiento($spreadsheet);
65
+        $spreadsheet = $this->cabeceraTenderingTerms($spreadsheet);
66
+        $spreadsheet = $this->cabeceraCriterioADjudicacion($spreadsheet);
67
+        $spreadsheet = $this->cabeceraCriteriosFinancieros($spreadsheet);
68
+        $spreadsheet = $this->cabeceraCriteriosTecnicos($spreadsheet);
69
+        $spreadsheet = $this->cabeceraRequisitosParticipacion($spreadsheet);
61 70
 
62 71
         $spreadsheet = $this->datosCompletosHojaLicitacion($spreadsheet, $result['hoja1']);
63 72
         $spreadsheet = $this->datosCompletosHojaBitacora($spreadsheet, $result);
@@ -143,7 +152,6 @@ class ExportXls extends CI_Controller
143 152
                 "partyItem" => $licitacion->partyItem,
144 153
                 "tipoIdParty" => $licitacion->tipoIdParty,
145 154
             );
146
-
147 155
             $result['hoja1'][$licitacion->id_licitacion]['project'] = array(
148 156
                 "name" => $licitacion->nameProject,
149 157
                 "estimatedOverallContractAmount" => $licitacion->estimatedOverallContractAmount,
@@ -159,14 +167,12 @@ class ExportXls extends CI_Controller
159 167
                 "contractExtension" => $licitacion->contractExtension,
160 168
 
161 169
             );
162
-
163 170
             $result['hoja1'][$licitacion->id_licitacion]['tenderProcess'] = array(
164 171
                 "tipoTender" => $licitacion->tipoTender,
165 172
                 "contrato_sistema" => $licitacion->contrato_sistema,
166 173
                 "urgency" => $licitacion->urgency,
167 174
                 "submision" => $licitacion->submision,
168 175
             );
169
-
170 176
             $result['hoja1'][$licitacion->id_licitacion]['tenderTerms'] = array(
171 177
                 "procurementLegislationDocumentReference" => $licitacion->procurementLegislationDocumentReference,
172 178
                 "allowedSubcontractTerms" => $licitacion->allowedSubcontractTerms,
@@ -179,9 +185,6 @@ class ExportXls extends CI_Controller
179 185
         guardar_log("Excel", "Consulta Valid notice info documentos");
180 186
         $result['validNoticeInfoDocumentos'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_valid_notice_info_documento");
181 187
 
182
-        /* guardar_log("Excel", "Consulta Valid notice info");
183
-        $result['validNoticeInfo'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_valid_notice_fechas"); */
184
-
185 188
         guardar_log("Excel", "Consulta projectLot");
186 189
         $result['projectLot'] = $this->Xlsexport_model->getProjectLotItem();
187 190
 
@@ -501,7 +504,6 @@ class ExportXls extends CI_Controller
501 504
         $spreadsheet->setActiveSheetIndex(7);
502 505
         $spreadsheet->getActiveSheet()->setTitle("Criterio Adjudicación");
503 506
 
504
-        //$datos = $this->Xlsexport_model->getDatosRelacionadasTablaWithoutLicitacion("maestro_tendering_terms_awarding_terms", "maestro_tendering_terms", "id_ajena_tt");
505 507
         if ($datos['num_rows'] > 0) {
506 508
             $aux = 2;
507 509
             $contador = 0;
@@ -523,7 +525,6 @@ class ExportXls extends CI_Controller
523 525
         $spreadsheet->setActiveSheetIndex(8);
524 526
         $spreadsheet->getActiveSheet()->setTitle("CriteriosEvaluacionFinanciera");
525 527
 
526
-        //$datos = $this->Xlsexport_model->getTenderingTermsCriteriosFinanciacion();
527 528
         if ($datos['num_rows'] > 0) {
528 529
             $aux = 2;
529 530
             $contador = 0;
@@ -544,7 +545,6 @@ class ExportXls extends CI_Controller
544 545
         $spreadsheet->setActiveSheetIndex(9);
545 546
         $spreadsheet->getActiveSheet()->setTitle("Criterios Evaluación Técnica");
546 547
 
547
-        //$datos = $this->Xlsexport_model->getTenderingTermsCriteriosTecnicos();
548 548
         if ($datos['num_rows'] > 0) {
549 549
             $aux = 2;
550 550
             $contador = 0;
@@ -566,7 +566,6 @@ class ExportXls extends CI_Controller
566 566
         $spreadsheet->setActiveSheetIndex(10);
567 567
         $spreadsheet->getActiveSheet()->setTitle("Requisitos Participación");
568 568
 
569
-        //$datos = $this->Xlsexport_model->getTenderingTermsRequisitos();
570 569
         if ($datos['num_rows'] > 0) {
571 570
             $aux = 2;
572 571
             $contador = 0;