salimkanoun / GaelO

src/models/Study.php

Braces +6 added lines, -2 removed lines

@@ -203,7 +203,7 @@ 
             $documentationQuery = $this->linkpdo->prepare("SELECT id_documentation FROM documentation
                                                     WHERE study = :study");
             
-        }else{
+        } else{
             $documentationQuery = $this->linkpdo->prepare("SELECT id_documentation FROM documentation
                                                     WHERE study = :study
                                                     AND ".$role."= 1 AND deleted=0");
@@ -292,7 +292,11 @@ 
         ));
         $result = $connecter->fetchAll(PDO::FETCH_COLUMN);
         
-        if(count($result)>0) return false; else return true;
+        if(count($result)>0) {
+        	return false;
+        } else {
+        	return true;
+        }
         
     }
     

Indentation +182 added lines, -182 removed lines

@@ -19,28 +19,28 @@ 
 
 Class Study {
     
-    private $linkpdo;
-    public $study;
-    public $patientCodePrefix;
+	private $linkpdo;
+	public $study;
+	public $patientCodePrefix;
     
-    public function __construct(String $study, PDO $linkpdo){
+	public function __construct(String $study, PDO $linkpdo){
 
-        $this->linkpdo=$linkpdo;
-        $connecter = $this->linkpdo->prepare('SELECT * FROM studies WHERE name=:study');
-        $connecter->execute(array(
-        		"study" => $study,
-        ));
-        $result = $connecter->fetch(PDO::FETCH_ASSOC);
+		$this->linkpdo=$linkpdo;
+		$connecter = $this->linkpdo->prepare('SELECT * FROM studies WHERE name=:study');
+		$connecter->execute(array(
+				"study" => $study,
+		));
+		$result = $connecter->fetch(PDO::FETCH_ASSOC);
 
-        $this->study=$result['name'];
-        $this->patientCodePrefix = $result['patient_code_prefix'];
+		$this->study=$result['name'];
+		$this->patientCodePrefix = $result['patient_code_prefix'];
         
         
-    }
+	}
 
-    public function getPatientsLinkedToUserCenters($username)
-    {
-        $patients = $this->linkpdo->prepare(' SELECT patients.code
+	public function getPatientsLinkedToUserCenters($username)
+	{
+		$patients = $this->linkpdo->prepare(' SELECT patients.code
             FROM   patients
             WHERE  patients.center IN (SELECT affiliated_centers.center
                 FROM   affiliated_centers
@@ -52,234 +52,234 @@ 
                 AND study = :study
                 GROUP  BY patients.code');
 
-        $patients->execute(array(
-            'username' => $username,
-            'study' => $this->study
-        ));
+		$patients->execute(array(
+			'username' => $username,
+			'study' => $this->study
+		));
 
-        $patientsCodes = $patients->fetchAll(PDO::FETCH_COLUMN);
+		$patientsCodes = $patients->fetchAll(PDO::FETCH_COLUMN);
 
-        $patientObjectsArray = [];
+		$patientObjectsArray = [];
 
-        foreach ($patientsCodes as $patientCode) {
-            $patientObjectsArray[] = new Patient($patientCode, $this->linkpdo);
-        }
+		foreach ($patientsCodes as $patientCode) {
+			$patientObjectsArray[] = new Patient($patientCode, $this->linkpdo);
+		}
 
-        return $patientObjectsArray;
-    }
+		return $patientObjectsArray;
+	}
 
-    public function getAllCreatedVisits(bool $deleted=false){
+	public function getAllCreatedVisits(bool $deleted=false){
 
-        $possibleStudyGroups=$this->getAllPossibleVisitGroups();
+		$possibleStudyGroups=$this->getAllPossibleVisitGroups();
 
-        $visitsObjectArray = [];
+		$visitsObjectArray = [];
 
-        foreach($possibleStudyGroups as $studyGroup){
-            $createdVisits=$studyGroup->getStudyVisitManager()->getCreatedVisits($deleted);
-            array_push($visitsObjectArray, ...$createdVisits);
-        }
+		foreach($possibleStudyGroups as $studyGroup){
+			$createdVisits=$studyGroup->getStudyVisitManager()->getCreatedVisits($deleted);
+			array_push($visitsObjectArray, ...$createdVisits);
+		}
 
-        return $visitsObjectArray;
+		return $visitsObjectArray;
 
-    }
+	}
 
-    public function getAllAwaitingUploadImagingVisit(){
+	public function getAllAwaitingUploadImagingVisit(){
 
-        $possibleStudyGroups=$this->getAllPossibleVisitGroups();
-        $visitsObjectArray = [];
+		$possibleStudyGroups=$this->getAllPossibleVisitGroups();
+		$visitsObjectArray = [];
 
-        foreach($possibleStudyGroups as $studyGroup){
-            if(in_array($studyGroup->groupModality, array(Visit_Group::GROUP_MODALITY_CT, Visit_Group::GROUP_MODALITY_MR, Visit_Group::GROUP_MODALITY_PET)) ){
-                $awaitingUploadVisits=$studyGroup->getStudyVisitManager()->getAwaitingUploadVisit();
-                array_push($visitsObjectArray, ...$awaitingUploadVisits);
-            }
+		foreach($possibleStudyGroups as $studyGroup){
+			if(in_array($studyGroup->groupModality, array(Visit_Group::GROUP_MODALITY_CT, Visit_Group::GROUP_MODALITY_MR, Visit_Group::GROUP_MODALITY_PET)) ){
+				$awaitingUploadVisits=$studyGroup->getStudyVisitManager()->getAwaitingUploadVisit();
+				array_push($visitsObjectArray, ...$awaitingUploadVisits);
+			}
             
             
-        }
+		}
         
-        return $visitsObjectArray;
+		return $visitsObjectArray;
 
-    }
+	}
 
-    public function getAllAwaitingReviewImagingVisit($username = null){
+	public function getAllAwaitingReviewImagingVisit($username = null){
 
-        $possibleStudyGroups=$this->getAllPossibleVisitGroups();
-        $visitsObjectArray = [];
+		$possibleStudyGroups=$this->getAllPossibleVisitGroups();
+		$visitsObjectArray = [];
 
-        foreach($possibleStudyGroups as $studyGroup){
-            if(in_array($studyGroup->groupModality, array(Visit_Group::GROUP_MODALITY_CT, Visit_Group::GROUP_MODALITY_MR, Visit_Group::GROUP_MODALITY_PET)) ){
-                $awaitingReviewVisits=$studyGroup->getStudyVisitManager()->getAwaitingReviewVisit($username);
-                array_push($visitsObjectArray, ...$awaitingReviewVisits);
-            }
+		foreach($possibleStudyGroups as $studyGroup){
+			if(in_array($studyGroup->groupModality, array(Visit_Group::GROUP_MODALITY_CT, Visit_Group::GROUP_MODALITY_MR, Visit_Group::GROUP_MODALITY_PET)) ){
+				$awaitingReviewVisits=$studyGroup->getStudyVisitManager()->getAwaitingReviewVisit($username);
+				array_push($visitsObjectArray, ...$awaitingReviewVisits);
+			}
             
             
-        }
+		}
         
-        return $visitsObjectArray;
+		return $visitsObjectArray;
 
-    }
+	}
 
-    public function getAllUploadedImagingVisits(){
+	public function getAllUploadedImagingVisits(){
 
-        $possibleStudyGroups=$this->getAllPossibleVisitGroups();
-        $visitsObjectArray = [];
+		$possibleStudyGroups=$this->getAllPossibleVisitGroups();
+		$visitsObjectArray = [];
 
-        foreach($possibleStudyGroups as $studyGroup){
-            if(in_array($studyGroup->groupModality, array(Visit_Group::GROUP_MODALITY_CT, Visit_Group::GROUP_MODALITY_MR, Visit_Group::GROUP_MODALITY_PET)) ){
-                $uploadedVisits=$studyGroup->getStudyVisitManager()->getUploadedVisits();
-                array_push($visitsObjectArray, ...$uploadedVisits);
-            }
+		foreach($possibleStudyGroups as $studyGroup){
+			if(in_array($studyGroup->groupModality, array(Visit_Group::GROUP_MODALITY_CT, Visit_Group::GROUP_MODALITY_MR, Visit_Group::GROUP_MODALITY_PET)) ){
+				$uploadedVisits=$studyGroup->getStudyVisitManager()->getUploadedVisits();
+				array_push($visitsObjectArray, ...$uploadedVisits);
+			}
             
             
-        }
+		}
         
-        return $visitsObjectArray;
+		return $visitsObjectArray;
 
-    }
+	}
 
-    public function isHavingAwaitingReviewImagingVisit($username=null){
-        $awaitingVisits=$this->getAllAwaitingReviewImagingVisit($username);
-        $havingAwaitingReview= (sizeof($awaitingVisits) > 0);
-        return $havingAwaitingReview;
-    }
+	public function isHavingAwaitingReviewImagingVisit($username=null){
+		$awaitingVisits=$this->getAllAwaitingReviewImagingVisit($username);
+		$havingAwaitingReview= (sizeof($awaitingVisits) > 0);
+		return $havingAwaitingReview;
+	}
 
 
 
-    public function getAllPossibleVisitGroups(){
+	public function getAllPossibleVisitGroups(){
 
-        $allGroupsType = $this->linkpdo->prepare('SELECT id FROM visit_group WHERE study = :study');
-        $allGroupsType->execute(array('study' => $this->study));
-        $allGroupsIds=$allGroupsType->fetchall(PDO::FETCH_COLUMN);
+		$allGroupsType = $this->linkpdo->prepare('SELECT id FROM visit_group WHERE study = :study');
+		$allGroupsType->execute(array('study' => $this->study));
+		$allGroupsIds=$allGroupsType->fetchall(PDO::FETCH_COLUMN);
         
-        $visitGroupArray=[];
-        foreach ($allGroupsIds as $groupId){
-            $visitGroupArray[]=new Visit_Group($this->linkpdo, $groupId);
-        }
+		$visitGroupArray=[];
+		foreach ($allGroupsIds as $groupId){
+			$visitGroupArray[]=new Visit_Group($this->linkpdo, $groupId);
+		}
         
-        return $visitGroupArray;
+		return $visitGroupArray;
 
-    }
+	}
 
-    public function getSpecificGroup(String $groupModality) : Visit_Group {
+	public function getSpecificGroup(String $groupModality) : Visit_Group {
 
-        $groupQuery = $this->linkpdo->prepare('SELECT id FROM visit_group WHERE study = :study AND group_modality=:groupModality');
-        $groupQuery->execute(array('study' => $this->study, 'groupModality'=> $groupModality));
-        $groupId=$groupQuery->fetch(PDO::FETCH_COLUMN);
+		$groupQuery = $this->linkpdo->prepare('SELECT id FROM visit_group WHERE study = :study AND group_modality=:groupModality');
+		$groupQuery->execute(array('study' => $this->study, 'groupModality'=> $groupModality));
+		$groupId=$groupQuery->fetch(PDO::FETCH_COLUMN);
         
-        return new Visit_Group($this->linkpdo, $groupId);
+		return new Visit_Group($this->linkpdo, $groupId);
 
-    }
+	}
 
-    public function getStudySpecificGroupManager(String $groupModality) : Group_Visit_Manager {
+	public function getStudySpecificGroupManager(String $groupModality) : Group_Visit_Manager {
 
-        $visitGroup=$this->getSpecificGroup($groupModality);
+		$visitGroup=$this->getSpecificGroup($groupModality);
         
-        return new Group_Visit_Manager($this, $visitGroup, $this->linkpdo);
+		return new Group_Visit_Manager($this, $visitGroup, $this->linkpdo);
 
-    }
+	}
 
-    public function getReviewManager() : Study_Review_Manager {
-        return new Study_Review_Manager($this);
-    }
+	public function getReviewManager() : Study_Review_Manager {
+		return new Study_Review_Manager($this);
+	}
 
-    public function getExportStudyData() : Export_Study_Data{
-        return new Export_Study_Data($this);
-    }
+	public function getExportStudyData() : Export_Study_Data{
+		return new Export_Study_Data($this);
+	}
     
-    public function getAllPatientsInStudy(){
-        $allPatientQuery = $this->linkpdo->prepare('SELECT code FROM patients WHERE study = :study');
-        $allPatientQuery->execute(array('study' => $this->study));
-        $allPatients=$allPatientQuery->fetchall(PDO::FETCH_COLUMN);
+	public function getAllPatientsInStudy(){
+		$allPatientQuery = $this->linkpdo->prepare('SELECT code FROM patients WHERE study = :study');
+		$allPatientQuery->execute(array('study' => $this->study));
+		$allPatients=$allPatientQuery->fetchall(PDO::FETCH_COLUMN);
         
-        $patientObjectArray=[];
-        foreach ($allPatients as $patient){
-            $patientObjectArray[]=new Patient($patient, $this->linkpdo);
-        }
+		$patientObjectArray=[];
+		foreach ($allPatients as $patient){
+			$patientObjectArray[]=new Patient($patient, $this->linkpdo);
+		}
         
-        return $patientObjectArray;
+		return $patientObjectArray;
         
-    }
+	}
     
-    public function getDocumentation(String $role){
-        if($role==User::SUPERVISOR){
-            $documentationQuery = $this->linkpdo->prepare("SELECT id_documentation FROM documentation
+	public function getDocumentation(String $role){
+		if($role==User::SUPERVISOR){
+			$documentationQuery = $this->linkpdo->prepare("SELECT id_documentation FROM documentation
                                                     WHERE study = :study");
             
-        }else{
-            $documentationQuery = $this->linkpdo->prepare("SELECT id_documentation FROM documentation
+		}else{
+			$documentationQuery = $this->linkpdo->prepare("SELECT id_documentation FROM documentation
                                                     WHERE study = :study
                                                     AND ".$role."= 1 AND deleted=0");
             
-        }
+		}
         
-        $documentationQuery->execute(array('study' => $this->study));
-        $documentationAnswers=$documentationQuery->fetchAll(PDO::FETCH_COLUMN);
+		$documentationQuery->execute(array('study' => $this->study));
+		$documentationAnswers=$documentationQuery->fetchAll(PDO::FETCH_COLUMN);
         
-        $documentationObjects=[];
-        foreach ($documentationAnswers as $documentationId){
-        	$documentationObjects[]=new Documentation($this->linkpdo, $documentationId);
-        }
-        return $documentationObjects;
-    }
+		$documentationObjects=[];
+		foreach ($documentationAnswers as $documentationId){
+			$documentationObjects[]=new Documentation($this->linkpdo, $documentationId);
+		}
+		return $documentationObjects;
+	}
     
-    /**
-     * Return userObject array for all users having role in the study
-     * @return User[]
-     */
-    public function getUsersWithRoleInStudy(){
-        $req = $this->linkpdo->prepare('SELECT DISTINCT users.username FROM roles,users
+	/**
+	 * Return userObject array for all users having role in the study
+	 * @return User[]
+	 */
+	public function getUsersWithRoleInStudy(){
+		$req = $this->linkpdo->prepare('SELECT DISTINCT users.username FROM roles,users
                                   WHERE roles.username=users.username
                                   AND roles.study=:study');
-        $req->execute(array('study' => $this->study));
-        $answers=$req->fetchAll(PDO::FETCH_COLUMN);
+		$req->execute(array('study' => $this->study));
+		$answers=$req->fetchAll(PDO::FETCH_COLUMN);
         
-        $usersObjects=[];
-        foreach ($answers as $username){
-            $usersObjects[]=new User($username, $this->linkpdo);
-        }
-        return $usersObjects;
+		$usersObjects=[];
+		foreach ($answers as $username){
+			$usersObjects[]=new User($username, $this->linkpdo);
+		}
+		return $usersObjects;
         
-    }
+	}
     
-    public function getUsersByRoleInStudy(String $role){
-        $req = $this->linkpdo->prepare('SELECT username FROM roles
+	public function getUsersByRoleInStudy(String $role){
+		$req = $this->linkpdo->prepare('SELECT username FROM roles
 									   WHERE study=:study AND name=:role ');
-        $req->execute(array('study' => $this->study, 'role'=>$role));
-        $answers=$req->fetchAll(PDO::FETCH_COLUMN);
+		$req->execute(array('study' => $this->study, 'role'=>$role));
+		$answers=$req->fetchAll(PDO::FETCH_COLUMN);
         
-        $usersObjects=[];
-        foreach ($answers as $username){
-            $usersObjects[]=new User($username, $this->linkpdo);
-        }
-        return $usersObjects;
+		$usersObjects=[];
+		foreach ($answers as $username){
+			$usersObjects[]=new User($username, $this->linkpdo);
+		}
+		return $usersObjects;
         
-    }
+	}
     
-    public function getAllRolesByUsers(){
-        $roles_query = $this->linkpdo->prepare('SELECT * FROM roles WHERE study=:study');
-        $roles_query->execute(array('study'=>$this->study));
-        $definedRoles=$roles_query->fetchall(PDO::FETCH_ASSOC);
+	public function getAllRolesByUsers(){
+		$roles_query = $this->linkpdo->prepare('SELECT * FROM roles WHERE study=:study');
+		$roles_query->execute(array('study'=>$this->study));
+		$definedRoles=$roles_query->fetchall(PDO::FETCH_ASSOC);
         
-        foreach ($definedRoles as $role){
-            $rolesList[$role['username']][]=$role['name'];
-        }
-        return $rolesList;
-    }
-
-    public function getStatistics(String $modality) {
-        return new Statistics($this, $modality);
-    }
+		foreach ($definedRoles as $role){
+			$rolesList[$role['username']][]=$role['name'];
+		}
+		return $rolesList;
+	}
+
+	public function getStatistics(String $modality) {
+		return new Statistics($this, $modality);
+	}
     
-    public function changeStudyActivation(bool $activated){
-        $req = $this->linkpdo->prepare('UPDATE studies SET
+	public function changeStudyActivation(bool $activated){
+		$req = $this->linkpdo->prepare('UPDATE studies SET
     								active = :active
 						        WHERE name = :study');
-        $req->execute(array( 'study'=> $this->study, 'active'=>intval($activated)));
-    }
+		$req->execute(array( 'study'=> $this->study, 'active'=>intval($activated)));
+	}
     
-    public function isOriginalOrthancNeverKnown($anonFromOrthancStudyId){
+	public function isOriginalOrthancNeverKnown($anonFromOrthancStudyId){
 
-        $connecter = $this->linkpdo->prepare('SELECT Study_Orthanc_ID FROM visits 
+		$connecter = $this->linkpdo->prepare('SELECT Study_Orthanc_ID FROM visits 
                                                 INNER JOIN visit_type ON 
                                                 (visit_type.id=visits.visit_type_id 
                                                 AND visit_type.group_id IN (SELECT id FROM visit_group WHERE study = :study))
@@ -287,26 +287,26 @@ 
                                             AND orthanc_studies.Anon_From_Orthanc_ID=:Anon_From_Orthanc_ID 
                                             AND orthanc_studies.deleted=0 
                                             AND visits.deleted=0'
-                                            );
-        $connecter->execute(array(
-            "study" => $this->study,
-            "Anon_From_Orthanc_ID"=>$anonFromOrthancStudyId
-        ));
-        $result = $connecter->fetchAll(PDO::FETCH_COLUMN);
+											);
+		$connecter->execute(array(
+			"study" => $this->study,
+			"Anon_From_Orthanc_ID"=>$anonFromOrthancStudyId
+		));
+		$result = $connecter->fetchAll(PDO::FETCH_COLUMN);
         
-        if(count($result)>0) return false; else return true;
+		if(count($result)>0) return false; else return true;
         
-    }
+	}
     
-    public static function createStudy(string $studyName, $patientCodePrefix, PDO $linkpdo){
+	public static function createStudy(string $studyName, $patientCodePrefix, PDO $linkpdo){
         
-        $req = $linkpdo->prepare('INSERT INTO studies (name, patient_code_prefix) VALUES(:studyName, :patientCodePrefix) ');
+		$req = $linkpdo->prepare('INSERT INTO studies (name, patient_code_prefix) VALUES(:studyName, :patientCodePrefix) ');
         
-        $req->execute(array(
-            'studyName' => $studyName,
-            'patientCodePrefix' => $patientCodePrefix
-        ));
+		$req->execute(array(
+			'studyName' => $studyName,
+			'patientCodePrefix' => $patientCodePrefix
+		));
         
-    }
+	}
     
 }
\ No newline at end of file

Spacing +56 added lines, -56 removed lines

@@ -23,24 +23,24 @@ 
     public $study;
     public $patientCodePrefix;
     
-    public function __construct(String $study, PDO $linkpdo){
+    public function __construct(String $study, PDO $linkpdo) {
 
         $this->linkpdo=$linkpdo;
-        $connecter = $this->linkpdo->prepare('SELECT * FROM studies WHERE name=:study');
+        $connecter=$this->linkpdo->prepare('SELECT * FROM studies WHERE name=:study');
         $connecter->execute(array(
         		"study" => $study,
         ));
-        $result = $connecter->fetch(PDO::FETCH_ASSOC);
+        $result=$connecter->fetch(PDO::FETCH_ASSOC);
 
         $this->study=$result['name'];
-        $this->patientCodePrefix = $result['patient_code_prefix'];
+        $this->patientCodePrefix=$result['patient_code_prefix'];
         
         
     }
 
     public function getPatientsLinkedToUserCenters($username)
     {
-        $patients = $this->linkpdo->prepare(' SELECT patients.code
+        $patients=$this->linkpdo->prepare(' SELECT patients.code
             FROM   patients
             WHERE  patients.center IN (SELECT affiliated_centers.center
                 FROM   affiliated_centers
@@ -57,24 +57,24 @@ 
             'study' => $this->study
         ));
 
-        $patientsCodes = $patients->fetchAll(PDO::FETCH_COLUMN);
+        $patientsCodes=$patients->fetchAll(PDO::FETCH_COLUMN);
 
-        $patientObjectsArray = [];
+        $patientObjectsArray=[];
 
         foreach ($patientsCodes as $patientCode) {
-            $patientObjectsArray[] = new Patient($patientCode, $this->linkpdo);
+            $patientObjectsArray[]=new Patient($patientCode, $this->linkpdo);
         }
 
         return $patientObjectsArray;
     }
 
-    public function getAllCreatedVisits(bool $deleted=false){
+    public function getAllCreatedVisits(bool $deleted=false) {
 
         $possibleStudyGroups=$this->getAllPossibleVisitGroups();
 
-        $visitsObjectArray = [];
+        $visitsObjectArray=[];
 
-        foreach($possibleStudyGroups as $studyGroup){
+        foreach ($possibleStudyGroups as $studyGroup) {
             $createdVisits=$studyGroup->getStudyVisitManager()->getCreatedVisits($deleted);
             array_push($visitsObjectArray, ...$createdVisits);
         }
@@ -83,13 +83,13 @@ 
 
     }
 
-    public function getAllAwaitingUploadImagingVisit(){
+    public function getAllAwaitingUploadImagingVisit() {
 
         $possibleStudyGroups=$this->getAllPossibleVisitGroups();
-        $visitsObjectArray = [];
+        $visitsObjectArray=[];
 
-        foreach($possibleStudyGroups as $studyGroup){
-            if(in_array($studyGroup->groupModality, array(Visit_Group::GROUP_MODALITY_CT, Visit_Group::GROUP_MODALITY_MR, Visit_Group::GROUP_MODALITY_PET)) ){
+        foreach ($possibleStudyGroups as $studyGroup) {
+            if (in_array($studyGroup->groupModality, array(Visit_Group::GROUP_MODALITY_CT, Visit_Group::GROUP_MODALITY_MR, Visit_Group::GROUP_MODALITY_PET))) {
                 $awaitingUploadVisits=$studyGroup->getStudyVisitManager()->getAwaitingUploadVisit();
                 array_push($visitsObjectArray, ...$awaitingUploadVisits);
             }
@@ -101,13 +101,13 @@ 
 
     }
 
-    public function getAllAwaitingReviewImagingVisit($username = null){
+    public function getAllAwaitingReviewImagingVisit($username=null) {
 
         $possibleStudyGroups=$this->getAllPossibleVisitGroups();
-        $visitsObjectArray = [];
+        $visitsObjectArray=[];
 
-        foreach($possibleStudyGroups as $studyGroup){
-            if(in_array($studyGroup->groupModality, array(Visit_Group::GROUP_MODALITY_CT, Visit_Group::GROUP_MODALITY_MR, Visit_Group::GROUP_MODALITY_PET)) ){
+        foreach ($possibleStudyGroups as $studyGroup) {
+            if (in_array($studyGroup->groupModality, array(Visit_Group::GROUP_MODALITY_CT, Visit_Group::GROUP_MODALITY_MR, Visit_Group::GROUP_MODALITY_PET))) {
                 $awaitingReviewVisits=$studyGroup->getStudyVisitManager()->getAwaitingReviewVisit($username);
                 array_push($visitsObjectArray, ...$awaitingReviewVisits);
             }
@@ -119,13 +119,13 @@ 
 
     }
 
-    public function getAllUploadedImagingVisits(){
+    public function getAllUploadedImagingVisits() {
 
         $possibleStudyGroups=$this->getAllPossibleVisitGroups();
-        $visitsObjectArray = [];
+        $visitsObjectArray=[];
 
-        foreach($possibleStudyGroups as $studyGroup){
-            if(in_array($studyGroup->groupModality, array(Visit_Group::GROUP_MODALITY_CT, Visit_Group::GROUP_MODALITY_MR, Visit_Group::GROUP_MODALITY_PET)) ){
+        foreach ($possibleStudyGroups as $studyGroup) {
+            if (in_array($studyGroup->groupModality, array(Visit_Group::GROUP_MODALITY_CT, Visit_Group::GROUP_MODALITY_MR, Visit_Group::GROUP_MODALITY_PET))) {
                 $uploadedVisits=$studyGroup->getStudyVisitManager()->getUploadedVisits();
                 array_push($visitsObjectArray, ...$uploadedVisits);
             }
@@ -137,22 +137,22 @@ 
 
     }
 
-    public function isHavingAwaitingReviewImagingVisit($username=null){
+    public function isHavingAwaitingReviewImagingVisit($username=null) {
         $awaitingVisits=$this->getAllAwaitingReviewImagingVisit($username);
-        $havingAwaitingReview= (sizeof($awaitingVisits) > 0);
+        $havingAwaitingReview=(sizeof($awaitingVisits) > 0);
         return $havingAwaitingReview;
     }
 
 
 
-    public function getAllPossibleVisitGroups(){
+    public function getAllPossibleVisitGroups() {
 
-        $allGroupsType = $this->linkpdo->prepare('SELECT id FROM visit_group WHERE study = :study');
+        $allGroupsType=$this->linkpdo->prepare('SELECT id FROM visit_group WHERE study = :study');
         $allGroupsType->execute(array('study' => $this->study));
         $allGroupsIds=$allGroupsType->fetchall(PDO::FETCH_COLUMN);
         
         $visitGroupArray=[];
-        foreach ($allGroupsIds as $groupId){
+        foreach ($allGroupsIds as $groupId) {
             $visitGroupArray[]=new Visit_Group($this->linkpdo, $groupId);
         }
         
@@ -162,7 +162,7 @@ 
 
     public function getSpecificGroup(String $groupModality) : Visit_Group {
 
-        $groupQuery = $this->linkpdo->prepare('SELECT id FROM visit_group WHERE study = :study AND group_modality=:groupModality');
+        $groupQuery=$this->linkpdo->prepare('SELECT id FROM visit_group WHERE study = :study AND group_modality=:groupModality');
         $groupQuery->execute(array('study' => $this->study, 'groupModality'=> $groupModality));
         $groupId=$groupQuery->fetch(PDO::FETCH_COLUMN);
         
@@ -186,13 +186,13 @@ 
         return new Export_Study_Data($this);
     }
     
-    public function getAllPatientsInStudy(){
-        $allPatientQuery = $this->linkpdo->prepare('SELECT code FROM patients WHERE study = :study');
+    public function getAllPatientsInStudy() {
+        $allPatientQuery=$this->linkpdo->prepare('SELECT code FROM patients WHERE study = :study');
         $allPatientQuery->execute(array('study' => $this->study));
         $allPatients=$allPatientQuery->fetchall(PDO::FETCH_COLUMN);
         
         $patientObjectArray=[];
-        foreach ($allPatients as $patient){
+        foreach ($allPatients as $patient) {
             $patientObjectArray[]=new Patient($patient, $this->linkpdo);
         }
         
@@ -200,13 +200,13 @@ 
         
     }
     
-    public function getDocumentation(String $role){
-        if($role==User::SUPERVISOR){
-            $documentationQuery = $this->linkpdo->prepare("SELECT id_documentation FROM documentation
+    public function getDocumentation(String $role) {
+        if ($role == User::SUPERVISOR) {
+            $documentationQuery=$this->linkpdo->prepare("SELECT id_documentation FROM documentation
                                                     WHERE study = :study");
             
-        }else{
-            $documentationQuery = $this->linkpdo->prepare("SELECT id_documentation FROM documentation
+        }else {
+            $documentationQuery=$this->linkpdo->prepare("SELECT id_documentation FROM documentation
                                                     WHERE study = :study
                                                     AND ".$role."= 1 AND deleted=0");
             
@@ -216,7 +216,7 @@ 
         $documentationAnswers=$documentationQuery->fetchAll(PDO::FETCH_COLUMN);
         
         $documentationObjects=[];
-        foreach ($documentationAnswers as $documentationId){
+        foreach ($documentationAnswers as $documentationId) {
         	$documentationObjects[]=new Documentation($this->linkpdo, $documentationId);
         }
         return $documentationObjects;
@@ -226,41 +226,41 @@ 
      * Return userObject array for all users having role in the study
      * @return User[]
      */
-    public function getUsersWithRoleInStudy(){
-        $req = $this->linkpdo->prepare('SELECT DISTINCT users.username FROM roles,users
+    public function getUsersWithRoleInStudy() {
+        $req=$this->linkpdo->prepare('SELECT DISTINCT users.username FROM roles,users
                                   WHERE roles.username=users.username
                                   AND roles.study=:study');
         $req->execute(array('study' => $this->study));
         $answers=$req->fetchAll(PDO::FETCH_COLUMN);
         
         $usersObjects=[];
-        foreach ($answers as $username){
+        foreach ($answers as $username) {
             $usersObjects[]=new User($username, $this->linkpdo);
         }
         return $usersObjects;
         
     }
     
-    public function getUsersByRoleInStudy(String $role){
-        $req = $this->linkpdo->prepare('SELECT username FROM roles
+    public function getUsersByRoleInStudy(String $role) {
+        $req=$this->linkpdo->prepare('SELECT username FROM roles
 									   WHERE study=:study AND name=:role ');
         $req->execute(array('study' => $this->study, 'role'=>$role));
         $answers=$req->fetchAll(PDO::FETCH_COLUMN);
         
         $usersObjects=[];
-        foreach ($answers as $username){
+        foreach ($answers as $username) {
             $usersObjects[]=new User($username, $this->linkpdo);
         }
         return $usersObjects;
         
     }
     
-    public function getAllRolesByUsers(){
-        $roles_query = $this->linkpdo->prepare('SELECT * FROM roles WHERE study=:study');
+    public function getAllRolesByUsers() {
+        $roles_query=$this->linkpdo->prepare('SELECT * FROM roles WHERE study=:study');
         $roles_query->execute(array('study'=>$this->study));
         $definedRoles=$roles_query->fetchall(PDO::FETCH_ASSOC);
         
-        foreach ($definedRoles as $role){
+        foreach ($definedRoles as $role) {
             $rolesList[$role['username']][]=$role['name'];
         }
         return $rolesList;
@@ -270,16 +270,16 @@ 
         return new Statistics($this, $modality);
     }
     
-    public function changeStudyActivation(bool $activated){
-        $req = $this->linkpdo->prepare('UPDATE studies SET
+    public function changeStudyActivation(bool $activated) {
+        $req=$this->linkpdo->prepare('UPDATE studies SET
     								active = :active
 						        WHERE name = :study');
-        $req->execute(array( 'study'=> $this->study, 'active'=>intval($activated)));
+        $req->execute(array('study'=> $this->study, 'active'=>intval($activated)));
     }
     
-    public function isOriginalOrthancNeverKnown($anonFromOrthancStudyId){
+    public function isOriginalOrthancNeverKnown($anonFromOrthancStudyId) {
 
-        $connecter = $this->linkpdo->prepare('SELECT Study_Orthanc_ID FROM visits 
+        $connecter=$this->linkpdo->prepare('SELECT Study_Orthanc_ID FROM visits 
                                                 INNER JOIN visit_type ON 
                                                 (visit_type.id=visits.visit_type_id 
                                                 AND visit_type.group_id IN (SELECT id FROM visit_group WHERE study = :study))
@@ -292,15 +292,15 @@ 
             "study" => $this->study,
             "Anon_From_Orthanc_ID"=>$anonFromOrthancStudyId
         ));
-        $result = $connecter->fetchAll(PDO::FETCH_COLUMN);
+        $result=$connecter->fetchAll(PDO::FETCH_COLUMN);
         
-        if(count($result)>0) return false; else return true;
+        if (count($result) > 0) return false; else return true;
         
     }
     
-    public static function createStudy(string $studyName, $patientCodePrefix, PDO $linkpdo){
+    public static function createStudy(string $studyName, $patientCodePrefix, PDO $linkpdo) {
         
-        $req = $linkpdo->prepare('INSERT INTO studies (name, patient_code_prefix) VALUES(:studyName, :patientCodePrefix) ');
+        $req=$linkpdo->prepare('INSERT INTO studies (name, patient_code_prefix) VALUES(:studyName, :patientCodePrefix) ');
         
         $req->execute(array(
             'studyName' => $studyName,

src/models/Study_Details.php

Braces +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
         
         if(empty($dataStudies)){
             return false;
-        }else{
+        } else{
             return true;
         }
         

Indentation +95 added lines, -95 removed lines

@@ -18,129 +18,129 @@
  */
 
 Class Study_Details{
-    private $linkpdo;
-    public $studyUID;
-    public $idVisit;
-    public $uploaderUsername;
-    public $uploadDate;
+	private $linkpdo;
+	public $studyUID;
+	public $idVisit;
+	public $uploaderUsername;
+	public $uploadDate;
     
-    public $studyAcquisitionDate;
-    public $studyAcquisitionTime;
-    public $studyAcquisitionDateTime;
-    public $studyOrthancId;
-    public $studyDescription;
-    public $patientOrthancId;
-    public $patientName;
-    public $patientId;
+	public $studyAcquisitionDate;
+	public $studyAcquisitionTime;
+	public $studyAcquisitionDateTime;
+	public $studyOrthancId;
+	public $studyDescription;
+	public $patientOrthancId;
+	public $patientName;
+	public $patientId;
     
-    public $nbOfSeries;
-    public $diskSize;
-    public $uncompressedDiskSize;
-    public $deleted;
-    public $numberOfInstances;
+	public $nbOfSeries;
+	public $diskSize;
+	public $uncompressedDiskSize;
+	public $deleted;
+	public $numberOfInstances;
     
-    public static function getStudyObjectByUID(string $studyUID, PDO $linkpdo){
+	public static function getStudyObjectByUID(string $studyUID, PDO $linkpdo){
         
-        $studyQuery = $linkpdo->prepare ( 'SELECT study_orthanc_id FROM orthanc_studies
+		$studyQuery = $linkpdo->prepare ( 'SELECT study_orthanc_id FROM orthanc_studies
                                                 WHERE study_uid=:studyUID' );
         
-        $studyQuery->execute(array(
-            "studyUID" => $studyUID
-        ));
+		$studyQuery->execute(array(
+			"studyUID" => $studyUID
+		));
         
-        $orthancID=$studyQuery->fetch(PDO::FETCH_COLUMN);
+		$orthancID=$studyQuery->fetch(PDO::FETCH_COLUMN);
         
-        return new Study_Details($orthancID, $linkpdo);
+		return new Study_Details($orthancID, $linkpdo);
         
-    }
+	}
     
-    public function __construct($studyOrthancId, $linkpdo){
-        $this->linkpdo=$linkpdo;
-        $this->studyOrthancId=$studyOrthancId;
+	public function __construct($studyOrthancId, $linkpdo){
+		$this->linkpdo=$linkpdo;
+		$this->studyOrthancId=$studyOrthancId;
         
-        $studyQuery = $this->linkpdo->prepare ( 'SELECT * FROM orthanc_studies
+		$studyQuery = $this->linkpdo->prepare ( 'SELECT * FROM orthanc_studies
                                                 WHERE study_orthanc_id=:studyOrthancID' );
         
-        $studyQuery->execute(array(
-            "studyOrthancID" => $this->studyOrthancId
-        ));
-        
-        $studyData=$studyQuery->fetch(PDO::FETCH_ASSOC);
-        
-        $this->studyAcquisitionDate=$studyData['acquisition_date'];
-        $this->studyAcquisitionTime=$studyData['acquisition_time'];
-        $this->studyAcquisitionDateTime=$studyData['acquisition_datetime'];
-        $this->studyUID=$studyData['study_uid'];
-        $this->studyDescription=$studyData['study_description'];
-        $this->patientOrthancId=$studyData['patient_orthanc_id'];
-        $this->patientName=$studyData['patient_name'];
-        $this->patientId=$studyData['patient_id'];
-        $this->nbOfSeries=$studyData['number_of_series'];
-        $this->diskSize=$studyData['disk_size'];
-        $this->uncompressedDiskSize=$studyData['uncompressed_disk_size'];
-        $this->numberOfInstances=$studyData['number_of_instances'];
-        $this->deleted=$studyData['deleted'];
-        $this->idVisit=$studyData['id_visit'];
-        
-        $this->uploaderUsername=$studyData['uploader'];
-        $this->uploadDate=$studyData['upload_date'];
-        
-    }
+		$studyQuery->execute(array(
+			"studyOrthancID" => $this->studyOrthancId
+		));
+        
+		$studyData=$studyQuery->fetch(PDO::FETCH_ASSOC);
+        
+		$this->studyAcquisitionDate=$studyData['acquisition_date'];
+		$this->studyAcquisitionTime=$studyData['acquisition_time'];
+		$this->studyAcquisitionDateTime=$studyData['acquisition_datetime'];
+		$this->studyUID=$studyData['study_uid'];
+		$this->studyDescription=$studyData['study_description'];
+		$this->patientOrthancId=$studyData['patient_orthanc_id'];
+		$this->patientName=$studyData['patient_name'];
+		$this->patientId=$studyData['patient_id'];
+		$this->nbOfSeries=$studyData['number_of_series'];
+		$this->diskSize=$studyData['disk_size'];
+		$this->uncompressedDiskSize=$studyData['uncompressed_disk_size'];
+		$this->numberOfInstances=$studyData['number_of_instances'];
+		$this->deleted=$studyData['deleted'];
+		$this->idVisit=$studyData['id_visit'];
+        
+		$this->uploaderUsername=$studyData['uploader'];
+		$this->uploadDate=$studyData['upload_date'];
+        
+	}
     
-    public function getChildSeries(){
+	public function getChildSeries(){
         
-        $idFetcher = $this->linkpdo->prepare("SELECT orthanc_series.series_orthanc_id FROM orthanc_series, orthanc_studies
+		$idFetcher = $this->linkpdo->prepare("SELECT orthanc_series.series_orthanc_id FROM orthanc_series, orthanc_studies
 										WHERE orthanc_series.study_orthanc_id=orthanc_studies.study_orthanc_id
                                         AND orthanc_studies.study_orthanc_id=:studyOrthancID");
         
-        $idFetcher->execute(array(
-            "studyOrthancID" => $this->studyOrthancId
-        ));
+		$idFetcher->execute(array(
+			"studyOrthancID" => $this->studyOrthancId
+		));
         
-        $orthancSeriesIDs=$idFetcher->fetchAll(PDO::FETCH_COLUMN);
+		$orthancSeriesIDs=$idFetcher->fetchAll(PDO::FETCH_COLUMN);
         
-        $childSeriesObject=[];
-        foreach ($orthancSeriesIDs as $orthancSerieID){
-            $childSeriesObject[]=new Series_Details($orthancSerieID, $this->linkpdo);
-        }
+		$childSeriesObject=[];
+		foreach ($orthancSeriesIDs as $orthancSerieID){
+			$childSeriesObject[]=new Series_Details($orthancSerieID, $this->linkpdo);
+		}
         
-        return $childSeriesObject;
+		return $childSeriesObject;
         
-    }
+	}
     
-    public function changeDeletionStatus($deleted){
-        
-        //Activate only if no other activated study
-        if($deleted==false && $this->isExistingActivatedStudyForVisit()==true){
-            throw new Exception("already existing activated study");
-            return;
-        }
-        
-        $changeStatusUpload=$this->linkpdo->prepare('UPDATE orthanc_studies SET deleted = :deleted WHERE id_visit = :idvisit AND study_orthanc_id=:studyOrthancID');
-        $changeStatusUpload->execute(array('idvisit'=> $this->idVisit,
-            'studyOrthancID'=>$this->studyOrthancId, 'deleted'=>intval($deleted) ) );
-        
-        //reactivate all series of this study
-        $childSeries=$this->getChildSeries();
-        foreach ($childSeries as $serie){
-            $serie->changeDeletionStatus(false);
-        }
-    }
+	public function changeDeletionStatus($deleted){
+        
+		//Activate only if no other activated study
+		if($deleted==false && $this->isExistingActivatedStudyForVisit()==true){
+			throw new Exception("already existing activated study");
+			return;
+		}
+        
+		$changeStatusUpload=$this->linkpdo->prepare('UPDATE orthanc_studies SET deleted = :deleted WHERE id_visit = :idvisit AND study_orthanc_id=:studyOrthancID');
+		$changeStatusUpload->execute(array('idvisit'=> $this->idVisit,
+			'studyOrthancID'=>$this->studyOrthancId, 'deleted'=>intval($deleted) ) );
+        
+		//reactivate all series of this study
+		$childSeries=$this->getChildSeries();
+		foreach ($childSeries as $serie){
+			$serie->changeDeletionStatus(false);
+		}
+	}
     
-    private function isExistingActivatedStudyForVisit(){
+	private function isExistingActivatedStudyForVisit(){
         
-        $studyQuery = $this->linkpdo->prepare('SELECT study_orthanc_id FROM orthanc_studies
+		$studyQuery = $this->linkpdo->prepare('SELECT study_orthanc_id FROM orthanc_studies
                                         WHERE orthanc_studies.id_visit=:idVisit AND deleted=0;
                                     ');
-        $studyQuery->execute(array('idVisit' => $this->idVisit ));
+		$studyQuery->execute(array('idVisit' => $this->idVisit ));
         
-        $dataStudies = $studyQuery->fetchAll(PDO::FETCH_COLUMN);
+		$dataStudies = $studyQuery->fetchAll(PDO::FETCH_COLUMN);
         
-        if(empty($dataStudies)){
-            return false;
-        }else{
-            return true;
-        }
+		if(empty($dataStudies)){
+			return false;
+		}else{
+			return true;
+		}
         
-    }
+	}
 }
\ No newline at end of file

Spacing +18 added lines, -18 removed lines

@@ -17,7 +17,7 @@ 
  * Access data of a dicom study in database
  */
 
-Class Study_Details{
+Class Study_Details {
     private $linkpdo;
     public $studyUID;
     public $idVisit;
@@ -39,9 +39,9 @@ 
     public $deleted;
     public $numberOfInstances;
     
-    public static function getStudyObjectByUID(string $studyUID, PDO $linkpdo){
+    public static function getStudyObjectByUID(string $studyUID, PDO $linkpdo) {
         
-        $studyQuery = $linkpdo->prepare ( 'SELECT study_orthanc_id FROM orthanc_studies
+        $studyQuery=$linkpdo->prepare('SELECT study_orthanc_id FROM orthanc_studies
                                                 WHERE study_uid=:studyUID' );
         
         $studyQuery->execute(array(
@@ -54,11 +54,11 @@ 
         
     }
     
-    public function __construct($studyOrthancId, $linkpdo){
+    public function __construct($studyOrthancId, $linkpdo) {
         $this->linkpdo=$linkpdo;
         $this->studyOrthancId=$studyOrthancId;
         
-        $studyQuery = $this->linkpdo->prepare ( 'SELECT * FROM orthanc_studies
+        $studyQuery=$this->linkpdo->prepare('SELECT * FROM orthanc_studies
                                                 WHERE study_orthanc_id=:studyOrthancID' );
         
         $studyQuery->execute(array(
@@ -87,9 +87,9 @@ 
         
     }
     
-    public function getChildSeries(){
+    public function getChildSeries() {
         
-        $idFetcher = $this->linkpdo->prepare("SELECT orthanc_series.series_orthanc_id FROM orthanc_series, orthanc_studies
+        $idFetcher=$this->linkpdo->prepare("SELECT orthanc_series.series_orthanc_id FROM orthanc_series, orthanc_studies
 										WHERE orthanc_series.study_orthanc_id=orthanc_studies.study_orthanc_id
                                         AND orthanc_studies.study_orthanc_id=:studyOrthancID");
         
@@ -100,7 +100,7 @@ 
         $orthancSeriesIDs=$idFetcher->fetchAll(PDO::FETCH_COLUMN);
         
         $childSeriesObject=[];
-        foreach ($orthancSeriesIDs as $orthancSerieID){
+        foreach ($orthancSeriesIDs as $orthancSerieID) {
             $childSeriesObject[]=new Series_Details($orthancSerieID, $this->linkpdo);
         }
         
@@ -108,37 +108,37 @@ 
         
     }
     
-    public function changeDeletionStatus($deleted){
+    public function changeDeletionStatus($deleted) {
         
         //Activate only if no other activated study
-        if($deleted==false && $this->isExistingActivatedStudyForVisit()==true){
+        if ($deleted == false && $this->isExistingActivatedStudyForVisit() == true) {
             throw new Exception("already existing activated study");
             return;
         }
         
         $changeStatusUpload=$this->linkpdo->prepare('UPDATE orthanc_studies SET deleted = :deleted WHERE id_visit = :idvisit AND study_orthanc_id=:studyOrthancID');
         $changeStatusUpload->execute(array('idvisit'=> $this->idVisit,
-            'studyOrthancID'=>$this->studyOrthancId, 'deleted'=>intval($deleted) ) );
+            'studyOrthancID'=>$this->studyOrthancId, 'deleted'=>intval($deleted)));
         
         //reactivate all series of this study
         $childSeries=$this->getChildSeries();
-        foreach ($childSeries as $serie){
+        foreach ($childSeries as $serie) {
             $serie->changeDeletionStatus(false);
         }
     }
     
-    private function isExistingActivatedStudyForVisit(){
+    private function isExistingActivatedStudyForVisit() {
         
-        $studyQuery = $this->linkpdo->prepare('SELECT study_orthanc_id FROM orthanc_studies
+        $studyQuery=$this->linkpdo->prepare('SELECT study_orthanc_id FROM orthanc_studies
                                         WHERE orthanc_studies.id_visit=:idVisit AND deleted=0;
                                     ');
-        $studyQuery->execute(array('idVisit' => $this->idVisit ));
+        $studyQuery->execute(array('idVisit' => $this->idVisit));
         
-        $dataStudies = $studyQuery->fetchAll(PDO::FETCH_COLUMN);
+        $dataStudies=$studyQuery->fetchAll(PDO::FETCH_COLUMN);
         
-        if(empty($dataStudies)){
+        if (empty($dataStudies)) {
             return false;
-        }else{
+        }else {
             return true;
         }
         

src/rest/add-review.php

Indentation +3 added lines, -3 removed lines

@@ -31,8 +31,8 @@ 
 $visitAccessCheck=$userObject->isVisitAllowed($id_visit, User::REVIEWER);
 
 if($visitAccessCheck) {
-    //Instanciate the specific object for review management
-    $visitObject=new Visit($id_visit, $linkpdo);
+	//Instanciate the specific object for review management
+	$visitObject=new Visit($id_visit, $linkpdo);
 	$ReviewObect=$visitObject->getFromProcessor(false, $username);
 	$ReviewObect->saveForm($data, $data['validate'], $linkpdo);
 	$answer="Saved";
@@ -40,6 +40,6 @@ 
 	echo(json_encode($answer));
 	
 } else{
-    header('HTTP/1.0 403 Forbidden');
+	header('HTTP/1.0 403 Forbidden');
 }
 

Spacing +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
 require_once($_SERVER['DOCUMENT_ROOT'].'/rest/check_login.php');
 
 // get posted data in a PHP Object
-$data = json_decode(file_get_contents("php://input"), true);
+$data=json_decode(file_get_contents("php://input"), true);
 
 $type_visit=$data['type_visit'];
 $patient_num=$data['patient_num'];
@@ -30,7 +30,7 @@ 
 // Check reviewer's permissions
 $visitAccessCheck=$userObject->isVisitAllowed($id_visit, User::REVIEWER);
 
-if($visitAccessCheck) {
+if ($visitAccessCheck) {
     //Instanciate the specific object for review management
     $visitObject=new Visit($id_visit, $linkpdo);
 	$ReviewObect=$visitObject->getFromProcessor(false, $username);
@@ -39,7 +39,7 @@ 
 	header("Content-Type: application/json; charset=UTF-8");
 	echo(json_encode($answer));
 	
-} else{
+}else {
     header('HTTP/1.0 403 Forbidden');
 }
 

src/rest/get-existing-form.php

Indentation +12 added lines, -12 removed lines

@@ -30,22 +30,22 @@
 
 if($visitAccessCheck){
     
-    $result=[];
+	$result=[];
     
-    $visitObject=new Visit($id_visit, $linkpdo);
-    try{
-        $reviewObject=$visitObject->queryExistingReviewForReviewer($username);
-        $result=$reviewObject->getSpecificData();
-        echo(json_encode($result));
+	$visitObject=new Visit($id_visit, $linkpdo);
+	try{
+		$reviewObject=$visitObject->queryExistingReviewForReviewer($username);
+		$result=$reviewObject->getSpecificData();
+		echo(json_encode($result));
 
-    }catch (Exception $e){
-        error_log($e->getMessage());
-        header('HTTP/1.0 404 Not Found');
-    }
+	}catch (Exception $e){
+		error_log($e->getMessage());
+		header('HTTP/1.0 404 Not Found');
+	}
 
     
 }else{
-    header('HTTP/1.0 403 Forbidden');
-    die('You are not allowed to access this file.'); 
+	header('HTTP/1.0 403 Forbidden');
+	die('You are not allowed to access this file.'); 
     
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -22,29 +22,29 @@
 header("Content-Type: application/json; charset=UTF-8");
 
 // get posted data in a PHP Object
-$data = json_decode(file_get_contents("php://input"), true);
+$data=json_decode(file_get_contents("php://input"), true);
 
 $id_visit=$data['id_visit'];
 
 $visitAccessCheck=$userObject->isVisitAllowed($id_visit, User::REVIEWER);
 
-if($visitAccessCheck){
+if ($visitAccessCheck) {
     
     $result=[];
     
     $visitObject=new Visit($id_visit, $linkpdo);
-    try{
+    try {
         $reviewObject=$visitObject->queryExistingReviewForReviewer($username);
         $result=$reviewObject->getSpecificData();
         echo(json_encode($result));
 
-    }catch (Exception $e){
+    }catch (Exception $e) {
         error_log($e->getMessage());
         header('HTTP/1.0 404 Not Found');
     }
 
     
-}else{
+}else {
     header('HTTP/1.0 403 Forbidden');
     die('You are not allowed to access this file.'); 
     

Braces +2 added lines, -2 removed lines

@@ -38,13 +38,13 @@
         $result=$reviewObject->getSpecificData();
         echo(json_encode($result));
 
-    }catch (Exception $e){
+    } catch (Exception $e){
         error_log($e->getMessage());
         header('HTTP/1.0 404 Not Found');
     }
 
     
-}else{
+} else{
     header('HTTP/1.0 403 Forbidden');
     die('You are not allowed to access this file.'); 
     

src/rest/download-dicom.php

Braces +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 	//Delete temp file at the end of reading
 	unlink($tempfile);
 	
-}else{
+} else{
     header('HTTP/1.0 403 Forbidden');
     die('You are not allowed to access this file.'); 
 }
\ No newline at end of file

Indentation +5 added lines, -5 removed lines

@@ -34,9 +34,9 @@ 
 //If permission granted and visit active and review available and QC done
 if($visitPermissions) {
     
-    //Get Array of Orthanc Series ID
-    $resultatsIDs = $visitObject->getSeriesOrthancID();
-    //Generate zip from orthanc and output it to the navigator
+	//Get Array of Orthanc Series ID
+	$resultatsIDs = $visitObject->getSeriesOrthancID();
+	//Generate zip from orthanc and output it to the navigator
 	$orthanc=new Orthanc();
 	$tempfile=$orthanc->getZipTempFile($resultatsIDs);
 	
@@ -54,6 +54,6 @@ 
 	unlink($tempfile);
 	
 }else{
-    header('HTTP/1.0 403 Forbidden');
-    die('You are not allowed to access this file.'); 
+	header('HTTP/1.0 403 Forbidden');
+	die('You are not allowed to access this file.'); 
 }
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -21,7 +21,7 @@ 
 require_once($_SERVER['DOCUMENT_ROOT'].'/rest/check_login.php');
 
 // get posted data in a PHP Object
-$data = json_decode(file_get_contents("php://input"), true);
+$data=json_decode(file_get_contents("php://input"), true);
 
 $id_visit=$data['id_visit'];
 
@@ -32,17 +32,17 @@ 
 $visitPermissions=$userObject->isVisitAllowed($id_visit, User::REVIEWER);
 
 //If permission granted and visit active and review available and QC done
-if($visitPermissions) {
+if ($visitPermissions) {
     
     //Get Array of Orthanc Series ID
-    $resultatsIDs = $visitObject->getSeriesOrthancID();
+    $resultatsIDs=$visitObject->getSeriesOrthancID();
     //Generate zip from orthanc and output it to the navigator
 	$orthanc=new Orthanc();
 	$tempfile=$orthanc->getZipTempFile($resultatsIDs);
 	
-	$file = @fopen($tempfile,"rb");
-	if($file){
-		while(!feof($file))
+	$file=@fopen($tempfile, "rb");
+	if ($file) {
+		while (!feof($file))
 		{
 			print(@fread($file, 1024*8));
 			flush();
@@ -53,7 +53,7 @@ 
 	//Delete temp file at the end of reading
 	unlink($tempfile);
 	
-}else{
+}else {
     header('HTTP/1.0 403 Forbidden');
     die('You are not allowed to access this file.'); 
 }
\ No newline at end of file

src/rest/check_login.php

Indentation +14 added lines, -14 removed lines

@@ -22,9 +22,9 @@ 
 require_once($_SERVER['DOCUMENT_ROOT'].'/vendor/autoload.php');
 
 if (!isset($_SERVER['PHP_AUTH_USER'])) {
-    header('WWW-Authenticate: Basic realm="Gaelo"');
-    header('HTTP/1.0 401 Unauthorized');
-    exit;
+	header('WWW-Authenticate: Basic realm="Gaelo"');
+	header('HTTP/1.0 401 Unauthorized');
+	exit;
     
 }
 
@@ -38,21 +38,21 @@ 
 
 if(!$passwordCheck){
     
-    if(!$userObject->isExistingUser){
-        header('HTTP/1.1 420 Non existing user');
+	if(!$userObject->isExistingUser){
+		header('HTTP/1.1 420 Non existing user');
         
-    }else if(!$userObject->passwordCorrect && $userObject->userStatus == User::ACTIVATED && $userObject->passwordDateValide){
-        header('HTTP/1.1 420 Wrong Password '.$userObject->loginAttempt."/3 wrong attempt");
+	}else if(!$userObject->passwordCorrect && $userObject->userStatus == User::ACTIVATED && $userObject->passwordDateValide){
+		header('HTTP/1.1 420 Wrong Password '.$userObject->loginAttempt."/3 wrong attempt");
         
-    } else if(!$userObject->passwordDateValide){
-        header('HTTP/1.1 420 Outdated Password, go to website to renew it');
+	} else if(!$userObject->passwordDateValide){
+		header('HTTP/1.1 420 Outdated Password, go to website to renew it');
         
-    } else if($userObject->userStatus != User::ACTIVATED){
-        header('HTTP/1.1 420 Account '.$userObject->userStatus);
-    }
+	} else if($userObject->userStatus != User::ACTIVATED){
+		header('HTTP/1.1 420 Account '.$userObject->userStatus);
+	}
     
-    exit();
+	exit();
     
 }else{
-    header("HTTP/1.1 200 OK");
+	header("HTTP/1.1 200 OK");
 }

Spacing +6 added lines, -6 removed lines

@@ -36,23 +36,23 @@
 $userObject=new User($username, $linkpdo);
 $passwordCheck=$userObject->isPasswordCorrectAndActivitedAccount($password);
 
-if(!$passwordCheck){
+if (!$passwordCheck) {
     
-    if(!$userObject->isExistingUser){
+    if (!$userObject->isExistingUser) {
         header('HTTP/1.1 420 Non existing user');
         
-    }else if(!$userObject->passwordCorrect && $userObject->userStatus == User::ACTIVATED && $userObject->passwordDateValide){
+    }else if (!$userObject->passwordCorrect && $userObject->userStatus == User::ACTIVATED && $userObject->passwordDateValide) {
         header('HTTP/1.1 420 Wrong Password '.$userObject->loginAttempt."/3 wrong attempt");
         
-    } else if(!$userObject->passwordDateValide){
+    }else if (!$userObject->passwordDateValide) {
         header('HTTP/1.1 420 Outdated Password, go to website to renew it');
         
-    } else if($userObject->userStatus != User::ACTIVATED){
+    }else if ($userObject->userStatus != User::ACTIVATED) {
         header('HTTP/1.1 420 Account '.$userObject->userStatus);
     }
     
     exit();
     
-}else{
+}else {
     header("HTTP/1.1 200 OK");
 }

Braces +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
     if(!$userObject->isExistingUser){
         header('HTTP/1.1 420 Non existing user');
         
-    }else if(!$userObject->passwordCorrect && $userObject->userStatus == User::ACTIVATED && $userObject->passwordDateValide){
+    } else if(!$userObject->passwordCorrect && $userObject->userStatus == User::ACTIVATED && $userObject->passwordDateValide){
         header('HTTP/1.1 420 Wrong Password '.$userObject->loginAttempt."/3 wrong attempt");
         
     } else if(!$userObject->passwordDateValide){
@@ -53,6 +53,6 @@ 
     
     exit();
     
-}else{
+} else{
     header("HTTP/1.1 200 OK");
 }

src/includes/table_visit.php

Indentation +16 added lines, -16 removed lines

@@ -18,13 +18,13 @@ 
  * @param Patient $patient
  */
 function build_patient_visit_table(Patient $patient) {
-    if ($patient->patientWithdraw)
-        $patientStatus = "Withdrawn";
-    else
-        $patientStatus = "Included";
+	if ($patient->patientWithdraw)
+		$patientStatus = "Withdrawn";
+	else
+		$patientStatus = "Included";
     
-    $patientCenter=$patient->getPatientCenter();
-    ?>
+	$patientCenter=$patient->getPatientCenter();
+	?>
 	<div style="overflow-x:auto;"> 
     	<table id='tab_patient' class='table table-striped table-sm table-border'>
         	<tr>
@@ -88,11 +88,11 @@ 
     	        <td>Quality control</td>
 			</tr>
         	<?php 
-            foreach ($visitObjects as $visitObject) {
-                $numberOfSeries = count($visitObject->getSeriesOrthancID());
+			foreach ($visitObjects as $visitObject) {
+				$numberOfSeries = count($visitObject->getSeriesOrthancID());
                 
-                if ($numberOfSeries == 0) $numberOfSeries = "Not Uploaded";
-                ?>    
+				if ($numberOfSeries == 0) $numberOfSeries = "Not Uploaded";
+				?>    
                 <tr>
 					 <td><?=$visitObject->visitGroupObject->groupModality?></td>
 					 <td class="visitLink" data-visitid=<?=$visitObject->id_visit?> ><?=htmlspecialchars($visitObject->visitType)?></td>
@@ -103,20 +103,20 @@ 
         	         <td><?=$numberOfSeries?></td>
         	         <td><?=$visitObject->acquisitionDate?></td>
                 <?php 
-                if ($role == User::INVESTIGATOR && (in_array($visitObject->stateQualityControl, array(Visit::QC_NOT_DONE, Visit::QC_CORRECTIVE_ACTION_ASKED)) ) ) {
-                    ?>
+				if ($role == User::INVESTIGATOR && (in_array($visitObject->stateQualityControl, array(Visit::QC_NOT_DONE, Visit::QC_CORRECTIVE_ACTION_ASKED)) ) ) {
+					?>
         			<td>
         				<a href=scripts/delete_visit.php?id_visit=<?=$visitObject->id_visit?> class="ajaxLinkConfirm">
         					<img class="icon" src="assets/images/corbeille.png" alt="Delete">
         				</a>
         			</td> 
         	        <?php
-                }
-                ?>
+				}
+				?>
                 </tr>
             <?php
-            }
-            ?>
+			}
+			?>
     </table> 
     </div>
 <?php     

Spacing +5 added lines, -5 removed lines

@@ -19,9 +19,9 @@ 
  */
 function build_patient_visit_table(Patient $patient) {
     if ($patient->patientWithdraw)
-        $patientStatus = "Withdrawn";
+        $patientStatus="Withdrawn";
     else
-        $patientStatus = "Included";
+        $patientStatus="Included";
     
     $patientCenter=$patient->getPatientCenter();
     ?>
@@ -89,9 +89,9 @@ 
 			</tr>
         	<?php 
             foreach ($visitObjects as $visitObject) {
-                $numberOfSeries = count($visitObject->getSeriesOrthancID());
+                $numberOfSeries=count($visitObject->getSeriesOrthancID());
                 
-                if ($numberOfSeries == 0) $numberOfSeries = "Not Uploaded";
+                if ($numberOfSeries == 0) $numberOfSeries="Not Uploaded";
                 ?>    
                 <tr>
 					 <td><?=$visitObject->visitGroupObject->groupModality?></td>
@@ -103,7 +103,7 @@ 
         	         <td><?=$numberOfSeries?></td>
         	         <td><?=$visitObject->acquisitionDate?></td>
                 <?php 
-                if ($role == User::INVESTIGATOR && (in_array($visitObject->stateQualityControl, array(Visit::QC_NOT_DONE, Visit::QC_CORRECTIVE_ACTION_ASKED)) ) ) {
+                if ($role == User::INVESTIGATOR && (in_array($visitObject->stateQualityControl, array(Visit::QC_NOT_DONE, Visit::QC_CORRECTIVE_ACTION_ASKED)))) {
                     ?>
         			<td>
         				<a href=scripts/delete_visit.php?id_visit=<?=$visitObject->id_visit?> class="ajaxLinkConfirm">

Braces +8 added lines, -5 removed lines

@@ -18,10 +18,11 @@ 
  * @param Patient $patient
  */
 function build_patient_visit_table(Patient $patient) {
-    if ($patient->patientWithdraw)
-        $patientStatus = "Withdrawn";
-    else
-        $patientStatus = "Included";
+    if ($patient->patientWithdraw) {
+            $patientStatus = "Withdrawn";
+    } else {
+            $patientStatus = "Included";
+    }
     
     $patientCenter=$patient->getPatientCenter();
     ?>
@@ -91,7 +92,9 @@ 
             foreach ($visitObjects as $visitObject) {
                 $numberOfSeries = count($visitObject->getSeriesOrthancID());
                 
-                if ($numberOfSeries == 0) $numberOfSeries = "Not Uploaded";
+                if ($numberOfSeries == 0) {
+                	$numberOfSeries = "Not Uploaded";
+                }
                 ?>    
                 <tr>
 					 <td><?=$visitObject->visitGroupObject->groupModality?></td>

src/includes/header.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 	<div id="header-content">
 		<a href="/main">
 			<img id="logo-gaelo" src="assets/images/gaelo-logo-rectangle.png" alt="GaelO">
-			<div id="name-div"><?php if(defined('GAELO_PLATEFORM_NAME')) echo(htmlspecialchars(GAELO_PLATEFORM_NAME)); else echo('GaelO')?></div>
+			<div id="name-div"><?php if (defined('GAELO_PLATEFORM_NAME')) echo(htmlspecialchars(GAELO_PLATEFORM_NAME)); else echo('GaelO')?></div>
 		</a>
 	</div>
 </header>
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -17,7 +17,9 @@
 	<div id="header-content">
 		<a href="/main">
 			<img id="logo-gaelo" src="assets/images/gaelo-logo-rectangle.png" alt="GaelO">
-			<div id="name-div"><?php if(defined('GAELO_PLATEFORM_NAME')) echo(htmlspecialchars(GAELO_PLATEFORM_NAME)); else echo('GaelO')?></div>
+			<div id="name-div"><?php if(defined('GAELO_PLATEFORM_NAME')) {
+	echo(htmlspecialchars(GAELO_PLATEFORM_NAME));
+} else echo('GaelO')?></div>
 		</a>
 	</div>
 </header>
\ No newline at end of file

src/views/change_password_view.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
 <head>
 	<meta charset="utf-8">
 	<title>Change your password</title>
-	<?php require $_SERVER['DOCUMENT_ROOT'].'/includes/jsLibrairies.php';?>
+	<?php require $_SERVER['DOCUMENT_ROOT'].'/includes/jsLibrairies.php'; ?>
 	
 	<script type="text/javascript">
 	//Send form in Ajax and process JSON answers
@@ -81,7 +81,7 @@ 
 </head>
 
 <body>
-<?php require $_SERVER['DOCUMENT_ROOT'].'/includes/header.php';?>
+<?php require $_SERVER['DOCUMENT_ROOT'].'/includes/header.php'; ?>
 
     <div class="alert alert-danger text-center" id="error" style="display: none;" ></div>
     <div class="alert alert-success text-center" id="success" style="display: none;" ></div>