amarcinkowski / hospitalplugin

src/Entities/PatientZZ.php

Doc Comments +7 added lines, -7 removed lines

@@ -81,7 +81,7 @@ 
     public $edukacjaIWsparciePsychiczne;
     //
     /**
-     * @return aktywnoscFizyczna
+     * @return integer
      */
     public function getAktywnoscFizyczna()
     {
@@ -99,7 +99,7 @@ 
     }
 
     /**
-     * @return higiena
+     * @return integer
      */
     public function getHigiena()
     {
@@ -117,7 +117,7 @@ 
     }
 
     /**
-     * @return odzywianie
+     * @return integer
      */
     public function getOdzywianie()
     {
@@ -135,7 +135,7 @@ 
     }
 
     /**
-     * @return wydalanie
+     * @return integer
      */
     public function getWydalanie()
     {
@@ -153,7 +153,7 @@ 
     }
 
     /**
-     * @return pomiarObjawowZyciowych
+     * @return integer
      */
     public function getPomiarObjawowZyciowych()
     {
@@ -171,7 +171,7 @@ 
     }
 
     /**
-     * @return leczenie
+     * @return integer
      */
     public function getLeczenie()
     {
@@ -189,7 +189,7 @@ 
     }
 
     /**
-     * @return edukacjaIWsparciePsychiczne
+     * @return integer
      */
     public function getEdukacjaIWsparciePsychiczne()
     {

src/utils/ExcelExport.php

Doc Comments +8 added lines, -3 removed lines

@@ -17,6 +17,7 @@ 
 	}
 	/**
 	 * 
+	 * @param integer $num
 	 */
 	public static function getColumnLetter($num) {
 		return chr ( 65 + $num );
@@ -38,6 +39,8 @@ 
 		ExcelExport::downloadExcel ( $objPHPExcel, $dataSetName . '.xlsx' );
 	}
 	/**
+	 * @param string $cells
+	 * @param string $color
 	 */
 	static function cellColor($objPHPExcel, $cells, $color) {
 		$objPHPExcel->getActiveSheet ()->getStyle ( $cells )->getFill ()->applyFromArray ( array (
@@ -69,7 +72,8 @@ 
 	}
 	/**
 	 *
-	 * @param unknown $objPHPExcel        	
+	 * @param \PHPExcel $objPHPExcel
+	 * @param string $filename        	
 	 */
 	private static function downloadExcel($objPHPExcel, $filename) {
 		ob_end_clean ();
@@ -89,7 +93,8 @@ 
 	}
 	/**
 	 * remove special chars and words from string 
-	 * @param unknown $string        	
+	 * @param unknown $string
+	 * @param string[] $removeWords        	
 	 */
 	private static function clearName($string, $removeWords) {
 		$string = str_replace ( ' ', '-', $string );
@@ -102,7 +107,7 @@ 
 	}
 	/**
 	 * @param unknown $objPHPExcel        	
-	 * @param unknown $title        	
+	 * @param string $title        	
 	 */
 	static function printTitle($objPHPExcel, $title) {
 		$objPHPExcel->getActiveSheet ()->setTitle ( ExcelExport::clearName ( $title, array('ddzia') ), true );

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace Hospitalplugin\utils;
 
-use Hospitalplugin\Entities\InfectionsCRUD;
 use Hospitalplugin\Entities\Infections;
 
 class ExcelExport {

Indentation +111 added lines, -111 removed lines

@@ -7,119 +7,119 @@
 
 class ExcelExport {
 	
-	/**
-	 */
-	public static function init() {
-		add_action ( 'admin_init', array (
-				'Hospitalplugin\utils\ExcelExport',
-				'excel_export' 
-		), 1 );
-	}
-	/**
-	 * 
-	 */
-	public static function getColumnLetter($num) {
-		return chr ( 65 + $num );
-	}
-	/**
-	 */
-	static function excel_export() {
-		if (! isset ( $_POST ['excel'] )) {
-			return;
-		} else {
-			// dataSetName: Infections, Punction
-			$dataSetName = $_POST ['dataSetName'];
-			$classname = '\Hospitalplugin\utils\ExcelExport' . $dataSetName;
-		}
+    /**
+     */
+    public static function init() {
+        add_action ( 'admin_init', array (
+                'Hospitalplugin\utils\ExcelExport',
+                'excel_export' 
+        ), 1 );
+    }
+    /**
+     * 
+     */
+    public static function getColumnLetter($num) {
+        return chr ( 65 + $num );
+    }
+    /**
+     */
+    static function excel_export() {
+        if (! isset ( $_POST ['excel'] )) {
+            return;
+        } else {
+            // dataSetName: Infections, Punction
+            $dataSetName = $_POST ['dataSetName'];
+            $classname = '\Hospitalplugin\utils\ExcelExport' . $dataSetName;
+        }
 		
-		$objPHPExcel = new \PHPExcel ();
-		$classname::fillData ( $objPHPExcel );
+        $objPHPExcel = new \PHPExcel ();
+        $classname::fillData ( $objPHPExcel );
 		
-		ExcelExport::downloadExcel ( $objPHPExcel, $dataSetName . '.xlsx' );
-	}
-	/**
-	 */
-	static function cellColor($objPHPExcel, $cells, $color) {
-		$objPHPExcel->getActiveSheet ()->getStyle ( $cells )->getFill ()->applyFromArray ( array (
-				'type' => \PHPExcel_Style_Fill::FILL_SOLID,
-				'startcolor' => array (
-						'rgb' => $color 
-				) 
-		) );
-	}
-	/**
-	 */
-	static function styleActiveSheet($objPHPExcel) {
-		$objPHPExcel->getActiveSheet ()->getDefaultStyle ()->getFont ()->setName ( 'Arial' )->setSize ( 8 )->setBold ( false );
-		$objPHPExcel->getActiveSheet ()->getDefaultStyle ()->getNumberFormat ()->setFormatCode ( \PHPExcel_Style_NumberFormat::FORMAT_TEXT );
-		$objPHPExcel->getActiveSheet ()->freezePane ( 'A3' );
-		$style = array (
-				'alignment' => array (
-						'horizontal' => \PHPExcel_Style_Alignment::HORIZONTAL_CENTER,
-						'vertical' => \PHPExcel_Style_Alignment::VERTICAL_CENTER 
-				) 
-		);
-		$objWorksheet = $objPHPExcel->getActiveSheet ();
-		$objWorksheet->getDefaultStyle ()->applyFromArray ( $style );
-		$objWorksheet->getStyle ( 'A1:AA2' )->getFont ()->setBold ( true );
-		for($col = ord ( 'a' ); $col <= ord ( 'z' ); $col ++) {
-			$objWorksheet->getColumnDimension ( chr ( $col ) )->setAutoSize ( true );
-		}
-		return $objPHPExcel;
-	}
-	/**
-	 *
-	 * @param unknown $objPHPExcel        	
-	 */
-	private static function downloadExcel($objPHPExcel, $filename) {
-		ob_end_clean ();
-		ob_start ();
-		header ( "Content-type: application/vnd.ms-excel; charset=utf-8" );
-		header ( "Content-Transfer-Encoding: binary" );
-		header ( "Content-Description: File Transfer" );
-		header ( "Content-Disposition: attachment; filename=\"" . $filename . "\"" );
-		header ( "Cache-Control: max-age=0" );
-		header ( "Expires: 0" );
-		header ( "Pragma: no-cache" );
+        ExcelExport::downloadExcel ( $objPHPExcel, $dataSetName . '.xlsx' );
+    }
+    /**
+     */
+    static function cellColor($objPHPExcel, $cells, $color) {
+        $objPHPExcel->getActiveSheet ()->getStyle ( $cells )->getFill ()->applyFromArray ( array (
+                'type' => \PHPExcel_Style_Fill::FILL_SOLID,
+                'startcolor' => array (
+                        'rgb' => $color 
+                ) 
+        ) );
+    }
+    /**
+     */
+    static function styleActiveSheet($objPHPExcel) {
+        $objPHPExcel->getActiveSheet ()->getDefaultStyle ()->getFont ()->setName ( 'Arial' )->setSize ( 8 )->setBold ( false );
+        $objPHPExcel->getActiveSheet ()->getDefaultStyle ()->getNumberFormat ()->setFormatCode ( \PHPExcel_Style_NumberFormat::FORMAT_TEXT );
+        $objPHPExcel->getActiveSheet ()->freezePane ( 'A3' );
+        $style = array (
+                'alignment' => array (
+                        'horizontal' => \PHPExcel_Style_Alignment::HORIZONTAL_CENTER,
+                        'vertical' => \PHPExcel_Style_Alignment::VERTICAL_CENTER 
+                ) 
+        );
+        $objWorksheet = $objPHPExcel->getActiveSheet ();
+        $objWorksheet->getDefaultStyle ()->applyFromArray ( $style );
+        $objWorksheet->getStyle ( 'A1:AA2' )->getFont ()->setBold ( true );
+        for($col = ord ( 'a' ); $col <= ord ( 'z' ); $col ++) {
+            $objWorksheet->getColumnDimension ( chr ( $col ) )->setAutoSize ( true );
+        }
+        return $objPHPExcel;
+    }
+    /**
+     *
+     * @param unknown $objPHPExcel        	
+     */
+    private static function downloadExcel($objPHPExcel, $filename) {
+        ob_end_clean ();
+        ob_start ();
+        header ( "Content-type: application/vnd.ms-excel; charset=utf-8" );
+        header ( "Content-Transfer-Encoding: binary" );
+        header ( "Content-Description: File Transfer" );
+        header ( "Content-Disposition: attachment; filename=\"" . $filename . "\"" );
+        header ( "Cache-Control: max-age=0" );
+        header ( "Expires: 0" );
+        header ( "Pragma: no-cache" );
 		
-		$objWriter = \PHPExcel_IOFactory::createWriter ( $objPHPExcel, 'Excel2007' );
-		$objWriter->setPreCalculateFormulas ( true );
-		$objWriter->save ( 'php://output' );
-		exit ();
-	}
-	/**
-	 * remove special chars and words from string 
-	 * @param unknown $string        	
-	 */
-	private static function clearName($string, $removeWords) {
-		$string = str_replace ( ' ', '-', $string );
-		$string = preg_replace ( '/[^A-Za-z0-9\-]/', '', $string );
-		foreach ( $removeWords as $word ) {
-			$string = str_replace ( $word, '', $string );
-		}
-		$string = substr ( $string, 0, 29 );
-		return $string;
-	}
-	/**
-	 * @param unknown $objPHPExcel        	
-	 * @param unknown $title        	
-	 */
-	static function printTitle($objPHPExcel, $title) {
-		$objPHPExcel->getActiveSheet ()->setTitle ( ExcelExport::clearName ( $title, array('ddzia') ), true );
-		$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, 1, $title );
-	}
-	/**
-	 *
-	 * @param unknown $objPHPExcel
-	 */
-	static function newSheet($objPHPExcel, $index = -1) {
-		if ($index < 0) {
-			$index = $objPHPExcel->getSheetCount ();
-		}
-		$objPHPExcel->createSheet ( $index );
-		$objPHPExcel->setActiveSheetIndex ( $index );
-		$sheet = $objPHPExcel->getActiveSheet ();
-		return $sheet;
-	}
+        $objWriter = \PHPExcel_IOFactory::createWriter ( $objPHPExcel, 'Excel2007' );
+        $objWriter->setPreCalculateFormulas ( true );
+        $objWriter->save ( 'php://output' );
+        exit ();
+    }
+    /**
+     * remove special chars and words from string 
+     * @param unknown $string        	
+     */
+    private static function clearName($string, $removeWords) {
+        $string = str_replace ( ' ', '-', $string );
+        $string = preg_replace ( '/[^A-Za-z0-9\-]/', '', $string );
+        foreach ( $removeWords as $word ) {
+            $string = str_replace ( $word, '', $string );
+        }
+        $string = substr ( $string, 0, 29 );
+        return $string;
+    }
+    /**
+     * @param unknown $objPHPExcel        	
+     * @param unknown $title        	
+     */
+    static function printTitle($objPHPExcel, $title) {
+        $objPHPExcel->getActiveSheet ()->setTitle ( ExcelExport::clearName ( $title, array('ddzia') ), true );
+        $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, 1, $title );
+    }
+    /**
+     *
+     * @param unknown $objPHPExcel
+     */
+    static function newSheet($objPHPExcel, $index = -1) {
+        if ($index < 0) {
+            $index = $objPHPExcel->getSheetCount ();
+        }
+        $objPHPExcel->createSheet ( $index );
+        $objPHPExcel->setActiveSheetIndex ( $index );
+        $sheet = $objPHPExcel->getActiveSheet ();
+        return $sheet;
+    }
 	
 }
\ No newline at end of file

Spacing +44 added lines, -44 removed lines

@@ -10,60 +10,60 @@ 
 	/**
 	 */
 	public static function init() {
-		add_action ( 'admin_init', array (
+		add_action('admin_init', array(
 				'Hospitalplugin\utils\ExcelExport',
 				'excel_export' 
-		), 1 );
+		), 1);
 	}
 	/**
 	 * 
 	 */
 	public static function getColumnLetter($num) {
-		return chr ( 65 + $num );
+		return chr(65 + $num);
 	}
 	/**
 	 */
 	static function excel_export() {
-		if (! isset ( $_POST ['excel'] )) {
+		if (!isset ($_POST ['excel'])) {
 			return;
 		} else {
 			// dataSetName: Infections, Punction
 			$dataSetName = $_POST ['dataSetName'];
-			$classname = '\Hospitalplugin\utils\ExcelExport' . $dataSetName;
+			$classname = '\Hospitalplugin\utils\ExcelExport'.$dataSetName;
 		}
 		
-		$objPHPExcel = new \PHPExcel ();
-		$classname::fillData ( $objPHPExcel );
+		$objPHPExcel = new \PHPExcel();
+		$classname::fillData($objPHPExcel);
 		
-		ExcelExport::downloadExcel ( $objPHPExcel, $dataSetName . '.xlsx' );
+		ExcelExport::downloadExcel($objPHPExcel, $dataSetName.'.xlsx');
 	}
 	/**
 	 */
 	static function cellColor($objPHPExcel, $cells, $color) {
-		$objPHPExcel->getActiveSheet ()->getStyle ( $cells )->getFill ()->applyFromArray ( array (
+		$objPHPExcel->getActiveSheet()->getStyle($cells)->getFill()->applyFromArray(array(
 				'type' => \PHPExcel_Style_Fill::FILL_SOLID,
-				'startcolor' => array (
+				'startcolor' => array(
 						'rgb' => $color 
 				) 
-		) );
+		));
 	}
 	/**
 	 */
 	static function styleActiveSheet($objPHPExcel) {
-		$objPHPExcel->getActiveSheet ()->getDefaultStyle ()->getFont ()->setName ( 'Arial' )->setSize ( 8 )->setBold ( false );
-		$objPHPExcel->getActiveSheet ()->getDefaultStyle ()->getNumberFormat ()->setFormatCode ( \PHPExcel_Style_NumberFormat::FORMAT_TEXT );
-		$objPHPExcel->getActiveSheet ()->freezePane ( 'A3' );
-		$style = array (
-				'alignment' => array (
+		$objPHPExcel->getActiveSheet()->getDefaultStyle()->getFont()->setName('Arial')->setSize(8)->setBold(false);
+		$objPHPExcel->getActiveSheet()->getDefaultStyle()->getNumberFormat()->setFormatCode(\PHPExcel_Style_NumberFormat::FORMAT_TEXT);
+		$objPHPExcel->getActiveSheet()->freezePane('A3');
+		$style = array(
+				'alignment' => array(
 						'horizontal' => \PHPExcel_Style_Alignment::HORIZONTAL_CENTER,
 						'vertical' => \PHPExcel_Style_Alignment::VERTICAL_CENTER 
 				) 
 		);
-		$objWorksheet = $objPHPExcel->getActiveSheet ();
-		$objWorksheet->getDefaultStyle ()->applyFromArray ( $style );
-		$objWorksheet->getStyle ( 'A1:AA2' )->getFont ()->setBold ( true );
-		for($col = ord ( 'a' ); $col <= ord ( 'z' ); $col ++) {
-			$objWorksheet->getColumnDimension ( chr ( $col ) )->setAutoSize ( true );
+		$objWorksheet = $objPHPExcel->getActiveSheet();
+		$objWorksheet->getDefaultStyle()->applyFromArray($style);
+		$objWorksheet->getStyle('A1:AA2')->getFont()->setBold(true);
+		for ($col = ord('a'); $col <= ord('z'); $col ++) {
+			$objWorksheet->getColumnDimension(chr($col))->setAutoSize(true);
 		}
 		return $objPHPExcel;
 	}
@@ -72,19 +72,19 @@ 
 	 * @param unknown $objPHPExcel        	
 	 */
 	private static function downloadExcel($objPHPExcel, $filename) {
-		ob_end_clean ();
-		ob_start ();
-		header ( "Content-type: application/vnd.ms-excel; charset=utf-8" );
-		header ( "Content-Transfer-Encoding: binary" );
-		header ( "Content-Description: File Transfer" );
-		header ( "Content-Disposition: attachment; filename=\"" . $filename . "\"" );
-		header ( "Cache-Control: max-age=0" );
-		header ( "Expires: 0" );
-		header ( "Pragma: no-cache" );
+		ob_end_clean();
+		ob_start();
+		header("Content-type: application/vnd.ms-excel; charset=utf-8");
+		header("Content-Transfer-Encoding: binary");
+		header("Content-Description: File Transfer");
+		header("Content-Disposition: attachment; filename=\"".$filename."\"");
+		header("Cache-Control: max-age=0");
+		header("Expires: 0");
+		header("Pragma: no-cache");
 		
-		$objWriter = \PHPExcel_IOFactory::createWriter ( $objPHPExcel, 'Excel2007' );
-		$objWriter->setPreCalculateFormulas ( true );
-		$objWriter->save ( 'php://output' );
+		$objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007');
+		$objWriter->setPreCalculateFormulas(true);
+		$objWriter->save('php://output');
 		exit ();
 	}
 	/**
@@ -92,12 +92,12 @@ 
 	 * @param unknown $string        	
 	 */
 	private static function clearName($string, $removeWords) {
-		$string = str_replace ( ' ', '-', $string );
-		$string = preg_replace ( '/[^A-Za-z0-9\-]/', '', $string );
-		foreach ( $removeWords as $word ) {
-			$string = str_replace ( $word, '', $string );
+		$string = str_replace(' ', '-', $string);
+		$string = preg_replace('/[^A-Za-z0-9\-]/', '', $string);
+		foreach ($removeWords as $word) {
+			$string = str_replace($word, '', $string);
 		}
-		$string = substr ( $string, 0, 29 );
+		$string = substr($string, 0, 29);
 		return $string;
 	}
 	/**
@@ -105,8 +105,8 @@ 
 	 * @param unknown $title        	
 	 */
 	static function printTitle($objPHPExcel, $title) {
-		$objPHPExcel->getActiveSheet ()->setTitle ( ExcelExport::clearName ( $title, array('ddzia') ), true );
-		$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, 1, $title );
+		$objPHPExcel->getActiveSheet()->setTitle(ExcelExport::clearName($title, array('ddzia')), true);
+		$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow(0, 1, $title);
 	}
 	/**
 	 *
@@ -114,11 +114,11 @@ 
 	 */
 	static function newSheet($objPHPExcel, $index = -1) {
 		if ($index < 0) {
-			$index = $objPHPExcel->getSheetCount ();
+			$index = $objPHPExcel->getSheetCount();
 		}
-		$objPHPExcel->createSheet ( $index );
-		$objPHPExcel->setActiveSheetIndex ( $index );
-		$sheet = $objPHPExcel->getActiveSheet ();
+		$objPHPExcel->createSheet($index);
+		$objPHPExcel->setActiveSheetIndex($index);
+		$sheet = $objPHPExcel->getActiveSheet();
 		return $sheet;
 	}
 	

src/utils/ExcelExportInfections.php

Doc Comments +6 added lines, -1 removed lines

@@ -38,12 +38,17 @@
 		}
 		return $row;
 	}
+
+	/**
+	 * @param string $title
+	 */
 	private static function printTitle($objPHPExcel, $title) {
 		$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, 1, $title );
 	}
 	/**
 	 *
-	 * @param PHPExcel $objPHPExcel        	
+	 * @param PHPExcel $objPHPExcel
+	 * @param integer $row        	
 	 */
 	private static function printFooter($objPHPExcel, $cols, $row) {
 		$objPHPExcel->getActiveSheet ()->getStyle ( 'A' . $row . ':AA' . ($row + 1) )->getFont ()->setBold ( true );

Indentation +57 added lines, -57 removed lines

@@ -6,62 +6,62 @@
 use Hospitalplugin\Entities\Infections;
 
 class ExcelExportInfections {
-	private static function getData() {
-		$wardId = (! empty ( $_POST ['wardId'] ) ? $_POST ['wardId'] : 0);
-		$date = (! empty ( $_POST ['date'] ) ? $_POST ['date'] : (new \DateTime ())->format ( "Y-m" ));
-		$from = new \DateTime ( $date . '-01' );
-		$fromStr = $from->format ( 'Y-m-01' );
-		$toStr = $from->format ( 'Y-m-t' );
-		$infections = InfectionsCRUD::getInfections ( $fromStr, $toStr, $wardId, 'Infections' );
-		return $infections;
-	}
-	private static function getColumns() {
-		return Infections::getFields ();
-	}
-	private static function printHeaders($objPHPExcel, $cols) {
-		$count = 0;
-		foreach ( $cols as $col => $sym ) {
-			$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, 2, sprintf ( "%7s", $col ) );
-		}
-	}
-	/**
-	 */
-	private static function printData($objPHPExcel, $data, $cols) {
-		$row = 3;
-		foreach ( $data as $rowValue ) {
-			$count = 0;
-			foreach ( $cols as $col => $sym ) {
-				$value = $rowValue->$sym;
-				$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, $row, $value );
-			}
-			$row ++;
-		}
-		return $row;
-	}
-	private static function printTitle($objPHPExcel, $title) {
-		$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, 1, $title );
-	}
-	/**
-	 *
-	 * @param PHPExcel $objPHPExcel        	
-	 */
-	private static function printFooter($objPHPExcel, $cols, $row) {
-		$objPHPExcel->getActiveSheet ()->getStyle ( 'A' . $row . ':AA' . ($row + 1) )->getFont ()->setBold ( true );
-		// SUM
-		$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 1, $row, "SUMA" );
-		for($i = 2; $i < count ( $cols ); $i ++) {
-			$colLetter = chr ( 65 + $i );
-			$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $i, $row, "=sum(" . $colLetter . "3" . ":" . $colLetter . ($row - 1) . ")" );
-		}
-		ExcelExport::cellColor ( $objPHPExcel, 'A' . $row . ':AA' . ($row + 1), 'DDDDDD' );
-	}
-	static function fillData($objPHPExcel) {
-		$data = ExcelExportInfections::getData ();
-		$cols = ExcelExportInfections::getColumns ();
+    private static function getData() {
+        $wardId = (! empty ( $_POST ['wardId'] ) ? $_POST ['wardId'] : 0);
+        $date = (! empty ( $_POST ['date'] ) ? $_POST ['date'] : (new \DateTime ())->format ( "Y-m" ));
+        $from = new \DateTime ( $date . '-01' );
+        $fromStr = $from->format ( 'Y-m-01' );
+        $toStr = $from->format ( 'Y-m-t' );
+        $infections = InfectionsCRUD::getInfections ( $fromStr, $toStr, $wardId, 'Infections' );
+        return $infections;
+    }
+    private static function getColumns() {
+        return Infections::getFields ();
+    }
+    private static function printHeaders($objPHPExcel, $cols) {
+        $count = 0;
+        foreach ( $cols as $col => $sym ) {
+            $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, 2, sprintf ( "%7s", $col ) );
+        }
+    }
+    /**
+     */
+    private static function printData($objPHPExcel, $data, $cols) {
+        $row = 3;
+        foreach ( $data as $rowValue ) {
+            $count = 0;
+            foreach ( $cols as $col => $sym ) {
+                $value = $rowValue->$sym;
+                $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, $row, $value );
+            }
+            $row ++;
+        }
+        return $row;
+    }
+    private static function printTitle($objPHPExcel, $title) {
+        $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, 1, $title );
+    }
+    /**
+     *
+     * @param PHPExcel $objPHPExcel        	
+     */
+    private static function printFooter($objPHPExcel, $cols, $row) {
+        $objPHPExcel->getActiveSheet ()->getStyle ( 'A' . $row . ':AA' . ($row + 1) )->getFont ()->setBold ( true );
+        // SUM
+        $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 1, $row, "SUMA" );
+        for($i = 2; $i < count ( $cols ); $i ++) {
+            $colLetter = chr ( 65 + $i );
+            $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $i, $row, "=sum(" . $colLetter . "3" . ":" . $colLetter . ($row - 1) . ")" );
+        }
+        ExcelExport::cellColor ( $objPHPExcel, 'A' . $row . ':AA' . ($row + 1), 'DDDDDD' );
+    }
+    static function fillData($objPHPExcel) {
+        $data = ExcelExportInfections::getData ();
+        $cols = ExcelExportInfections::getColumns ();
 		
-		ExcelExportInfections::printTitle ( $objPHPExcel, "Raport" );
-		ExcelExportInfections::printHeaders ( $objPHPExcel, $cols );
-		$lastRow = ExcelExportInfections::printData ( $objPHPExcel, $data, $cols );
-		ExcelExportInfections::printFooter ( $objPHPExcel, $cols, $lastRow );
-	}
+        ExcelExportInfections::printTitle ( $objPHPExcel, "Raport" );
+        ExcelExportInfections::printHeaders ( $objPHPExcel, $cols );
+        $lastRow = ExcelExportInfections::printData ( $objPHPExcel, $data, $cols );
+        ExcelExportInfections::printFooter ( $objPHPExcel, $cols, $lastRow );
+    }
 }
\ No newline at end of file

Spacing +25 added lines, -25 removed lines

@@ -7,61 +7,61 @@
 
 class ExcelExportInfections {
 	private static function getData() {
-		$wardId = (! empty ( $_POST ['wardId'] ) ? $_POST ['wardId'] : 0);
-		$date = (! empty ( $_POST ['date'] ) ? $_POST ['date'] : (new \DateTime ())->format ( "Y-m" ));
-		$from = new \DateTime ( $date . '-01' );
-		$fromStr = $from->format ( 'Y-m-01' );
-		$toStr = $from->format ( 'Y-m-t' );
-		$infections = InfectionsCRUD::getInfections ( $fromStr, $toStr, $wardId, 'Infections' );
+		$wardId = (!empty ($_POST ['wardId']) ? $_POST ['wardId'] : 0);
+		$date = (!empty ($_POST ['date']) ? $_POST ['date'] : (new \DateTime())->format("Y-m"));
+		$from = new \DateTime($date.'-01');
+		$fromStr = $from->format('Y-m-01');
+		$toStr = $from->format('Y-m-t');
+		$infections = InfectionsCRUD::getInfections($fromStr, $toStr, $wardId, 'Infections');
 		return $infections;
 	}
 	private static function getColumns() {
-		return Infections::getFields ();
+		return Infections::getFields();
 	}
 	private static function printHeaders($objPHPExcel, $cols) {
 		$count = 0;
-		foreach ( $cols as $col => $sym ) {
-			$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, 2, sprintf ( "%7s", $col ) );
+		foreach ($cols as $col => $sym) {
+			$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow($count ++, 2, sprintf("%7s", $col));
 		}
 	}
 	/**
 	 */
 	private static function printData($objPHPExcel, $data, $cols) {
 		$row = 3;
-		foreach ( $data as $rowValue ) {
+		foreach ($data as $rowValue) {
 			$count = 0;
-			foreach ( $cols as $col => $sym ) {
+			foreach ($cols as $col => $sym) {
 				$value = $rowValue->$sym;
-				$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, $row, $value );
+				$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow($count ++, $row, $value);
 			}
 			$row ++;
 		}
 		return $row;
 	}
 	private static function printTitle($objPHPExcel, $title) {
-		$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, 1, $title );
+		$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow(0, 1, $title);
 	}
 	/**
 	 *
 	 * @param PHPExcel $objPHPExcel        	
 	 */
 	private static function printFooter($objPHPExcel, $cols, $row) {
-		$objPHPExcel->getActiveSheet ()->getStyle ( 'A' . $row . ':AA' . ($row + 1) )->getFont ()->setBold ( true );
+		$objPHPExcel->getActiveSheet()->getStyle('A'.$row.':AA'.($row + 1))->getFont()->setBold(true);
 		// SUM
-		$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 1, $row, "SUMA" );
-		for($i = 2; $i < count ( $cols ); $i ++) {
-			$colLetter = chr ( 65 + $i );
-			$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $i, $row, "=sum(" . $colLetter . "3" . ":" . $colLetter . ($row - 1) . ")" );
+		$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow(1, $row, "SUMA");
+		for ($i = 2; $i < count($cols); $i ++) {
+			$colLetter = chr(65 + $i);
+			$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow($i, $row, "=sum(".$colLetter."3".":".$colLetter.($row - 1).")");
 		}
-		ExcelExport::cellColor ( $objPHPExcel, 'A' . $row . ':AA' . ($row + 1), 'DDDDDD' );
+		ExcelExport::cellColor($objPHPExcel, 'A'.$row.':AA'.($row + 1), 'DDDDDD');
 	}
 	static function fillData($objPHPExcel) {
-		$data = ExcelExportInfections::getData ();
-		$cols = ExcelExportInfections::getColumns ();
+		$data = ExcelExportInfections::getData();
+		$cols = ExcelExportInfections::getColumns();
 		
-		ExcelExportInfections::printTitle ( $objPHPExcel, "Raport" );
-		ExcelExportInfections::printHeaders ( $objPHPExcel, $cols );
-		$lastRow = ExcelExportInfections::printData ( $objPHPExcel, $data, $cols );
-		ExcelExportInfections::printFooter ( $objPHPExcel, $cols, $lastRow );
+		ExcelExportInfections::printTitle($objPHPExcel, "Raport");
+		ExcelExportInfections::printHeaders($objPHPExcel, $cols);
+		$lastRow = ExcelExportInfections::printData($objPHPExcel, $data, $cols);
+		ExcelExportInfections::printFooter($objPHPExcel, $cols, $lastRow);
 	}
 }
\ No newline at end of file

src/utils/ExcelExportPunction.php

Doc Comments +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 	/**
 	 *
 	 * @param unknown $objPHPExcel        	
-	 * @param unknown $cols        	
+	 * @param string[] $cols        	
 	 */
 	private static function printHeaders($objPHPExcel, $cols) {
 		$count = 1;

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
 
 namespace Hospitalplugin\utils;
 
-use Hospitalplugin\Entities\InfectionsCRUD;
-use Hospitalplugin\Entities\Infections;
 use Hospitalplugin\Entities\PatientRaport;
 use Hospitalplugin\Entities\WardCRUD;
 

Indentation +128 added lines, -128 removed lines

@@ -9,133 +9,133 @@
 
 class ExcelExportPunction {
 	
-	/**
-	 *
-	 * @param unknown $id        	
-	 */
-	private static function getData($id, $type) {
-		$raport = PatientRaport::getRaportBetweenDates ( $id, $type, '2014-06-01', (new \DateTime ())->format ( "Y-m-d" ) );
-		return $raport;
-	}
-	/**
-	 *
-	 * @param unknown $objPHPExcel        	
-	 * @param unknown $cols        	
-	 */
-	private static function printHeaders($objPHPExcel, $cols) {
-		$count = 1;
-		$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, 2, "Data" );
-		foreach ( $cols as $col ) {
-			$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, 2, sprintf ( "%7s", $col ) );
-		}
-	}
-	/**
-	 */
-	private static function printData($objPHPExcel, $data, $type) {
-		$row = 3;
-		$lastColumn = 1;
-		$colNumberOfPatients = ExcelExport::getColumnLetter ( 1 );
-		$indexes = PatientRaport::getIndexes ( $type );
-		foreach ( $data as $rowKey => $rowValue ) {
-			// 1 col: date
-			$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, $row, json_encode ( $rowKey ) );
-			$count = 1;
-			// 2-5 cols: N1 N2 N3 N0
-			foreach ( $indexes as $index ) {
-				$value = isset ( $rowValue [$index] ) ? $rowValue [$index] : "0";
-				$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, $row, $value );
-			}
-			// 6 col: num of categorized (N = N1+N2+N3)
-			$colHighestCategory = ExcelExport::getColumnLetter ( $count - 2 );
-			$colNumberOfPatients = ExcelExport::getColumnLetter ( $count );
-			$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, $row, '=SUM(B' . $row . ':' . $colHighestCategory . $row . ')' );
-			$tpb = PatientRaport::getTpb ( $type );
-			// 7-11 tpb1, tpb2, tpb3, 0 (no-cat), 2 (add)
-			foreach ( $tpb as $tpbn ) {
-				$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, $row, $tpbn );
-			}
-			// 9-11: Tpb1*N1,Tpb2*N2,Tpb3*N3+2xN
-			$tpbSize = count ( $tpb );
-			foreach ( $tpb as $tpbn ) {
-				$col1Letter = ExcelExport::getColumnLetter ( $count - 2 * $tpbSize );
-				$col2Letter = ExcelExport::getColumnLetter ( $count - $tpbSize );
-				$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, $row, '=' . $col1Letter . $row . "*" . $col2Letter . $row );
-			}
-			// SUM Tpb
-			$col3Letter = ExcelExport::getColumnLetter ( $count - $tpbSize );
-			$col4Letter = ExcelExport::getColumnLetter ( $count - 1 );
-			$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, $row, '=SUM(' . $col3Letter . $row . ":" . $col4Letter . $row . ")" );
-			$row ++;
-			$lastColumn = $count - 1;
-		}
-		// number of categorization days
-		$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 1, 1, '=COUNTIFS(' . $colNumberOfPatients . '3:' . $colNumberOfPatients . ($row - 1) . ',">0")' );
-		// sum
-		$col5Letter = ExcelExport::getColumnLetter ( $lastColumn );
-		$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 2, 1, '=SUM(' . $col5Letter . '3:' . $col5Letter . ($row - 1) . ')/60' );
-		return $row;
-	}
+    /**
+     *
+     * @param unknown $id        	
+     */
+    private static function getData($id, $type) {
+        $raport = PatientRaport::getRaportBetweenDates ( $id, $type, '2014-06-01', (new \DateTime ())->format ( "Y-m-d" ) );
+        return $raport;
+    }
+    /**
+     *
+     * @param unknown $objPHPExcel        	
+     * @param unknown $cols        	
+     */
+    private static function printHeaders($objPHPExcel, $cols) {
+        $count = 1;
+        $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, 2, "Data" );
+        foreach ( $cols as $col ) {
+            $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, 2, sprintf ( "%7s", $col ) );
+        }
+    }
+    /**
+     */
+    private static function printData($objPHPExcel, $data, $type) {
+        $row = 3;
+        $lastColumn = 1;
+        $colNumberOfPatients = ExcelExport::getColumnLetter ( 1 );
+        $indexes = PatientRaport::getIndexes ( $type );
+        foreach ( $data as $rowKey => $rowValue ) {
+            // 1 col: date
+            $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, $row, json_encode ( $rowKey ) );
+            $count = 1;
+            // 2-5 cols: N1 N2 N3 N0
+            foreach ( $indexes as $index ) {
+                $value = isset ( $rowValue [$index] ) ? $rowValue [$index] : "0";
+                $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, $row, $value );
+            }
+            // 6 col: num of categorized (N = N1+N2+N3)
+            $colHighestCategory = ExcelExport::getColumnLetter ( $count - 2 );
+            $colNumberOfPatients = ExcelExport::getColumnLetter ( $count );
+            $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, $row, '=SUM(B' . $row . ':' . $colHighestCategory . $row . ')' );
+            $tpb = PatientRaport::getTpb ( $type );
+            // 7-11 tpb1, tpb2, tpb3, 0 (no-cat), 2 (add)
+            foreach ( $tpb as $tpbn ) {
+                $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, $row, $tpbn );
+            }
+            // 9-11: Tpb1*N1,Tpb2*N2,Tpb3*N3+2xN
+            $tpbSize = count ( $tpb );
+            foreach ( $tpb as $tpbn ) {
+                $col1Letter = ExcelExport::getColumnLetter ( $count - 2 * $tpbSize );
+                $col2Letter = ExcelExport::getColumnLetter ( $count - $tpbSize );
+                $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, $row, '=' . $col1Letter . $row . "*" . $col2Letter . $row );
+            }
+            // SUM Tpb
+            $col3Letter = ExcelExport::getColumnLetter ( $count - $tpbSize );
+            $col4Letter = ExcelExport::getColumnLetter ( $count - 1 );
+            $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, $row, '=SUM(' . $col3Letter . $row . ":" . $col4Letter . $row . ")" );
+            $row ++;
+            $lastColumn = $count - 1;
+        }
+        // number of categorization days
+        $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 1, 1, '=COUNTIFS(' . $colNumberOfPatients . '3:' . $colNumberOfPatients . ($row - 1) . ',">0")' );
+        // sum
+        $col5Letter = ExcelExport::getColumnLetter ( $lastColumn );
+        $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 2, 1, '=SUM(' . $col5Letter . '3:' . $col5Letter . ($row - 1) . ')/60' );
+        return $row;
+    }
 	
-	/**
-	 *
-	 * @param unknown $objPHPExcel        	
-	 */
-	static function fillSummary($objPHPExcel) {
-		ExcelExport::newSheet ( $objPHPExcel, 0 );
-		ExcelExport::printTitle ( $objPHPExcel, "Raport" );
-		$sheetCount = $objPHPExcel->getSheetCount ();
-		$objPHPExcel->getActiveSheet ()->setCellValue ( 'A2', 'Oddz.' );
-		$objPHPExcel->getActiveSheet ()->setCellValue ( 'B2', 'Dni' );
-		$objPHPExcel->getActiveSheet ()->setCellValue ( 'C2', 'Tpb' );
-		$objPHPExcel->getActiveSheet ()->setCellValue ( 'D2', 'Tśpb' );
-		$objPHPExcel->getActiveSheet ()->setCellValue ( 'E2', 'Tśpc*' );
-		$objPHPExcel->getActiveSheet ()->setCellValue ( 'F2', 'Tśpc**' );
-		$objPHPExcel->getActiveSheet ()->setCellValue ( 'G2', 'Td***' );
-		$objPHPExcel->getActiveSheet ()->setCellValue ( 'H2', 'Le*' );
-		$objPHPExcel->getActiveSheet ()->setCellValue ( 'I2', 'Le**' );
-		for($i = 1; $i < $sheetCount; $i ++) {
-			$loadedSheetNames = $objPHPExcel->getSheetNames ();
-			foreach ( $loadedSheetNames as $sheetIndex => $loadedSheetName ) {
-				if ($sheetIndex == 0) {
-					continue;
-				}
-				$row = $sheetIndex + 2;
-				$objPHPExcel->getActiveSheet ()->setCellValue ( 'A' . $row, "='" . $loadedSheetName . "'!A1" );
-				$objPHPExcel->getActiveSheet ()->setCellValue ( 'B' . $row, "='" . $loadedSheetName . "'!B1" );
-				$objPHPExcel->getActiveSheet ()->setCellValue ( 'C' . $row, "='" . $loadedSheetName . "'!C1" );
-				$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 3, $row, "=IF(C" . $row . ">0,C" . $row . "/B" . $row . ",0)" );
-				$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 4, $row, "=D" . $row . "*110%" );
-				$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 5, $row, "=D" . $row . "*125%" );
-				$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 6, $row, "1531" );
-				$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 7, $row, "=IF(E" . $row . ">0,E" . $row . "*365/G" . $row . ",\"-\")" );
-				$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 8, $row, "=IF(F" . $row . ">0,F" . $row . "*365/G" . $row . ",\"-\")" );
-			}
-			$objPHPExcel->getActiveSheet ()->getStyle ( 'C3:I100' )->getNumberFormat ()->setFormatCode ( '#,##0.0' );
-			$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, $row + 1, "* Czas pielęgnacji pośredniej jako 10% czasu pielęgnacji bezpośredniej" );
-			$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, $row + 2, "** Czas pielęgnacji pośredniej jako 25% czasu pielęgnacji bezpośredniej" );
-			$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, $row + 3, "*** Czas dyspozycyjny - propozycja z Rozporządzenia MZ: 202 dni x 7,58 h" );
-			ExcelExport::styleActiveSheet ( $objPHPExcel );
-		}
-	}
-	static function fillData($objPHPExcel) {
-		// no time limit for this script
-		set_time_limit ( 0 );
-		$time_start = microtime ( true );
-		// remove first default sheet
-		$objPHPExcel->removeSheetByIndex ( 0 );
-		// get wards
-		$wards = WardCRUD::getWardsArray ();
-		foreach ( $wards as $ward ) {
-			ExcelExport::newSheet ( $objPHPExcel );
-			$wardName = $ward->name . " (" . $ward->getTypOddzialu () . ")";
-			ExcelExport::printTitle ( $objPHPExcel, $wardName );
-			$data = ExcelExportPunction::getData ( $ward->id, $ward->getTypOddzialu () );
-			$cols = PatientRaport::getColumns ( $ward->getTypOddzialu () );
-			ExcelExportPunction::printHeaders ( $objPHPExcel, $cols );
-			ExcelExportPunction::printData ( $objPHPExcel, $data, $ward->getTypOddzialu () );
-			ExcelExport::styleActiveSheet ( $objPHPExcel );
-		}
-		ExcelExportPunction::fillSummary ( $objPHPExcel );
-		$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, 100, "summary " . ($time_start - microtime ( true )) . " s" );
-	}
+    /**
+     *
+     * @param unknown $objPHPExcel        	
+     */
+    static function fillSummary($objPHPExcel) {
+        ExcelExport::newSheet ( $objPHPExcel, 0 );
+        ExcelExport::printTitle ( $objPHPExcel, "Raport" );
+        $sheetCount = $objPHPExcel->getSheetCount ();
+        $objPHPExcel->getActiveSheet ()->setCellValue ( 'A2', 'Oddz.' );
+        $objPHPExcel->getActiveSheet ()->setCellValue ( 'B2', 'Dni' );
+        $objPHPExcel->getActiveSheet ()->setCellValue ( 'C2', 'Tpb' );
+        $objPHPExcel->getActiveSheet ()->setCellValue ( 'D2', 'Tśpb' );
+        $objPHPExcel->getActiveSheet ()->setCellValue ( 'E2', 'Tśpc*' );
+        $objPHPExcel->getActiveSheet ()->setCellValue ( 'F2', 'Tśpc**' );
+        $objPHPExcel->getActiveSheet ()->setCellValue ( 'G2', 'Td***' );
+        $objPHPExcel->getActiveSheet ()->setCellValue ( 'H2', 'Le*' );
+        $objPHPExcel->getActiveSheet ()->setCellValue ( 'I2', 'Le**' );
+        for($i = 1; $i < $sheetCount; $i ++) {
+            $loadedSheetNames = $objPHPExcel->getSheetNames ();
+            foreach ( $loadedSheetNames as $sheetIndex => $loadedSheetName ) {
+                if ($sheetIndex == 0) {
+                    continue;
+                }
+                $row = $sheetIndex + 2;
+                $objPHPExcel->getActiveSheet ()->setCellValue ( 'A' . $row, "='" . $loadedSheetName . "'!A1" );
+                $objPHPExcel->getActiveSheet ()->setCellValue ( 'B' . $row, "='" . $loadedSheetName . "'!B1" );
+                $objPHPExcel->getActiveSheet ()->setCellValue ( 'C' . $row, "='" . $loadedSheetName . "'!C1" );
+                $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 3, $row, "=IF(C" . $row . ">0,C" . $row . "/B" . $row . ",0)" );
+                $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 4, $row, "=D" . $row . "*110%" );
+                $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 5, $row, "=D" . $row . "*125%" );
+                $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 6, $row, "1531" );
+                $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 7, $row, "=IF(E" . $row . ">0,E" . $row . "*365/G" . $row . ",\"-\")" );
+                $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 8, $row, "=IF(F" . $row . ">0,F" . $row . "*365/G" . $row . ",\"-\")" );
+            }
+            $objPHPExcel->getActiveSheet ()->getStyle ( 'C3:I100' )->getNumberFormat ()->setFormatCode ( '#,##0.0' );
+            $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, $row + 1, "* Czas pielęgnacji pośredniej jako 10% czasu pielęgnacji bezpośredniej" );
+            $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, $row + 2, "** Czas pielęgnacji pośredniej jako 25% czasu pielęgnacji bezpośredniej" );
+            $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, $row + 3, "*** Czas dyspozycyjny - propozycja z Rozporządzenia MZ: 202 dni x 7,58 h" );
+            ExcelExport::styleActiveSheet ( $objPHPExcel );
+        }
+    }
+    static function fillData($objPHPExcel) {
+        // no time limit for this script
+        set_time_limit ( 0 );
+        $time_start = microtime ( true );
+        // remove first default sheet
+        $objPHPExcel->removeSheetByIndex ( 0 );
+        // get wards
+        $wards = WardCRUD::getWardsArray ();
+        foreach ( $wards as $ward ) {
+            ExcelExport::newSheet ( $objPHPExcel );
+            $wardName = $ward->name . " (" . $ward->getTypOddzialu () . ")";
+            ExcelExport::printTitle ( $objPHPExcel, $wardName );
+            $data = ExcelExportPunction::getData ( $ward->id, $ward->getTypOddzialu () );
+            $cols = PatientRaport::getColumns ( $ward->getTypOddzialu () );
+            ExcelExportPunction::printHeaders ( $objPHPExcel, $cols );
+            ExcelExportPunction::printData ( $objPHPExcel, $data, $ward->getTypOddzialu () );
+            ExcelExport::styleActiveSheet ( $objPHPExcel );
+        }
+        ExcelExportPunction::fillSummary ( $objPHPExcel );
+        $objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, 100, "summary " . ($time_start - microtime ( true )) . " s" );
+    }
 }
\ No newline at end of file

Spacing +72 added lines, -72 removed lines

@@ -14,7 +14,7 @@ 
 	 * @param unknown $id        	
 	 */
 	private static function getData($id, $type) {
-		$raport = PatientRaport::getRaportBetweenDates ( $id, $type, '2014-06-01', (new \DateTime ())->format ( "Y-m-d" ) );
+		$raport = PatientRaport::getRaportBetweenDates($id, $type, '2014-06-01', (new \DateTime())->format("Y-m-d"));
 		return $raport;
 	}
 	/**
@@ -24,9 +24,9 @@ 
 	 */
 	private static function printHeaders($objPHPExcel, $cols) {
 		$count = 1;
-		$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, 2, "Data" );
-		foreach ( $cols as $col ) {
-			$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, 2, sprintf ( "%7s", $col ) );
+		$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow(0, 2, "Data");
+		foreach ($cols as $col) {
+			$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow($count ++, 2, sprintf("%7s", $col));
 		}
 	}
 	/**
@@ -34,45 +34,45 @@ 
 	private static function printData($objPHPExcel, $data, $type) {
 		$row = 3;
 		$lastColumn = 1;
-		$colNumberOfPatients = ExcelExport::getColumnLetter ( 1 );
-		$indexes = PatientRaport::getIndexes ( $type );
-		foreach ( $data as $rowKey => $rowValue ) {
+		$colNumberOfPatients = ExcelExport::getColumnLetter(1);
+		$indexes = PatientRaport::getIndexes($type);
+		foreach ($data as $rowKey => $rowValue) {
 			// 1 col: date
-			$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, $row, json_encode ( $rowKey ) );
+			$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow(0, $row, json_encode($rowKey));
 			$count = 1;
 			// 2-5 cols: N1 N2 N3 N0
-			foreach ( $indexes as $index ) {
-				$value = isset ( $rowValue [$index] ) ? $rowValue [$index] : "0";
-				$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, $row, $value );
+			foreach ($indexes as $index) {
+				$value = isset ($rowValue [$index]) ? $rowValue [$index] : "0";
+				$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow($count ++, $row, $value);
 			}
 			// 6 col: num of categorized (N = N1+N2+N3)
-			$colHighestCategory = ExcelExport::getColumnLetter ( $count - 2 );
-			$colNumberOfPatients = ExcelExport::getColumnLetter ( $count );
-			$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, $row, '=SUM(B' . $row . ':' . $colHighestCategory . $row . ')' );
-			$tpb = PatientRaport::getTpb ( $type );
+			$colHighestCategory = ExcelExport::getColumnLetter($count - 2);
+			$colNumberOfPatients = ExcelExport::getColumnLetter($count);
+			$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow($count ++, $row, '=SUM(B'.$row.':'.$colHighestCategory.$row.')');
+			$tpb = PatientRaport::getTpb($type);
 			// 7-11 tpb1, tpb2, tpb3, 0 (no-cat), 2 (add)
-			foreach ( $tpb as $tpbn ) {
-				$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, $row, $tpbn );
+			foreach ($tpb as $tpbn) {
+				$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow($count ++, $row, $tpbn);
 			}
 			// 9-11: Tpb1*N1,Tpb2*N2,Tpb3*N3+2xN
-			$tpbSize = count ( $tpb );
-			foreach ( $tpb as $tpbn ) {
-				$col1Letter = ExcelExport::getColumnLetter ( $count - 2 * $tpbSize );
-				$col2Letter = ExcelExport::getColumnLetter ( $count - $tpbSize );
-				$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, $row, '=' . $col1Letter . $row . "*" . $col2Letter . $row );
+			$tpbSize = count($tpb);
+			foreach ($tpb as $tpbn) {
+				$col1Letter = ExcelExport::getColumnLetter($count - 2 * $tpbSize);
+				$col2Letter = ExcelExport::getColumnLetter($count - $tpbSize);
+				$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow($count ++, $row, '='.$col1Letter.$row."*".$col2Letter.$row);
 			}
 			// SUM Tpb
-			$col3Letter = ExcelExport::getColumnLetter ( $count - $tpbSize );
-			$col4Letter = ExcelExport::getColumnLetter ( $count - 1 );
-			$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( $count ++, $row, '=SUM(' . $col3Letter . $row . ":" . $col4Letter . $row . ")" );
+			$col3Letter = ExcelExport::getColumnLetter($count - $tpbSize);
+			$col4Letter = ExcelExport::getColumnLetter($count - 1);
+			$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow($count ++, $row, '=SUM('.$col3Letter.$row.":".$col4Letter.$row.")");
 			$row ++;
 			$lastColumn = $count - 1;
 		}
 		// number of categorization days
-		$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 1, 1, '=COUNTIFS(' . $colNumberOfPatients . '3:' . $colNumberOfPatients . ($row - 1) . ',">0")' );
+		$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow(1, 1, '=COUNTIFS('.$colNumberOfPatients.'3:'.$colNumberOfPatients.($row - 1).',">0")');
 		// sum
-		$col5Letter = ExcelExport::getColumnLetter ( $lastColumn );
-		$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 2, 1, '=SUM(' . $col5Letter . '3:' . $col5Letter . ($row - 1) . ')/60' );
+		$col5Letter = ExcelExport::getColumnLetter($lastColumn);
+		$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow(2, 1, '=SUM('.$col5Letter.'3:'.$col5Letter.($row - 1).')/60');
 		return $row;
 	}
 	
@@ -81,61 +81,61 @@ 
 	 * @param unknown $objPHPExcel        	
 	 */
 	static function fillSummary($objPHPExcel) {
-		ExcelExport::newSheet ( $objPHPExcel, 0 );
-		ExcelExport::printTitle ( $objPHPExcel, "Raport" );
-		$sheetCount = $objPHPExcel->getSheetCount ();
-		$objPHPExcel->getActiveSheet ()->setCellValue ( 'A2', 'Oddz.' );
-		$objPHPExcel->getActiveSheet ()->setCellValue ( 'B2', 'Dni' );
-		$objPHPExcel->getActiveSheet ()->setCellValue ( 'C2', 'Tpb' );
-		$objPHPExcel->getActiveSheet ()->setCellValue ( 'D2', 'Tśpb' );
-		$objPHPExcel->getActiveSheet ()->setCellValue ( 'E2', 'Tśpc*' );
-		$objPHPExcel->getActiveSheet ()->setCellValue ( 'F2', 'Tśpc**' );
-		$objPHPExcel->getActiveSheet ()->setCellValue ( 'G2', 'Td***' );
-		$objPHPExcel->getActiveSheet ()->setCellValue ( 'H2', 'Le*' );
-		$objPHPExcel->getActiveSheet ()->setCellValue ( 'I2', 'Le**' );
-		for($i = 1; $i < $sheetCount; $i ++) {
-			$loadedSheetNames = $objPHPExcel->getSheetNames ();
-			foreach ( $loadedSheetNames as $sheetIndex => $loadedSheetName ) {
+		ExcelExport::newSheet($objPHPExcel, 0);
+		ExcelExport::printTitle($objPHPExcel, "Raport");
+		$sheetCount = $objPHPExcel->getSheetCount();
+		$objPHPExcel->getActiveSheet()->setCellValue('A2', 'Oddz.');
+		$objPHPExcel->getActiveSheet()->setCellValue('B2', 'Dni');
+		$objPHPExcel->getActiveSheet()->setCellValue('C2', 'Tpb');
+		$objPHPExcel->getActiveSheet()->setCellValue('D2', 'Tśpb');
+		$objPHPExcel->getActiveSheet()->setCellValue('E2', 'Tśpc*');
+		$objPHPExcel->getActiveSheet()->setCellValue('F2', 'Tśpc**');
+		$objPHPExcel->getActiveSheet()->setCellValue('G2', 'Td***');
+		$objPHPExcel->getActiveSheet()->setCellValue('H2', 'Le*');
+		$objPHPExcel->getActiveSheet()->setCellValue('I2', 'Le**');
+		for ($i = 1; $i < $sheetCount; $i ++) {
+			$loadedSheetNames = $objPHPExcel->getSheetNames();
+			foreach ($loadedSheetNames as $sheetIndex => $loadedSheetName) {
 				if ($sheetIndex == 0) {
 					continue;
 				}
 				$row = $sheetIndex + 2;
-				$objPHPExcel->getActiveSheet ()->setCellValue ( 'A' . $row, "='" . $loadedSheetName . "'!A1" );
-				$objPHPExcel->getActiveSheet ()->setCellValue ( 'B' . $row, "='" . $loadedSheetName . "'!B1" );
-				$objPHPExcel->getActiveSheet ()->setCellValue ( 'C' . $row, "='" . $loadedSheetName . "'!C1" );
-				$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 3, $row, "=IF(C" . $row . ">0,C" . $row . "/B" . $row . ",0)" );
-				$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 4, $row, "=D" . $row . "*110%" );
-				$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 5, $row, "=D" . $row . "*125%" );
-				$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 6, $row, "1531" );
-				$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 7, $row, "=IF(E" . $row . ">0,E" . $row . "*365/G" . $row . ",\"-\")" );
-				$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 8, $row, "=IF(F" . $row . ">0,F" . $row . "*365/G" . $row . ",\"-\")" );
+				$objPHPExcel->getActiveSheet()->setCellValue('A'.$row, "='".$loadedSheetName."'!A1");
+				$objPHPExcel->getActiveSheet()->setCellValue('B'.$row, "='".$loadedSheetName."'!B1");
+				$objPHPExcel->getActiveSheet()->setCellValue('C'.$row, "='".$loadedSheetName."'!C1");
+				$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow(3, $row, "=IF(C".$row.">0,C".$row."/B".$row.",0)");
+				$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow(4, $row, "=D".$row."*110%");
+				$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow(5, $row, "=D".$row."*125%");
+				$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow(6, $row, "1531");
+				$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow(7, $row, "=IF(E".$row.">0,E".$row."*365/G".$row.",\"-\")");
+				$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow(8, $row, "=IF(F".$row.">0,F".$row."*365/G".$row.",\"-\")");
 			}
-			$objPHPExcel->getActiveSheet ()->getStyle ( 'C3:I100' )->getNumberFormat ()->setFormatCode ( '#,##0.0' );
-			$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, $row + 1, "* Czas pielęgnacji pośredniej jako 10% czasu pielęgnacji bezpośredniej" );
-			$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, $row + 2, "** Czas pielęgnacji pośredniej jako 25% czasu pielęgnacji bezpośredniej" );
-			$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, $row + 3, "*** Czas dyspozycyjny - propozycja z Rozporządzenia MZ: 202 dni x 7,58 h" );
-			ExcelExport::styleActiveSheet ( $objPHPExcel );
+			$objPHPExcel->getActiveSheet()->getStyle('C3:I100')->getNumberFormat()->setFormatCode('#,##0.0');
+			$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow(0, $row + 1, "* Czas pielęgnacji pośredniej jako 10% czasu pielęgnacji bezpośredniej");
+			$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow(0, $row + 2, "** Czas pielęgnacji pośredniej jako 25% czasu pielęgnacji bezpośredniej");
+			$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow(0, $row + 3, "*** Czas dyspozycyjny - propozycja z Rozporządzenia MZ: 202 dni x 7,58 h");
+			ExcelExport::styleActiveSheet($objPHPExcel);
 		}
 	}
 	static function fillData($objPHPExcel) {
 		// no time limit for this script
-		set_time_limit ( 0 );
-		$time_start = microtime ( true );
+		set_time_limit(0);
+		$time_start = microtime(true);
 		// remove first default sheet
-		$objPHPExcel->removeSheetByIndex ( 0 );
+		$objPHPExcel->removeSheetByIndex(0);
 		// get wards
-		$wards = WardCRUD::getWardsArray ();
-		foreach ( $wards as $ward ) {
-			ExcelExport::newSheet ( $objPHPExcel );
-			$wardName = $ward->name . " (" . $ward->getTypOddzialu () . ")";
-			ExcelExport::printTitle ( $objPHPExcel, $wardName );
-			$data = ExcelExportPunction::getData ( $ward->id, $ward->getTypOddzialu () );
-			$cols = PatientRaport::getColumns ( $ward->getTypOddzialu () );
-			ExcelExportPunction::printHeaders ( $objPHPExcel, $cols );
-			ExcelExportPunction::printData ( $objPHPExcel, $data, $ward->getTypOddzialu () );
-			ExcelExport::styleActiveSheet ( $objPHPExcel );
+		$wards = WardCRUD::getWardsArray();
+		foreach ($wards as $ward) {
+			ExcelExport::newSheet($objPHPExcel);
+			$wardName = $ward->name." (".$ward->getTypOddzialu().")";
+			ExcelExport::printTitle($objPHPExcel, $wardName);
+			$data = ExcelExportPunction::getData($ward->id, $ward->getTypOddzialu());
+			$cols = PatientRaport::getColumns($ward->getTypOddzialu());
+			ExcelExportPunction::printHeaders($objPHPExcel, $cols);
+			ExcelExportPunction::printData($objPHPExcel, $data, $ward->getTypOddzialu());
+			ExcelExport::styleActiveSheet($objPHPExcel);
 		}
-		ExcelExportPunction::fillSummary ( $objPHPExcel );
-		$objPHPExcel->getActiveSheet ()->setCellValueByColumnAndRow ( 0, 100, "summary " . ($time_start - microtime ( true )) . " s" );
+		ExcelExportPunction::fillSummary($objPHPExcel);
+		$objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow(0, 100, "summary ".($time_start - microtime(true))." s");
 	}
 }
\ No newline at end of file

src/utils/PersonGenerator.php

Doc Comments +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
     private static $fnames;
 
     /**
-     * @return \Hospitalplugin\Entities\Patient
+     * @return string
 	 */
     public static function getRandomPerson()
     {
@@ -70,8 +70,8 @@ 
     }
 
     /**
-     * @param unknown $haystack
-     * @param unknown $needle
+     * @param string $haystack
+     * @param string $needle
      * @return boolean
      */
     static function endsWith($haystack, $needle)

Unused Use Statements -1 removed lines

@@ -24,7 +24,6 @@
 namespace Hospitalplugin\utils;
 
 use Hospitalplugin\Entities\Patient;
-use Hospitalplugin\Entities\PatientZZ;
 
 /**
  * PersonGenerator

Indentation +30 added lines, -30 removed lines

@@ -1,26 +1,26 @@ 
 <?php
 /**
- * PersonGenerator
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose, provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- *
- * @category  Wp
- * @package   Punction
- * @author    Andrzej Marcinkowski <andrzej.max.marcinkowski@gmail.com>
- * @copyright 2014 Wojewódzki Szpital Zespolony, Kalisz
- * @license   MIT http://opensource.org/licenses/MIT
- * @version   1.0 $Id: a88997670673063e272ee5666aa86ed1ec9a1561 $ $Format:%H$
- * @link      http://
- * @since     File available since Release 1.0.0
- * PHP Version 5
- */
+     * PersonGenerator
+     *
+     * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
+     * OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
+     *
+     * Permission is hereby granted to use or copy this program
+     * for any purpose, provided the above notices are retained on all copies.
+     * Permission to modify the code and to distribute modified code is granted,
+     * provided the above notices are retained, and a notice that the code was
+     * modified is included with the above copyright notice.
+     *
+     * @category  Wp
+     * @package   Punction
+     * @author    Andrzej Marcinkowski <andrzej.max.marcinkowski@gmail.com>
+     * @copyright 2014 Wojewódzki Szpital Zespolony, Kalisz
+     * @license   MIT http://opensource.org/licenses/MIT
+     * @version   1.0 $Id: a88997670673063e272ee5666aa86ed1ec9a1561 $ $Format:%H$
+     * @link      http://
+     * @since     File available since Release 1.0.0
+     * PHP Version 5
+     */
 namespace Hospitalplugin\utils;
 
 use Hospitalplugin\Entities\Patient;
@@ -50,7 +50,7 @@ 
 
     /**
      * @return \Hospitalplugin\Entities\Patient
-	 */
+     */
     public static function getRandomPerson()
     {
         // TODO extract paths
@@ -93,11 +93,11 @@ 
     }
 
     /**
-	 *
-	 * @param $date        	
-	 * @param $sex
-	 *        	'm' / 'f'
-	 */
+     *
+     * @param $date        	
+     * @param $sex
+     *        	'm' / 'f'
+     */
     public static function getRandomPesel($date, $sex = 'm')
     {
         $datetime = new \DateTime($date);
@@ -125,8 +125,8 @@ 
         $intSum = 0;
         for ($i = 0; $i < 10; $i ++) {
             $intSum += $arrSteps[$i] * $x[$i]; // mnożymy każdy ze znaków
-                                                   // przez wagć i sumujemy
-                                                   // wszystko
+                                                    // przez wagć i sumujemy
+                                                    // wszystko
         }
         $int = 10 - $intSum % 10; // obliczamy sumć kontrolną
         $intControlNr = ($int == 10) ? 0 : $int;
@@ -139,7 +139,7 @@ 
      * 
      * @param unknown $arr
      * @return string random element
-	 */
+     */
     public static function getRandom($arr)
     {
         return implode('', $arr[array_rand($arr)]);

Spacing +6 added lines, -6 removed lines

@@ -54,19 +54,19 @@ 
     public static function getRandomPerson()
     {
         // TODO extract paths
-        self::$names = Utils::readFileToArray(__DIR__ . '/../../resources/pl_names.csv');
-        self::$mnames = Utils::readFileToArray(__DIR__ . '/../../resources/pl_mnames.csv');
-        self::$fnames = Utils::readFileToArray(__DIR__ . '/../../resources/pl_fnames.csv');
+        self::$names = Utils::readFileToArray(__DIR__.'/../../resources/pl_names.csv');
+        self::$mnames = Utils::readFileToArray(__DIR__.'/../../resources/pl_mnames.csv');
+        self::$fnames = Utils::readFileToArray(__DIR__.'/../../resources/pl_fnames.csv');
         // var_dump(self::$mnames);
         $sex = (rand(0, 1) == 0 ? 'm' : 'f');
         $firstname = ($sex == 'm' ? self::getRandom(self::$mnames) : self::getRandom(self::$fnames));
         $lastname = self::getRandom(self::$names);
         if ($sex == 'f' && self::endsWith($lastname, 'i')) {
-            $lastname = rtrim($lastname, "i") . 'a';
+            $lastname = rtrim($lastname, "i").'a';
         }
         $bdate = self::getRandomBirthDate();
         $pesel = self::getRandomPesel($bdate, $sex);
-        return $firstname . ' ' . $lastname . '|' . $pesel;
+        return $firstname.' '.$lastname.'|'.$pesel;
     }
 
     /**
@@ -86,7 +86,7 @@ 
     {
         $age = rand(0, 100);
         $dayOfYear = rand(0, 365);
-        $interval = new \DateInterval('P' . $age . 'Y' . $dayOfYear . 'D');
+        $interval = new \DateInterval('P'.$age.'Y'.$dayOfYear.'D');
         $date = new \DateTime();
         $birth = $date->sub($interval);
         return $birth->format('Y-m-d');

src/utils/Utils.php

Doc Comments +10 added lines, -8 removed lines

@@ -44,7 +44,7 @@ 
      *
      * @param $date1 $date1 string parsable date strtotime(date)           
      * @param $date2 $date2 string parsable date strtotime(date)          
-     * @return number
+     * @return double
      */
     public static function diffDates($date1, $date2)
     {
@@ -73,6 +73,7 @@ 
      *
      * @param $month int month 1-12
      * @param $day int day 1-31
+     * @param string $date
      * @return string Y-m-d
      */
     public static function getNextDayDate($date)
@@ -84,7 +85,7 @@ 
     /**
      * precious day in Y-m-d format
      *
-     * @param $date sttring Y-m-d
+     * @param string $date sttring Y-m-d
      * @return string Y-m-d
      */
     public static function getPreviousDay($date)
@@ -118,8 +119,8 @@ 
      * @return string date
      *
      *
-     * @param $month int default null
-     * @param $day int default null            
+     * @param integer $month int default null
+     * @param integer $day int default null            
      */
     public static function getStartDate($month = null, $day = null)
     {
@@ -140,8 +141,8 @@ 
     /**
      * getEndDate
      *
-     * @param $month int default null
-     * @param $day int default null
+     * @param integer $month int default null
+     * @param integer $day int default null
      */
     public static function getEndDate($month = null, $day = null)
     {
@@ -216,7 +217,7 @@ 
     /**
      * read file to array
      *
-     * @param $url file url
+     * @param string $url file url
      * @param $delm default ;
      * @param $encl default \
      * @param $head default false
@@ -338,8 +339,9 @@ 
     /**
      * Class casting
      *
-     * @param string|object $destination
+     * @param string $destination
      * @param object $sourceObject
+     * @param integer $arguments
      * @return object
      */
     static function cast($destination, $sourceObject, $arguments = NULL)

Indentation +1 added lines, -1 removed lines

@@ -330,7 +330,7 @@
             
             // ź
             chr(0x9F) => 'ź',
-        	chr(0xBC) => 'ź'
+            chr(0xBC) => 'ź'
         );
         return html_entity_decode(mb_convert_encoding(strtr($text, $map), 'UTF-8', 'ISO-8859-2'), ENT_QUOTES, 'UTF-8');
     }

Spacing +5 added lines, -5 removed lines

@@ -65,7 +65,7 @@ 
      */
     public static function getNextDay($month, $day)
     {
-        return Utils::getNextDayDate('Y-' . $month . '-' . $day);
+        return Utils::getNextDayDate('Y-'.$month.'-'.$day);
     }
 
     /**
@@ -102,7 +102,7 @@ 
      */
     public static function getNextMonthFirstDay($month, $day)
     {
-        return date('Y-m-d', strtotime('+1 month', strtotime(date('Y-' . $month . '-01'))));
+        return date('Y-m-d', strtotime('+1 month', strtotime(date('Y-'.$month.'-01'))));
     }
 
     /**
@@ -129,10 +129,10 @@ 
         } else 
             if ($day == null) {
                 // first day of mnth
-                $date = new \DateTime(date('Y-') . $month . '-01');
+                $date = new \DateTime(date('Y-').$month.'-01');
             } else {
                 // date
-                $date = new \DateTime(date('Y-' . $month . '-' . $day));
+                $date = new \DateTime(date('Y-'.$month.'-'.$day));
             }
         return $date->format('Y-m-d');
     }
@@ -170,7 +170,7 @@ 
      */
     public static function getStartEndDate($dateParam)
     {
-        if (empty($dateParam) || ! in_array($dateParam, array(
+        if (empty($dateParam) || !in_array($dateParam, array(
             0,
             1,
             7

src/WP/ScriptsAndStyles.php

Doc Comments +1 added lines

@@ -89,6 +89,7 @@
      * hospitalRegisterScript
      * @param unknown $file
      * @param unknown $required
+     * @param string $hook
      */
     public function hospitalRegisterScript($file, $required = null, $hook = null)
     {

Indentation +21 added lines, -21 removed lines

@@ -1,26 +1,26 @@
 <?php
 /**
- * ScriptsAndStyles
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose, provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- *
- * @category  Wp
- * @package   Punction
- * @author    Andrzej Marcinkowski <andrzej.max.marcinkowski@gmail.com>
- * @copyright 2014 Wojewódzki Szpital Zespolony, Kalisz
- * @license   MIT http://opensource.org/licenses/MIT
- * @version   1.0  $Format:%H$
- * @link      http://
- * @since     File available since Release 1.0.0
- * PHP Version 5
- */
+     * ScriptsAndStyles
+     *
+     * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
+     * OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
+     *
+     * Permission is hereby granted to use or copy this program
+     * for any purpose, provided the above notices are retained on all copies.
+     * Permission to modify the code and to distribute modified code is granted,
+     * provided the above notices are retained, and a notice that the code was
+     * modified is included with the above copyright notice.
+     *
+     * @category  Wp
+     * @package   Punction
+     * @author    Andrzej Marcinkowski <andrzej.max.marcinkowski@gmail.com>
+     * @copyright 2014 Wojewódzki Szpital Zespolony, Kalisz
+     * @license   MIT http://opensource.org/licenses/MIT
+     * @version   1.0  $Format:%H$
+     * @link      http://
+     * @since     File available since Release 1.0.0
+     * PHP Version 5
+     */
 namespace Hospitalplugin\WP;
 
 /**

Spacing +4 added lines, -4 removed lines

@@ -81,8 +81,8 @@ 
      */
     public function hospitalRegisterStyle($file)
     {
-        wp_register_style('hospital_admin_style' . $file, $this->path . '/css/' . $file, array(), '1', 'screen');
-        wp_enqueue_style('hospital_admin_style' . $file);
+        wp_register_style('hospital_admin_style'.$file, $this->path.'/css/'.$file, array(), '1', 'screen');
+        wp_enqueue_style('hospital_admin_style'.$file);
     }
 
     /**
@@ -92,7 +92,7 @@ 
      */
     public function hospitalRegisterScript($file, $required = null, $hook = null)
     {
-        wp_enqueue_script('hospital_admin_script' . $file, $this->path . '/js/' . $file, $required);
+        wp_enqueue_script('hospital_admin_script'.$file, $this->path.'/js/'.$file, $required);
     }
 
     /**
@@ -106,7 +106,7 @@ 
         $params = array(
             'my_arr' => $json_dates
         );
-        wp_localize_script('hospital_admin_script' . $file, 'php_params', $params);
+        wp_localize_script('hospital_admin_script'.$file, 'php_params', $params);
     }
 
     /**

scripts/migrate_patients.php

Indentation +67 added lines, -67 removed lines

@@ -25,14 +25,14 @@ 
 use Punction\DB\DoctrineBootstrap;
 
 if (! defined ( 'ABSPATH' )) {
-	define ( 'WP_USE_THEMES', false );
-	require ('/var/www/wp/wp-load.php');
+    define ( 'WP_USE_THEMES', false );
+    require ('/var/www/wp/wp-load.php');
 }
 require_once ('/var/www/vendor/autoload.php');
 Logger::configure ( '../resources/log4php.xml' );
 /**
- * migration log4php logger
- */
+     * migration log4php logger
+     */
 $log = Logger::getLogger ( "migration" );
 $log->info ( "Start!" );
 
@@ -63,73 +63,73 @@ 
 $entityManager = $db1->getEntityManager ();
 
 foreach ( $results as $result ) {
-	/**
-	 */
-	$id = $result ['ID'];
-	/**
-	 */
-	$title = $result ['post_title'];
-	/**
-	 */
-	$pesel = implode ( get_post_meta ( $id, 'pesel' ) );
-	/**
-	 */
-	$oddzid = implode ( get_post_meta ( $id, 'oddzial.ID' ) );
-	/**
-	 */
+    /**
+     */
+    $id = $result ['ID'];
+    /**
+     */
+    $title = $result ['post_title'];
+    /**
+     */
+    $pesel = implode ( get_post_meta ( $id, 'pesel' ) );
+    /**
+     */
+    $oddzid = implode ( get_post_meta ( $id, 'oddzial.ID' ) );
+    /**
+     */
 	
-	$numer_historii = implode ( get_post_meta ( $id, 'numer_ksiegi_glownej' ) );
-	/**
-	 */
-	$data_kategoryzacji = implode ( get_post_meta ( $id, 'data_kategoryzacji' ) );
-	/**
-	 */
-	$kategoria_pacjenta = implode ( get_post_meta ( $id, 'kategoria_pacjenta' ) );
-	/**
-	 */
-	$aktywnosc_fizyczna = implode ( get_post_meta ( $id, '1_aktywnosc_fizyczna' ) );
-	/**
-	 */
-	$higiena = implode ( get_post_meta ( $id, '2_higiena' ) );
-	/**
-	 */
-	$odzywianie = implode ( get_post_meta ( $id, '3_odzywianie' ) );
-	/**
-	 */
-	$wydalanie = implode ( get_post_meta ( $id, '4_wydalanie' ) );
-	/**
-	 */
-	$pomiar_objawow_zyciowych = implode ( get_post_meta ( $id, '5_pomiar_objawow_zyciowych' ) );
-	/**
-	 */
-	$leczenie = implode ( get_post_meta ( $id, '6_leczenie' ) );
-	/**
-	 */
-	$edukacja_i_wsparcie_psychiczne = implode ( get_post_meta ( $id, '7_edukacja_i_wsparcie_psychiczne' ) );
+    $numer_historii = implode ( get_post_meta ( $id, 'numer_ksiegi_glownej' ) );
+    /**
+     */
+    $data_kategoryzacji = implode ( get_post_meta ( $id, 'data_kategoryzacji' ) );
+    /**
+     */
+    $kategoria_pacjenta = implode ( get_post_meta ( $id, 'kategoria_pacjenta' ) );
+    /**
+     */
+    $aktywnosc_fizyczna = implode ( get_post_meta ( $id, '1_aktywnosc_fizyczna' ) );
+    /**
+     */
+    $higiena = implode ( get_post_meta ( $id, '2_higiena' ) );
+    /**
+     */
+    $odzywianie = implode ( get_post_meta ( $id, '3_odzywianie' ) );
+    /**
+     */
+    $wydalanie = implode ( get_post_meta ( $id, '4_wydalanie' ) );
+    /**
+     */
+    $pomiar_objawow_zyciowych = implode ( get_post_meta ( $id, '5_pomiar_objawow_zyciowych' ) );
+    /**
+     */
+    $leczenie = implode ( get_post_meta ( $id, '6_leczenie' ) );
+    /**
+     */
+    $edukacja_i_wsparcie_psychiczne = implode ( get_post_meta ( $id, '7_edukacja_i_wsparcie_psychiczne' ) );
 	
-	/**
-	 */
-	$patient = new PatientZZ ();
-	$patient->setName ( $title );
-	if ($data_kategoryzacji == null) {
-		$log->warn ( "Patient " . $id . " missing date. Omitting." );
-		continue;
-	}
-	$patient->setDataKategoryzacji ( \DateTime::createFromFormat ( "d-m-Y", $data_kategoryzacji ) );
-	$patient->setOddzialId ( $oddzid );
-	$patient->setNumerHistorii ( $numer_historii );
+    /**
+     */
+    $patient = new PatientZZ ();
+    $patient->setName ( $title );
+    if ($data_kategoryzacji == null) {
+        $log->warn ( "Patient " . $id . " missing date. Omitting." );
+        continue;
+    }
+    $patient->setDataKategoryzacji ( \DateTime::createFromFormat ( "d-m-Y", $data_kategoryzacji ) );
+    $patient->setOddzialId ( $oddzid );
+    $patient->setNumerHistorii ( $numer_historii );
 	
-	$patient->setPesel ( $pesel );
-	$patient->setKategoriaPacjenta ( $kategoria_pacjenta );
-	$patient->setAktywnoscFizyczna ( $aktywnosc_fizyczna );
-	$patient->setHigiena ( $higiena );
-	$patient->setOdzywianie ( $odzywianie );
-	$patient->setWydalanie ( $wydalanie );
-	$patient->setPomiarObjawowZyciowych ( $pomiar_objawow_zyciowych );
-	$patient->setLeczenie ( $leczenie );
-	$patient->setEdukacjaIWsparciePsychiczne ( $edukacja_i_wsparcie_psychiczne );
+    $patient->setPesel ( $pesel );
+    $patient->setKategoriaPacjenta ( $kategoria_pacjenta );
+    $patient->setAktywnoscFizyczna ( $aktywnosc_fizyczna );
+    $patient->setHigiena ( $higiena );
+    $patient->setOdzywianie ( $odzywianie );
+    $patient->setWydalanie ( $wydalanie );
+    $patient->setPomiarObjawowZyciowych ( $pomiar_objawow_zyciowych );
+    $patient->setLeczenie ( $leczenie );
+    $patient->setEdukacjaIWsparciePsychiczne ( $edukacja_i_wsparcie_psychiczne );
 	
-	$entityManager->persist ( $patient );
+    $entityManager->persist ( $patient );
 }
 $entityManager->flush ();
 $log->info ( "Stop!" );

Spacing +39 added lines, -39 removed lines

@@ -24,17 +24,17 @@ 
 use Hospitalplugin\Entities\PatientZZ;
 use Punction\DB\DoctrineBootstrap;
 
-if (! defined ( 'ABSPATH' )) {
-	define ( 'WP_USE_THEMES', false );
+if (!defined('ABSPATH')) {
+	define('WP_USE_THEMES', false);
 	require ('/var/www/wp/wp-load.php');
 }
 require_once ('/var/www/vendor/autoload.php');
-Logger::configure ( '../resources/log4php.xml' );
+Logger::configure('../resources/log4php.xml');
 /**
  * migration log4php logger
  */
-$log = Logger::getLogger ( "migration" );
-$log->info ( "Start!" );
+$log = Logger::getLogger("migration");
+$log->info("Start!");
 
 global $wpdb;
 /**
@@ -57,12 +57,12 @@ 
 $error = "Error: the query failed...";
 /**
  */
-$results = $wpdb->get_results ( $query, ARRAY_A ) || wp_die ( $error );
+$results = $wpdb->get_results($query, ARRAY_A) || wp_die($error);
 
-$db1 = new DoctrineBootstrap ();
-$entityManager = $db1->getEntityManager ();
+$db1 = new DoctrineBootstrap();
+$entityManager = $db1->getEntityManager();
 
-foreach ( $results as $result ) {
+foreach ($results as $result) {
 	/**
 	 */
 	$id = $result ['ID'];
@@ -71,65 +71,65 @@ 
 	$title = $result ['post_title'];
 	/**
 	 */
-	$pesel = implode ( get_post_meta ( $id, 'pesel' ) );
+	$pesel = implode(get_post_meta($id, 'pesel'));
 	/**
 	 */
-	$oddzid = implode ( get_post_meta ( $id, 'oddzial.ID' ) );
+	$oddzid = implode(get_post_meta($id, 'oddzial.ID'));
 	/**
 	 */
 	
-	$numer_historii = implode ( get_post_meta ( $id, 'numer_ksiegi_glownej' ) );
+	$numer_historii = implode(get_post_meta($id, 'numer_ksiegi_glownej'));
 	/**
 	 */
-	$data_kategoryzacji = implode ( get_post_meta ( $id, 'data_kategoryzacji' ) );
+	$data_kategoryzacji = implode(get_post_meta($id, 'data_kategoryzacji'));
 	/**
 	 */
-	$kategoria_pacjenta = implode ( get_post_meta ( $id, 'kategoria_pacjenta' ) );
+	$kategoria_pacjenta = implode(get_post_meta($id, 'kategoria_pacjenta'));
 	/**
 	 */
-	$aktywnosc_fizyczna = implode ( get_post_meta ( $id, '1_aktywnosc_fizyczna' ) );
+	$aktywnosc_fizyczna = implode(get_post_meta($id, '1_aktywnosc_fizyczna'));
 	/**
 	 */
-	$higiena = implode ( get_post_meta ( $id, '2_higiena' ) );
+	$higiena = implode(get_post_meta($id, '2_higiena'));
 	/**
 	 */
-	$odzywianie = implode ( get_post_meta ( $id, '3_odzywianie' ) );
+	$odzywianie = implode(get_post_meta($id, '3_odzywianie'));
 	/**
 	 */
-	$wydalanie = implode ( get_post_meta ( $id, '4_wydalanie' ) );
+	$wydalanie = implode(get_post_meta($id, '4_wydalanie'));
 	/**
 	 */
-	$pomiar_objawow_zyciowych = implode ( get_post_meta ( $id, '5_pomiar_objawow_zyciowych' ) );
+	$pomiar_objawow_zyciowych = implode(get_post_meta($id, '5_pomiar_objawow_zyciowych'));
 	/**
 	 */
-	$leczenie = implode ( get_post_meta ( $id, '6_leczenie' ) );
+	$leczenie = implode(get_post_meta($id, '6_leczenie'));
 	/**
 	 */
-	$edukacja_i_wsparcie_psychiczne = implode ( get_post_meta ( $id, '7_edukacja_i_wsparcie_psychiczne' ) );
+	$edukacja_i_wsparcie_psychiczne = implode(get_post_meta($id, '7_edukacja_i_wsparcie_psychiczne'));
 	
 	/**
 	 */
-	$patient = new PatientZZ ();
-	$patient->setName ( $title );
+	$patient = new PatientZZ();
+	$patient->setName($title);
 	if ($data_kategoryzacji == null) {
-		$log->warn ( "Patient " . $id . " missing date. Omitting." );
+		$log->warn("Patient ".$id." missing date. Omitting.");
 		continue;
 	}
-	$patient->setDataKategoryzacji ( \DateTime::createFromFormat ( "d-m-Y", $data_kategoryzacji ) );
-	$patient->setOddzialId ( $oddzid );
-	$patient->setNumerHistorii ( $numer_historii );
+	$patient->setDataKategoryzacji(\DateTime::createFromFormat("d-m-Y", $data_kategoryzacji));
+	$patient->setOddzialId($oddzid);
+	$patient->setNumerHistorii($numer_historii);
 	
-	$patient->setPesel ( $pesel );
-	$patient->setKategoriaPacjenta ( $kategoria_pacjenta );
-	$patient->setAktywnoscFizyczna ( $aktywnosc_fizyczna );
-	$patient->setHigiena ( $higiena );
-	$patient->setOdzywianie ( $odzywianie );
-	$patient->setWydalanie ( $wydalanie );
-	$patient->setPomiarObjawowZyciowych ( $pomiar_objawow_zyciowych );
-	$patient->setLeczenie ( $leczenie );
-	$patient->setEdukacjaIWsparciePsychiczne ( $edukacja_i_wsparcie_psychiczne );
+	$patient->setPesel($pesel);
+	$patient->setKategoriaPacjenta($kategoria_pacjenta);
+	$patient->setAktywnoscFizyczna($aktywnosc_fizyczna);
+	$patient->setHigiena($higiena);
+	$patient->setOdzywianie($odzywianie);
+	$patient->setWydalanie($wydalanie);
+	$patient->setPomiarObjawowZyciowych($pomiar_objawow_zyciowych);
+	$patient->setLeczenie($leczenie);
+	$patient->setEdukacjaIWsparciePsychiczne($edukacja_i_wsparcie_psychiczne);
 	
-	$entityManager->persist ( $patient );
+	$entityManager->persist($patient);
 }
-$entityManager->flush ();
-$log->info ( "Stop!" );
+$entityManager->flush();
+$log->info("Stop!");

src/Entities/Infections.php

Indentation +208 added lines, -208 removed lines

@@ -46,228 +46,228 @@
  */
 class Infections extends InfectionRaport {
 	
-	/**
-	 * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
-	 */
-	public $G;
+    /**
+     * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
+     */
+    public $G;
 	
-	/**
-	 * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
-	 */
-	public $A;
+    /**
+     * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
+     */
+    public $A;
 	
-	/**
-	 * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
-	 */
-	public $B;
+    /**
+     * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
+     */
+    public $B;
 	
-	/**
-	 * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
-	 */
-	public $Bzak;
+    /**
+     * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
+     */
+    public $Bzak;
 	
-	/**
-	 * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
-	 */
-	public $ZMO;
+    /**
+     * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
+     */
+    public $ZMO;
 	
-	/**
-	 * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
-	 */
-	public $ZUM;
+    /**
+     * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
+     */
+    public $ZUM;
 	
-	/**
-	 * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
-	 */
-	public $PNEUVAP;
+    /**
+     * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
+     */
+    public $PNEUVAP;
 	
-	/**
-	 * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
-	 */
-	public $ZODC;
+    /**
+     * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
+     */
+    public $ZODC;
 	
-	/**
-	 * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
-	 */
-	public $ZKR;
+    /**
+     * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
+     */
+    public $ZKR;
 	
-	/**
-	 * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
-	 */
-	public $ROZIII;
+    /**
+     * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
+     */
+    public $ROZIII;
 	
-	/**
-	 * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
-	 */
-	public $ROZII;
+    /**
+     * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
+     */
+    public $ROZII;
 	
-	/**
-	 * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
-	 */
-	public $OIOM;
+    /**
+     * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
+     */
+    public $OIOM;
 	
-	/**
-	 * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
-	 */
-	public $BM;
+    /**
+     * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
+     */
+    public $BM;
 	
-	/**
-	 * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
-	 */
-	public $IZOL;
+    /**
+     * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
+     */
+    public $IZOL;
 	
-	/**
-	 * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
-	 */
-	public $ZAK;
+    /**
+     * @Column(columnDefinition="SMALLINT NOT NULL DEFAULT 0") *
+     */
+    public $ZAK;
 	
-	/**
-	 * @Column(type="string", length=1000)
-	 */
-	public $Uwagi;
+    /**
+     * @Column(type="string", length=1000)
+     */
+    public $Uwagi;
 	
-	/**
-	 * @Column(type="string", length=1000)
-	 */
-	public $Weryfikacja = "";
-	public function getG() {
-		return $this->G;
-	}
-	public function setG($G) {
-		$this->G = $G;
-		return $this;
-	}
-	public function getA() {
-		return $this->A;
-	}
-	public function setA($A) {
-		$this->A = $A;
-		return $this;
-	}
-	public function getB() {
-		return $this->B;
-	}
-	public function setB($B) {
-		$this->B = $B;
-		return $this;
-	}
-	public function getBzak() {
-		return $this->Bzak;
-	}
-	public function setBzak($Bzak) {
-		$this->Bzak = $Bzak;
-		return $this;
-	}
-	public function getZMO() {
-		return $this->ZMO;
-	}
-	public function setZMO($ZMO) {
-		$this->ZMO = $ZMO;
-		return $this;
-	}
-	public function getZUM() {
-		return $this->ZUM;
-	}
-	public function setZUM($ZUM) {
-		$this->ZUM = $ZUM;
-		return $this;
-	}
-	public function getPNEUVAP() {
-		return $this->PNEUVAP;
-	}
-	public function setPNEUVAP($PNEUVAP) {
-		$this->PNEUVAP = $PNEUVAP;
-		return $this;
-	}
-	public function getZODC() {
-		return $this->ZODC;
-	}
-	public function setZODC($ZODC) {
-		$this->ZODC = $ZODC;
-		return $this;
-	}
-	public function getZKR() {
-		return $this->ZKR;
-	}
-	public function setZKR($ZKR) {
-		$this->ZKR = $ZKR;
-		return $this;
-	}
-	public function getOIOM() {
-		return $this->OIOM;
-	}
-	public function setOIOM($OIOM) {
-		$this->OIOM = $OIOM;
-		return $this;
-	}
-	public function getBM() {
-		return $this->BM;
-	}
-	public function setBM($BM) {
-		$this->BM = $BM;
-		return $this;
-	}
-	public function getIZOL() {
-		return $this->IZOL;
-	}
-	public function setIZOL($IZOL) {
-		$this->IZOL = $IZOL;
-		return $this;
-	}
-	public function getZAK() {
-		return $this->ZAK;
-	}
-	public function setZAK($ZAK) {
-		$this->ZAK = $ZAK;
-		return $this;
-	}
-	public function getROZIII() {
-		return $this->ROZIII;
-	}
-	public function setROZIII($ROZIII) {
-		$this->ROZIII = $ROZIII;
-		return $this;
-	}
-	public function getROZII() {
-		return $this->ROZII;
-	}
-	public function setROZII($ROZII) {
-		$this->ROZII = $ROZII;
-		return $this;
-	}
-	public function getUwagi() {
-		return $this->Uwagi;
-	}
-	public function setUwagi($Uwagi) {
-		$this->Uwagi = $Uwagi;
-		return $this;
-	}
-	public function getWeryfikacja() {
-		return $this->Weryfikacja;
-	}
-	public function setWeryfikacja($Weryfikacja) {
-		$this->Weryfikacja = $Weryfikacja;
-		return $this;
-	}
-	public static function getFields() {
-		return array (
-				"Data raportu" => "dataRaportu",
-				"Oddział" => "ward",
-				"G" => "G",
-				"A" => "A",
-				"B" => "B",
-				"Bzak" => "Bzak",
-				"ZMO" => "ZMO",
-				"ZUM" => "ZUM",
-				"PNEU-VAP" => "PNEUVAP",
-				"ZODC" => "ZODC",
-				"ZKR" => "ZKR",
-				"ROZ-III" => "ROZIII",
-				"ROZ-II" => "ROZII",
-				"OIOM" => "OIOM",
-				"BM" => "BM",
-				"IZOL" => "IZOL",
-				"ZAK" => "ZAK" 
-		);
-	}
+    /**
+     * @Column(type="string", length=1000)
+     */
+    public $Weryfikacja = "";
+    public function getG() {
+        return $this->G;
+    }
+    public function setG($G) {
+        $this->G = $G;
+        return $this;
+    }
+    public function getA() {
+        return $this->A;
+    }
+    public function setA($A) {
+        $this->A = $A;
+        return $this;
+    }
+    public function getB() {
+        return $this->B;
+    }
+    public function setB($B) {
+        $this->B = $B;
+        return $this;
+    }
+    public function getBzak() {
+        return $this->Bzak;
+    }
+    public function setBzak($Bzak) {
+        $this->Bzak = $Bzak;
+        return $this;
+    }
+    public function getZMO() {
+        return $this->ZMO;
+    }
+    public function setZMO($ZMO) {
+        $this->ZMO = $ZMO;
+        return $this;
+    }
+    public function getZUM() {
+        return $this->ZUM;
+    }
+    public function setZUM($ZUM) {
+        $this->ZUM = $ZUM;
+        return $this;
+    }
+    public function getPNEUVAP() {
+        return $this->PNEUVAP;
+    }
+    public function setPNEUVAP($PNEUVAP) {
+        $this->PNEUVAP = $PNEUVAP;
+        return $this;
+    }
+    public function getZODC() {
+        return $this->ZODC;
+    }
+    public function setZODC($ZODC) {
+        $this->ZODC = $ZODC;
+        return $this;
+    }
+    public function getZKR() {
+        return $this->ZKR;
+    }
+    public function setZKR($ZKR) {
+        $this->ZKR = $ZKR;
+        return $this;
+    }
+    public function getOIOM() {
+        return $this->OIOM;
+    }
+    public function setOIOM($OIOM) {
+        $this->OIOM = $OIOM;
+        return $this;
+    }
+    public function getBM() {
+        return $this->BM;
+    }
+    public function setBM($BM) {
+        $this->BM = $BM;
+        return $this;
+    }
+    public function getIZOL() {
+        return $this->IZOL;
+    }
+    public function setIZOL($IZOL) {
+        $this->IZOL = $IZOL;
+        return $this;
+    }
+    public function getZAK() {
+        return $this->ZAK;
+    }
+    public function setZAK($ZAK) {
+        $this->ZAK = $ZAK;
+        return $this;
+    }
+    public function getROZIII() {
+        return $this->ROZIII;
+    }
+    public function setROZIII($ROZIII) {
+        $this->ROZIII = $ROZIII;
+        return $this;
+    }
+    public function getROZII() {
+        return $this->ROZII;
+    }
+    public function setROZII($ROZII) {
+        $this->ROZII = $ROZII;
+        return $this;
+    }
+    public function getUwagi() {
+        return $this->Uwagi;
+    }
+    public function setUwagi($Uwagi) {
+        $this->Uwagi = $Uwagi;
+        return $this;
+    }
+    public function getWeryfikacja() {
+        return $this->Weryfikacja;
+    }
+    public function setWeryfikacja($Weryfikacja) {
+        $this->Weryfikacja = $Weryfikacja;
+        return $this;
+    }
+    public static function getFields() {
+        return array (
+                "Data raportu" => "dataRaportu",
+                "Oddział" => "ward",
+                "G" => "G",
+                "A" => "A",
+                "B" => "B",
+                "Bzak" => "Bzak",
+                "ZMO" => "ZMO",
+                "ZUM" => "ZUM",
+                "PNEU-VAP" => "PNEUVAP",
+                "ZODC" => "ZODC",
+                "ZKR" => "ZKR",
+                "ROZ-III" => "ROZIII",
+                "ROZ-II" => "ROZII",
+                "OIOM" => "OIOM",
+                "BM" => "BM",
+                "IZOL" => "IZOL",
+                "ZAK" => "ZAK" 
+        );
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -250,7 +250,7 @@
 		return $this;
 	}
 	public static function getFields() {
-		return array (
+		return array(
 				"Data raportu" => "dataRaportu",
 				"Oddział" => "ward",
 				"G" => "G",