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;
 

Indentation +23 added lines, -23 removed lines

@@ -31,30 +31,30 @@
 use Hospitalplugin\Twig\PLTwig;
 
 class HospitalForm {
-	public static function load($yaml, $class, $dir) {
-		try {
-			$em = DoctrineBootstrap::getEntityManager ();
+    public static function load($yaml, $class, $dir) {
+        try {
+            $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 )) {
-				$args = $_POST;
-				$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 (
-						'infections' => $object 
-				) );
-			}
-		} catch ( Exception $e ) {
-			echo "ERR: " . $e;
-		}
-	}
+            if (! empty ( $_POST )) {
+                $args = $_POST;
+                $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 (
+                        'infections' => $object 
+                ) );
+            }
+        } catch ( Exception $e ) {
+            echo "ERR: " . $e;
+        }
+    }
 }
 ?>
\ No newline at end of file

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

Doc Comments +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
 	/**
 	 * getId
 	 *
-	 * @return id
+	 * @return integer
 	 */
 	public function getId() {
 		return $this->id;
@@ -98,7 +98,7 @@ 
 	 * @param int $id
 	 *        	ID
 	 *        	
-	 * @return \Hospitalplugin\Entities\Patient
+	 * @return InfectionRaport
 	 */
 	public function setId($id) {
 		$this->id = $id;

Indentation +101 added lines, -101 removed lines

@@ -39,116 +39,116 @@
  */
 class InfectionRaport {
 	
-	/**
-	 * id
-	 * @Id @Column(type="integer") @GeneratedValue
-	 */
-	public $id;
+    /**
+     * id
+     * @Id @Column(type="integer") @GeneratedValue
+     */
+    public $id;
 	
-	/**
-	 * $dataRaportu datetime
-	 * @Column(type="datetime") *
-	 */
-	public $dataRaportu;
+    /**
+     * $dataRaportu datetime
+     * @Column(type="datetime") *
+     */
+    public $dataRaportu;
 	
-	/**
-	 * $dataPrzeslania datetime
-	 * @Column(type="datetime") *
-	 */
-	public $dataPrzeslania;
+    /**
+     * $dataPrzeslania datetime
+     * @Column(type="datetime") *
+     */
+    public $dataPrzeslania;
 	
-	/**
-	 * @ManyToOne(targetEntity="Hospitalplugin\Entities\Ward")
-	 * @JoinColumn(name="oddzialId", referencedColumnName="id")
-	 */
-	public $ward;
+    /**
+     * @ManyToOne(targetEntity="Hospitalplugin\Entities\Ward")
+     * @JoinColumn(name="oddzialId", referencedColumnName="id")
+     */
+    public $ward;
 	
-	/**
-	 * @ManyToOne(targetEntity="Hospitalplugin\Entities\User")
-	 * @JoinColumn(name="userId", referencedColumnName="id")
-	 */
-	protected $user;
+    /**
+     * @ManyToOne(targetEntity="Hospitalplugin\Entities\User")
+     * @JoinColumn(name="userId", referencedColumnName="id")
+     */
+    protected $user;
 	
-	function __construct($args) {
-		foreach ( $args as $key => $value ) {
-			if ($key == 'dataRaportu') {
-				$value = new \DateTime ( $value );
-			} 
-			call_user_func ( array (
-					$this,
-					'set' . $key 
-			), $value );
-		}
-		$this->dataPrzeslania = new \DateTime ();
-		echo '<h3><div class="alert alert-primary">Dziękuję za przesłanie raportu!</div></h3>';
-	}
+    function __construct($args) {
+        foreach ( $args as $key => $value ) {
+            if ($key == 'dataRaportu') {
+                $value = new \DateTime ( $value );
+            } 
+            call_user_func ( array (
+                    $this,
+                    'set' . $key 
+            ), $value );
+        }
+        $this->dataPrzeslania = new \DateTime ();
+        echo '<h3><div class="alert alert-primary">Dziękuję za przesłanie raportu!</div></h3>';
+    }
 	
-	/**
-	 * getId
-	 *
-	 * @return id
-	 */
-	public function getId() {
-		return $this->id;
-	}
+    /**
+     * getId
+     *
+     * @return id
+     */
+    public function getId() {
+        return $this->id;
+    }
 	
-	/**
-	 * sets id
-	 *
-	 * @param int $id
-	 *        	ID
-	 *        	
-	 * @return \Hospitalplugin\Entities\Patient
-	 */
-	public function setId($id) {
-		$this->id = $id;
-		return $this;
-	}
+    /**
+     * sets id
+     *
+     * @param int $id
+     *        	ID
+     *        	
+     * @return \Hospitalplugin\Entities\Patient
+     */
+    public function setId($id) {
+        $this->id = $id;
+        return $this;
+    }
 	
-	/**
-	 * toString
-	 *
-	 * @return string
-	 */
-	public function toString() {
-		$txt = $this->getId ();
-		$data = $this->getDataRaportu ();
-		if ($data instanceof \DateTime) {
-			$txt .= $this->getDataRaportu ()->format ( "Y-m-d" );
-		} else {
-			$txt .= $this->getDataRaportu ();
-		}
-		return $txt;
-	}
-	public function getDataRaportu() {
-		return $this->dataRaportu;
-	}
-	public function setDataRaportu($dataRaportu) {
-		$this->dataRaportu = $dataRaportu;
-		return $this;
-	}
+    /**
+     * toString
+     *
+     * @return string
+     */
+    public function toString() {
+        $txt = $this->getId ();
+        $data = $this->getDataRaportu ();
+        if ($data instanceof \DateTime) {
+            $txt .= $this->getDataRaportu ()->format ( "Y-m-d" );
+        } else {
+            $txt .= $this->getDataRaportu ();
+        }
+        return $txt;
+    }
+    public function getDataRaportu() {
+        return $this->dataRaportu;
+    }
+    public function setDataRaportu($dataRaportu) {
+        $this->dataRaportu = $dataRaportu;
+        return $this;
+    }
 	
-	public function getDataPrzeslania() {
-		return $this->dataPrzeslania;
-	}
-	public function setDataPrzeslania($dataPrzeslania) {
-		$this->dataPrzeslania = $dataPrzeslania;
-		return $this;
-	}
-	public function getWard() {
-		return $this->ward;
-	}
-	public function setWard($ward) {
-		$this->ward = $ward;
-		return $this;
-	}
-	public function getUser() {
-		return $this->user;
-	}
-	public function setUser($user) {
-		$this->user = $user;
-		return $this;
-	}
+    public function getDataPrzeslania() {
+        return $this->dataPrzeslania;
+    }
+    public function setDataPrzeslania($dataPrzeslania) {
+        $this->dataPrzeslania = $dataPrzeslania;
+        return $this;
+    }
+    public function getWard() {
+        return $this->ward;
+    }
+    public function setWard($ward) {
+        $this->ward = $ward;
+        return $this;
+    }
+    public function getUser() {
+        return $this->user;
+    }
+    public function setUser($user) {
+        $this->user = $user;
+        return $this;
+    }
 	
 	
 }

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;
 	}

src/Entities/InfectionsCRUD.php

Doc Comments +6 added lines

@@ -28,6 +28,12 @@
 use Hospitalplugin\utils\Utils;
 
 class InfectionsCRUD {
+
+	/**
+	 * @param string $from
+	 * @param string $to
+	 * @param string $class
+	 */
 	public static function getInfections($from, $to, $wardId, $class) {
 		$em = ( object ) DoctrineBootstrap::getEntityManager ();
 		$qb = $em->createQueryBuilder ();

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) {

Indentation +34 added lines, -34 removed lines

@@ -28,44 +28,44 @@
 use Hospitalplugin\utils\Utils;
 
 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' ) /* */
+    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 (
-				'from' => $from,
-				'to' => $to 
-		) );
-		if ($wardId != 'all') {
-			$qb->andWhere ( $qb->expr ()->eq ( 'i.ward', ':ward' ) ) /* */
-        			->setParameter ( 'ward', $wardId );
-		}
+                $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 );
+        }
 		
-		$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 ();
-		}
-	}
-	public static function obj2DB($obj) {
-		$id = $obj->id;
-		$em = DoctrineBootstrap::getEntityManager();
-		$infection = $em->getRepository('Hospitalplugin\Entities\Infections')->find($id);
-		$infection->setWeryfikacja($obj->value);
-		$em->persist($infection);
-		$em->flush();
-		echo $id;
-	}
+        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 ();
+        }
+    }
+    public static function obj2DB($obj) {
+        $id = $obj->id;
+        $em = DoctrineBootstrap::getEntityManager();
+        $infection = $em->getRepository('Hospitalplugin\Entities\Infections')->find($id);
+        $infection->setWeryfikacja($obj->value);
+        $em->persist($infection);
+        $em->flush();
+        echo $id;
+    }
 }
 ?>
\ No newline at end of file

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

Doc Comments +7 added lines, -10 removed lines

@@ -110,7 +110,7 @@ 
 	/**
 	 * Constructor
 	 *
-	 * @param unknown $args        	
+	 * @param integer $args        	
 	 */
 	function __construct($args) {
 		if (! isset ( $args ) || empty ( $args )) {
@@ -130,7 +130,7 @@ 
 	/**
 	 * getId
 	 *
-	 * @return id
+	 * @return integer
 	 */
 	public function getId() {
 		return $this->id;
@@ -152,7 +152,7 @@ 
 	/**
 	 * getName
 	 *
-	 * @return name
+	 * @return string
 	 */
 	public function getName() {
 		return $this->name;
@@ -196,7 +196,7 @@ 
 	/**
 	 * getOddzialId
 	 *
-	 * @return oddzialId
+	 * @return integer
 	 */
 	public function getOddzialId() {
 		return $this->oddzialId;
@@ -236,8 +236,6 @@ 
 	/**
 	 * setOddzialId
 	 *
-	 * @param int $oddzialId
-	 *        	oddzial id
 	 *        	
 	 * @return Patient
 	 */
@@ -249,7 +247,7 @@ 
 	/**
 	 * getPesel
 	 *
-	 * @return pesel
+	 * @return string
 	 */
 	public function getPesel() {
 		return $this->pesel;
@@ -271,7 +269,7 @@ 
 	/**
 	 * getKategoriaPacjenta
 	 *
-	 * @return kategoriaPacjenta
+	 * @return integer
 	 */
 	public function getKategoriaPacjenta() {
 		return $this->kategoriaPacjenta;
@@ -293,7 +291,7 @@ 
 	/**
 	 * getTyp
 	 *
-	 * @return typ
+	 * @return string
 	 */
 	public function getTyp() {
 		return $this->typ;
@@ -396,7 +394,6 @@ 
 	 * String with comma separated values.
 	 *
 	 * @deprecated JSON used
-	 * @param unknown $patient        	
 	 *
 	 * @return string
 	 */

Spacing +34 added lines, -34 removed lines

@@ -113,17 +113,17 @@ 
 	 * @param unknown $args        	
 	 */
 	function __construct($args) {
-		if (! isset ( $args ) || empty ( $args )) {
+		if (!isset ($args) || empty ($args)) {
 			return;
 		}
-		foreach ( $args as $key => $value ) {
+		foreach ($args as $key => $value) {
 			if ($key == 'dataKategoryzacji') {
-				$value = new \DateTime ( $value . ' 12:00:00' );
+				$value = new \DateTime($value.' 12:00:00');
 			}
-			call_user_func ( array (
+			call_user_func(array(
 					$this,
-					'set' . $key 
-			), $value );
+					'set'.$key 
+			), $value);
 		}
 	}
 	
@@ -333,23 +333,23 @@ 
 	 * @return string
 	 */
 	public function toString() {
-		$txt = $this->getName ();
-		$txt .= $this->getPesel ();
+		$txt = $this->getName();
+		$txt .= $this->getPesel();
 		$txt .= "id:";
-		$txt .= $this->getId ();
+		$txt .= $this->getId();
 		$txt .= "oid:";
-		$txt .= $this->getOddzialId ();
+		$txt .= $this->getOddzialId();
 		$txt .= "d:";
-		$data = $this->getDataKategoryzacji ();
+		$data = $this->getDataKategoryzacji();
 		if ($data instanceof \DateTime) {
-			$txt .= $this->getDataKategoryzacji ()->format ( "Y-m-d" );
+			$txt .= $this->getDataKategoryzacji()->format("Y-m-d");
 		} else {
-			$txt .= $this->getDataKategoryzacji ();
+			$txt .= $this->getDataKategoryzacji();
 		}
 		return $txt;
 	}
 	public function __toString() {
-		return $this->toString ();
+		return $this->toString();
 	}
 	
 	/**
@@ -358,7 +358,7 @@ 
 	 * @return multitype:string
 	 */
 	protected static function getFields() {
-		$fields = array (
+		$fields = array(
 				"id",
 				"name",
 				"pesel",
@@ -375,21 +375,21 @@ 
 	 * @return string
 	 */
 	public function toDatatablesJSONString() {
-		$return_object_array = [ ];
-		$fields = $this->getFields ();
-		foreach ( $fields as $field ) {
-			$value = call_user_func ( array (
+		$return_object_array = [];
+		$fields = $this->getFields();
+		foreach ($fields as $field) {
+			$value = call_user_func(array(
 					$this,
-					'get' . $field 
-			) );
+					'get'.$field 
+			));
 			if ($value instanceof \DateTime) {
-				$value = $value->format ( 'Y-m-d' );
+				$value = $value->format('Y-m-d');
 			}
-			array_push ( $return_object_array, array (
+			array_push($return_object_array, array(
 					$field => $value 
-			) );
+			));
 		}
-		return json_encode ( $this );
+		return json_encode($this);
 	}
 	
 	/**
@@ -402,19 +402,19 @@ 
 	 */
 	public function toDatatablesString() {
 		$string = "";
-		$fields = $this::getFields ();
-		foreach ( $fields as $field ) {
-			$value = call_user_func ( array (
+		$fields = $this::getFields();
+		foreach ($fields as $field) {
+			$value = call_user_func(array(
 					$this,
-					'get' . $field 
-			) );
+					'get'.$field 
+			));
 			if ($value instanceof \DateTime) {
-				$value = $value->format ( 'Y-m-d' );
+				$value = $value->format('Y-m-d');
 			}
-			$string .= $value . ",";
+			$string .= $value.",";
 		}
-		$string = trim ( $string, "," );
-		$string = str_replace ( "\n", "", $string );
+		$string = trim($string, ",");
+		$string = str_replace("\n", "", $string);
 		return $string;
 	}
 }

Indentation +361 added lines, -361 removed lines

@@ -57,365 +57,365 @@
  */
 class Patient {
 	
-	/**
-	 *
-	 * @var string $typ typ pacjenta
-	 */
-	protected $typ = "";
-	
-	/**
-	 * id
-	 * @Id @Column(type="integer") @GeneratedValue
-	 */
-	public $id;
-	
-	/**
-	 * name
-	 * @Column(type="string", length=50)
-	 */
-	public $name;
-	
-	/**
-	 * @Column(type="string", length=11)
-	 */
-	public $pesel;
-	
-	/**
-	 * @Column(type="integer") *
-	 */
-	public $numerHistorii;
-	
-	/**
-	 * $dataKategoryzacji datetime
-	 * @Column(type="datetime") *
-	 */
-	public $dataKategoryzacji;
-	
-	/**
-	 * @Column(type="integer") *
-	 */
-	protected $oddzialId;
-	
-	/**
-	 * @Column(columnDefinition="TINYINT(4) NOT NULL DEFAULT 0")
-	 */
-	public $kategoriaPacjenta = 0;
-	
-	/**
-	 * @ManyToOne(targetEntity="Hospitalplugin\Entities\User")
-	 * @JoinColumn(name="userId", referencedColumnName="id", nullable=true)
-	 * @Column(columnDefinition="INT(11) NOT NULL DEFAULT 0")
-	 */
-	public $user;
-	
-	/**
-	 * Constructor
-	 *
-	 * @param unknown $args        	
-	 */
-	function __construct($args) {
-		if (! isset ( $args ) || empty ( $args )) {
-			return;
-		}
-		foreach ( $args as $key => $value ) {
-			if ($key == 'dataKategoryzacji') {
-				$value = new \DateTime ( $value . ' 12:00:00' );
-			}
-			call_user_func ( array (
-					$this,
-					'set' . $key 
-			), $value );
-		}
-	}
-	
-	/**
-	 * getId
-	 *
-	 * @return id
-	 */
-	public function getId() {
-		return $this->id;
-	}
-	
-	/**
-	 * sets id
-	 *
-	 * @param int $id
-	 *        	ID
-	 *        	
-	 * @return \Hospitalplugin\Entities\Patient
-	 */
-	public function setId($id) {
-		$this->id = $id;
-		return $this;
-	}
-	
-	/**
-	 * getName
-	 *
-	 * @return name
-	 */
-	public function getName() {
-		return $this->name;
-	}
-	
-	/**
-	 * setName
-	 *
-	 * @param string $name
-	 *        	string name
-	 *        	
-	 * @return Patient
-	 */
-	public function setName($name) {
-		$this->name = $name;
-		return $this;
-	}
-	
-	/**
-	 * getDataKategoryzacji
-	 *
-	 * @return \DateTime dataKategoryzacji
-	 */
-	public function getDataKategoryzacji() {
-		return $this->dataKategoryzacji;
-	}
-	
-	/**
-	 * setDataKategoryzacji
-	 *
-	 * @param \DateTime $dataKategoryzacji
-	 *        	data kategoryzyzacji
-	 *        	
-	 * @return Patient
-	 */
-	public function setDataKategoryzacji(\DateTime $dataKategoryzacji) {
-		$this->dataKategoryzacji = $dataKategoryzacji;
-		return $this;
-	}
-	
-	/**
-	 * getOddzialId
-	 *
-	 * @return oddzialId
-	 */
-	public function getOddzialId() {
-		return $this->oddzialId;
-	}
-	
-	/**
-	 * setOddzialId
-	 *
-	 * @param int $oddzialId
-	 *        	oddzial id
-	 *        	
-	 * @return Patient
-	 */
-	public function setOddzialId($oddzialId) {
-		$this->oddzialId = $oddzialId;
-		return $this;
-	}
-	
-	/**
-	 *
-	 * @param Ward $ward        	
-	 */
-	public function setWard($ward) {
-		$this->oddzialId = $ward->id;
-		return $this;
-	}
-	
-	/**
-	 * getOddzialId
-	 *
-	 * @return oddzialId
-	 */
-	public function getNumerHistorii() {
-		return $this->numerHistorii;
-	}
-	
-	/**
-	 * setOddzialId
-	 *
-	 * @param int $oddzialId
-	 *        	oddzial id
-	 *        	
-	 * @return Patient
-	 */
-	public function setNumerHistorii($numerHistorii) {
-		$this->numerHistorii = $numerHistorii;
-		return $this;
-	}
-	
-	/**
-	 * getPesel
-	 *
-	 * @return pesel
-	 */
-	public function getPesel() {
-		return $this->pesel;
-	}
-	
-	/**
-	 * setPesel
-	 *
-	 * @param string $pesel
-	 *        	nr pesel
-	 *        	
-	 * @return Patient
-	 */
-	public function setPesel($pesel) {
-		$this->pesel = $pesel;
-		return $this;
-	}
-	
-	/**
-	 * getKategoriaPacjenta
-	 *
-	 * @return kategoriaPacjenta
-	 */
-	public function getKategoriaPacjenta() {
-		return $this->kategoriaPacjenta;
-	}
-	
-	/**
-	 * setKategoriaPacjenta
-	 *
-	 * @param int $kategoriaPacjenta
-	 *        	kategoriaPacjenta
-	 *        	
-	 * @return Patient
-	 */
-	public function setKategoriaPacjenta($kategoriaPacjenta) {
-		$this->kategoriaPacjenta = $kategoriaPacjenta;
-		return $this;
-	}
-	
-	/**
-	 * getTyp
-	 *
-	 * @return typ
-	 */
-	public function getTyp() {
-		return $this->typ;
-	}
-	
-	/**
-	 * setTyp
-	 *
-	 * @param string $typ        	
-	 *
-	 * @return \Hospitalplugin\Entities\Patient
-	 */
-	public function setTyp($typ) {
-		$this->typ = $typ;
-		return $this;
-	}
-	
-	/**
-	 * getUser
-	 */
-	public function getUser() {
-		return $this->user;
-	}
-	
-	/**
-	 *
-	 * @param User $user        	
-	 */
-	public function setUser($user) {
-		$this->user = $user;
-		return $this;
-	}
-	
-	/**
-	 * toString
-	 *
-	 * @return string
-	 */
-	public function toString() {
-		$txt = $this->getName ();
-		$txt .= $this->getPesel ();
-		$txt .= "id:";
-		$txt .= $this->getId ();
-		$txt .= "oid:";
-		$txt .= $this->getOddzialId ();
-		$txt .= "d:";
-		$data = $this->getDataKategoryzacji ();
-		if ($data instanceof \DateTime) {
-			$txt .= $this->getDataKategoryzacji ()->format ( "Y-m-d" );
-		} else {
-			$txt .= $this->getDataKategoryzacji ();
-		}
-		return $txt;
-	}
-	public function __toString() {
-		return $this->toString ();
-	}
-	
-	/**
-	 * getFields
-	 *
-	 * @return multitype:string
-	 */
-	protected static function getFields() {
-		$fields = array (
-				"id",
-				"name",
-				"pesel",
-				"numerHistorii",
-				"dataKategoryzacji",
-				"kategoriaPacjenta" 
-		);
-		return $fields;
-	}
-	
-	/**
-	 * toDatatablesJSONString
-	 *
-	 * @return string
-	 */
-	public function toDatatablesJSONString() {
-		$return_object_array = [ ];
-		$fields = $this->getFields ();
-		foreach ( $fields as $field ) {
-			$value = call_user_func ( array (
-					$this,
-					'get' . $field 
-			) );
-			if ($value instanceof \DateTime) {
-				$value = $value->format ( 'Y-m-d' );
-			}
-			array_push ( $return_object_array, array (
-					$field => $value 
-			) );
-		}
-		return json_encode ( $this );
-	}
-	
-	/**
-	 * String with comma separated values.
-	 *
-	 * @deprecated JSON used
-	 * @param unknown $patient        	
-	 *
-	 * @return string
-	 */
-	public function toDatatablesString() {
-		$string = "";
-		$fields = $this::getFields ();
-		foreach ( $fields as $field ) {
-			$value = call_user_func ( array (
-					$this,
-					'get' . $field 
-			) );
-			if ($value instanceof \DateTime) {
-				$value = $value->format ( 'Y-m-d' );
-			}
-			$string .= $value . ",";
-		}
-		$string = trim ( $string, "," );
-		$string = str_replace ( "\n", "", $string );
-		return $string;
-	}
+    /**
+     *
+     * @var string $typ typ pacjenta
+     */
+    protected $typ = "";
+	
+    /**
+     * id
+     * @Id @Column(type="integer") @GeneratedValue
+     */
+    public $id;
+	
+    /**
+     * name
+     * @Column(type="string", length=50)
+     */
+    public $name;
+	
+    /**
+     * @Column(type="string", length=11)
+     */
+    public $pesel;
+	
+    /**
+     * @Column(type="integer") *
+     */
+    public $numerHistorii;
+	
+    /**
+     * $dataKategoryzacji datetime
+     * @Column(type="datetime") *
+     */
+    public $dataKategoryzacji;
+	
+    /**
+     * @Column(type="integer") *
+     */
+    protected $oddzialId;
+	
+    /**
+     * @Column(columnDefinition="TINYINT(4) NOT NULL DEFAULT 0")
+     */
+    public $kategoriaPacjenta = 0;
+	
+    /**
+     * @ManyToOne(targetEntity="Hospitalplugin\Entities\User")
+     * @JoinColumn(name="userId", referencedColumnName="id", nullable=true)
+     * @Column(columnDefinition="INT(11) NOT NULL DEFAULT 0")
+     */
+    public $user;
+	
+    /**
+     * Constructor
+     *
+     * @param unknown $args        	
+     */
+    function __construct($args) {
+        if (! isset ( $args ) || empty ( $args )) {
+            return;
+        }
+        foreach ( $args as $key => $value ) {
+            if ($key == 'dataKategoryzacji') {
+                $value = new \DateTime ( $value . ' 12:00:00' );
+            }
+            call_user_func ( array (
+                    $this,
+                    'set' . $key 
+            ), $value );
+        }
+    }
+	
+    /**
+     * getId
+     *
+     * @return id
+     */
+    public function getId() {
+        return $this->id;
+    }
+	
+    /**
+     * sets id
+     *
+     * @param int $id
+     *        	ID
+     *        	
+     * @return \Hospitalplugin\Entities\Patient
+     */
+    public function setId($id) {
+        $this->id = $id;
+        return $this;
+    }
+	
+    /**
+     * getName
+     *
+     * @return name
+     */
+    public function getName() {
+        return $this->name;
+    }
+	
+    /**
+     * setName
+     *
+     * @param string $name
+     *        	string name
+     *        	
+     * @return Patient
+     */
+    public function setName($name) {
+        $this->name = $name;
+        return $this;
+    }
+	
+    /**
+     * getDataKategoryzacji
+     *
+     * @return \DateTime dataKategoryzacji
+     */
+    public function getDataKategoryzacji() {
+        return $this->dataKategoryzacji;
+    }
+	
+    /**
+     * setDataKategoryzacji
+     *
+     * @param \DateTime $dataKategoryzacji
+     *        	data kategoryzyzacji
+     *        	
+     * @return Patient
+     */
+    public function setDataKategoryzacji(\DateTime $dataKategoryzacji) {
+        $this->dataKategoryzacji = $dataKategoryzacji;
+        return $this;
+    }
+	
+    /**
+     * getOddzialId
+     *
+     * @return oddzialId
+     */
+    public function getOddzialId() {
+        return $this->oddzialId;
+    }
+	
+    /**
+     * setOddzialId
+     *
+     * @param int $oddzialId
+     *        	oddzial id
+     *        	
+     * @return Patient
+     */
+    public function setOddzialId($oddzialId) {
+        $this->oddzialId = $oddzialId;
+        return $this;
+    }
+	
+    /**
+     *
+     * @param Ward $ward        	
+     */
+    public function setWard($ward) {
+        $this->oddzialId = $ward->id;
+        return $this;
+    }
+	
+    /**
+     * getOddzialId
+     *
+     * @return oddzialId
+     */
+    public function getNumerHistorii() {
+        return $this->numerHistorii;
+    }
+	
+    /**
+     * setOddzialId
+     *
+     * @param int $oddzialId
+     *        	oddzial id
+     *        	
+     * @return Patient
+     */
+    public function setNumerHistorii($numerHistorii) {
+        $this->numerHistorii = $numerHistorii;
+        return $this;
+    }
+	
+    /**
+     * getPesel
+     *
+     * @return pesel
+     */
+    public function getPesel() {
+        return $this->pesel;
+    }
+	
+    /**
+     * setPesel
+     *
+     * @param string $pesel
+     *        	nr pesel
+     *        	
+     * @return Patient
+     */
+    public function setPesel($pesel) {
+        $this->pesel = $pesel;
+        return $this;
+    }
+	
+    /**
+     * getKategoriaPacjenta
+     *
+     * @return kategoriaPacjenta
+     */
+    public function getKategoriaPacjenta() {
+        return $this->kategoriaPacjenta;
+    }
+	
+    /**
+     * setKategoriaPacjenta
+     *
+     * @param int $kategoriaPacjenta
+     *        	kategoriaPacjenta
+     *        	
+     * @return Patient
+     */
+    public function setKategoriaPacjenta($kategoriaPacjenta) {
+        $this->kategoriaPacjenta = $kategoriaPacjenta;
+        return $this;
+    }
+	
+    /**
+     * getTyp
+     *
+     * @return typ
+     */
+    public function getTyp() {
+        return $this->typ;
+    }
+	
+    /**
+     * setTyp
+     *
+     * @param string $typ        	
+     *
+     * @return \Hospitalplugin\Entities\Patient
+     */
+    public function setTyp($typ) {
+        $this->typ = $typ;
+        return $this;
+    }
+	
+    /**
+     * getUser
+     */
+    public function getUser() {
+        return $this->user;
+    }
+	
+    /**
+     *
+     * @param User $user        	
+     */
+    public function setUser($user) {
+        $this->user = $user;
+        return $this;
+    }
+	
+    /**
+     * toString
+     *
+     * @return string
+     */
+    public function toString() {
+        $txt = $this->getName ();
+        $txt .= $this->getPesel ();
+        $txt .= "id:";
+        $txt .= $this->getId ();
+        $txt .= "oid:";
+        $txt .= $this->getOddzialId ();
+        $txt .= "d:";
+        $data = $this->getDataKategoryzacji ();
+        if ($data instanceof \DateTime) {
+            $txt .= $this->getDataKategoryzacji ()->format ( "Y-m-d" );
+        } else {
+            $txt .= $this->getDataKategoryzacji ();
+        }
+        return $txt;
+    }
+    public function __toString() {
+        return $this->toString ();
+    }
+	
+    /**
+     * getFields
+     *
+     * @return multitype:string
+     */
+    protected static function getFields() {
+        $fields = array (
+                "id",
+                "name",
+                "pesel",
+                "numerHistorii",
+                "dataKategoryzacji",
+                "kategoriaPacjenta" 
+        );
+        return $fields;
+    }
+	
+    /**
+     * toDatatablesJSONString
+     *
+     * @return string
+     */
+    public function toDatatablesJSONString() {
+        $return_object_array = [ ];
+        $fields = $this->getFields ();
+        foreach ( $fields as $field ) {
+            $value = call_user_func ( array (
+                    $this,
+                    'get' . $field 
+            ) );
+            if ($value instanceof \DateTime) {
+                $value = $value->format ( 'Y-m-d' );
+            }
+            array_push ( $return_object_array, array (
+                    $field => $value 
+            ) );
+        }
+        return json_encode ( $this );
+    }
+	
+    /**
+     * String with comma separated values.
+     *
+     * @deprecated JSON used
+     * @param unknown $patient        	
+     *
+     * @return string
+     */
+    public function toDatatablesString() {
+        $string = "";
+        $fields = $this::getFields ();
+        foreach ( $fields as $field ) {
+            $value = call_user_func ( array (
+                    $this,
+                    'get' . $field 
+            ) );
+            if ($value instanceof \DateTime) {
+                $value = $value->format ( 'Y-m-d' );
+            }
+            $string .= $value . ",";
+        }
+        $string = trim ( $string, "," );
+        $string = str_replace ( "\n", "", $string );
+        return $string;
+    }
 }

src/Entities/PatientCRUD.php

Doc Comments +3 added lines, -6 removed lines

@@ -51,11 +51,9 @@ 
 	 *
 	 * TODO(AM) testy na przypadki graniczne - pacjenci z data przed polnoca, po polnocy, godzina przed obecna, po obecnej
 	 *
-	 * @param int $day
-	 *        	dayOfTheMonth
-	 * @param int $month
-	 *        	month
 	 *        	
+	 * @param string $date1
+	 * @param string $date2
 	 * @return Patient array
 	 */
 	public static function getPatientsDateRange($date1, $date2, $wardId = 0) {
@@ -73,7 +71,7 @@ 
 	/**
 	 * getPatient
 	 *
-	 * @param $id $id
+	 * @param integer $id
 	 *        	int
 	 *        	
 	 * @return Patient Patient
@@ -111,7 +109,6 @@ 
 	/**
 	 * setPatientCategories
 	 *
-	 * @param Patient $obj        	
 	 *
 	 * @return Patient
 	 */

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 {

Indentation +110 added lines, -110 removed lines

@@ -32,120 +32,120 @@
 
 class PatientCRUD {
 	
-	/**
-	 * getPatients
-	 *
-	 * @param int $day
-	 *        	dayOfTheMonth
-	 * @param int $month
-	 *        	month
-	 *        	
-	 * @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 );
-	}
+    /**
+     * getPatients
+     *
+     * @param int $day
+     *        	dayOfTheMonth
+     * @param int $month
+     *        	month
+     *        	
+     * @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 );
+    }
 	
-	/**
-	 * getPatientsDateRange
-	 *
-	 * TODO(AM) testy na przypadki graniczne - pacjenci z data przed polnoca, po polnocy, godzina przed obecna, po obecnej
-	 *
-	 * @param int $day
-	 *        	dayOfTheMonth
-	 * @param int $month
-	 *        	month
-	 *        	
-	 * @return Patient array
-	 */
-	public static function getPatientsDateRange($date1, $date2, $wardId = 0) {
-		$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 ();
-		return $patients;
-	}
+    /**
+     * getPatientsDateRange
+     *
+     * TODO(AM) testy na przypadki graniczne - pacjenci z data przed polnoca, po polnocy, godzina przed obecna, po obecnej
+     *
+     * @param int $day
+     *        	dayOfTheMonth
+     * @param int $month
+     *        	month
+     *        	
+     * @return Patient array
+     */
+    public static function getPatientsDateRange($date1, $date2, $wardId = 0) {
+        $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 ();
+        return $patients;
+    }
 	
-	/**
-	 * getPatient
-	 *
-	 * @param $id $id
-	 *        	int
-	 *        	
-	 * @return Patient Patient
-	 */
-	public static function getPatient($id, $type = '') {
-		$entityManager = ( object ) DoctrineBootstrap::getEntityManager ();
-		$type = 'Hospitalplugin\Entities\Patient' . $type;
-		$patient = $entityManager->getRepository ( $type )->findOneBy ( array (
-				'id' => $id 
-		) );
-		return Utils::cast ( $type, ( object ) $patient, 0 );
-	}
+    /**
+     * getPatient
+     *
+     * @param $id $id
+     *        	int
+     *        	
+     * @return Patient Patient
+     */
+    public static function getPatient($id, $type = '') {
+        $entityManager = ( object ) DoctrineBootstrap::getEntityManager ();
+        $type = 'Hospitalplugin\Entities\Patient' . $type;
+        $patient = $entityManager->getRepository ( $type )->findOneBy ( array (
+                'id' => $id 
+        ) );
+        return Utils::cast ( $type, ( object ) $patient, 0 );
+    }
 	
-	/**
-	 * setPatientCategories
-	 *
-	 * @param Patient $obj        	
-	 *
-	 * @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 (
-					$patient,
-					'set' . ucwords ( $key ) 
-			), $value );
-		}
-		$entityManager->merge ( $patient );
-		$entityManager->flush ();
-		return $patient;
-	}
+    /**
+     * setPatientCategories
+     *
+     * @param Patient $obj        	
+     *
+     * @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 (
+                    $patient,
+                    'set' . ucwords ( $key ) 
+            ), $value );
+        }
+        $entityManager->merge ( $patient );
+        $entityManager->flush ();
+        return $patient;
+    }
 	
-	/**
-	 * setPatientCategories
-	 *
-	 * @param Patient $obj        	
-	 *
-	 * @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 ();
-		return $patient;
-	}
+    /**
+     * setPatientCategories
+     *
+     * @param Patient $obj        	
+     *
+     * @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 ();
+        return $patient;
+    }
 	
-	/**
-	 * deletePatient
-	 *
-	 * @param $id $id
-	 *        	int
-	 */
-	public static function deletePatient($id, $userId = 0) {
-		$entityManager = ( object ) DoctrineBootstrap::getEntityManager ();
-		$type = 'Hospitalplugin\Entities\Patient';
-		$patient = $entityManager->getRepository ( $type )->findOneBy ( array (
-				'id' => $id 
-		) );
-		$entityManager->remove ( $patient );
-		$log = strval($patient);
-		$audit = new PatientDeleted();
-		$audit->deletedAt = new \DateTime ();
-		$audit->deletedByUserId = $userId;
-		$audit->log = $log;
-		$entityManager->persist ( $audit );
-		$entityManager->flush ();
-	}
+    /**
+     * deletePatient
+     *
+     * @param $id $id
+     *        	int
+     */
+    public static function deletePatient($id, $userId = 0) {
+        $entityManager = ( object ) DoctrineBootstrap::getEntityManager ();
+        $type = 'Hospitalplugin\Entities\Patient';
+        $patient = $entityManager->getRepository ( $type )->findOneBy ( array (
+                'id' => $id 
+        ) );
+        $entityManager->remove ( $patient );
+        $log = strval($patient);
+        $audit = new PatientDeleted();
+        $audit->deletedAt = new \DateTime ();
+        $audit->deletedByUserId = $userId;
+        $audit->log = $log;
+        $entityManager->persist ( $audit );
+        $entityManager->flush ();
+    }
 }
 ?>
\ No newline at end of file

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

Doc Comments +13 added lines, -13 removed lines

@@ -81,7 +81,7 @@ 
     public $edukacjaZdrowotnaIOpiekaPsychospoleczna;
     //
     /**
-     * @return aktywnoscFizyczna
+     * @return integer
      */
     public function getAktywnoscFizyczna()
     {
@@ -90,7 +90,7 @@ 
 
     /**
      * @param int $aktywnoscFizyczna int aktywnoscFizyczna
-     * @return PatientZZ
+     * @return PatientDIA
      */
     public function setAktywnoscFizyczna($aktywnoscFizyczna)
     {
@@ -99,7 +99,7 @@ 
     }
 
     /**
-     * @return higiena
+     * @return integer
      */
     public function getHigiena()
     {
@@ -108,7 +108,7 @@ 
 
     /**
      * @param int $higiena int higiena
-     * @return PatientZZ
+     * @return PatientDIA
      */
     public function setHigiena($higiena)
     {
@@ -117,7 +117,7 @@ 
     }
 
     /**
-     * @return odzywianie
+     * @return integer
      */
     public function getOdzywianie()
     {
@@ -126,7 +126,7 @@ 
 
     /**
      * @param  int $odzywianie int odzywianie
-     * @return PatientZZ
+     * @return PatientDIA
      */
     public function setOdzywianie($odzywianie)
     {
@@ -135,7 +135,7 @@ 
     }
 
     /**
-     * @return wydalanie
+     * @return integer
      */
     public function getWydalanie()
     {
@@ -144,7 +144,7 @@ 
 
     /**
      * @param  int $wydalanie int wydalanie
-     * @return PatientZZ
+     * @return PatientDIA
      */
     public function setWydalanie($wydalanie)
     {
@@ -153,7 +153,7 @@ 
     }
 
     /**
-     * @return pomiarParametrowZyciowych
+     * @return integer
      */
     public function getPomiarParametrowZyciowych()
     {
@@ -162,7 +162,7 @@ 
 
     /**
      * @param  int $pomiarParametrowZyciowych int pomiarParametrowZyciowych
-     * @return PatientZZ
+     * @return PatientDIA
      */
     public function setPomiarParametrowZyciowych($pomiarParametrowZyciowych)
     {
@@ -171,7 +171,7 @@ 
     }
 
     /**
-     * @return leczenie
+     * @return integer
      */
     public function getLeczenie()
     {
@@ -180,7 +180,7 @@ 
 
     /**
      * @param  int $leczenie int leczenie
-     * @return PatientZZ
+     * @return PatientDIA
      */
     public function setLeczenie($leczenie)
     {
@@ -198,7 +198,7 @@ 
 
     /**
      * @param  int $edukacjaZdrowotnaIOpiekaPsychospoleczna int edukacjaZdrowotnaIOpiekaPsychospoleczna
-     * @return PatientZZ
+     * @return PatientDIA
      */
     public function setEdukacjaZdrowotnaIOpiekaPsychospoleczna($edukacjaZdrowotnaIOpiekaPsychospoleczna)
     {

Indentation +21 added lines, -21 removed lines

@@ -1,26 +1,26 @@
 <?php
 /**
- * PatientZZ
- *
- * 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
- */
+     * PatientZZ
+     *
+     * 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\Entities;
 
 /**

src/Entities/PatientPED.php

Doc Comments +11 added lines, -11 removed lines

@@ -83,7 +83,7 @@ 
     /**
      * getaktywnoscFizyczna
      * 
-     * @return aktywnoscFizyczna int
+     * @return integer int
      */
     public function getAktywnoscFizyczna()
     {
@@ -106,7 +106,7 @@ 
     /**
      * getHigiena
      * 
-     * @return Higiena int Higiena
+     * @return integer int Higiena
      */
     public function getHigiena()
     {
@@ -116,7 +116,7 @@ 
     /**
      * setHigiena
      * 
-     * @param int $Higiena int higiena
+     * @param int $higiena int higiena
      * 
      * @return PatientPED
      */
@@ -129,7 +129,7 @@ 
     /**
      * getKarmienieIOdzywianie
      * 
-     * @return KarmienieIOdzywianie
+     * @return integer
      */
     public function getKarmienieIOdzywianie()
     {
@@ -139,7 +139,7 @@ 
     /**
      * setKarmienieIOdzywianie
      * 
-     * @param int $KarmienieIOdzywianie itn karmienieIOdzywianie
+     * @param int $karmienieIOdzywianie itn karmienieIOdzywianie
      * 
      * @return PatientPED
      */
@@ -152,7 +152,7 @@ 
     /**
      * getWydalanie
      * 
-     * @return Wydalanie
+     * @return integer
      */
     public function getWydalanie()
     {
@@ -162,7 +162,7 @@ 
     /**
      * PatientPED
      * 
-     * @param int $Wydalanie Wydalanie
+     * @param int $wydalanie Wydalanie
      * 
      * @return PatientPED
      */
@@ -175,7 +175,7 @@ 
     /**
      * getPomiarParametrowZyciowych
      * 
-     * @return PomiarParametrowZyciowych
+     * @return integer
      */
     public function getPomiarParametrowZyciowych()
     {
@@ -185,7 +185,7 @@ 
     /**
      * setPomiarParametrowZyciowych
      * 
-     * @param int $PomiarParametrowZyciowych int PomiarParametrowZyciowych
+     * @param int $pomiarParametrowZyciowych int PomiarParametrowZyciowych
      * 
      * @return PatientPED
      */
@@ -198,7 +198,7 @@ 
     /**
      * getLeczenie
      * 
-     * @return Leczenie
+     * @return integer
      */
     public function getLeczenie()
     {
@@ -221,7 +221,7 @@ 
     /**
      * getEdukacjaZdrowotnaOrazWsparcieDzieckaIRodzicow
      * 
-     * @return EdukacjaZdrowotnaOrazWsparcieDzieckaIRodzicow
+     * @return integer
      */
     public function getEdukacjaZdrowotnaOrazWsparcieDzieckaIRodzicow()
     {

Indentation +21 added lines, -21 removed lines

@@ -1,26 +1,26 @@
 <?php
 /**
- * PatientPED
- *
- * 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
- */
+     * PatientPED
+     *
+     * 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\Entities;
 
 /**

src/Entities/PatientPOL.php

Doc Comments +14 added lines, -14 removed lines

@@ -81,7 +81,7 @@ 
     public $edukacjaIWsparciePsychiczne;
     //
     /**
-     * @return aktywnoscFizyczna
+     * @return integer
      */
     public function getAktywnoscFizyczna()
     {
@@ -90,7 +90,7 @@ 
 
     /**
      * @param int $aktywnoscFizyczna int aktywnoscFizyczna
-     * @return PatientZZ
+     * @return PatientPOL
      */
     public function setAktywnoscFizyczna($aktywnoscFizyczna)
     {
@@ -99,7 +99,7 @@ 
     }
 
     /**
-     * @return higiena
+     * @return integer
      */
     public function getHigiena()
     {
@@ -108,7 +108,7 @@ 
 
     /**
      * @param int $higiena int higiena
-     * @return PatientZZ
+     * @return PatientPOL
      */
     public function setHigiena($higiena)
     {
@@ -117,7 +117,7 @@ 
     }
 
     /**
-     * @return odzywianie
+     * @return integer
      */
     public function getOdzywianie()
     {
@@ -126,7 +126,7 @@ 
 
     /**
      * @param  int $odzywianie int odzywianie
-     * @return PatientZZ
+     * @return PatientPOL
      */
     public function setOdzywianie($odzywianie)
     {
@@ -135,7 +135,7 @@ 
     }
 
     /**
-     * @return wydalanie
+     * @return integer
      */
     public function getWydalanie()
     {
@@ -144,7 +144,7 @@ 
 
     /**
      * @param  int $wydalanie int wydalanie
-     * @return PatientZZ
+     * @return PatientPOL
      */
     public function setWydalanie($wydalanie)
     {
@@ -153,7 +153,7 @@ 
     }
 
     /**
-     * @return pomiarParametrowZyciowych
+     * @return integer
      */
     public function getPomiarParametrowZyciowych()
     {
@@ -162,7 +162,7 @@ 
 
     /**
      * @param  int $pomiarParametrowZyciowych int pomiarParametrowZyciowych
-     * @return PatientZZ
+     * @return PatientPOL
      */
     public function setPomiarParametrowZyciowych($pomiarParametrowZyciowych)
     {
@@ -171,7 +171,7 @@ 
     }
 
     /**
-     * @return leczenie
+     * @return integer
      */
     public function getLeczenie()
     {
@@ -180,7 +180,7 @@ 
 
     /**
      * @param  int $leczenie int leczenie
-     * @return PatientZZ
+     * @return PatientPOL
      */
     public function setLeczenie($leczenie)
     {
@@ -189,7 +189,7 @@ 
     }
 
     /**
-     * @return edukacjaIWsparciePsychiczne
+     * @return integer
      */
     public function getEdukacjaIWsparciePsychiczne()
     {
@@ -198,7 +198,7 @@ 
 
     /**
      * @param  int $edukacjaIWsparciePsychiczne int edukacjaIWsparciePsychiczne
-     * @return PatientZZ
+     * @return PatientPOL
      */
     public function setEdukacjaIWsparciePsychiczne($edukacjaIWsparciePsychiczne)
     {

Indentation +21 added lines, -21 removed lines

@@ -1,26 +1,26 @@
 <?php
 /**
- * PatientZZ
- *
- * 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
- */
+     * PatientZZ
+     *
+     * 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\Entities;
 
 /**

src/Entities/PatientRaport.php

Doc Comments +2 added lines, -2 removed lines

@@ -50,8 +50,8 @@
 	 *
 	 * @param unknown $wardId        	
 	 * @param unknown $type        	
-	 * @param unknown $startDate        	
-	 * @param unknown $endDate        	
+	 * @param string $startDate        	
+	 * @param string $endDate        	
 	 * @return array
 	 */
 	public static function getRaportBetweenDates($wardId, $type, $startDate, $endDate) {

Indentation +179 added lines, -179 removed lines

@@ -8,185 +8,185 @@
 use Doctrine\ORM\Query\ResultSetMapping;
 
 class PatientRaport {
-	/**
-	 *
-	 * @param unknown $wardId        	
-	 * @param unknown $date        	
-	 */
-	public static function getRaport($wardId, $date, $wardType) {
-		$startDate = $date . '-01';
-		$endDate = date ( "Y-m-t 23:59:59", strtotime ( $startDate ) );
+    /**
+     *
+     * @param unknown $wardId        	
+     * @param unknown $date        	
+     */
+    public static function getRaport($wardId, $date, $wardType) {
+        $startDate = $date . '-01';
+        $endDate = date ( "Y-m-t 23:59:59", strtotime ( $startDate ) );
 		
-		return PatientRaport::getRaportBetweenDates ( $wardId, $wardType, $startDate, $endDate );
-	}
-	private static function getQuery($type) {
-		if ($type == 'POR') {
-			// poród zabiegowy
-			$dql1 = "  SELECT p.kategoriaPacjenta + 3 as kategoria, DATE(p.dataKategoryzacji) as data, COUNT(p.kategoriaPacjenta) as suma ";
-			$dql1 .= " FROM Hospitalplugin\Entities\PatientPOR p ";
-			$dql1 .= " WHERE p.dataKategoryzacji BETWEEN ?1 AND ?2 AND p.oddzialId = ?3 AND p.iICzas = 3";
-			$dql1 .= " GROUP BY data, p.kategoriaPacjenta";
-			// poród siłami natury
-			$dql2 = "  SELECT p.kategoriaPacjenta as kategoria, DATE(p.dataKategoryzacji) as data, COUNT(p.kategoriaPacjenta) as suma ";
-			$dql2 .= " FROM Hospitalplugin\Entities\PatientPOR p ";
-			$dql2 .= " WHERE p.dataKategoryzacji BETWEEN ?1 AND ?2 AND p.oddzialId = ?3 AND (p.iICzas <> 3 OR p.iICzas IS NULL)";
-			$dql2 .= " GROUP BY data, p.kategoriaPacjenta";
-			return array (
-					$dql1,
-					$dql2 
-			);
-		} else {
-			// pozostałe typy
-			$dql = "  SELECT p.kategoriaPacjenta as kategoria, DATE(p.dataKategoryzacji) as data, COUNT(p.kategoriaPacjenta) as suma ";
-			$dql .= " FROM Hospitalplugin\Entities\Patient p ";
-			$dql .= " WHERE p.dataKategoryzacji BETWEEN ?1 AND ?2 AND p.oddzialId = ?3";
-			$dql .= " GROUP BY data, p.kategoriaPacjenta";
-			return array (
-					$dql 
-			);
-		}
-	}
-	/**
-	 *
-	 * @param unknown $wardId        	
-	 * @param unknown $type        	
-	 * @param unknown $startDate        	
-	 * @param unknown $endDate        	
-	 * @return array
-	 */
-	public static function getRaportBetweenDates($wardId, $type, $startDate, $endDate) {
-		$em = DoctrineBootstrap::getEntityManager ();
-		$em->getConfiguration ()->addCustomDatetimeFunction ( 'DATE', 'Hospitalplugin\DQLFunctions\DateFunction' );
-		$dql = PatientRaport::getQuery ( $type );
-		$allResults = array ();
-		foreach ( $dql as $query ) {
-			$result = $em->createQuery ( $query )->setParameter ( 1, $startDate )->setParameter ( 2, $endDate )->setParameter ( 3, $wardId )->getResult ();
-			$allResults = array_merge ( $result, $allResults );
-		}
+        return PatientRaport::getRaportBetweenDates ( $wardId, $wardType, $startDate, $endDate );
+    }
+    private static function getQuery($type) {
+        if ($type == 'POR') {
+            // poród zabiegowy
+            $dql1 = "  SELECT p.kategoriaPacjenta + 3 as kategoria, DATE(p.dataKategoryzacji) as data, COUNT(p.kategoriaPacjenta) as suma ";
+            $dql1 .= " FROM Hospitalplugin\Entities\PatientPOR p ";
+            $dql1 .= " WHERE p.dataKategoryzacji BETWEEN ?1 AND ?2 AND p.oddzialId = ?3 AND p.iICzas = 3";
+            $dql1 .= " GROUP BY data, p.kategoriaPacjenta";
+            // poród siłami natury
+            $dql2 = "  SELECT p.kategoriaPacjenta as kategoria, DATE(p.dataKategoryzacji) as data, COUNT(p.kategoriaPacjenta) as suma ";
+            $dql2 .= " FROM Hospitalplugin\Entities\PatientPOR p ";
+            $dql2 .= " WHERE p.dataKategoryzacji BETWEEN ?1 AND ?2 AND p.oddzialId = ?3 AND (p.iICzas <> 3 OR p.iICzas IS NULL)";
+            $dql2 .= " GROUP BY data, p.kategoriaPacjenta";
+            return array (
+                    $dql1,
+                    $dql2 
+            );
+        } else {
+            // pozostałe typy
+            $dql = "  SELECT p.kategoriaPacjenta as kategoria, DATE(p.dataKategoryzacji) as data, COUNT(p.kategoriaPacjenta) as suma ";
+            $dql .= " FROM Hospitalplugin\Entities\Patient p ";
+            $dql .= " WHERE p.dataKategoryzacji BETWEEN ?1 AND ?2 AND p.oddzialId = ?3";
+            $dql .= " GROUP BY data, p.kategoriaPacjenta";
+            return array (
+                    $dql 
+            );
+        }
+    }
+    /**
+     *
+     * @param unknown $wardId        	
+     * @param unknown $type        	
+     * @param unknown $startDate        	
+     * @param unknown $endDate        	
+     * @return array
+     */
+    public static function getRaportBetweenDates($wardId, $type, $startDate, $endDate) {
+        $em = DoctrineBootstrap::getEntityManager ();
+        $em->getConfiguration ()->addCustomDatetimeFunction ( 'DATE', 'Hospitalplugin\DQLFunctions\DateFunction' );
+        $dql = PatientRaport::getQuery ( $type );
+        $allResults = array ();
+        foreach ( $dql as $query ) {
+            $result = $em->createQuery ( $query )->setParameter ( 1, $startDate )->setParameter ( 2, $endDate )->setParameter ( 3, $wardId )->getResult ();
+            $allResults = array_merge ( $result, $allResults );
+        }
 		
-		$table = array ();
-		foreach ( $allResults as $row ) {
-			$table [$row ['data']] [$row ['kategoria']] = $row ['suma'];
-		}
-		return $table;
-	}
-	/**
-	 * @param unknown $type
-	 */
-	static function getColumns($type) {
-		if ($type == 'POR') {
-			return array (
-					'N1 naturalny',
-					'N2 naturalny',
-					'N3 naturalny',
-					'N1 zabiegowy',
-					'N2 zabiegowy',
-					'N3 zabiegowy',
-					'brak kat.',
-					'N',
-					'Tpb1',
-					'Tpb2',
-					'Tpb3',
-					'Tpb1z',
-					'Tpb2z',
-					'Tpb3z',
-					'Tpb0',
-					'2',
-					'Tpb1*N1',
-					'Tpb2*N2',
-					'Tpb3*N3',
-					'Tpb1z*N1z',
-					'Tpb2z*N2z',
-					'Tpb3z*N3z',
-					'Tpb0',
-					'2*N',
-					'Tpb/dzień'
-			);
-		} else {
-			return array (
-					'N1',
-					'N2',
-					'N3',
-					'brak kat.',
-					'N',
-					'Tpb1',
-					'Tpb2',
-					'Tpb3',
-					'Tpb0',
-					'2',
-					'Tpb1*N1',
-					'Tpb2*N2',
-					'Tpb3*N3',
-					'Tpb0',
-					'2*N',
-					'Tpb/dzień'
-			);
-		}
-	}
-	static function getIndexes($type) {
-		if ($type == 'POR') {
-			return array (
-					'1',
-					'2',
-					'3',
-					'4',
-					'5',
-					'6',
-					'0'
-			);
-		} else {
-			return array (
-					'1',
-					'2',
-					'3',
-					'0'
-			);
-		}
-	}
-	/**
-	 * based on
-	 * Zalecenie Konsultanta Krajowego w dz.
-	 * pielęgniarstwa w sprawie realizacji przepisów rozporządzenia Ministra Zdrowia z dnia 28 grudnia 2012 roku w sprawie sposobu ustalenia minimalnych norm zatrudnienia pielęgniarek i położnych w podmiotach leczniczych niebędących przedsiębiorcami.
-	 * http://www.nipip.pl/index.php/prawo/opiniekk/w-dz-pielegniarstwa/konsultant-krajowy-dr-hab-n-hum-maria-kozka/2265-zalecenie-konsultanta-krajowego-w-dz-pielegniarstwa-w-sprawie-realizacji-przepisow-rozporzadzenia-ministra-zdrowia-z-dnia-28-grudnia-2012-roku-w-sprawie-sposobu-ustalenia-minimalnych-norm-zatrudnienia-pielegniarek-i-poloznych-w-podmiotach-leczniczych-nieb
-	 *
-	 * @param unknown $type
-	 */
-	static function getTpb($type) {
-		if ($type == 'ZZ' || $type == 'PED') {
-			return array (
-					38,
-					95,
-					159,
-					0,
-					2
-			);
-		} else if ($type == 'PSY') {
-			return array (
-					40,
-					100,
-					160,
-					0,
-					2
-			);
-		} else if ($type == 'POR') {
-			return array (
-					137,
-					274,
-					328,
-					53,
-					53,
-					120,
-					0,
-					2
-			);
-		} else if ($type == 'POL') {
-			return array (
-					72,
-					100,
-					98,
-					0,
-					2
-			);
-		}
-	}
+        $table = array ();
+        foreach ( $allResults as $row ) {
+            $table [$row ['data']] [$row ['kategoria']] = $row ['suma'];
+        }
+        return $table;
+    }
+    /**
+     * @param unknown $type
+     */
+    static function getColumns($type) {
+        if ($type == 'POR') {
+            return array (
+                    'N1 naturalny',
+                    'N2 naturalny',
+                    'N3 naturalny',
+                    'N1 zabiegowy',
+                    'N2 zabiegowy',
+                    'N3 zabiegowy',
+                    'brak kat.',
+                    'N',
+                    'Tpb1',
+                    'Tpb2',
+                    'Tpb3',
+                    'Tpb1z',
+                    'Tpb2z',
+                    'Tpb3z',
+                    'Tpb0',
+                    '2',
+                    'Tpb1*N1',
+                    'Tpb2*N2',
+                    'Tpb3*N3',
+                    'Tpb1z*N1z',
+                    'Tpb2z*N2z',
+                    'Tpb3z*N3z',
+                    'Tpb0',
+                    '2*N',
+                    'Tpb/dzień'
+            );
+        } else {
+            return array (
+                    'N1',
+                    'N2',
+                    'N3',
+                    'brak kat.',
+                    'N',
+                    'Tpb1',
+                    'Tpb2',
+                    'Tpb3',
+                    'Tpb0',
+                    '2',
+                    'Tpb1*N1',
+                    'Tpb2*N2',
+                    'Tpb3*N3',
+                    'Tpb0',
+                    '2*N',
+                    'Tpb/dzień'
+            );
+        }
+    }
+    static function getIndexes($type) {
+        if ($type == 'POR') {
+            return array (
+                    '1',
+                    '2',
+                    '3',
+                    '4',
+                    '5',
+                    '6',
+                    '0'
+            );
+        } else {
+            return array (
+                    '1',
+                    '2',
+                    '3',
+                    '0'
+            );
+        }
+    }
+    /**
+     * based on
+     * Zalecenie Konsultanta Krajowego w dz.
+     * pielęgniarstwa w sprawie realizacji przepisów rozporządzenia Ministra Zdrowia z dnia 28 grudnia 2012 roku w sprawie sposobu ustalenia minimalnych norm zatrudnienia pielęgniarek i położnych w podmiotach leczniczych niebędących przedsiębiorcami.
+     * http://www.nipip.pl/index.php/prawo/opiniekk/w-dz-pielegniarstwa/konsultant-krajowy-dr-hab-n-hum-maria-kozka/2265-zalecenie-konsultanta-krajowego-w-dz-pielegniarstwa-w-sprawie-realizacji-przepisow-rozporzadzenia-ministra-zdrowia-z-dnia-28-grudnia-2012-roku-w-sprawie-sposobu-ustalenia-minimalnych-norm-zatrudnienia-pielegniarek-i-poloznych-w-podmiotach-leczniczych-nieb
+     *
+     * @param unknown $type
+     */
+    static function getTpb($type) {
+        if ($type == 'ZZ' || $type == 'PED') {
+            return array (
+                    38,
+                    95,
+                    159,
+                    0,
+                    2
+            );
+        } else if ($type == 'PSY') {
+            return array (
+                    40,
+                    100,
+                    160,
+                    0,
+                    2
+            );
+        } else if ($type == 'POR') {
+            return array (
+                    137,
+                    274,
+                    328,
+                    53,
+                    53,
+                    120,
+                    0,
+                    2
+            );
+        } else if ($type == 'POL') {
+            return array (
+                    72,
+                    100,
+                    98,
+                    0,
+                    2
+            );
+        }
+    }
 }
\ No newline at end of file

Spacing +22 added lines, -22 removed lines

@@ -14,10 +14,10 @@ 
 	 * @param unknown $date        	
 	 */
 	public static function getRaport($wardId, $date, $wardType) {
-		$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 PatientRaport::getRaportBetweenDates ( $wardId, $wardType, $startDate, $endDate );
+		return PatientRaport::getRaportBetweenDates($wardId, $wardType, $startDate, $endDate);
 	}
 	private static function getQuery($type) {
 		if ($type == 'POR') {
@@ -31,7 +31,7 @@ 
 			$dql2 .= " FROM Hospitalplugin\Entities\PatientPOR p ";
 			$dql2 .= " WHERE p.dataKategoryzacji BETWEEN ?1 AND ?2 AND p.oddzialId = ?3 AND (p.iICzas <> 3 OR p.iICzas IS NULL)";
 			$dql2 .= " GROUP BY data, p.kategoriaPacjenta";
-			return array (
+			return array(
 					$dql1,
 					$dql2 
 			);
@@ -41,7 +41,7 @@ 
 			$dql .= " FROM Hospitalplugin\Entities\Patient p ";
 			$dql .= " WHERE p.dataKategoryzacji BETWEEN ?1 AND ?2 AND p.oddzialId = ?3";
 			$dql .= " GROUP BY data, p.kategoriaPacjenta";
-			return array (
+			return array(
 					$dql 
 			);
 		}
@@ -55,17 +55,17 @@ 
 	 * @return array
 	 */
 	public static function getRaportBetweenDates($wardId, $type, $startDate, $endDate) {
-		$em = DoctrineBootstrap::getEntityManager ();
-		$em->getConfiguration ()->addCustomDatetimeFunction ( 'DATE', 'Hospitalplugin\DQLFunctions\DateFunction' );
-		$dql = PatientRaport::getQuery ( $type );
-		$allResults = array ();
-		foreach ( $dql as $query ) {
-			$result = $em->createQuery ( $query )->setParameter ( 1, $startDate )->setParameter ( 2, $endDate )->setParameter ( 3, $wardId )->getResult ();
-			$allResults = array_merge ( $result, $allResults );
+		$em = DoctrineBootstrap::getEntityManager();
+		$em->getConfiguration()->addCustomDatetimeFunction('DATE', 'Hospitalplugin\DQLFunctions\DateFunction');
+		$dql = PatientRaport::getQuery($type);
+		$allResults = array();
+		foreach ($dql as $query) {
+			$result = $em->createQuery($query)->setParameter(1, $startDate)->setParameter(2, $endDate)->setParameter(3, $wardId)->getResult();
+			$allResults = array_merge($result, $allResults);
 		}
 		
-		$table = array ();
-		foreach ( $allResults as $row ) {
+		$table = array();
+		foreach ($allResults as $row) {
 			$table [$row ['data']] [$row ['kategoria']] = $row ['suma'];
 		}
 		return $table;
@@ -75,7 +75,7 @@ 
 	 */
 	static function getColumns($type) {
 		if ($type == 'POR') {
-			return array (
+			return array(
 					'N1 naturalny',
 					'N2 naturalny',
 					'N3 naturalny',
@@ -103,7 +103,7 @@ 
 					'Tpb/dzień'
 			);
 		} else {
-			return array (
+			return array(
 					'N1',
 					'N2',
 					'N3',
@@ -125,7 +125,7 @@ 
 	}
 	static function getIndexes($type) {
 		if ($type == 'POR') {
-			return array (
+			return array(
 					'1',
 					'2',
 					'3',
@@ -135,7 +135,7 @@ 
 					'0'
 			);
 		} else {
-			return array (
+			return array(
 					'1',
 					'2',
 					'3',
@@ -153,7 +153,7 @@ 
 	 */
 	static function getTpb($type) {
 		if ($type == 'ZZ' || $type == 'PED') {
-			return array (
+			return array(
 					38,
 					95,
 					159,
@@ -161,7 +161,7 @@ 
 					2
 			);
 		} else if ($type == 'PSY') {
-			return array (
+			return array(
 					40,
 					100,
 					160,
@@ -169,7 +169,7 @@ 
 					2
 			);
 		} else if ($type == 'POR') {
-			return array (
+			return array(
 					137,
 					274,
 					328,
@@ -180,7 +180,7 @@ 
 					2
 			);
 		} else if ($type == 'POL') {
-			return array (
+			return array(
 					72,
 					100,
 					98,

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 {
 	/**