Commit e9fa2e12d07e8c668b39feb7278f1db343c1771a
1 parent
f76bf49c
add new form data to excel report
Showing
1 changed file
with
28 additions
and
2 deletions
Show diff stats
console/controllers/PdfController.php
... | ... | @@ -75,7 +75,7 @@ class PdfController extends Controller{ |
75 | 75 | $sheet->setCellValue('E1','Телефон (рабочий)')->getStyle('E1')->applyFromArray($styleArray); |
76 | 76 | $sheet->setCellValue('F1','Телефон (дополнительный)')->getStyle('F1')->applyFromArray($styleArray); |
77 | 77 | $sheet->setCellValue('G1','Факс')->getStyle('G1')->applyFromArray($styleArray); |
78 | - $sheet->setCellValue('H1','Страна\организация')->getStyle('H1')->applyFromArray($styleArray); | |
78 | + $sheet->setCellValue('H1','Организация')->getStyle('H1')->applyFromArray($styleArray); | |
79 | 79 | $sheet->setCellValue('I1','Пол')->getStyle('I1')->applyFromArray($styleArray); |
80 | 80 | $sheet->setCellValue('J1','Дата рождения')->getStyle('J1')->applyFromArray($styleArray); |
81 | 81 | $sheet->setCellValue('K1','Серия, номер')->getStyle('K1')->applyFromArray($styleArray); |
... | ... | @@ -86,6 +86,9 @@ class PdfController extends Controller{ |
86 | 86 | $sheet->setCellValue('P1','Особенное питание')->getStyle('P1')->applyFromArray($styleArray); |
87 | 87 | $sheet->setCellValue('Q1','Рабочий язык')->getStyle('Q1')->applyFromArray($styleArray); |
88 | 88 | $sheet->setCellValue('R1','Ссылка на фотографию')->getStyle('R1')->applyFromArray($styleArray); |
89 | + $sheet->setCellValue('S1','Национальность')->getStyle('R1')->applyFromArray($styleArray); | |
90 | + $sheet->setCellValue('T1','Страна')->getStyle('R1')->applyFromArray($styleArray); | |
91 | + $sheet->setCellValue('U1','Рабочий статус делегата')->getStyle('R1')->applyFromArray($styleArray); | |
89 | 92 | |
90 | 93 | $sheet->getColumnDimension('A')->setAutoSize(true); |
91 | 94 | $sheet->getColumnDimension('B')->setAutoSize(true); |
... | ... | @@ -105,6 +108,9 @@ class PdfController extends Controller{ |
105 | 108 | $sheet->getColumnDimension('P')->setAutoSize(true); |
106 | 109 | $sheet->getColumnDimension('Q')->setAutoSize(true); |
107 | 110 | $sheet->getColumnDimension('R')->setAutoSize(true); |
111 | + $sheet->getColumnDimension('S')->setAutoSize(true); | |
112 | + $sheet->getColumnDimension('T')->setAutoSize(true); | |
113 | + $sheet->getColumnDimension('U')->setAutoSize(true); | |
108 | 114 | $fileName=$model->timeFrom."-".$model->timeTo."_".substr(md5(time()),0,6).'.xlsx'; |
109 | 115 | foreach($data as $key => $d){ |
110 | 116 | $key+=3; |
... | ... | @@ -139,7 +145,24 @@ class PdfController extends Controller{ |
139 | 145 | break; |
140 | 146 | } |
141 | 147 | |
142 | - | |
148 | + $workStatus=false; | |
149 | + switch ($d->user_work_status){ | |
150 | + case 0: | |
151 | + $workStatus=$d::WORK_STATUS_0; | |
152 | + break; | |
153 | + case 1: | |
154 | + $workStatus=$d::WORK_STATUS_1; | |
155 | + break; | |
156 | + case 2: | |
157 | + $workStatus=$d::WORK_STATUS_2; | |
158 | + break; | |
159 | + case 3: | |
160 | + $workStatus=$d::WORK_STATUS_3; | |
161 | + break; | |
162 | + case 4: | |
163 | + $workStatus=$d::WORK_STATUS_4; | |
164 | + break; | |
165 | + } | |
143 | 166 | |
144 | 167 | |
145 | 168 | $sheet->setCellValue('A'.$key, $d->name); |
... | ... | @@ -160,6 +183,9 @@ class PdfController extends Controller{ |
160 | 183 | $sheet->setCellValue('P'.$key, $d->special_meal); |
161 | 184 | $sheet->setCellValue('Q'.$key, $workLang); |
162 | 185 | $sheet->setCellValue('R'.$key,Yii::$app->request->hostInfo.$d->image); |
186 | + $sheet->setCellValue('S'.$key,$d->nationality); | |
187 | + $sheet->setCellValue('T'.$key,$d->country_from); | |
188 | + $sheet->setCellValue('U'.$key,\Yii::t('app',$workStatus,[],'ru')); | |
163 | 189 | $writer = new Xlsx($spreadsheet); |
164 | 190 | |
165 | 191 | $writer->save(__DIR__.'/../../frontend/web/files/xls/'.$fileName); | ... | ... |