salimkanoun / GaelO

src/index.php

Spacing +1 added lines, -1 removed lines

@@ -20,6 +20,6 @@
  * @author      Salim Kanoun <Salim.Kanoun@gmail.com>

  */

 

-header( 'content-type: text/html; charset=utf-8' );

+header('content-type: text/html; charset=utf-8');

 require_once('vendor/autoload.php');

 require 'router.php';
\ No newline at end of file

src/models/Documentation.php

Indentation +75 added lines, -75 removed lines

@@ -20,66 +20,66 @@ 
  */
 class Documentation {
     
-    public $documentId;
-    public $study;
-    public $documentName;
-    public $documentFileLocation;
-    public $documentVersion;
-    public $documentDate;
-    public $accessInvestigator;
-    public $accessController;
-    public $accessMonitor;
-    public $accessReviewer;
-    public $deleted;
+	public $documentId;
+	public $study;
+	public $documentName;
+	public $documentFileLocation;
+	public $documentVersion;
+	public $documentDate;
+	public $accessInvestigator;
+	public $accessController;
+	public $accessMonitor;
+	public $accessReviewer;
+	public $deleted;
     
     
-    public function __construct(PDO $linkpdo, int $idDocumentation){
+	public function __construct(PDO $linkpdo, int $idDocumentation){
     	
-    	$documentationQuery = $linkpdo->prepare("SELECT * FROM documentation WHERE id_documentation = :idDocumentation");
-    	$documentationQuery->execute(array('idDocumentation' => $idDocumentation));
-    	$documentation=$documentationQuery->fetch(PDO::FETCH_ASSOC);
+		$documentationQuery = $linkpdo->prepare("SELECT * FROM documentation WHERE id_documentation = :idDocumentation");
+		$documentationQuery->execute(array('idDocumentation' => $idDocumentation));
+		$documentation=$documentationQuery->fetch(PDO::FETCH_ASSOC);
     	
-        $this->documentId=$documentation['id_documentation'];
-        $this->study=$documentation['study'];
-        $this->documentName=$documentation['name'];
-        $this->documentVersion=$documentation['version'];
-        $this->documentDate=$documentation['document_date'];
-        $this->accessInvestigator=$documentation['investigator'];
-        $this->accessController=$documentation['controller'];
-        $this->accessMonitor=$documentation['monitor'];
-        $this->accessReviewer=$documentation['reviewer'];
-        $this->deleted=$documentation['deleted'];
+		$this->documentId=$documentation['id_documentation'];
+		$this->study=$documentation['study'];
+		$this->documentName=$documentation['name'];
+		$this->documentVersion=$documentation['version'];
+		$this->documentDate=$documentation['document_date'];
+		$this->accessInvestigator=$documentation['investigator'];
+		$this->accessController=$documentation['controller'];
+		$this->accessMonitor=$documentation['monitor'];
+		$this->accessReviewer=$documentation['reviewer'];
+		$this->deleted=$documentation['deleted'];
         
-        $this->documentFileLocation = ($_SERVER['DOCUMENT_ROOT']."/data/upload/documentation/".$this->study."/".$this->documentName);
-    }
+		$this->documentFileLocation = ($_SERVER['DOCUMENT_ROOT']."/data/upload/documentation/".$this->study."/".$this->documentName);
+	}
     
-    /**
-     * Return if the current documentation is allowed for a given role
-     * @param String $role
-     * @return boolean
-     */
+	/**
+	 * Return if the current documentation is allowed for a given role
+	 * @param String $role
+	 * @return boolean
+	 */
     
-    public function isDocumentationAllowedForRole(String $role){
-        if($role==User::INVESTIGATOR) return $this->accessInvestigator;
-        else if($role==User::CONTROLLER) return $this->accessController;
-        else if($role==User::MONITOR) return $this->accessMonitor;
-        else if($role==User::REVIEWER) return $this->accessReviewer;
-        else if($role==User::SUPERVISOR) return true;
-        else return false;
-    }
+	public function isDocumentationAllowedForRole(String $role){
+		if($role==User::INVESTIGATOR) return $this->accessInvestigator;
+		else if($role==User::CONTROLLER) return $this->accessController;
+		else if($role==User::MONITOR) return $this->accessMonitor;
+		else if($role==User::REVIEWER) return $this->accessReviewer;
+		else if($role==User::SUPERVISOR) return true;
+		else return false;
+	}
     
-    /**
-     * Update documentation table
-     * @param PDO $linkpdo
-     * @param int $idDocumentation
-     * @param bool $investigator
-     * @param bool $monitor
-     * @param bool $controller
-     * @param bool $reviewer
-     * @param bool $deleted
-     */
-    public static function updateDocumentation(PDO $linkpdo, int $idDocumentation, bool $investigator, bool $monitor, bool $controller, bool $reviewer, bool $deleted){
-        $update = $linkpdo->prepare('UPDATE documentation
+	/**
+	 * Update documentation table
+	 * @param PDO $linkpdo
+	 * @param int $idDocumentation
+	 * @param bool $investigator
+	 * @param bool $monitor
+	 * @param bool $controller
+	 * @param bool $reviewer
+	 * @param bool $deleted
+	 */
+	public static function updateDocumentation(PDO $linkpdo, int $idDocumentation, bool $investigator, bool $monitor, bool $controller, bool $reviewer, bool $deleted){
+		$update = $linkpdo->prepare('UPDATE documentation
                                     SET investigator = :investigator,
                                         controller = :controller,
                                         monitor = :monitor,
@@ -87,29 +87,29 @@ 
                                         deleted=:deleted
 									WHERE id_documentation = :id');
         
-        $update->execute(array('investigator' => intval($investigator),
-            'controller' => intval($controller),
-            'monitor' => intval($monitor),
-            'reviewer' =>intval($reviewer),
-            'deleted'=>intval($deleted),
-            'id' => $idDocumentation ));
-    }
+		$update->execute(array('investigator' => intval($investigator),
+			'controller' => intval($controller),
+			'monitor' => intval($monitor),
+			'reviewer' =>intval($reviewer),
+			'deleted'=>intval($deleted),
+			'id' => $idDocumentation ));
+	}
     
-    /**
-     * Create documentation entry in database
-     * @param PDO $linkpdo
-     * @param String $uploadedFilename
-     * @param String $study
-     * @param String $version
-     */
-    public static function insertDocumentation(PDO $linkpdo, String $uploadedFilename, String $study, String $version){
-        $insertion = $linkpdo->prepare('INSERT INTO documentation (name, document_date, study, version)
+	/**
+	 * Create documentation entry in database
+	 * @param PDO $linkpdo
+	 * @param String $uploadedFilename
+	 * @param String $study
+	 * @param String $version
+	 */
+	public static function insertDocumentation(PDO $linkpdo, String $uploadedFilename, String $study, String $version){
+		$insertion = $linkpdo->prepare('INSERT INTO documentation (name, document_date, study, version)
 																			VALUES (:name, :doc_date, :study, :version)');
-        $insertion->execute(array(
-            'name' => $uploadedFilename,
-            'doc_date' => date("Y-m-d"),
-            'study' => $study,
-            'version'=>$version
-        ));
-    }
+		$insertion->execute(array(
+			'name' => $uploadedFilename,
+			'doc_date' => date("Y-m-d"),
+			'study' => $study,
+			'version'=>$version
+		));
+	}
 }
\ No newline at end of file

Spacing +14 added lines, -14 removed lines

@@ -33,9 +33,9 @@ 
     public $deleted;
     
     
-    public function __construct(PDO $linkpdo, int $idDocumentation){
+    public function __construct(PDO $linkpdo, int $idDocumentation) {
     	
-    	$documentationQuery = $linkpdo->prepare("SELECT * FROM documentation WHERE id_documentation = :idDocumentation");
+    	$documentationQuery=$linkpdo->prepare("SELECT * FROM documentation WHERE id_documentation = :idDocumentation");
     	$documentationQuery->execute(array('idDocumentation' => $idDocumentation));
     	$documentation=$documentationQuery->fetch(PDO::FETCH_ASSOC);
     	
@@ -50,7 +50,7 @@ 
         $this->accessReviewer=$documentation['reviewer'];
         $this->deleted=$documentation['deleted'];
         
-        $this->documentFileLocation = ($_SERVER['DOCUMENT_ROOT']."/data/upload/documentation/".$this->study."/".$this->documentName);
+        $this->documentFileLocation=($_SERVER['DOCUMENT_ROOT']."/data/upload/documentation/".$this->study."/".$this->documentName);
     }
     
     /**
@@ -59,12 +59,12 @@ 
      * @return boolean
      */
     
-    public function isDocumentationAllowedForRole(String $role){
-        if($role==User::INVESTIGATOR) return $this->accessInvestigator;
-        else if($role==User::CONTROLLER) return $this->accessController;
-        else if($role==User::MONITOR) return $this->accessMonitor;
-        else if($role==User::REVIEWER) return $this->accessReviewer;
-        else if($role==User::SUPERVISOR) return true;
+    public function isDocumentationAllowedForRole(String $role) {
+        if ($role == User::INVESTIGATOR) return $this->accessInvestigator;
+        else if ($role == User::CONTROLLER) return $this->accessController;
+        else if ($role == User::MONITOR) return $this->accessMonitor;
+        else if ($role == User::REVIEWER) return $this->accessReviewer;
+        else if ($role == User::SUPERVISOR) return true;
         else return false;
     }
     
@@ -78,8 +78,8 @@ 
      * @param bool $reviewer
      * @param bool $deleted
      */
-    public static function updateDocumentation(PDO $linkpdo, int $idDocumentation, bool $investigator, bool $monitor, bool $controller, bool $reviewer, bool $deleted){
-        $update = $linkpdo->prepare('UPDATE documentation
+    public static function updateDocumentation(PDO $linkpdo, int $idDocumentation, bool $investigator, bool $monitor, bool $controller, bool $reviewer, bool $deleted) {
+        $update=$linkpdo->prepare('UPDATE documentation
                                     SET investigator = :investigator,
                                         controller = :controller,
                                         monitor = :monitor,
@@ -92,7 +92,7 @@ 
             'monitor' => intval($monitor),
             'reviewer' =>intval($reviewer),
             'deleted'=>intval($deleted),
-            'id' => $idDocumentation ));
+            'id' => $idDocumentation));
     }
     
     /**
@@ -102,8 +102,8 @@ 
      * @param String $study
      * @param String $version
      */
-    public static function insertDocumentation(PDO $linkpdo, String $uploadedFilename, String $study, String $version){
-        $insertion = $linkpdo->prepare('INSERT INTO documentation (name, document_date, study, version)
+    public static function insertDocumentation(PDO $linkpdo, String $uploadedFilename, String $study, String $version) {
+        $insertion=$linkpdo->prepare('INSERT INTO documentation (name, document_date, study, version)
 																			VALUES (:name, :doc_date, :study, :version)');
         $insertion->execute(array(
             'name' => $uploadedFilename,

Braces +13 added lines, -6 removed lines

@@ -60,12 +60,19 @@
      */
     
     public function isDocumentationAllowedForRole(String $role){
-        if($role==User::INVESTIGATOR) return $this->accessInvestigator;
-        else if($role==User::CONTROLLER) return $this->accessController;
-        else if($role==User::MONITOR) return $this->accessMonitor;
-        else if($role==User::REVIEWER) return $this->accessReviewer;
-        else if($role==User::SUPERVISOR) return true;
-        else return false;
+        if($role==User::INVESTIGATOR) {
+        	return $this->accessInvestigator;
+        } else if($role==User::CONTROLLER) {
+        	return $this->accessController;
+        } else if($role==User::MONITOR) {
+        	return $this->accessMonitor;
+        } else if($role==User::REVIEWER) {
+        	return $this->accessReviewer;
+        } else if($role==User::SUPERVISOR) {
+        	return true;
+        } else {
+        	return false;
+        }
     }
     
     /**

src/models/TagAnon.php

Indentation +11 added lines, -11 removed lines

@@ -18,18 +18,18 @@
  */

 class TagAnon {

     

-    const KEEP=0;

-    const REPLACE=1;

-    const CLEAR=2;

+	const KEEP=0;

+	const REPLACE=1;

+	const CLEAR=2;

     

-    public $tag;

-    public $choice;

-    public $newValue;

+	public $tag;

+	public $choice;

+	public $newValue;

     

-    public function __construct($tag, $choice, $newValue=null){

-        $this->tag=$tag;

-        $this->choice=$choice;

-        $this->newValue=$newValue;

-    }

+	public function __construct($tag, $choice, $newValue=null){

+		$this->tag=$tag;

+		$this->choice=$choice;

+		$this->newValue=$newValue;

+	}

     

 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     public $choice;

     public $newValue;

     

-    public function __construct($tag, $choice, $newValue=null){

+    public function __construct($tag, $choice, $newValue=null) {

         $this->tag=$tag;

         $this->choice=$choice;

         $this->newValue=$newValue;

src/models/Center.php

Indentation +16 added lines, -16 removed lines

@@ -32,18 +32,18 @@ 
 	 */
 	public function __construct(PDO $linkpdo, $code){
 	    
-	    $centerQuery = $linkpdo->prepare('SELECT * FROM centers WHERE code=:code');
-	    $centerQuery->execute(array('code'=>$code));
-	    $center=$centerQuery->fetch(PDO::FETCH_ASSOC);
+		$centerQuery = $linkpdo->prepare('SELECT * FROM centers WHERE code=:code');
+		$centerQuery->execute(array('code'=>$code));
+		$center=$centerQuery->fetch(PDO::FETCH_ASSOC);
 	    
-	    if(empty($center)){
-	        throw new Exception("Non Existing Center");
-	    }
-	    $this->linkpdo=$linkpdo;
-	    $this->name=$center['name'];
-	    $this->code=$center['code'];
-	    $this->countryCode=$center['country_code'];
-	    $this->countryName=Global_Data::getCountryName($linkpdo, $this->countryCode);
+		if(empty($center)){
+			throw new Exception("Non Existing Center");
+		}
+		$this->linkpdo=$linkpdo;
+		$this->name=$center['name'];
+		$this->code=$center['code'];
+		$this->countryCode=$center['country_code'];
+		$this->countryName=Global_Data::getCountryName($linkpdo, $this->countryCode);
 	}
 
 	/**
@@ -52,14 +52,14 @@ 
 	 * @param string $countryCode
 	 */
 	public function updateCenter(string $name, string $countryCode){
-	    $updatePatient = $this->linkpdo->prepare("UPDATE centers
+		$updatePatient = $this->linkpdo->prepare("UPDATE centers
                                             SET name = :centerName,
                                             country_code = :countryCode
                                             WHERE code = :code");
 	    
-	    $updatePatient->execute(array('centerName'=>$name,
-	        'countryCode'=>$countryCode,
-	        'code'=>$this->code));
+		$updatePatient->execute(array('centerName'=>$name,
+			'countryCode'=>$countryCode,
+			'code'=>$this->code));
 	    
 	}
 
@@ -107,7 +107,7 @@ 
 		$insertion->execute(array(
 				'name' => $name,
 				'code' => $code,
-		        'countryCode' =>$countryCode
+				'countryCode' =>$countryCode
 		));
 	}
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -17,7 +17,7 @@ 
  * Center management in the plateform
  */
 
-Class Center{
+Class Center {
 	public $name;
 	public $code;
 	public $countryCode;
@@ -30,13 +30,13 @@ 
 	 * @param $code
 	 * @throws Exception
 	 */
-	public function __construct(PDO $linkpdo, $code){
+	public function __construct(PDO $linkpdo, $code) {
 	    
-	    $centerQuery = $linkpdo->prepare('SELECT * FROM centers WHERE code=:code');
+	    $centerQuery=$linkpdo->prepare('SELECT * FROM centers WHERE code=:code');
 	    $centerQuery->execute(array('code'=>$code));
 	    $center=$centerQuery->fetch(PDO::FETCH_ASSOC);
 	    
-	    if(empty($center)){
+	    if (empty($center)) {
 	        throw new Exception("Non Existing Center");
 	    }
 	    $this->linkpdo=$linkpdo;
@@ -51,8 +51,8 @@ 
 	 * @param string $name
 	 * @param string $countryCode
 	 */
-	public function updateCenter(string $name, string $countryCode){
-	    $updatePatient = $this->linkpdo->prepare("UPDATE centers
+	public function updateCenter(string $name, string $countryCode) {
+	    $updatePatient=$this->linkpdo->prepare("UPDATE centers
                                             SET name = :centerName,
                                             country_code = :countryCode
                                             WHERE code = :code");
@@ -69,7 +69,7 @@ 
 	 * @param $center
 	 * @return User[]
 	 */
-	public static function getUsersAffiliatedToCenter(PDO $linkpdo, $center){
+	public static function getUsersAffiliatedToCenter(PDO $linkpdo, $center) {
 		
 		//Select All users that has a matching center
 		$queryUsersEmail=$linkpdo->prepare('
@@ -87,7 +87,7 @@ 
 		$users=$queryUsersEmail->fetchAll(PDO::FETCH_COLUMN);
 		
 		$usersObjects=[];
-		foreach ($users as $user){
+		foreach ($users as $user) {
 			$usersObjects[]=new User($user, $linkpdo);
 			
 		}
@@ -102,8 +102,8 @@ 
 	 * @param $name
 	 * @param string $countryCode
 	 */
-	public static function addCenter(PDO $linkpdo, $code, String $name, String $countryCode){
-		$insertion = $linkpdo->prepare('INSERT INTO centers (code, name, country_code) VALUES (:code, :name, :countryCode)' );
+	public static function addCenter(PDO $linkpdo, $code, String $name, String $countryCode) {
+		$insertion=$linkpdo->prepare('INSERT INTO centers (code, name, country_code) VALUES (:code, :name, :countryCode)');
 		$insertion->execute(array(
 				'name' => $name,
 				'code' => $code,

src/models/Patient.php

Indentation +167 added lines, -167 removed lines

@@ -19,99 +19,99 @@ 
 
 class Patient{
     
-    public $patient;
-    private $linkpdo;
-    public $patientCode;
-    public $patientFirstName;
-    public $patientLastName;
-    public $patientGender;
-    public $patientBirthDateUS;
-    public $patientBirthDate;
-    public $patientRegistrationDate;
-    public $patientInvestigatorName;
-    public $patientCenter;
-    public $patientStudy;
-    public $patientWithdraw;
-    public $patientWithdrawReason;
-    public $patientWithdrawDate;
-    public $patientWithdrawDateString;
-
-    const PATIENT_WITHDRAW="withdraw";
+	public $patient;
+	private $linkpdo;
+	public $patientCode;
+	public $patientFirstName;
+	public $patientLastName;
+	public $patientGender;
+	public $patientBirthDateUS;
+	public $patientBirthDate;
+	public $patientRegistrationDate;
+	public $patientInvestigatorName;
+	public $patientCenter;
+	public $patientStudy;
+	public $patientWithdraw;
+	public $patientWithdrawReason;
+	public $patientWithdrawDate;
+	public $patientWithdrawDateString;
+
+	const PATIENT_WITHDRAW="withdraw";
     
-    function __construct($patientCode, PDO $linkpdo) {
-        $this->patient=$patientCode;
-        $this->linkpdo= $linkpdo;
+	function __construct($patientCode, PDO $linkpdo) {
+		$this->patient=$patientCode;
+		$this->linkpdo= $linkpdo;
         
-        $queryPatientsData = $this->linkpdo->prepare('SELECT * FROM patients WHERE code = :patient');
-        $queryPatientsData->execute(array('patient' => $this->patient));
-        $dataPatient = $queryPatientsData->fetch(PDO::FETCH_ASSOC);
+		$queryPatientsData = $this->linkpdo->prepare('SELECT * FROM patients WHERE code = :patient');
+		$queryPatientsData->execute(array('patient' => $this->patient));
+		$dataPatient = $queryPatientsData->fetch(PDO::FETCH_ASSOC);
         
-        if(empty($dataPatient)){
-            throw new Exception("Non Existing Patient");
-        }
+		if(empty($dataPatient)){
+			throw new Exception("Non Existing Patient");
+		}
         
-        $this->patientCode=$dataPatient['code'];
-        $this->patientFirstName=$dataPatient['first_name'];
-        $this->patientLastName=$dataPatient['last_name'];
-        $this->patientGender=$dataPatient['gender'];
-        $this->patientBirthDateUS=sprintf("%02d", $dataPatient['birth_month']).'-'.sprintf("%02d", $dataPatient['birth_day']).'-'.$dataPatient['birth_year'];
-        $this->patientBirthDate=sprintf("%02d", $dataPatient['birth_year']).'-'.sprintf("%02d", $dataPatient['birth_month']).'-'.$dataPatient['birth_day'];
-        $this->patientRegistrationDate=$dataPatient['registration_date'];
-        $this->patientInvestigatorName=$dataPatient['investigator_name'];
-        $this->patientCenter=$dataPatient['center'];
-        $this->patientStudy=$dataPatient['study'];
-        $this->patientWithdraw=$dataPatient['withdraw'];
-        $this->patientWithdrawReason=$dataPatient['withdraw_reason'];
-        $this->patientWithdrawDate=new DateTimeImmutable($dataPatient['withdraw_date']);
-        $this->patientWithdrawDateString=$dataPatient['withdraw_date'];
+		$this->patientCode=$dataPatient['code'];
+		$this->patientFirstName=$dataPatient['first_name'];
+		$this->patientLastName=$dataPatient['last_name'];
+		$this->patientGender=$dataPatient['gender'];
+		$this->patientBirthDateUS=sprintf("%02d", $dataPatient['birth_month']).'-'.sprintf("%02d", $dataPatient['birth_day']).'-'.$dataPatient['birth_year'];
+		$this->patientBirthDate=sprintf("%02d", $dataPatient['birth_year']).'-'.sprintf("%02d", $dataPatient['birth_month']).'-'.$dataPatient['birth_day'];
+		$this->patientRegistrationDate=$dataPatient['registration_date'];
+		$this->patientInvestigatorName=$dataPatient['investigator_name'];
+		$this->patientCenter=$dataPatient['center'];
+		$this->patientStudy=$dataPatient['study'];
+		$this->patientWithdraw=$dataPatient['withdraw'];
+		$this->patientWithdrawReason=$dataPatient['withdraw_reason'];
+		$this->patientWithdrawDate=new DateTimeImmutable($dataPatient['withdraw_date']);
+		$this->patientWithdrawDateString=$dataPatient['withdraw_date'];
         
-    }
+	}
 
-    public function getImmutableRegistrationDate() : DateTimeImmutable {
-        return new DateTimeImmutable($this->patientRegistrationDate);
-    }
+	public function getImmutableRegistrationDate() : DateTimeImmutable {
+		return new DateTimeImmutable($this->patientRegistrationDate);
+	}
     
-    /**
-     * get Patient's Center Object
-     * @return Center
-     */
-    public function getPatientCenter() : Center {
-        $centerObject=new Center($this->linkpdo, $this->patientCenter);
-        return $centerObject;
-    }
+	/**
+	 * get Patient's Center Object
+	 * @return Center
+	 */
+	public function getPatientCenter() : Center {
+		$centerObject=new Center($this->linkpdo, $this->patientCenter);
+		return $centerObject;
+	}
     
-    /**
-     * Update withdraw status
-     * @param bool $withdraw
-     * @param string $withdrawDate
-     * @param string $withdrawReason
-     */
-    public function changeWithdrawStatus(bool $withdraw, ?string $withdrawDate, ?string $withdrawReason){
+	/**
+	 * Update withdraw status
+	 * @param bool $withdraw
+	 * @param string $withdrawDate
+	 * @param string $withdrawReason
+	 */
+	public function changeWithdrawStatus(bool $withdraw, ?string $withdrawDate, ?string $withdrawReason){
         
-        $insertion = $this->linkpdo->prepare('UPDATE patients
+		$insertion = $this->linkpdo->prepare('UPDATE patients
                                             SET withdraw = :withdraw,
                                             withdraw_date = :withdraw_date,
                                             withdraw_reason = :withdraw_reason
                                             WHERE patients.code = :patient');
         
-        $insertion->execute(array('withdraw'=>intval($withdraw),
-            'withdraw_date' => $withdrawDate,
-            'withdraw_reason' => $withdrawReason,
-            'patient' => $this->patient));
+		$insertion->execute(array('withdraw'=>intval($withdraw),
+			'withdraw_date' => $withdrawDate,
+			'withdraw_reason' => $withdrawReason,
+			'patient' => $this->patient));
         
-    }
+	}
     
-    /**
-     * Update patient data
-     * @param $initials
-     * @param $gender
-     * @param $birthDate
-     * @param $registrationDate
-     * @param $investigator
-     * @param $centerCode
-     */
-    public function editPatientDetails($initials, $gender, $birthDate, $registrationDate, $investigator, $centerCode){
-            $insertion = $this->linkpdo->prepare("UPDATE patients
+	/**
+	 * Update patient data
+	 * @param $initials
+	 * @param $gender
+	 * @param $birthDate
+	 * @param $registrationDate
+	 * @param $investigator
+	 * @param $centerCode
+	 */
+	public function editPatientDetails($initials, $gender, $birthDate, $registrationDate, $investigator, $centerCode){
+			$insertion = $this->linkpdo->prepare("UPDATE patients
                                             SET first_name = :firstName,
                                             last_name = :lastName,
                                             gender = :gender,
@@ -123,131 +123,131 @@ 
                                             center=:centerCode
                                             WHERE patients.code = :patient");
             
-            $insertion->execute(array('firstName'=>$initials[1],
-                'lastName'=>$initials[0],
-                'gender'=>strtoupper($gender[0]),
-                'year'=>substr($birthDate, 0, 4),
-                'month'=>substr($birthDate, 5, 2),
-                'day'=>substr($birthDate, 8, 2),
-                'registrationDate' => $registrationDate,
-                'investigator' => $investigator,
-                'centerCode'=>$centerCode,
-                'patient' => $this->patient));
+			$insertion->execute(array('firstName'=>$initials[1],
+				'lastName'=>$initials[0],
+				'gender'=>strtoupper($gender[0]),
+				'year'=>substr($birthDate, 0, 4),
+				'month'=>substr($birthDate, 5, 2),
+				'day'=>substr($birthDate, 8, 2),
+				'registrationDate' => $registrationDate,
+				'investigator' => $investigator,
+				'centerCode'=>$centerCode,
+				'patient' => $this->patient));
        
         
-    }
-
-    /**
-     * Return visit Manage to manage patient's visit status
-     */
-    public function getPatientVisitManager(Visit_Group $visitGroupObject) {
-        //Look if specific patient visit manager exists for this study
-        $specificObjectFile=$_SERVER["DOCUMENT_ROOT"].'/data/form/'.$this->patientStudy.'/Poo/'.$this->patientStudy."_Patient_Visit_Manager.php";
+	}
+
+	/**
+	 * Return visit Manage to manage patient's visit status
+	 */
+	public function getPatientVisitManager(Visit_Group $visitGroupObject) {
+		//Look if specific patient visit manager exists for this study
+		$specificObjectFile=$_SERVER["DOCUMENT_ROOT"].'/data/form/'.$this->patientStudy.'/Poo/'.$this->patientStudy."_Patient_Visit_Manager.php";
             
-        if(is_file($specificObjectFile)){
-            require_once($specificObjectFile);
-            $objectName=$this->patientStudy."_Patient_Visit_Manager";
-            return new $objectName($this, $visitGroupObject, $this->linkpdo);
-        }else{
-            return new Patient_Visit_Manager($this, $visitGroupObject, $this->linkpdo);
-        }
+		if(is_file($specificObjectFile)){
+			require_once($specificObjectFile);
+			$objectName=$this->patientStudy."_Patient_Visit_Manager";
+			return new $objectName($this, $visitGroupObject, $this->linkpdo);
+		}else{
+			return new Patient_Visit_Manager($this, $visitGroupObject, $this->linkpdo);
+		}
 
-    }
+	}
 
-    private function getAllPossibleVisitGroup() : Array { 
+	private function getAllPossibleVisitGroup() : Array { 
 
-        $patientStudy=$this->getPatientStudy();
-        $possibleStudyGroups=$patientStudy->getAllPossibleVisitGroups();
+		$patientStudy=$this->getPatientStudy();
+		$possibleStudyGroups=$patientStudy->getAllPossibleVisitGroups();
 
-        return $possibleStudyGroups;
+		return $possibleStudyGroups;
 
-    }
+	}
 
-    /**
-     * Return visits created for this patient without group filter
-     */
-    public function getAllCreatedPatientsVisits(bool $deletedVisits = false) : Array
-    {
-        $possibleStudyGroups=$this->getAllPossibleVisitGroup();
+	/**
+	 * Return visits created for this patient without group filter
+	 */
+	public function getAllCreatedPatientsVisits(bool $deletedVisits = false) : Array
+	{
+		$possibleStudyGroups=$this->getAllPossibleVisitGroup();
 
-        $visitsObjectArray = [];
+		$visitsObjectArray = [];
 
-        foreach($possibleStudyGroups as $studyGroup){
-            $createdVisits=$this->getPatientVisitManager($studyGroup)->getCreatedPatientsVisits($deletedVisits);
-            array_push($visitsObjectArray, ...$createdVisits);
-        }
+		foreach($possibleStudyGroups as $studyGroup){
+			$createdVisits=$this->getPatientVisitManager($studyGroup)->getCreatedPatientsVisits($deletedVisits);
+			array_push($visitsObjectArray, ...$createdVisits);
+		}
 
-        return $visitsObjectArray;
-    }
+		return $visitsObjectArray;
+	}
 
 
-     /**
-     * Return visits uploaded for this patient without group filter
-     */
-    public function getAllQcDonePatientsVisits(bool $deletedVisits = false) : Array
-    {
-        $possibleStudyGroups=$this->getAllPossibleVisitGroup();
+	 /**
+	  * Return visits uploaded for this patient without group filter
+	  */
+	public function getAllQcDonePatientsVisits(bool $deletedVisits = false) : Array
+	{
+		$possibleStudyGroups=$this->getAllPossibleVisitGroup();
 
-        $visitsObjectArray = [];
+		$visitsObjectArray = [];
 
-        foreach($possibleStudyGroups as $studyGroup){
-            $createdVisits=$this->getPatientVisitManager($studyGroup)->getQcDonePatientsVisits($deletedVisits);
-            array_push($visitsObjectArray, ...$createdVisits);
-        }
+		foreach($possibleStudyGroups as $studyGroup){
+			$createdVisits=$this->getPatientVisitManager($studyGroup)->getQcDonePatientsVisits($deletedVisits);
+			array_push($visitsObjectArray, ...$createdVisits);
+		}
 
-        return $visitsObjectArray;
-    }
+		return $visitsObjectArray;
+	}
 
-    public function getAllVisitToCreate() : array {
+	public function getAllVisitToCreate() : array {
 
-        $possiblevisitsGroups=$this->getAllPossibleVisitGroup();
+		$possiblevisitsGroups=$this->getAllPossibleVisitGroup();
 
-        $visitsObjectArray = [];
+		$visitsObjectArray = [];
 
-        foreach($possiblevisitsGroups as $visitGroup){
-            try{
-                $availableVisits=$this->getPatientVisitManager($visitGroup)->getAvailableVisitsToCreate();
-            }catch (Exception $e){
-                $availableVisits=array($e->getMessage());
-            }
+		foreach($possiblevisitsGroups as $visitGroup){
+			try{
+				$availableVisits=$this->getPatientVisitManager($visitGroup)->getAvailableVisitsToCreate();
+			}catch (Exception $e){
+				$availableVisits=array($e->getMessage());
+			}
 
-            $visitsObjectArray [$visitGroup->groupModality]['visitsName'] = $availableVisits;
-            $visitsObjectArray [$visitGroup->groupModality]['groupId'] = $visitGroup->groupId;
-        }
+			$visitsObjectArray [$visitGroup->groupModality]['visitsName'] = $availableVisits;
+			$visitsObjectArray [$visitGroup->groupModality]['groupId'] = $visitGroup->groupId;
+		}
 
-        return $visitsObjectArray;
+		return $visitsObjectArray;
 
-    }
+	}
 
-    public function isMissingVisit(){
+	public function isMissingVisit(){
 
-        $modalitiesMissingVisits=$this->getMissingVisitModalities();
+		$modalitiesMissingVisits=$this->getMissingVisitModalities();
 
-        $isMissingSomeVisits= ( sizeof($modalitiesMissingVisits) > 0 ) ;
+		$isMissingSomeVisits= ( sizeof($modalitiesMissingVisits) > 0 ) ;
 
-        return $isMissingSomeVisits ; 
+		return $isMissingSomeVisits ; 
 
-    }
+	}
 
-    public function getMissingVisitModalities(){
+	public function getMissingVisitModalities(){
 
-        $possiblevisitsGroups=$this->getAllPossibleVisitGroup();
+		$possiblevisitsGroups=$this->getAllPossibleVisitGroup();
 
-        $visitsMissingGroupsArray = [];
+		$visitsMissingGroupsArray = [];
 
-        foreach($possiblevisitsGroups as $visitGroup){
-            $missingVisit=$this->getPatientVisitManager($visitGroup)->isMissingVisit();
-            if($missingVisit){
-                $visitsMissingGroupsArray[]=$visitGroup->groupModality;
-            }
-        }
+		foreach($possiblevisitsGroups as $visitGroup){
+			$missingVisit=$this->getPatientVisitManager($visitGroup)->isMissingVisit();
+			if($missingVisit){
+				$visitsMissingGroupsArray[]=$visitGroup->groupModality;
+			}
+		}
 
-        return $visitsMissingGroupsArray;
+		return $visitsMissingGroupsArray;
 
-    }
+	}
 
-    public function getPatientStudy() : Study {
-        return new Study($this->patientStudy, $this->linkpdo);
-    }
+	public function getPatientStudy() : Study {
+		return new Study($this->patientStudy, $this->linkpdo);
+	}
       
 }
\ No newline at end of file

Spacing +30 added lines, -30 removed lines

@@ -17,7 +17,7 @@ 
  * Access Patient data
  */
 
-class Patient{
+class Patient {
     
     public $patient;
     private $linkpdo;
@@ -40,13 +40,13 @@ 
     
     function __construct($patientCode, PDO $linkpdo) {
         $this->patient=$patientCode;
-        $this->linkpdo= $linkpdo;
+        $this->linkpdo=$linkpdo;
         
-        $queryPatientsData = $this->linkpdo->prepare('SELECT * FROM patients WHERE code = :patient');
+        $queryPatientsData=$this->linkpdo->prepare('SELECT * FROM patients WHERE code = :patient');
         $queryPatientsData->execute(array('patient' => $this->patient));
-        $dataPatient = $queryPatientsData->fetch(PDO::FETCH_ASSOC);
+        $dataPatient=$queryPatientsData->fetch(PDO::FETCH_ASSOC);
         
-        if(empty($dataPatient)){
+        if (empty($dataPatient)) {
             throw new Exception("Non Existing Patient");
         }
         
@@ -86,9 +86,9 @@ 
      * @param string $withdrawDate
      * @param string $withdrawReason
      */
-    public function changeWithdrawStatus(bool $withdraw, ?string $withdrawDate, ?string $withdrawReason){
+    public function changeWithdrawStatus(bool $withdraw, ?string $withdrawDate, ?string $withdrawReason) {
         
-        $insertion = $this->linkpdo->prepare('UPDATE patients
+        $insertion=$this->linkpdo->prepare('UPDATE patients
                                             SET withdraw = :withdraw,
                                             withdraw_date = :withdraw_date,
                                             withdraw_reason = :withdraw_reason
@@ -110,8 +110,8 @@ 
      * @param $investigator
      * @param $centerCode
      */
-    public function editPatientDetails($initials, $gender, $birthDate, $registrationDate, $investigator, $centerCode){
-            $insertion = $this->linkpdo->prepare("UPDATE patients
+    public function editPatientDetails($initials, $gender, $birthDate, $registrationDate, $investigator, $centerCode) {
+            $insertion=$this->linkpdo->prepare("UPDATE patients
                                             SET first_name = :firstName,
                                             last_name = :lastName,
                                             gender = :gender,
@@ -144,11 +144,11 @@ 
         //Look if specific patient visit manager exists for this study
         $specificObjectFile=$_SERVER["DOCUMENT_ROOT"].'/data/form/'.$this->patientStudy.'/Poo/'.$this->patientStudy."_Patient_Visit_Manager.php";
             
-        if(is_file($specificObjectFile)){
+        if (is_file($specificObjectFile)) {
             require_once($specificObjectFile);
             $objectName=$this->patientStudy."_Patient_Visit_Manager";
             return new $objectName($this, $visitGroupObject, $this->linkpdo);
-        }else{
+        }else {
             return new Patient_Visit_Manager($this, $visitGroupObject, $this->linkpdo);
         }
 
@@ -166,13 +166,13 @@ 
     /**
      * Return visits created for this patient without group filter
      */
-    public function getAllCreatedPatientsVisits(bool $deletedVisits = false) : Array
+    public function getAllCreatedPatientsVisits(bool $deletedVisits=false) : Array
     {
         $possibleStudyGroups=$this->getAllPossibleVisitGroup();
 
-        $visitsObjectArray = [];
+        $visitsObjectArray=[];
 
-        foreach($possibleStudyGroups as $studyGroup){
+        foreach ($possibleStudyGroups as $studyGroup) {
             $createdVisits=$this->getPatientVisitManager($studyGroup)->getCreatedPatientsVisits($deletedVisits);
             array_push($visitsObjectArray, ...$createdVisits);
         }
@@ -184,13 +184,13 @@ 
      /**
      * Return visits uploaded for this patient without group filter
      */
-    public function getAllQcDonePatientsVisits(bool $deletedVisits = false) : Array
+    public function getAllQcDonePatientsVisits(bool $deletedVisits=false) : Array
     {
         $possibleStudyGroups=$this->getAllPossibleVisitGroup();
 
-        $visitsObjectArray = [];
+        $visitsObjectArray=[];
 
-        foreach($possibleStudyGroups as $studyGroup){
+        foreach ($possibleStudyGroups as $studyGroup) {
             $createdVisits=$this->getPatientVisitManager($studyGroup)->getQcDonePatientsVisits($deletedVisits);
             array_push($visitsObjectArray, ...$createdVisits);
         }
@@ -202,42 +202,42 @@ 
 
         $possiblevisitsGroups=$this->getAllPossibleVisitGroup();
 
-        $visitsObjectArray = [];
+        $visitsObjectArray=[];
 
-        foreach($possiblevisitsGroups as $visitGroup){
-            try{
+        foreach ($possiblevisitsGroups as $visitGroup) {
+            try {
                 $availableVisits=$this->getPatientVisitManager($visitGroup)->getAvailableVisitsToCreate();
-            }catch (Exception $e){
+            }catch (Exception $e) {
                 $availableVisits=array($e->getMessage());
             }
 
-            $visitsObjectArray [$visitGroup->groupModality]['visitsName'] = $availableVisits;
-            $visitsObjectArray [$visitGroup->groupModality]['groupId'] = $visitGroup->groupId;
+            $visitsObjectArray [$visitGroup->groupModality]['visitsName']=$availableVisits;
+            $visitsObjectArray [$visitGroup->groupModality]['groupId']=$visitGroup->groupId;
         }
 
         return $visitsObjectArray;
 
     }
 
-    public function isMissingVisit(){
+    public function isMissingVisit() {
 
         $modalitiesMissingVisits=$this->getMissingVisitModalities();
 
-        $isMissingSomeVisits= ( sizeof($modalitiesMissingVisits) > 0 ) ;
+        $isMissingSomeVisits=(sizeof($modalitiesMissingVisits) > 0);
 
-        return $isMissingSomeVisits ; 
+        return $isMissingSomeVisits; 
 
     }
 
-    public function getMissingVisitModalities(){
+    public function getMissingVisitModalities() {
 
         $possiblevisitsGroups=$this->getAllPossibleVisitGroup();
 
-        $visitsMissingGroupsArray = [];
+        $visitsMissingGroupsArray=[];
 
-        foreach($possiblevisitsGroups as $visitGroup){
+        foreach ($possiblevisitsGroups as $visitGroup) {
             $missingVisit=$this->getPatientVisitManager($visitGroup)->isMissingVisit();
-            if($missingVisit){
+            if ($missingVisit) {
                 $visitsMissingGroupsArray[]=$visitGroup->groupModality;
             }
         }

Braces +2 added lines, -2 removed lines

@@ -148,7 +148,7 @@ 
             require_once($specificObjectFile);
             $objectName=$this->patientStudy."_Patient_Visit_Manager";
             return new $objectName($this, $visitGroupObject, $this->linkpdo);
-        }else{
+        } else{
             return new Patient_Visit_Manager($this, $visitGroupObject, $this->linkpdo);
         }
 
@@ -207,7 +207,7 @@ 
         foreach($possiblevisitsGroups as $visitGroup){
             try{
                 $availableVisits=$this->getPatientVisitManager($visitGroup)->getAvailableVisitsToCreate();
-            }catch (Exception $e){
+            } catch (Exception $e){
                 $availableVisits=array($e->getMessage());
             }
 

src/models/Orthanc_Patient.php

Indentation +6 added lines, -6 removed lines

@@ -32,10 +32,10 @@ 
 	
 	
 	public function __construct($patientOrthancID, $url, $context){
-	    //Set orthanc address
-	    $this->url=$url;
-	    $this->context = $context;
-	    //Set current patient Orthanc ID
+		//Set orthanc address
+		$this->url=$url;
+		$this->context = $context;
+		//Set current patient Orthanc ID
 		$this->patientOrthancID=$patientOrthancID;
 	}
 	
@@ -43,8 +43,8 @@ 
 	 * Get and store the main tags of the patient level
 	 */
 	public function retrievePatientData(){
-	    $context  = stream_context_create($this->context);
-	    $json = file_get_contents($this->url.'/patients/'.$this->patientOrthancID, false, $context);
+		$context  = stream_context_create($this->context);
+		$json = file_get_contents($this->url.'/patients/'.$this->patientOrthancID, false, $context);
 		$patientJson=json_decode($json, true);
 		//Add needed informations in this object
 		$this->patientName=$patientJson['MainDicomTags']['PatientName'];

Spacing +8 added lines, -8 removed lines

@@ -19,7 +19,7 @@ 
  * This class is not used anymore ...
  */
 
-class Orthanc_Patient{
+class Orthanc_Patient {
 	public $patientName;
 	public $patientID;
 	public $patientSex;
@@ -31,10 +31,10 @@ 
 	private $context;
 	
 	
-	public function __construct($patientOrthancID, $url, $context){
+	public function __construct($patientOrthancID, $url, $context) {
 	    //Set orthanc address
 	    $this->url=$url;
-	    $this->context = $context;
+	    $this->context=$context;
 	    //Set current patient Orthanc ID
 		$this->patientOrthancID=$patientOrthancID;
 	}
@@ -42,9 +42,9 @@ 
 	/** 
 	 * Get and store the main tags of the patient level
 	 */
-	public function retrievePatientData(){
-	    $context  = stream_context_create($this->context);
-	    $json = file_get_contents($this->url.'/patients/'.$this->patientOrthancID, false, $context);
+	public function retrievePatientData() {
+	    $context=stream_context_create($this->context);
+	    $json=file_get_contents($this->url.'/patients/'.$this->patientOrthancID, false, $context);
 		$patientJson=json_decode($json, true);
 		//Add needed informations in this object
 		$this->patientName=$patientJson['MainDicomTags']['PatientName'];
@@ -58,8 +58,8 @@ 
 	/**
 	 * Retrieve data from study level
 	 */
-	public function getStudiesData(){
-		foreach ($this->studiesOrthancID as $studyID){
+	public function getStudiesData() {
+		foreach ($this->studiesOrthancID as $studyID) {
 			//Create a study object of each study
 			$study=new Orthanc_Study($studyID, $this->url, $this->context);
 			//fetch the data of the study level

src/models/Group_Visit_Manager.php

Braces +3 added lines, -1 removed lines

@@ -124,7 +124,9 @@
             $visitObject = new Visit($visitId, $this->linkpdo);
 
             if (!empty($username)) {
-                if ($visitObject->isAwaitingReviewForReviewerUser($username)) $visitObjectArray[] = $visitObject;
+                if ($visitObject->isAwaitingReviewForReviewerUser($username)) {
+                	$visitObjectArray[] = $visitObject;
+                }
             } else {
                 $visitObjectArray[] = $visitObject;
             }

Indentation +187 added lines, -187 removed lines

@@ -21,57 +21,57 @@ 
 class Group_Visit_Manager
 {
 
-    private Study $studyObject;
-    private Visit_Group $visitGroupObject;
-    private PDO $linkpdo;
-
-
-    public function __construct(Study $studyObject, Visit_Group $visitGroupObject, PDO $linkpdo)
-    {
-        $this->linkpdo = $linkpdo;
-        $this->studyObject = $studyObject;
-        $this->visitGroupObject = $visitGroupObject;
-    }
-
-    public function getVisitGroupObject(): Visit_Group
-    {
-        return $this->visitGroupObject;
-    }
-
-    /**
-     * Return uploaded and non deleted visit Objects (visit Done and Upload status done)
-     */
-    public function getUploadedVisits(): array
-    {
-
-        $uploadedVisitQuery = $this->linkpdo->prepare('SELECT id_visit FROM visits 
+	private Study $studyObject;
+	private Visit_Group $visitGroupObject;
+	private PDO $linkpdo;
+
+
+	public function __construct(Study $studyObject, Visit_Group $visitGroupObject, PDO $linkpdo)
+	{
+		$this->linkpdo = $linkpdo;
+		$this->studyObject = $studyObject;
+		$this->visitGroupObject = $visitGroupObject;
+	}
+
+	public function getVisitGroupObject(): Visit_Group
+	{
+		return $this->visitGroupObject;
+	}
+
+	/**
+	 * Return uploaded and non deleted visit Objects (visit Done and Upload status done)
+	 */
+	public function getUploadedVisits(): array
+	{
+
+		$uploadedVisitQuery = $this->linkpdo->prepare('SELECT id_visit FROM visits 
                                                                     INNER JOIN visit_type ON 
                                                                         (visit_type.id=visits.visit_type_id 
                                                                         AND visit_type.group_id = :visitGroupId)
                                                                 WHERE deleted=0
                                                                     AND upload_status="Done" ');
 
-        $uploadedVisitQuery->execute(array(
-            'visitGroupId' => $this->visitGroupObject->groupId
-        ));
+		$uploadedVisitQuery->execute(array(
+			'visitGroupId' => $this->visitGroupObject->groupId
+		));
 
-        $uploadedVisitIds = $uploadedVisitQuery->fetchall(PDO::FETCH_COLUMN);
+		$uploadedVisitIds = $uploadedVisitQuery->fetchall(PDO::FETCH_COLUMN);
 
-        $visitObjectArray = [];
-        foreach ($uploadedVisitIds as $id_visit) {
-            $visitObjectArray[] = new Visit($id_visit, $this->linkpdo);
-        }
+		$visitObjectArray = [];
+		foreach ($uploadedVisitIds as $id_visit) {
+			$visitObjectArray[] = new Visit($id_visit, $this->linkpdo);
+		}
 
-        return $visitObjectArray;
-    }
+		return $visitObjectArray;
+	}
 
-    /**
-     * Get visits with a awaiting upload status (Visit Done but upload status not done)
-     */
-    public function getAwaitingUploadVisit(): array
-    {
+	/**
+	 * Get visits with a awaiting upload status (Visit Done but upload status not done)
+	 */
+	public function getAwaitingUploadVisit(): array
+	{
 
-        $uploadedVisitQuery = $this->linkpdo->prepare("SELECT id_visit FROM visits 
+		$uploadedVisitQuery = $this->linkpdo->prepare("SELECT id_visit FROM visits 
                                                                     INNER JOIN visit_type ON 
                                                                          (visit_type.id=visits.visit_type_id 
                                                                             AND visit_type.group_id = :visitGroupId)
@@ -79,32 +79,32 @@ 
 														        AND upload_status = 'Not Done'
 														        AND status_done = 'Done' ");
 
-        $uploadedVisitQuery->execute(
-            array(
-                'visitGroupId' => $this->visitGroupObject->groupId
-            )
-        );
-        $uploadedVisitIds = $uploadedVisitQuery->fetchAll(PDO::FETCH_COLUMN);
-
-        $visitObjectArray = [];
-        foreach ($uploadedVisitIds as $id_visit) {
-            $visitObjectArray[] = new Visit($id_visit, $this->linkpdo);
-        }
-
-        return $visitObjectArray;
-    }
-
-    /**
-     * Get Visits awaiting review
-     * Optionally visit awaiting review can be specific to an username
-     * @param string $username
-     * @return Visit[]
-     */
-    public function getAwaitingReviewVisit(string $username = null): array
-    {
-
-        //Query visit to analyze visit awaiting a review
-        $idVisitsQuery = $this->linkpdo->prepare('SELECT id_visit FROM visits 
+		$uploadedVisitQuery->execute(
+			array(
+				'visitGroupId' => $this->visitGroupObject->groupId
+			)
+		);
+		$uploadedVisitIds = $uploadedVisitQuery->fetchAll(PDO::FETCH_COLUMN);
+
+		$visitObjectArray = [];
+		foreach ($uploadedVisitIds as $id_visit) {
+			$visitObjectArray[] = new Visit($id_visit, $this->linkpdo);
+		}
+
+		return $visitObjectArray;
+	}
+
+	/**
+	 * Get Visits awaiting review
+	 * Optionally visit awaiting review can be specific to an username
+	 * @param string $username
+	 * @return Visit[]
+	 */
+	public function getAwaitingReviewVisit(string $username = null): array
+	{
+
+		//Query visit to analyze visit awaiting a review
+		$idVisitsQuery = $this->linkpdo->prepare('SELECT id_visit FROM visits 
                                                                     INNER JOIN visit_type ON 
                                                                         (visit_type.id=visits.visit_type_id 
                                                                         AND visit_type.group_id = :visitGroupId)
@@ -112,35 +112,35 @@ 
                                                                 AND review_available=1 
                                                                 ORDER BY visit_type.visit_order ');
 
-        $idVisitsQuery->execute(array(
-            'visitGroupId' => $this->visitGroupObject->groupId
-        ));
+		$idVisitsQuery->execute(array(
+			'visitGroupId' => $this->visitGroupObject->groupId
+		));
 
-        $visitList = $idVisitsQuery->fetchAll(PDO::FETCH_COLUMN);
+		$visitList = $idVisitsQuery->fetchAll(PDO::FETCH_COLUMN);
 
-        $visitObjectArray = [];
+		$visitObjectArray = [];
 
-        foreach ($visitList as $visitId) {
-            $visitObject = new Visit($visitId, $this->linkpdo);
+		foreach ($visitList as $visitId) {
+			$visitObject = new Visit($visitId, $this->linkpdo);
 
-            if (!empty($username)) {
-                if ($visitObject->isAwaitingReviewForReviewerUser($username)) $visitObjectArray[] = $visitObject;
-            } else {
-                $visitObjectArray[] = $visitObject;
-            }
-        }
+			if (!empty($username)) {
+				if ($visitObject->isAwaitingReviewForReviewerUser($username)) $visitObjectArray[] = $visitObject;
+			} else {
+				$visitObjectArray[] = $visitObject;
+			}
+		}
 
-        return $visitObjectArray;
-    }
+		return $visitObjectArray;
+	}
 
-    /**
-     * For controller tree
-     * List all visits that awaiting QC Action (QC not done or waiting definitive conclusion)
-     */
-    public function getVisitForControllerAction(): array
-    {
+	/**
+	 * For controller tree
+	 * List all visits that awaiting QC Action (QC not done or waiting definitive conclusion)
+	 */
+	public function getVisitForControllerAction(): array
+	{
 
-        $visitsQuery = $this->linkpdo->prepare('SELECT id_visit FROM visits 
+		$visitsQuery = $this->linkpdo->prepare('SELECT id_visit FROM visits 
                                                     INNER JOIN visit_type ON 
                                                         (visit_type.id=visits.visit_type_id 
                                                         AND visit_type.group_id = :visitGroupId)
@@ -151,55 +151,55 @@ 
                                                     AND (state_quality_control = "Not Done"
                                                         OR state_quality_control = "Wait Definitive Conclusion")
                                                     ORDER BY visit_type.visit_order');
-        $visitsQuery->execute(array(
-            'visitGroupId' => $this->visitGroupObject->groupId
-        ));
+		$visitsQuery->execute(array(
+			'visitGroupId' => $this->visitGroupObject->groupId
+		));
 
-        $visits = $visitsQuery->fetchAll(PDO::FETCH_COLUMN);
+		$visits = $visitsQuery->fetchAll(PDO::FETCH_COLUMN);
 
-        $visitObjectArray = [];
-        foreach ($visits as $visit) {
-            $visitObjectArray[] = new Visit($visit, $this->linkpdo);
-        }
+		$visitObjectArray = [];
+		foreach ($visits as $visit) {
+			$visitObjectArray[] = new Visit($visit, $this->linkpdo);
+		}
 
-        return $visitObjectArray;
-    }
+		return $visitObjectArray;
+	}
 
-    /**
-     * Return visits with a specific QC Status
-     */
-    public function getVisitWithQCStatus($qcStatus): array
-    {
+	/**
+	 * Return visits with a specific QC Status
+	 */
+	public function getVisitWithQCStatus($qcStatus): array
+	{
 
-        $visitQuery = $this->linkpdo->prepare("SELECT id_visit FROM visits 
+		$visitQuery = $this->linkpdo->prepare("SELECT id_visit FROM visits 
                                                         INNER JOIN visit_type ON 
                                                             (visit_type.id=visits.visit_type_id 
                                                             AND visit_type.group_id = :visitGroupId)
                                                         WHERE deleted=0
                                                         AND state_quality_control=:qcStatus");
 
-        $visitQuery->execute(array(
-            'study' => $this->study,
-            'qcStatus' => $qcStatus,
-            'visitGroupId' => $this->visitGroupObject->groupId
-        ));
-        $visitIds = $visitQuery->fetchall(PDO::FETCH_COLUMN);
+		$visitQuery->execute(array(
+			'study' => $this->study,
+			'qcStatus' => $qcStatus,
+			'visitGroupId' => $this->visitGroupObject->groupId
+		));
+		$visitIds = $visitQuery->fetchall(PDO::FETCH_COLUMN);
 
-        $visitObjectArray = [];
-        foreach ($visitIds as $id_visit) {
-            $visitObjectArray[] = new Visit($id_visit, $this->linkpdo);
-        }
+		$visitObjectArray = [];
+		foreach ($visitIds as $id_visit) {
+			$visitObjectArray[] = new Visit($id_visit, $this->linkpdo);
+		}
 
-        return $visitObjectArray;
-    }
+		return $visitObjectArray;
+	}
 
-    /**
-     * Get Visits with image uploaded status but investigator form missing
-     */
-    public function getVisitsMissingInvestigatorForm(): array
-    {
+	/**
+	 * Get Visits with image uploaded status but investigator form missing
+	 */
+	public function getVisitsMissingInvestigatorForm(): array
+	{
 
-        $visitQuery = $this->linkpdo->prepare("SELECT id_visit FROM visits 
+		$visitQuery = $this->linkpdo->prepare("SELECT id_visit FROM visits 
                                                             INNER JOIN visit_type ON 
                                                                 (visit_type.id=visits.visit_type_id 
                                                                 AND visit_type.group_id = :visitGroupId)
@@ -207,99 +207,99 @@ 
                                                             AND state_investigator_form !='Done' 
                                                             AND upload_status='Done'");
 
-        $visitQuery->execute(array(
-            'visitGroupId' => $this->visitGroupObject->groupId
-        ));
+		$visitQuery->execute(array(
+			'visitGroupId' => $this->visitGroupObject->groupId
+		));
 
-        $visitIds = $visitQuery->fetchAll(PDO::FETCH_COLUMN);
+		$visitIds = $visitQuery->fetchAll(PDO::FETCH_COLUMN);
 
-        $visitObjectArray = [];
-        foreach ($visitIds as $id_visit) {
-            $visitObjectArray[] = new Visit($id_visit, $this->linkpdo);
-        }
+		$visitObjectArray = [];
+		foreach ($visitIds as $id_visit) {
+			$visitObjectArray[] = new Visit($id_visit, $this->linkpdo);
+		}
 
-        return $visitObjectArray;
-    }
+		return $visitObjectArray;
+	}
 
-    /**
-     * Return studie's created visits
-     */
-    public function getCreatedVisits(bool $deleted = false): array
-    {
+	/**
+	 * Return studie's created visits
+	 */
+	public function getCreatedVisits(bool $deleted = false): array
+	{
 
-        $uploadedVisitQuery = $this->linkpdo->prepare('SELECT id_visit FROM visits 
+		$uploadedVisitQuery = $this->linkpdo->prepare('SELECT id_visit FROM visits 
                                                     INNER JOIN visit_type ON 
                                                         (visit_type.id=visits.visit_type_id 
                                                         AND visit_type.group_id = :visitGroupId)
                                                     AND deleted = :deleted 
                                                     ORDER BY patient_code, visit_type.visit_order');
 
-        $uploadedVisitQuery->execute(array(
-            'deleted' => intval($deleted),
-            'visitGroupId' => $this->visitGroupObject->groupId
-        ));
+		$uploadedVisitQuery->execute(array(
+			'deleted' => intval($deleted),
+			'visitGroupId' => $this->visitGroupObject->groupId
+		));
 
-        $uploadedVisitIds = $uploadedVisitQuery->fetchAll(PDO::FETCH_COLUMN);
+		$uploadedVisitIds = $uploadedVisitQuery->fetchAll(PDO::FETCH_COLUMN);
 
-        $visitObjectArray = [];
-        foreach ($uploadedVisitIds as $id_visit) {
-            $visitObjectArray[] = new Visit($id_visit, $this->linkpdo);
-        }
+		$visitObjectArray = [];
+		foreach ($uploadedVisitIds as $id_visit) {
+			$visitObjectArray[] = new Visit($id_visit, $this->linkpdo);
+		}
 
-        return $visitObjectArray;
-    }
+		return $visitObjectArray;
+	}
 
-    /**
-     * Determine all patient status for a specific visitType
-     */
-    public function getPatientVisitStatusForVisitType(Visit_Type $visitType)
-    {
+	/**
+	 * Determine all patient status for a specific visitType
+	 */
+	public function getPatientVisitStatusForVisitType(Visit_Type $visitType)
+	{
 
-        //Get patients list in this study
-        $allPatients = $this->studyObject->getAllPatientsInStudy();
+		//Get patients list in this study
+		$allPatients = $this->studyObject->getAllPatientsInStudy();
 
-        $results = [];
+		$results = [];
 
-        foreach ($allPatients as $patient) {
+		foreach ($allPatients as $patient) {
 
-            $patientCenter = $patient->getPatientCenter();
-            $visitManager = $patient->getPatientVisitManager($this->visitGroupObject);
+			$patientCenter = $patient->getPatientCenter();
+			$visitManager = $patient->getPatientVisitManager($this->visitGroupObject);
 
-            $patientData = [];
-            $patientData['center'] = $patientCenter->name;
-            $patientData['country'] = $patientCenter->countryName;
-            $patientData['firstname'] = $patient->patientFirstName;
-            $patientData['lastname'] = $patient->patientLastName;
-            $patientData['birthdate'] = $patient->patientBirthDate;
-            $patientData['registration_date'] = $patient->patientRegistrationDate;
+			$patientData = [];
+			$patientData['center'] = $patientCenter->name;
+			$patientData['country'] = $patientCenter->countryName;
+			$patientData['firstname'] = $patient->patientFirstName;
+			$patientData['lastname'] = $patient->patientLastName;
+			$patientData['birthdate'] = $patient->patientBirthDate;
+			$patientData['registration_date'] = $patient->patientRegistrationDate;
 
-            $visitStatus = $visitManager->determineVisitStatus($visitType->name);
+			$visitStatus = $visitManager->determineVisitStatus($visitType->name);
 
-            $results[$patient->patientCode] = array_merge($patientData, $visitStatus);
-        }
+			$results[$patient->patientCode] = array_merge($patientData, $visitStatus);
+		}
 
-        return $results;
-    }
+		return $results;
+	}
 
-    /**
-     * Determine all visits status for all visit type for all patients
-     */
-    public function getPatientsAllVisitsStatus()
-    {
+	/**
+	 * Determine all visits status for all visit type for all patients
+	 */
+	public function getPatientsAllVisitsStatus()
+	{
 
-        //Get ordered list of possible visits in this study
-        $allVisitsType = $this->visitGroupObject->getAllVisitTypesOfGroup();
+		//Get ordered list of possible visits in this study
+		$allVisitsType = $this->visitGroupObject->getAllVisitTypesOfGroup();
 
-        $results = [];
+		$results = [];
 
-        foreach ($allVisitsType as $visitType) {
+		foreach ($allVisitsType as $visitType) {
 
-            $allPatientStatus = $this->getPatientVisitStatusForVisitType($visitType);
+			$allPatientStatus = $this->getPatientVisitStatusForVisitType($visitType);
 
-            $results[$visitType->name] = $allPatientStatus;
-            //array_push($results, ...$allPatientStatus);
-        }
+			$results[$visitType->name] = $allPatientStatus;
+			//array_push($results, ...$allPatientStatus);
+		}
 
-        return $results;
-    }
+		return $results;
+	}
 }

Spacing +53 added lines, -53 removed lines

@@ -28,9 +28,9 @@ 
 
     public function __construct(Study $studyObject, Visit_Group $visitGroupObject, PDO $linkpdo)
     {
-        $this->linkpdo = $linkpdo;
-        $this->studyObject = $studyObject;
-        $this->visitGroupObject = $visitGroupObject;
+        $this->linkpdo=$linkpdo;
+        $this->studyObject=$studyObject;
+        $this->visitGroupObject=$visitGroupObject;
     }
 
     public function getVisitGroupObject(): Visit_Group
@@ -44,7 +44,7 @@ 
     public function getUploadedVisits(): array
     {
 
-        $uploadedVisitQuery = $this->linkpdo->prepare('SELECT id_visit FROM visits 
+        $uploadedVisitQuery=$this->linkpdo->prepare('SELECT id_visit FROM visits 
                                                                     INNER JOIN visit_type ON 
                                                                         (visit_type.id=visits.visit_type_id 
                                                                         AND visit_type.group_id = :visitGroupId)
@@ -55,11 +55,11 @@ 
             'visitGroupId' => $this->visitGroupObject->groupId
         ));
 
-        $uploadedVisitIds = $uploadedVisitQuery->fetchall(PDO::FETCH_COLUMN);
+        $uploadedVisitIds=$uploadedVisitQuery->fetchall(PDO::FETCH_COLUMN);
 
-        $visitObjectArray = [];
+        $visitObjectArray=[];
         foreach ($uploadedVisitIds as $id_visit) {
-            $visitObjectArray[] = new Visit($id_visit, $this->linkpdo);
+            $visitObjectArray[]=new Visit($id_visit, $this->linkpdo);
         }
 
         return $visitObjectArray;
@@ -71,7 +71,7 @@ 
     public function getAwaitingUploadVisit(): array
     {
 
-        $uploadedVisitQuery = $this->linkpdo->prepare("SELECT id_visit FROM visits 
+        $uploadedVisitQuery=$this->linkpdo->prepare("SELECT id_visit FROM visits 
                                                                     INNER JOIN visit_type ON 
                                                                          (visit_type.id=visits.visit_type_id 
                                                                             AND visit_type.group_id = :visitGroupId)
@@ -84,11 +84,11 @@ 
                 'visitGroupId' => $this->visitGroupObject->groupId
             )
         );
-        $uploadedVisitIds = $uploadedVisitQuery->fetchAll(PDO::FETCH_COLUMN);
+        $uploadedVisitIds=$uploadedVisitQuery->fetchAll(PDO::FETCH_COLUMN);
 
-        $visitObjectArray = [];
+        $visitObjectArray=[];
         foreach ($uploadedVisitIds as $id_visit) {
-            $visitObjectArray[] = new Visit($id_visit, $this->linkpdo);
+            $visitObjectArray[]=new Visit($id_visit, $this->linkpdo);
         }
 
         return $visitObjectArray;
@@ -100,11 +100,11 @@ 
      * @param string $username
      * @return Visit[]
      */
-    public function getAwaitingReviewVisit(string $username = null): array
+    public function getAwaitingReviewVisit(string $username=null): array
     {
 
         //Query visit to analyze visit awaiting a review
-        $idVisitsQuery = $this->linkpdo->prepare('SELECT id_visit FROM visits 
+        $idVisitsQuery=$this->linkpdo->prepare('SELECT id_visit FROM visits 
                                                                     INNER JOIN visit_type ON 
                                                                         (visit_type.id=visits.visit_type_id 
                                                                         AND visit_type.group_id = :visitGroupId)
@@ -116,17 +116,17 @@ 
             'visitGroupId' => $this->visitGroupObject->groupId
         ));
 
-        $visitList = $idVisitsQuery->fetchAll(PDO::FETCH_COLUMN);
+        $visitList=$idVisitsQuery->fetchAll(PDO::FETCH_COLUMN);
 
-        $visitObjectArray = [];
+        $visitObjectArray=[];
 
         foreach ($visitList as $visitId) {
-            $visitObject = new Visit($visitId, $this->linkpdo);
+            $visitObject=new Visit($visitId, $this->linkpdo);
 
             if (!empty($username)) {
-                if ($visitObject->isAwaitingReviewForReviewerUser($username)) $visitObjectArray[] = $visitObject;
-            } else {
-                $visitObjectArray[] = $visitObject;
+                if ($visitObject->isAwaitingReviewForReviewerUser($username)) $visitObjectArray[]=$visitObject;
+            }else {
+                $visitObjectArray[]=$visitObject;
             }
         }
 
@@ -140,7 +140,7 @@ 
     public function getVisitForControllerAction(): array
     {
 
-        $visitsQuery = $this->linkpdo->prepare('SELECT id_visit FROM visits 
+        $visitsQuery=$this->linkpdo->prepare('SELECT id_visit FROM visits 
                                                     INNER JOIN visit_type ON 
                                                         (visit_type.id=visits.visit_type_id 
                                                         AND visit_type.group_id = :visitGroupId)
@@ -155,11 +155,11 @@ 
             'visitGroupId' => $this->visitGroupObject->groupId
         ));
 
-        $visits = $visitsQuery->fetchAll(PDO::FETCH_COLUMN);
+        $visits=$visitsQuery->fetchAll(PDO::FETCH_COLUMN);
 
-        $visitObjectArray = [];
+        $visitObjectArray=[];
         foreach ($visits as $visit) {
-            $visitObjectArray[] = new Visit($visit, $this->linkpdo);
+            $visitObjectArray[]=new Visit($visit, $this->linkpdo);
         }
 
         return $visitObjectArray;
@@ -171,7 +171,7 @@ 
     public function getVisitWithQCStatus($qcStatus): array
     {
 
-        $visitQuery = $this->linkpdo->prepare("SELECT id_visit FROM visits 
+        $visitQuery=$this->linkpdo->prepare("SELECT id_visit FROM visits 
                                                         INNER JOIN visit_type ON 
                                                             (visit_type.id=visits.visit_type_id 
                                                             AND visit_type.group_id = :visitGroupId)
@@ -183,11 +183,11 @@ 
             'qcStatus' => $qcStatus,
             'visitGroupId' => $this->visitGroupObject->groupId
         ));
-        $visitIds = $visitQuery->fetchall(PDO::FETCH_COLUMN);
+        $visitIds=$visitQuery->fetchall(PDO::FETCH_COLUMN);
 
-        $visitObjectArray = [];
+        $visitObjectArray=[];
         foreach ($visitIds as $id_visit) {
-            $visitObjectArray[] = new Visit($id_visit, $this->linkpdo);
+            $visitObjectArray[]=new Visit($id_visit, $this->linkpdo);
         }
 
         return $visitObjectArray;
@@ -199,7 +199,7 @@ 
     public function getVisitsMissingInvestigatorForm(): array
     {
 
-        $visitQuery = $this->linkpdo->prepare("SELECT id_visit FROM visits 
+        $visitQuery=$this->linkpdo->prepare("SELECT id_visit FROM visits 
                                                             INNER JOIN visit_type ON 
                                                                 (visit_type.id=visits.visit_type_id 
                                                                 AND visit_type.group_id = :visitGroupId)
@@ -211,11 +211,11 @@ 
             'visitGroupId' => $this->visitGroupObject->groupId
         ));
 
-        $visitIds = $visitQuery->fetchAll(PDO::FETCH_COLUMN);
+        $visitIds=$visitQuery->fetchAll(PDO::FETCH_COLUMN);
 
-        $visitObjectArray = [];
+        $visitObjectArray=[];
         foreach ($visitIds as $id_visit) {
-            $visitObjectArray[] = new Visit($id_visit, $this->linkpdo);
+            $visitObjectArray[]=new Visit($id_visit, $this->linkpdo);
         }
 
         return $visitObjectArray;
@@ -224,10 +224,10 @@ 
     /**
      * Return studie's created visits
      */
-    public function getCreatedVisits(bool $deleted = false): array
+    public function getCreatedVisits(bool $deleted=false): array
     {
 
-        $uploadedVisitQuery = $this->linkpdo->prepare('SELECT id_visit FROM visits 
+        $uploadedVisitQuery=$this->linkpdo->prepare('SELECT id_visit FROM visits 
                                                     INNER JOIN visit_type ON 
                                                         (visit_type.id=visits.visit_type_id 
                                                         AND visit_type.group_id = :visitGroupId)
@@ -239,11 +239,11 @@ 
             'visitGroupId' => $this->visitGroupObject->groupId
         ));
 
-        $uploadedVisitIds = $uploadedVisitQuery->fetchAll(PDO::FETCH_COLUMN);
+        $uploadedVisitIds=$uploadedVisitQuery->fetchAll(PDO::FETCH_COLUMN);
 
-        $visitObjectArray = [];
+        $visitObjectArray=[];
         foreach ($uploadedVisitIds as $id_visit) {
-            $visitObjectArray[] = new Visit($id_visit, $this->linkpdo);
+            $visitObjectArray[]=new Visit($id_visit, $this->linkpdo);
         }
 
         return $visitObjectArray;
@@ -256,26 +256,26 @@ 
     {
 
         //Get patients list in this study
-        $allPatients = $this->studyObject->getAllPatientsInStudy();
+        $allPatients=$this->studyObject->getAllPatientsInStudy();
 
-        $results = [];
+        $results=[];
 
         foreach ($allPatients as $patient) {
 
-            $patientCenter = $patient->getPatientCenter();
-            $visitManager = $patient->getPatientVisitManager($this->visitGroupObject);
+            $patientCenter=$patient->getPatientCenter();
+            $visitManager=$patient->getPatientVisitManager($this->visitGroupObject);
 
-            $patientData = [];
-            $patientData['center'] = $patientCenter->name;
-            $patientData['country'] = $patientCenter->countryName;
-            $patientData['firstname'] = $patient->patientFirstName;
-            $patientData['lastname'] = $patient->patientLastName;
-            $patientData['birthdate'] = $patient->patientBirthDate;
-            $patientData['registration_date'] = $patient->patientRegistrationDate;
+            $patientData=[];
+            $patientData['center']=$patientCenter->name;
+            $patientData['country']=$patientCenter->countryName;
+            $patientData['firstname']=$patient->patientFirstName;
+            $patientData['lastname']=$patient->patientLastName;
+            $patientData['birthdate']=$patient->patientBirthDate;
+            $patientData['registration_date']=$patient->patientRegistrationDate;
 
-            $visitStatus = $visitManager->determineVisitStatus($visitType->name);
+            $visitStatus=$visitManager->determineVisitStatus($visitType->name);
 
-            $results[$patient->patientCode] = array_merge($patientData, $visitStatus);
+            $results[$patient->patientCode]=array_merge($patientData, $visitStatus);
         }
 
         return $results;
@@ -288,15 +288,15 @@ 
     {
 
         //Get ordered list of possible visits in this study
-        $allVisitsType = $this->visitGroupObject->getAllVisitTypesOfGroup();
+        $allVisitsType=$this->visitGroupObject->getAllVisitTypesOfGroup();
 
-        $results = [];
+        $results=[];
 
         foreach ($allVisitsType as $visitType) {
 
-            $allPatientStatus = $this->getPatientVisitStatusForVisitType($visitType);
+            $allPatientStatus=$this->getPatientVisitStatusForVisitType($visitType);
 
-            $results[$visitType->name] = $allPatientStatus;
+            $results[$visitType->name]=$allPatientStatus;
             //array_push($results, ...$allPatientStatus);
         }
 

src/models/Study_Review_Manager.php

Spacing +26 added lines, -26 removed lines

@@ -25,16 +25,16 @@ 
 
 	public function __construct(Study $studyObject)
 	{
-		$this->studyObject = $studyObject;
+		$this->studyObject=$studyObject;
 	}
 
 	private function getAvailableReviewersName(): Array
 	{
 		//List the Reviewers declared in the study
-		$reviewerUsersObjects = $this->studyObject->getUsersByRoleInStudy(User::REVIEWER);
-		$availableReviewers = [];
+		$reviewerUsersObjects=$this->studyObject->getUsersByRoleInStudy(User::REVIEWER);
+		$availableReviewers=[];
 		foreach ($reviewerUsersObjects as $reviewerObject) {
-			$availableReviewers[] = $reviewerObject->lastName . " " . $reviewerObject->firstName;
+			$availableReviewers[]=$reviewerObject->lastName." ".$reviewerObject->firstName;
 		}
 
 		return $availableReviewers;
@@ -48,45 +48,45 @@ 
 	public function getReviewsDetailsByVisit() : Array
 	{
 
-		$availableReviewers = $this->getAvailableReviewersName();
+		$availableReviewers=$this->getAvailableReviewersName();
 		//Retrieve created Visit from the study Object
-		$createdVisitObjects = $this->studyObject->getAllCreatedVisits();
+		$createdVisitObjects=$this->studyObject->getAllCreatedVisits();
 
 		//GlobalMap
-		$reviewdetailsMap = [];
+		$reviewdetailsMap=[];
 
 		foreach ($createdVisitObjects as $createdVisit) {
 			if ($createdVisit->stateQualityControl == Visit::QC_ACCEPTED && $createdVisit->visitTypeObject->reviewNeeded) {
 				//If QC Accepted and review needed we analyze it
-				$newVisit['visitId'] = $createdVisit->id_visit;
-				$newVisit['visitModality'] = $createdVisit->visitGroupObject->groupModality;
-				$newVisit['patientNumber'] = $createdVisit->patientCode;
-				$newVisit['visit'] = $createdVisit->visitType;
-				$newVisit['acquisitionDate'] = $createdVisit->acquisitionDate;
-				$newVisit['reviewStatus'] = $createdVisit->reviewStatus;
+				$newVisit['visitId']=$createdVisit->id_visit;
+				$newVisit['visitModality']=$createdVisit->visitGroupObject->groupModality;
+				$newVisit['patientNumber']=$createdVisit->patientCode;
+				$newVisit['visit']=$createdVisit->visitType;
+				$newVisit['acquisitionDate']=$createdVisit->acquisitionDate;
+				$newVisit['reviewStatus']=$createdVisit->reviewStatus;
 				//Retrieve review
 				try {
-					$reviewObjects = $createdVisit->getReviewsObject(false);
-				} catch (Exception $e) {
-					$reviewObjects = [];
+					$reviewObjects=$createdVisit->getReviewsObject(false);
+				}catch (Exception $e) {
+					$reviewObjects=[];
 				}
 
-				$newVisit['numberOfReview'] = count($reviewObjects);
-				$newVisit['reviewDoneBy'] = [];
-				$newVisit['reviewDetailsArray'] = [];
+				$newVisit['numberOfReview']=count($reviewObjects);
+				$newVisit['reviewDoneBy']=[];
+				$newVisit['reviewDetailsArray']=[];
 				foreach ($reviewObjects as $review) {
-					$reviewerObject = $review->getUserObject();
-					$details['user'] = $reviewerObject->lastName . " " . $reviewerObject->firstName;
-					$details['date'] = $review->reviewDate;
-					$newVisit['reviewDetailsArray'][] = $details;
-					$newVisit['reviewDoneBy'][] = $reviewerObject->lastName . " " . $reviewerObject->firstName;
+					$reviewerObject=$review->getUserObject();
+					$details['user']=$reviewerObject->lastName." ".$reviewerObject->firstName;
+					$details['date']=$review->reviewDate;
+					$newVisit['reviewDetailsArray'][]=$details;
+					$newVisit['reviewDoneBy'][]=$reviewerObject->lastName." ".$reviewerObject->firstName;
 				}
 
 				//Determine missing reviewer for this visit
-				$newVisit['reviewNotDoneBy'] = array_diff($availableReviewers, $newVisit['reviewDoneBy']);
+				$newVisit['reviewNotDoneBy']=array_diff($availableReviewers, $newVisit['reviewDoneBy']);
 
 				//Add all data to the global map
-				$reviewdetailsMap[$createdVisit->id_visit] = $newVisit;
+				$reviewdetailsMap[$createdVisit->id_visit]=$newVisit;
 			}
 		}
 		return $reviewdetailsMap;

src/models/Visit_Type.php

Indentation +79 added lines, -79 removed lines

@@ -18,108 +18,108 @@
  */
 Class Visit_Type{
     
-    public $id;
-    public $groupId;
-    public $name;
-    public $tableReviewSpecificName;
-    public $visitOrder;
-    public $localFormNeeded;
-    public $qcNeeded;
-    public $reviewNeeded;
-    public $optionalVisit;
-    public $limitLowDays;
-    public $limitUpDays;
-    public $anonProfile;
+	public $id;
+	public $groupId;
+	public $name;
+	public $tableReviewSpecificName;
+	public $visitOrder;
+	public $localFormNeeded;
+	public $qcNeeded;
+	public $reviewNeeded;
+	public $optionalVisit;
+	public $limitLowDays;
+	public $limitUpDays;
+	public $anonProfile;
 
-    public $linkpdo;
+	public $linkpdo;
     
-    public function __construct(PDO $linkpdo, int $visitTypeId){
+	public function __construct(PDO $linkpdo, int $visitTypeId){
         
-        $this->linkpdo=$linkpdo;
-        $visitTypeQuery = $this->linkpdo->prepare('SELECT * FROM visit_type WHERE id = :visitTypeId');
-        $visitTypeQuery->execute(array('visitTypeId' => $visitTypeId));
-        $visitType=$visitTypeQuery->fetch(PDO::FETCH_ASSOC);
+		$this->linkpdo=$linkpdo;
+		$visitTypeQuery = $this->linkpdo->prepare('SELECT * FROM visit_type WHERE id = :visitTypeId');
+		$visitTypeQuery->execute(array('visitTypeId' => $visitTypeId));
+		$visitType=$visitTypeQuery->fetch(PDO::FETCH_ASSOC);
 
-        $this->id=$visitType['id'];
-        $this->groupId=$visitType['group_id'];
-        $this->name=$visitType['name'];
-        $this->tableReviewSpecificName=$visitType['table_review_specific'];
-        $this->visitOrder=$visitType['visit_order'];
-        $this->localFormNeeded=$visitType['local_form_needed'];
-        $this->qcNeeded=$visitType['qc_needed'];
-        $this->reviewNeeded=$visitType['review_needed'];
-        $this->optionalVisit=$visitType['optional'];
-        $this->limitLowDays=$visitType['limit_low_days'];
-        $this->limitUpDays=$visitType['limit_up_days'];
-        $this->anonProfile=$visitType['anon_profile'];
+		$this->id=$visitType['id'];
+		$this->groupId=$visitType['group_id'];
+		$this->name=$visitType['name'];
+		$this->tableReviewSpecificName=$visitType['table_review_specific'];
+		$this->visitOrder=$visitType['visit_order'];
+		$this->localFormNeeded=$visitType['local_form_needed'];
+		$this->qcNeeded=$visitType['qc_needed'];
+		$this->reviewNeeded=$visitType['review_needed'];
+		$this->optionalVisit=$visitType['optional'];
+		$this->limitLowDays=$visitType['limit_low_days'];
+		$this->limitUpDays=$visitType['limit_up_days'];
+		$this->anonProfile=$visitType['anon_profile'];
         
-    }
+	}
 
-    public static function getVisitTypeByName($groupId, String $visitName,PDO $linkpdo) : Visit_Type {
-        $visitTypeQuery = $linkpdo->prepare('SELECT id FROM visit_type WHERE group_id = :groupId AND name= :name');
-        $visitTypeQuery->execute(array('groupId' => $groupId, 'name'=>$visitName));
-        $visitTypeId=$visitTypeQuery->fetch(PDO::FETCH_COLUMN);
-        return new Visit_Type($linkpdo, $visitTypeId);
+	public static function getVisitTypeByName($groupId, String $visitName,PDO $linkpdo) : Visit_Type {
+		$visitTypeQuery = $linkpdo->prepare('SELECT id FROM visit_type WHERE group_id = :groupId AND name= :name');
+		$visitTypeQuery->execute(array('groupId' => $groupId, 'name'=>$visitName));
+		$visitTypeId=$visitTypeQuery->fetch(PDO::FETCH_COLUMN);
+		return new Visit_Type($linkpdo, $visitTypeId);
 
-    }
+	}
     
-    /**
-     * Return name of specific table of this visit type
-     * @return array
-     */
-    public function getSpecificFormColumn() : Array {
-        $visitsTypeColumnQuery=$this->linkpdo->prepare('SELECT `COLUMN_NAME`
+	/**
+	 * Return name of specific table of this visit type
+	 * @return array
+	 */
+	public function getSpecificFormColumn() : Array {
+		$visitsTypeColumnQuery=$this->linkpdo->prepare('SELECT `COLUMN_NAME`
                                             FROM `INFORMATION_SCHEMA`.`COLUMNS`
                                             WHERE  `TABLE_NAME`="'.$this->tableReviewSpecificName.'"');
-        $visitsTypeColumnQuery->execute();
-        $columnsSpecific=$visitsTypeColumnQuery->fetchAll(PDO::FETCH_COLUMN);
+		$visitsTypeColumnQuery->execute();
+		$columnsSpecific=$visitsTypeColumnQuery->fetchAll(PDO::FETCH_COLUMN);
         
-        return $columnsSpecific;
-    }
+		return $columnsSpecific;
+	}
     
-    /**
-     * Return name and type of the specific table of this visit
-     * @return array
-     */
-    public function getSpecificTableInputType() : Array {
-        $query = $this->linkpdo->prepare('SELECT COLUMN_NAME, COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME="'.$this->tableReviewSpecificName.'"');
-        $query->execute();
-        $datas=$query->fetchAll(PDO::FETCH_ASSOC);
+	/**
+	 * Return name and type of the specific table of this visit
+	 * @return array
+	 */
+	public function getSpecificTableInputType() : Array {
+		$query = $this->linkpdo->prepare('SELECT COLUMN_NAME, COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME="'.$this->tableReviewSpecificName.'"');
+		$query->execute();
+		$datas=$query->fetchAll(PDO::FETCH_ASSOC);
         
-        return $datas;
+		return $datas;
         
-    }
+	}
 
-    public function getVisitGroup() : Visit_Group{
-        return new Visit_Group($this->linkpdo, $this->groupId);
-    }
+	public function getVisitGroup() : Visit_Group{
+		return new Visit_Group($this->linkpdo, $this->groupId);
+	}
     
-    public static function createVisitType(string $studyName, Visit_Group $visitGroup, String $visitName, int $order, int $limitLowDays, int $limitUpDays, bool $localFormNeed, bool $qcNeeded, bool $reviewNeeded, bool $optional, String $anonProfile, PDO $linkpdo){
+	public static function createVisitType(string $studyName, Visit_Group $visitGroup, String $visitName, int $order, int $limitLowDays, int $limitUpDays, bool $localFormNeed, bool $qcNeeded, bool $reviewNeeded, bool $optional, String $anonProfile, PDO $linkpdo){
         
-        $req = $linkpdo->prepare('INSERT INTO visit_type (group_id, name, table_review_specific, visit_order, local_form_needed, qc_needed, review_needed, optional, limit_low_days, limit_up_days, anon_profile)
+		$req = $linkpdo->prepare('INSERT INTO visit_type (group_id, name, table_review_specific, visit_order, local_form_needed, qc_needed, review_needed, optional, limit_low_days, limit_up_days, anon_profile)
                                       VALUES(:groupId, :visitName, :tableSpecific, :order, :localFormNeeded, :qcNeeded, :reviewNeeded, :optional, :limitLowDays, :limitUpDays, :anonProfile)');
         
-        $tableSpecificName=$visitGroup->groupModality."_".$studyName."_".$visitName;
+		$tableSpecificName=$visitGroup->groupModality."_".$studyName."_".$visitName;
 
-        $req->execute(array('groupId' => $visitGroup->groupId,
-            'visitName'=>$visitName,
-            'tableSpecific'=>$tableSpecificName,
-            'order'=>intval($order),
-            'localFormNeeded'=>intval($localFormNeed),
-            'qcNeeded'=>intval($qcNeeded),
-            'reviewNeeded'=>intval($reviewNeeded),
-            'optional'=>intval($optional),
-            'limitLowDays'=>intval($limitLowDays),
-            'limitUpDays'=>intval($limitUpDays),
-            'anonProfile'=>$anonProfile
-        ));
+		$req->execute(array('groupId' => $visitGroup->groupId,
+			'visitName'=>$visitName,
+			'tableSpecific'=>$tableSpecificName,
+			'order'=>intval($order),
+			'localFormNeeded'=>intval($localFormNeed),
+			'qcNeeded'=>intval($qcNeeded),
+			'reviewNeeded'=>intval($reviewNeeded),
+			'optional'=>intval($optional),
+			'limitLowDays'=>intval($limitLowDays),
+			'limitUpDays'=>intval($limitUpDays),
+			'anonProfile'=>$anonProfile
+		));
         
-        //Create specific table of the visit for form with relation with the review table
-        $req = $linkpdo->prepare(' CREATE TABLE '.$tableSpecificName.' (id_review integer(11) NOT NULL, PRIMARY KEY (id_review));
+		//Create specific table of the visit for form with relation with the review table
+		$req = $linkpdo->prepare(' CREATE TABLE '.$tableSpecificName.' (id_review integer(11) NOT NULL, PRIMARY KEY (id_review));
             ALTER TABLE '.$tableSpecificName.' ADD FOREIGN KEY fk_idReview (id_review) REFERENCES reviews(id_review);
             ALTER TABLE '.$tableSpecificName.' ADD PRIMARY KEY (`id_review`); ');
         
-        $req->execute();
-    }
+		$req->execute();
+	}
     
 }
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -16,7 +16,7 @@ 
 /**
  * Acces data of Visit Type table
  */
-Class Visit_Type{
+Class Visit_Type {
     
     public $id;
     public $groupId;
@@ -33,10 +33,10 @@ 
 
     public $linkpdo;
     
-    public function __construct(PDO $linkpdo, int $visitTypeId){
+    public function __construct(PDO $linkpdo, int $visitTypeId) {
         
         $this->linkpdo=$linkpdo;
-        $visitTypeQuery = $this->linkpdo->prepare('SELECT * FROM visit_type WHERE id = :visitTypeId');
+        $visitTypeQuery=$this->linkpdo->prepare('SELECT * FROM visit_type WHERE id = :visitTypeId');
         $visitTypeQuery->execute(array('visitTypeId' => $visitTypeId));
         $visitType=$visitTypeQuery->fetch(PDO::FETCH_ASSOC);
 
@@ -55,8 +55,8 @@ 
         
     }
 
-    public static function getVisitTypeByName($groupId, String $visitName,PDO $linkpdo) : Visit_Type {
-        $visitTypeQuery = $linkpdo->prepare('SELECT id FROM visit_type WHERE group_id = :groupId AND name= :name');
+    public static function getVisitTypeByName($groupId, String $visitName, PDO $linkpdo) : Visit_Type {
+        $visitTypeQuery=$linkpdo->prepare('SELECT id FROM visit_type WHERE group_id = :groupId AND name= :name');
         $visitTypeQuery->execute(array('groupId' => $groupId, 'name'=>$visitName));
         $visitTypeId=$visitTypeQuery->fetch(PDO::FETCH_COLUMN);
         return new Visit_Type($linkpdo, $visitTypeId);
@@ -82,7 +82,7 @@ 
      * @return array
      */
     public function getSpecificTableInputType() : Array {
-        $query = $this->linkpdo->prepare('SELECT COLUMN_NAME, COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME="'.$this->tableReviewSpecificName.'"');
+        $query=$this->linkpdo->prepare('SELECT COLUMN_NAME, COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME="'.$this->tableReviewSpecificName.'"');
         $query->execute();
         $datas=$query->fetchAll(PDO::FETCH_ASSOC);
         
@@ -94,9 +94,9 @@ 
         return new Visit_Group($this->linkpdo, $this->groupId);
     }
     
-    public static function createVisitType(string $studyName, Visit_Group $visitGroup, String $visitName, int $order, int $limitLowDays, int $limitUpDays, bool $localFormNeed, bool $qcNeeded, bool $reviewNeeded, bool $optional, String $anonProfile, PDO $linkpdo){
+    public static function createVisitType(string $studyName, Visit_Group $visitGroup, String $visitName, int $order, int $limitLowDays, int $limitUpDays, bool $localFormNeed, bool $qcNeeded, bool $reviewNeeded, bool $optional, String $anonProfile, PDO $linkpdo) {
         
-        $req = $linkpdo->prepare('INSERT INTO visit_type (group_id, name, table_review_specific, visit_order, local_form_needed, qc_needed, review_needed, optional, limit_low_days, limit_up_days, anon_profile)
+        $req=$linkpdo->prepare('INSERT INTO visit_type (group_id, name, table_review_specific, visit_order, local_form_needed, qc_needed, review_needed, optional, limit_low_days, limit_up_days, anon_profile)
                                       VALUES(:groupId, :visitName, :tableSpecific, :order, :localFormNeeded, :qcNeeded, :reviewNeeded, :optional, :limitLowDays, :limitUpDays, :anonProfile)');
         
         $tableSpecificName=$visitGroup->groupModality."_".$studyName."_".$visitName;
@@ -115,7 +115,7 @@ 
         ));
         
         //Create specific table of the visit for form with relation with the review table
-        $req = $linkpdo->prepare(' CREATE TABLE '.$tableSpecificName.' (id_review integer(11) NOT NULL, PRIMARY KEY (id_review));
+        $req=$linkpdo->prepare(' CREATE TABLE '.$tableSpecificName.' (id_review integer(11) NOT NULL, PRIMARY KEY (id_review));
             ALTER TABLE '.$tableSpecificName.' ADD FOREIGN KEY fk_idReview (id_review) REFERENCES reviews(id_review);
             ALTER TABLE '.$tableSpecificName.' ADD PRIMARY KEY (`id_review`); ');