salimkanoun / GaelO

src/models/Visit.php

Indentation +2 added lines, -2 removed lines

@@ -236,7 +236,7 @@ 
         
 		$update->execute(array('id_visit' => $this->id_visit));
 		//Set visit to not review available (include a refresh of the current object)
-        $this->changeReviewAvailability(false);
+		$this->changeReviewAvailability(false);
         
 	}
     
@@ -335,7 +335,7 @@ 
 	 * @return Review|Review[]
 	 */
 	public function getReviewsObject(bool $local, bool $onlyValidated=false) {
-        if(!$onlyValidated){
+		if(!$onlyValidated){
 			$reviewQuery=$this->linkpdo->prepare('SELECT id_review FROM reviews WHERE id_visit=:idVisit AND deleted=0 AND is_local=:isLocal');
         
 		}else{

Spacing +4 added lines, -4 removed lines

@@ -335,10 +335,10 @@ 
 	 * @return Review|Review[]
 	 */
 	public function getReviewsObject(bool $local, bool $onlyValidated=false) {
-        if(!$onlyValidated){
+        if (!$onlyValidated) {
 			$reviewQuery=$this->linkpdo->prepare('SELECT id_review FROM reviews WHERE id_visit=:idVisit AND deleted=0 AND is_local=:isLocal');
         
-		}else{
+		}else {
 			$reviewQuery=$this->linkpdo->prepare('SELECT id_review FROM reviews WHERE id_visit=:idVisit AND deleted=0 AND validated=1 AND is_local=:isLocal');
         
 		}
@@ -443,13 +443,13 @@ 
 			if ($this->getVisitCharacteristics()->reviewNeeded) {
 				//If review needed make it available for reviewers
 				$this->changeReviewAvailability(true);
-			}else if( ! $this->getVisitCharacteristics()->qcNeeded) {
+			}else if (!$this->getVisitCharacteristics()->qcNeeded) {
 				//The visit is QC accepted and will not go further as Review is not needed
 				//Inform supervisors that the visit is well recieved
 				//Do this only if QC is not needed as supervisor will get QC notification otherwise (avoid dual mail)
 				$this->sendUploadNotificationToSupervisor();
 			}
-		}else if ($controlDecision == Visit::QC_REFUSED){
+		}else if ($controlDecision == Visit::QC_REFUSED) {
 			$this->changeReviewAvailability(false);
 		}
         

Braces +14 added lines, -11 removed lines

@@ -338,7 +338,7 @@ 
         if(!$onlyValidated){
 			$reviewQuery=$this->linkpdo->prepare('SELECT id_review FROM reviews WHERE id_visit=:idVisit AND deleted=0 AND is_local=:isLocal');
         
-		}else{
+		} else{
 			$reviewQuery=$this->linkpdo->prepare('SELECT id_review FROM reviews WHERE id_visit=:idVisit AND deleted=0 AND validated=1 AND is_local=:isLocal');
         
 		}
@@ -374,13 +374,16 @@ 
 		$filteredReview=array_filter($reviewsObjects, function($review) use ($username) {
 			if ($review->username == $username) {
 				return true;
-			}else {
+			} else {
 				return false;
 			}
 		});
 		$filteredReview=array_values($filteredReview);
-		if (sizeof($filteredReview) == 1) return $filteredReview[0];
-		else throw new Exception('No review for reviwer');
+		if (sizeof($filteredReview) == 1) {
+			return $filteredReview[0];
+		} else {
+			throw new Exception('No review for reviwer');
+		}
 
 	}
 
@@ -399,7 +402,7 @@ 
     	
 		if (empty($dataVisits)) {
 			return true;
-		}else {
+		} else {
 			return false;
 		}
     	
@@ -443,13 +446,13 @@ 
 			if ($this->getVisitCharacteristics()->reviewNeeded) {
 				//If review needed make it available for reviewers
 				$this->changeReviewAvailability(true);
-			}else if( ! $this->getVisitCharacteristics()->qcNeeded) {
+			} else if( ! $this->getVisitCharacteristics()->qcNeeded) {
 				//The visit is QC accepted and will not go further as Review is not needed
 				//Inform supervisors that the visit is well recieved
 				//Do this only if QC is not needed as supervisor will get QC notification otherwise (avoid dual mail)
 				$this->sendUploadNotificationToSupervisor();
 			}
-		}else if ($controlDecision == Visit::QC_REFUSED){
+		} else if ($controlDecision == Visit::QC_REFUSED){
 			$this->changeReviewAvailability(false);
 		}
         
@@ -592,7 +595,7 @@ 
 			require_once($specificObjectFile);
 			$objectName=$modality."_".$this->study."_".$this->visitType;
 			$formProcessor=new $objectName($this, $local, $username, $this->linkpdo);
-		}else {
+		} else {
 			throw new Exception('Missing From Processor for this visit');
 		}
     	
@@ -624,7 +627,7 @@ 
 
 			return true;
             
-		}else {
+		} else {
 			return false;
 		}
 	}
@@ -664,7 +667,7 @@ 
 
 		try {
 			$reviewObject=$this->queryExistingReviewForReviewer($username);
-		}catch (Exception $e) {
+		} catch (Exception $e) {
 			//User does not have any review, so visit still awaiting it's review
 			return true;
 		}
@@ -673,7 +676,7 @@ 
 		//not awaiting review if form already validated
 		if ($reviewObject->validated) {
 			return false;
-		}else {
+		} else {
 			return true;
 		}
         

src/models/Export_Study_Data.php

Braces +14 added lines, -14 removed lines

@@ -38,7 +38,7 @@ 
 			try {
 				$modalityCreatedVisit=$this->studyObject->getStudySpecificGroupManager($visitGroup->groupModality)->getCreatedVisits();
 				array_push($this->allcreatedVisits, ...$modalityCreatedVisit);
-			}catch (Exception $e) { }
+			} catch (Exception $e) { }
 		}
 	}
 
@@ -215,12 +215,12 @@ 
 		$localReviews=[];
 		try {
 			$localReviews[]=$visitObject->getReviewsObject(true);
-		}catch (Exception $e) { }
+		} catch (Exception $e) { }
 
 		$expertReviews=[];
 		try {
 			$expertReviews=$visitObject->getReviewsObject(false, true);
-		}catch (Exception $e) { }
+		} catch (Exception $e) { }
 
 		//Merge all reviews in an array
 		$reviewObjects=array_merge($localReviews, $expertReviews);
@@ -318,29 +318,29 @@ 
 
 		if ($visitObject->statusDone == Visit::NOT_DONE) {
 			return 0;
-		}else if ($visitObject->uploadStatus == Visit::NOT_DONE || $visitObject->stateInvestigatorForm == Visit::NOT_DONE) {
+		} else if ($visitObject->uploadStatus == Visit::NOT_DONE || $visitObject->stateInvestigatorForm == Visit::NOT_DONE) {
 			if ($visitObject->uploadStatus == Visit::NOT_DONE && $visitObject->stateInvestigatorForm == Visit::NOT_DONE) {
 				return 1;
-			}else if ($visitObject->stateInvestigatorForm == Visit::NOT_DONE) {
+			} else if ($visitObject->stateInvestigatorForm == Visit::NOT_DONE) {
 				return 3;
-			}else if ($visitObject->uploadStatus == Visit::NOT_DONE) {
+			} else if ($visitObject->uploadStatus == Visit::NOT_DONE) {
 				return 2;
 			}
-		}else if ($visitObject->qcStatus == Visit::QC_NOT_DONE) {
+		} else if ($visitObject->qcStatus == Visit::QC_NOT_DONE) {
 			return 4;
-		}else if ($visitObject->qcStatus == Visit::QC_CORRECTIVE_ACTION_ASKED) {
+		} else if ($visitObject->qcStatus == Visit::QC_CORRECTIVE_ACTION_ASKED) {
 			return 5;
-		}else if ($visitObject->qcStatus == Visit::QC_REFUSED) {
+		} else if ($visitObject->qcStatus == Visit::QC_REFUSED) {
 			return 6;
-		}else if ($visitObject->reviewStatus == Visit::NOT_DONE) {
+		} else if ($visitObject->reviewStatus == Visit::NOT_DONE) {
 			return 7;
-		}else if ($visitObject->reviewStatus == Visit::REVIEW_ONGOING) {
+		} else if ($visitObject->reviewStatus == Visit::REVIEW_ONGOING) {
 			return 8;
-		}else if ($visitObject->reviewStatus == Visit::REVIEW_WAIT_ADJUDICATION) {
+		} else if ($visitObject->reviewStatus == Visit::REVIEW_WAIT_ADJUDICATION) {
 			return 9;
-		}else if ($visitObject->reviewStatus == Visit::REVIEW_DONE) {
+		} else if ($visitObject->reviewStatus == Visit::REVIEW_DONE) {
 			return 10;
-		}else {
+		} else {
 			//If none of these case return -1, should not happen
 			return -1;
 		}