amarcinkowski / hospitalplugin

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;

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

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

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

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

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

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

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

Spacing +23 added lines, -23 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,14 +180,14 @@ 
 					2
 			);
 		} else if ($type == 'DIA') {
-			return array (
+			return array(
 					52,
 					112,
 					0,
 					2
 			);
 		} else if ($type == 'POL') {
-			return array (
+			return array(
 					72,
 					100,
 					98,

src/Entities/PatientRaportOptimized.php

Doc Comments +2 added lines, -2 removed lines

@@ -59,8 +59,8 @@
 	/**
 	 * 
 	 * @param unknown $wardId
-	 * @param unknown $startDate
-	 * @param unknown $endDate
+	 * @param string $startDate
+	 * @param string $endDate
 	 */
 	public static function getRaportBetweenDatesNative($wardId, $startDate, $endDate) {
 		$em = DoctrineBootstrap::getEntityManager ();

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;