From e9fa2e12d07e8c668b39feb7278f1db343c1771a Mon Sep 17 00:00:00 2001
From: dozer111 <alkhonko@gmail.com>
Date: Wed, 19 Sep 2018 17:32:35 +0300
Subject: [PATCH] add new form data to excel report

---
 console/controllers/PdfController.php | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/console/controllers/PdfController.php b/console/controllers/PdfController.php
index d65305a..a65cd6d 100644
--- a/console/controllers/PdfController.php
+++ b/console/controllers/PdfController.php
@@ -75,7 +75,7 @@ class PdfController extends Controller{
 			$sheet->setCellValue('E1','Телефон (рабочий)')->getStyle('E1')->applyFromArray($styleArray);
 			$sheet->setCellValue('F1','Телефон (дополнительный)')->getStyle('F1')->applyFromArray($styleArray);
 			$sheet->setCellValue('G1','Факс')->getStyle('G1')->applyFromArray($styleArray);
-			$sheet->setCellValue('H1','Страна\организация')->getStyle('H1')->applyFromArray($styleArray);
+			$sheet->setCellValue('H1','Организация')->getStyle('H1')->applyFromArray($styleArray);
 			$sheet->setCellValue('I1','Пол')->getStyle('I1')->applyFromArray($styleArray);
 			$sheet->setCellValue('J1','Дата рождения')->getStyle('J1')->applyFromArray($styleArray);
 			$sheet->setCellValue('K1','Серия, номер')->getStyle('K1')->applyFromArray($styleArray);
@@ -86,6 +86,9 @@ class PdfController extends Controller{
 			$sheet->setCellValue('P1','Особенное питание')->getStyle('P1')->applyFromArray($styleArray);
 			$sheet->setCellValue('Q1','Рабочий язык')->getStyle('Q1')->applyFromArray($styleArray);
 			$sheet->setCellValue('R1','Ссылка на фотографию')->getStyle('R1')->applyFromArray($styleArray);
+			$sheet->setCellValue('S1','Национальность')->getStyle('R1')->applyFromArray($styleArray);
+			$sheet->setCellValue('T1','Страна')->getStyle('R1')->applyFromArray($styleArray);
+			$sheet->setCellValue('U1','Рабочий статус делегата')->getStyle('R1')->applyFromArray($styleArray);
 
 			$sheet->getColumnDimension('A')->setAutoSize(true);
 			$sheet->getColumnDimension('B')->setAutoSize(true);
@@ -105,6 +108,9 @@ class PdfController extends Controller{
 			$sheet->getColumnDimension('P')->setAutoSize(true);
 			$sheet->getColumnDimension('Q')->setAutoSize(true);
 			$sheet->getColumnDimension('R')->setAutoSize(true);
+			$sheet->getColumnDimension('S')->setAutoSize(true);
+			$sheet->getColumnDimension('T')->setAutoSize(true);
+			$sheet->getColumnDimension('U')->setAutoSize(true);
 			$fileName=$model->timeFrom."-".$model->timeTo."_".substr(md5(time()),0,6).'.xlsx';
 			foreach($data as $key => $d){
 				$key+=3;
@@ -139,7 +145,24 @@ class PdfController extends Controller{
 						break;
 				}
 
-
+				$workStatus=false;
+				switch ($d->user_work_status){
+					case 0:
+						$workStatus=$d::WORK_STATUS_0;
+						break;
+					case 1:
+						$workStatus=$d::WORK_STATUS_1;
+						break;
+					case 2:
+						$workStatus=$d::WORK_STATUS_2;
+						break;
+					case 3:
+						$workStatus=$d::WORK_STATUS_3;
+						break;
+					case 4:
+						$workStatus=$d::WORK_STATUS_4;
+						break;
+				}
 
 
 				$sheet->setCellValue('A'.$key, $d->name);
@@ -160,6 +183,9 @@ class PdfController extends Controller{
 				$sheet->setCellValue('P'.$key, $d->special_meal);
 				$sheet->setCellValue('Q'.$key, $workLang);
 				$sheet->setCellValue('R'.$key,Yii::$app->request->hostInfo.$d->image);
+				$sheet->setCellValue('S'.$key,$d->nationality);
+				$sheet->setCellValue('T'.$key,$d->country_from);
+				$sheet->setCellValue('U'.$key,\Yii::t('app',$workStatus,[],'ru'));
 				$writer = new Xlsx($spreadsheet);
 
 				$writer->save(__DIR__.'/../../frontend/web/files/xls/'.$fileName);
--
libgit2 0.21.4