Nermosis 3 vuotta sitten
vanhempi
commit
eb60f7df3a
1 muutettua tiedostoa jossa 9 lisäystä ja 10 poistoa
  1. 9 10
      application/controllers/ExportXls.php

+ 9 - 10
application/controllers/ExportXls.php Näytä tiedosto

58
         $spreadsheet = $this->cabecerasOpenPlacspDocumentos($spreadsheet, 12);
58
         $spreadsheet = $this->cabecerasOpenPlacspDocumentos($spreadsheet, 12);
59
         $spreadsheet = $this->cabecerasOpenPlacspDocumentos($spreadsheet, 13);
59
         $spreadsheet = $this->cabecerasOpenPlacspDocumentos($spreadsheet, 13);
60
         $spreadsheet = $this->cabecerasOpenPlacspDocumentos($spreadsheet, 14);
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
         $spreadsheet = $this->datosCompletosHojaLicitacion($spreadsheet, $result['hoja1']);
71
         $spreadsheet = $this->datosCompletosHojaLicitacion($spreadsheet, $result['hoja1']);
63
         $spreadsheet = $this->datosCompletosHojaBitacora($spreadsheet, $result);
72
         $spreadsheet = $this->datosCompletosHojaBitacora($spreadsheet, $result);
143
                 "partyItem" => $licitacion->partyItem,
152
                 "partyItem" => $licitacion->partyItem,
144
                 "tipoIdParty" => $licitacion->tipoIdParty,
153
                 "tipoIdParty" => $licitacion->tipoIdParty,
145
             );
154
             );
146
-
147
             $result['hoja1'][$licitacion->id_licitacion]['project'] = array(
155
             $result['hoja1'][$licitacion->id_licitacion]['project'] = array(
148
                 "name" => $licitacion->nameProject,
156
                 "name" => $licitacion->nameProject,
149
                 "estimatedOverallContractAmount" => $licitacion->estimatedOverallContractAmount,
157
                 "estimatedOverallContractAmount" => $licitacion->estimatedOverallContractAmount,
159
                 "contractExtension" => $licitacion->contractExtension,
167
                 "contractExtension" => $licitacion->contractExtension,
160
 
168
 
161
             );
169
             );
162
-
163
             $result['hoja1'][$licitacion->id_licitacion]['tenderProcess'] = array(
170
             $result['hoja1'][$licitacion->id_licitacion]['tenderProcess'] = array(
164
                 "tipoTender" => $licitacion->tipoTender,
171
                 "tipoTender" => $licitacion->tipoTender,
165
                 "contrato_sistema" => $licitacion->contrato_sistema,
172
                 "contrato_sistema" => $licitacion->contrato_sistema,
166
                 "urgency" => $licitacion->urgency,
173
                 "urgency" => $licitacion->urgency,
167
                 "submision" => $licitacion->submision,
174
                 "submision" => $licitacion->submision,
168
             );
175
             );
169
-
170
             $result['hoja1'][$licitacion->id_licitacion]['tenderTerms'] = array(
176
             $result['hoja1'][$licitacion->id_licitacion]['tenderTerms'] = array(
171
                 "procurementLegislationDocumentReference" => $licitacion->procurementLegislationDocumentReference,
177
                 "procurementLegislationDocumentReference" => $licitacion->procurementLegislationDocumentReference,
172
                 "allowedSubcontractTerms" => $licitacion->allowedSubcontractTerms,
178
                 "allowedSubcontractTerms" => $licitacion->allowedSubcontractTerms,
179
         guardar_log("Excel", "Consulta Valid notice info documentos");
185
         guardar_log("Excel", "Consulta Valid notice info documentos");
180
         $result['validNoticeInfoDocumentos'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_valid_notice_info_documento");
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
         guardar_log("Excel", "Consulta projectLot");
188
         guardar_log("Excel", "Consulta projectLot");
186
         $result['projectLot'] = $this->Xlsexport_model->getProjectLotItem();
189
         $result['projectLot'] = $this->Xlsexport_model->getProjectLotItem();
187
 
190
 
501
         $spreadsheet->setActiveSheetIndex(7);
504
         $spreadsheet->setActiveSheetIndex(7);
502
         $spreadsheet->getActiveSheet()->setTitle("Criterio Adjudicación");
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
         if ($datos['num_rows'] > 0) {
507
         if ($datos['num_rows'] > 0) {
506
             $aux = 2;
508
             $aux = 2;
507
             $contador = 0;
509
             $contador = 0;
523
         $spreadsheet->setActiveSheetIndex(8);
525
         $spreadsheet->setActiveSheetIndex(8);
524
         $spreadsheet->getActiveSheet()->setTitle("CriteriosEvaluacionFinanciera");
526
         $spreadsheet->getActiveSheet()->setTitle("CriteriosEvaluacionFinanciera");
525
 
527
 
526
-        //$datos = $this->Xlsexport_model->getTenderingTermsCriteriosFinanciacion();
527
         if ($datos['num_rows'] > 0) {
528
         if ($datos['num_rows'] > 0) {
528
             $aux = 2;
529
             $aux = 2;
529
             $contador = 0;
530
             $contador = 0;
544
         $spreadsheet->setActiveSheetIndex(9);
545
         $spreadsheet->setActiveSheetIndex(9);
545
         $spreadsheet->getActiveSheet()->setTitle("Criterios Evaluación Técnica");
546
         $spreadsheet->getActiveSheet()->setTitle("Criterios Evaluación Técnica");
546
 
547
 
547
-        //$datos = $this->Xlsexport_model->getTenderingTermsCriteriosTecnicos();
548
         if ($datos['num_rows'] > 0) {
548
         if ($datos['num_rows'] > 0) {
549
             $aux = 2;
549
             $aux = 2;
550
             $contador = 0;
550
             $contador = 0;
566
         $spreadsheet->setActiveSheetIndex(10);
566
         $spreadsheet->setActiveSheetIndex(10);
567
         $spreadsheet->getActiveSheet()->setTitle("Requisitos Participación");
567
         $spreadsheet->getActiveSheet()->setTitle("Requisitos Participación");
568
 
568
 
569
-        //$datos = $this->Xlsexport_model->getTenderingTermsRequisitos();
570
         if ($datos['num_rows'] > 0) {
569
         if ($datos['num_rows'] > 0) {
571
             $aux = 2;
570
             $aux = 2;
572
             $contador = 0;
571
             $contador = 0;