amarcinkowski / hospitalplugin

src/Entities/HospitalForm.php

Unused Use Statements -2 removed lines

@@ -25,8 +25,6 @@
 namespace Hospitalplugin\Entities;
 
 use Hospitalplugin\DB\DoctrineBootstrap;
-use Hospitalplugin\utils\Utils;
-use Hospitalplugin\Twig\EscapePLCharsExtension;
 use Hospitalplugin\Entities\WardCRUD;
 use Hospitalplugin\Twig\PLTwig;
 

Spacing +15 added lines, -15 removed lines

@@ -33,27 +33,27 @@
 class HospitalForm {
 	public static function load($yaml, $class, $dir) {
 		try {
-			$em = DoctrineBootstrap::getEntityManager ();
+			$em = DoctrineBootstrap::getEntityManager();
 			
-			$userId = $userId = wp_get_current_user ()->ID;
-			$ward = WardCRUD::getWardForUser ( $userId );
-			$user = $em->find ( "\Hospitalplugin\Entities\User", $userId );
+			$userId = $userId = wp_get_current_user()->ID;
+			$ward = WardCRUD::getWardForUser($userId);
+			$user = $em->find("\Hospitalplugin\Entities\User", $userId);
 			
-			if (! empty ( $_POST )) {
+			if (!empty ($_POST)) {
 				$args = $_POST;
-				$i = new $class ( $args );
-				$i->setWard ( $ward );
-				$i->setUser ( $user );
-				$em->persist ( $i );
-				$em->flush ();
+				$i = new $class($args);
+				$i->setWard($ward);
+				$i->setUser($user);
+				$em->persist($i);
+				$em->flush();
 			} else {
-				$object = \Hospitalplugin\utils\YAML2Object::getObject ( $yaml );
-				echo PLTwig::load ( $dir )->render ( 'form.twig', array (
+				$object = \Hospitalplugin\utils\YAML2Object::getObject($yaml);
+				echo PLTwig::load($dir)->render('form.twig', array(
 						'infections' => $object 
-				) );
+				));
 			}
-		} catch ( Exception $e ) {
-			echo "ERR: " . $e;
+		} catch (Exception $e) {
+			echo "ERR: ".$e;
 		}
 	}
 }

src/Entities/InfectionsCRUD.php

Unused Use Statements -1 removed lines

@@ -25,7 +25,6 @@
 namespace Hospitalplugin\Entities;
 
 use Hospitalplugin\DB\DoctrineBootstrap;
-use Hospitalplugin\utils\Utils;
 
 class InfectionsCRUD {
 	public static function getInfections($from, $to, $wardId, $class) {

Spacing +17 added lines, -17 removed lines

@@ -29,33 +29,33 @@
 
 class InfectionsCRUD {
 	public static function getInfections($from, $to, $wardId, $class) {
-		$em = ( object ) DoctrineBootstrap::getEntityManager ();
-		$qb = $em->createQueryBuilder ();
-		$qb->select ( 'i' )->from ( 'Hospitalplugin\Entities\\' . $class, 'i' ) /* */
-        ->addOrderBy ( 'i.dataRaportu', 'DESC' ) /* */
-        ->addOrderBy ( 'i.dataPrzeslania ', 'DESC' ) /* */
-        ->where ( /* */
-        		$qb->expr ()->between ( 'i.dataRaportu', ':from', ':to' ) ) /* */
-        		->setParameters ( array (
+		$em = (object) DoctrineBootstrap::getEntityManager();
+		$qb = $em->createQueryBuilder();
+		$qb->select('i')->from('Hospitalplugin\Entities\\'.$class, 'i') /* */
+        ->addOrderBy('i.dataRaportu', 'DESC') /* */
+        ->addOrderBy('i.dataPrzeslania ', 'DESC') /* */
+        ->where( /* */
+        		$qb->expr()->between('i.dataRaportu', ':from', ':to') ) /* */
+        		->setParameters(array(
 				'from' => $from,
 				'to' => $to 
-		) );
+		));
 		if ($wardId != 'all') {
-			$qb->andWhere ( $qb->expr ()->eq ( 'i.ward', ':ward' ) ) /* */
-        			->setParameter ( 'ward', $wardId );
+			$qb->andWhere($qb->expr()->eq('i.ward', ':ward')) /* */
+        			->setParameter('ward', $wardId);
 		}
 		
-		$query = $qb->getQuery ();
-		$infections = $query->getResult ();
+		$query = $qb->getQuery();
+		$infections = $query->getResult();
 		
 		return $infections;
 	}
 	public static function updateVerification($id, $weryfikacja) {
 		if ($id != null && $weryfikacja != null) {
-			$em = ( object ) DoctrineBootstrap::getEntityManager ();
-			$infection = $em->getRepository ( 'Hospitalplugin\Entities\Infections' )->find ( $id );
-			$infection->setWeryfikacja ( $weryfikacja );
-			$em->flush ();
+			$em = (object) DoctrineBootstrap::getEntityManager();
+			$infection = $em->getRepository('Hospitalplugin\Entities\Infections')->find($id);
+			$infection->setWeryfikacja($weryfikacja);
+			$em->flush();
 		}
 	}
 	public static function obj2DB($obj) {

src/Entities/PatientCRUD.php

Unused Use Statements -1 removed lines

@@ -27,7 +27,6 @@
 use Hospitalplugin\DB\DoctrineBootstrap;
 use Hospitalplugin\Entities\Patient;
 use Hospitalplugin\Entities\PatientDeleted;
-use Hospitalplugin\Entities\PatientFactory;
 use Hospitalplugin\utils\Utils;
 
 class PatientCRUD {

Spacing +32 added lines, -32 removed lines

@@ -43,7 +43,7 @@ 
 	 * @return Patient array
 	 */
 	public static function getPatients($month = null, $day = null, $wardId = 0) {
-		return PatientCRUD::getPatientsDateRange ( Utils::getStartDate ( $month, $day ), Utils::getEndDate ( $month, $day ), $wardId );
+		return PatientCRUD::getPatientsDateRange(Utils::getStartDate($month, $day), Utils::getEndDate($month, $day), $wardId);
 	}
 	
 	/**
@@ -59,14 +59,14 @@ 
 	 * @return Patient array
 	 */
 	public static function getPatientsDateRange($date1, $date2, $wardId = 0) {
-		$entityManager = ( object ) DoctrineBootstrap::getEntityManager ();
-		$params = array (
+		$entityManager = (object) DoctrineBootstrap::getEntityManager();
+		$params = array(
 				'from' => $date1,
 				'to' => $date2,
 				'oddzialId' => $wardId 
 		);
-		$q = $entityManager->createQuery ( 'select p FROM Hospitalplugin\Entities\Patient p WHERE p.dataKategoryzacji BETWEEN :from AND :to and p.oddzialId = :oddzialId ORDER BY p.name' )->setParameters ( $params )->setFirstResult ( 0 )->setMaxResults ( 1000 );
-		$patients = $q->getResult ();
+		$q = $entityManager->createQuery('select p FROM Hospitalplugin\Entities\Patient p WHERE p.dataKategoryzacji BETWEEN :from AND :to and p.oddzialId = :oddzialId ORDER BY p.name')->setParameters($params)->setFirstResult(0)->setMaxResults(1000);
+		$patients = $q->getResult();
 		return $patients;
 	}
 	
@@ -79,12 +79,12 @@ 
 	 * @return Patient Patient
 	 */
 	public static function getPatient($id, $type = '') {
-		$entityManager = ( object ) DoctrineBootstrap::getEntityManager ();
-		$type = 'Hospitalplugin\Entities\Patient' . $type;
-		$patient = $entityManager->getRepository ( $type )->findOneBy ( array (
+		$entityManager = (object) DoctrineBootstrap::getEntityManager();
+		$type = 'Hospitalplugin\Entities\Patient'.$type;
+		$patient = $entityManager->getRepository($type)->findOneBy(array(
 				'id' => $id 
-		) );
-		return Utils::cast ( $type, ( object ) $patient, 0 );
+		));
+		return Utils::cast($type, (object) $patient, 0);
 	}
 	
 	/**
@@ -95,16 +95,16 @@ 
 	 * @return Patient
 	 */
 	public static function setPatientCategories($obj, $type) {
-		$entityManager = DoctrineBootstrap::getEntityManager ();
-		$patient = PatientCRUD::getPatient ( $obj->id, $type );
-		foreach ( get_object_vars ( $obj ) as $key => $value ) {
-			call_user_func ( array (
+		$entityManager = DoctrineBootstrap::getEntityManager();
+		$patient = PatientCRUD::getPatient($obj->id, $type);
+		foreach (get_object_vars($obj) as $key => $value) {
+			call_user_func(array(
 					$patient,
-					'set' . ucwords ( $key ) 
-			), $value );
+					'set'.ucwords($key) 
+			), $value);
 		}
-		$entityManager->merge ( $patient );
-		$entityManager->flush ();
+		$entityManager->merge($patient);
+		$entityManager->flush();
 		return $patient;
 	}
 	
@@ -116,13 +116,13 @@ 
 	 * @return Patient
 	 */
 	public static function createPatient($type, $name, $pesel) {
-		$entityManager = DoctrineBootstrap::getEntityManager ();
-		$type = 'Hospitalplugin\Entities\Patient' . $type;
-		$patient = new $type ();
-		$patient->setName ( $name );
-		$patient->setPesel ( $pesel );
-		$entityManager->persist ( $patient );
-		$entityManager->flush ();
+		$entityManager = DoctrineBootstrap::getEntityManager();
+		$type = 'Hospitalplugin\Entities\Patient'.$type;
+		$patient = new $type();
+		$patient->setName($name);
+		$patient->setPesel($pesel);
+		$entityManager->persist($patient);
+		$entityManager->flush();
 		return $patient;
 	}
 	
@@ -133,19 +133,19 @@ 
 	 *        	int
 	 */
 	public static function deletePatient($id, $userId = 0) {
-		$entityManager = ( object ) DoctrineBootstrap::getEntityManager ();
+		$entityManager = (object) DoctrineBootstrap::getEntityManager();
 		$type = 'Hospitalplugin\Entities\Patient';
-		$patient = $entityManager->getRepository ( $type )->findOneBy ( array (
+		$patient = $entityManager->getRepository($type)->findOneBy(array(
 				'id' => $id 
-		) );
-		$entityManager->remove ( $patient );
+		));
+		$entityManager->remove($patient);
 		$log = strval($patient);
 		$audit = new PatientDeleted();
-		$audit->deletedAt = new \DateTime ();
+		$audit->deletedAt = new \DateTime();
 		$audit->deletedByUserId = $userId;
 		$audit->log = $log;
-		$entityManager->persist ( $audit );
-		$entityManager->flush ();
+		$entityManager->persist($audit);
+		$entityManager->flush();
 	}
 }
 ?>
\ No newline at end of file

src/Entities/PatientRaportOptimized.php

Unused Use Statements -3 removed lines

@@ -3,9 +3,6 @@
 namespace Hospitalplugin\Entities;
 
 use Hospitalplugin\DB\DoctrineBootstrap;
-use Hospitalplugin\utils\Utils;
-use Doctrine\DBAL\Schema\View;
-use Doctrine\ORM\Query\ResultSetMapping;
 
 class PatientRaportOptimized {
 	/**

Spacing +15 added lines, -15 removed lines

@@ -14,14 +14,14 @@ 
 	 * @param unknown $date        	
 	 */
 	public static function getRaport($wardId, $date) {
-		$startDate = $date . '-01';
-		$endDate = date ( "Y-m-t 23:59:59", strtotime ( $startDate ) );
+		$startDate = $date.'-01';
+		$endDate = date("Y-m-t 23:59:59", strtotime($startDate));
 		
-		return PatientRaportOptimized::getRaportBetweenDatesNative ( $wardId, $startDate, $endDate );
+		return PatientRaportOptimized::getRaportBetweenDatesNative($wardId, $startDate, $endDate);
 	}
 	private static function updateNativeRaport() {
-		$em = DoctrineBootstrap::getEntityManager ();
-		$conn = $em->getConnection ();
+		$em = DoctrineBootstrap::getEntityManager();
+		$conn = $em->getConnection();
 		// create report table
 		$sql1 = "CREATE TABLE IF NOT EXISTS kategoria_view 
 					(data DATETIME, oddzialId INT, kategoria INT, suma INT,
@@ -50,9 +50,9 @@ 
 					kategoriaPacjenta";
 		// select
 		try {
-			$conn->query ( $sql1 );
-			$conn->query ( $sql2 );
-		} catch ( Exception $e ) {
+			$conn->query($sql1);
+			$conn->query($sql2);
+		} catch (Exception $e) {
 			// echo 'Caught exception: ', $e->getMessage(), "\n";
 		}
 	}
@@ -63,19 +63,19 @@ 
 	 * @param unknown $endDate
 	 */
 	public static function getRaportBetweenDatesNative($wardId, $startDate, $endDate) {
-		$em = DoctrineBootstrap::getEntityManager ();
+		$em = DoctrineBootstrap::getEntityManager();
 		PatientRaportOptimized::updateNativeRaport();
-		$conn = $em->getConnection ();
+		$conn = $em->getConnection();
 		$sql3 = "SELECT kategoria, date(data) as data, suma FROM kategoria_view WHERE data between :data1 AND :data2 and oddzialId = :oddzialId";
-		$stmt = $conn->prepare ( $sql3 );
-		$stmt->execute ( array (
+		$stmt = $conn->prepare($sql3);
+		$stmt->execute(array(
 				'data1' => $startDate,
 				'data2' => $endDate,
 				'oddzialId' => $wardId 
-		) );
+		));
 		$result = $stmt->fetchAll();
-		$table = array ();
-		foreach ( $result as $row ) {
+		$table = array();
+		foreach ($result as $row) {
 			$table [$row ['data']] [$row ['kategoria']] = $row ['suma'];
 		}
 		return $table;

src/utils/ExcelExport.php

Unused Use Statements -1 removed lines

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

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/ExcelExportPunction.php

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;
 

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

Unused Use Statements -1 removed lines

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

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');

scripts/migrate_patients.php

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/InfectionRaport.php

Spacing +10 added lines, -10 removed lines

@@ -70,16 +70,16 @@ 
 	protected $user;
 	
 	function __construct($args) {
-		foreach ( $args as $key => $value ) {
+		foreach ($args as $key => $value) {
 			if ($key == 'dataRaportu') {
-				$value = new \DateTime ( $value );
+				$value = new \DateTime($value);
 			} 
-			call_user_func ( array (
+			call_user_func(array(
 					$this,
-					'set' . $key 
-			), $value );
+					'set'.$key 
+			), $value);
 		}
-		$this->dataPrzeslania = new \DateTime ();
+		$this->dataPrzeslania = new \DateTime();
 		echo '<h3><div class="alert alert-primary">Dziękuję za przesłanie raportu!</div></h3>';
 	}
 	
@@ -111,12 +111,12 @@ 
 	 * @return string
 	 */
 	public function toString() {
-		$txt = $this->getId ();
-		$data = $this->getDataRaportu ();
+		$txt = $this->getId();
+		$data = $this->getDataRaportu();
 		if ($data instanceof \DateTime) {
-			$txt .= $this->getDataRaportu ()->format ( "Y-m-d" );
+			$txt .= $this->getDataRaportu()->format("Y-m-d");
 		} else {
-			$txt .= $this->getDataRaportu ();
+			$txt .= $this->getDataRaportu();
 		}
 		return $txt;
 	}