@@ -77,10 +77,10 @@ discard block |
||
| 77 | 77 | $isAvailable=$this->isSearchedFileAvailable($fileArray); |
| 78 | 78 | if ($isAvailable) { |
| 79 | 79 | return array($this->ftpFileName); |
| 80 | - }else { |
|
| 80 | + } else { |
|
| 81 | 81 | throw new Exception('Target File Not Found'); |
| 82 | 82 | } |
| 83 | - }else { |
|
| 83 | + } else { |
|
| 84 | 84 | return $fileArray; |
| 85 | 85 | } |
| 86 | 86 | } |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | if ($this->ftpIsSftp) { |
| 113 | 113 | |
| 114 | 114 | $filesArray=$this->getSftp(); |
| 115 | - }else { |
|
| 115 | + } else { |
|
| 116 | 116 | $filesArray=$this->getFtp(); |
| 117 | 117 | //$ftpConnect = ftp_ssl_connect ($this->ftpHost, $this->ftpPort) or die("Can't Connect to Server ".$this->ftpHost); |
| 118 | 118 | |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | |
| 137 | 137 | return $sftp; |
| 138 | 138 | |
| 139 | - }else { |
|
| 139 | + } else { |
|
| 140 | 140 | |
| 141 | 141 | if (!$ftpConnect=ftp_connect($this->ftpHost, $this->ftpPort)) { |
| 142 | 142 | throw new Exception('Cant Connect to Server'.$this->ftpHost); |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | |
| 170 | 170 | return $result; |
| 171 | 171 | |
| 172 | - }else { |
|
| 172 | + } else { |
|
| 173 | 173 | |
| 174 | 174 | $ftp=$this->connectAndGoToFolder(); |
| 175 | 175 | |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | $fileArray=array_filter($fileArray, function($file) { |
| 192 | 192 | if ($file == '.' || $file == '..') { |
| 193 | 193 | return false; |
| 194 | - }else { |
|
| 194 | + } else { |
|
| 195 | 195 | return true; |
| 196 | 196 | } |
| 197 | 197 | }); |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | $fileArray=array_filter($fileArray, function($file) { |
| 231 | 231 | if ($file == '.' || $file == '..') { |
| 232 | 232 | return false; |
| 233 | - }else { |
|
| 233 | + } else { |
|
| 234 | 234 | return true; |
| 235 | 235 | } |
| 236 | 236 | }); |
@@ -274,7 +274,7 @@ discard block |
||
| 274 | 274 | if ($i == 0) { |
| 275 | 275 | //First line is column definition |
| 276 | 276 | $titles=$columns; |
| 277 | - }else { |
|
| 277 | + } else { |
|
| 278 | 278 | $patient=[]; |
| 279 | 279 | //For each column associate data into an associative array |
| 280 | 280 | for ($j=0; $j < sizeof($columns); $j++) { |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | $email->setSubject('FTP Process Failed'); |
| 296 | 296 | $email->addAminEmails(); |
| 297 | 297 | $email->sendEmail(); |
| 298 | - }catch (Exception $e) { |
|
| 298 | + } catch (Exception $e) { |
|
| 299 | 299 | echo('sendEmailException'); |
| 300 | 300 | echo($e->getMessage()); |
| 301 | 301 | } |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | $modalityCreatedVisits=$this->studyObject->getStudySpecificGroupManager($visitGroup->groupModality)->getCreatedVisits(); |
| 40 | 40 | $modalityDeletedVisits=$this->studyObject->getStudySpecificGroupManager($visitGroup->groupModality)->getCreatedVisits(true); |
| 41 | 41 | array_push($this->allcreatedVisits, ...$modalityCreatedVisits, ...$modalityDeletedVisits); |
| 42 | - }catch (Exception $e) { } |
|
| 42 | + } catch (Exception $e) { } |
|
| 43 | 43 | } |
| 44 | 44 | } |
| 45 | 45 | |
@@ -216,12 +216,12 @@ discard block |
||
| 216 | 216 | $localReviews=[]; |
| 217 | 217 | try { |
| 218 | 218 | $localReviews[]=$visitObject->getReviewsObject(true); |
| 219 | - }catch (Exception $e) { } |
|
| 219 | + } catch (Exception $e) { } |
|
| 220 | 220 | |
| 221 | 221 | $expertReviews=[]; |
| 222 | 222 | try { |
| 223 | 223 | $expertReviews=$visitObject->getReviewsObject(false, true); |
| 224 | - }catch (Exception $e) { } |
|
| 224 | + } catch (Exception $e) { } |
|
| 225 | 225 | |
| 226 | 226 | //Merge all reviews in an array |
| 227 | 227 | $reviewObjects=array_merge($localReviews, $expertReviews); |
@@ -320,29 +320,29 @@ discard block |
||
| 320 | 320 | |
| 321 | 321 | if ($visitObject->statusDone == Visit::NOT_DONE) { |
| 322 | 322 | return 0; |
| 323 | - }else if ($visitObject->uploadStatus == Visit::NOT_DONE || $visitObject->stateInvestigatorForm == Visit::NOT_DONE) { |
|
| 323 | + } else if ($visitObject->uploadStatus == Visit::NOT_DONE || $visitObject->stateInvestigatorForm == Visit::NOT_DONE) { |
|
| 324 | 324 | if ($visitObject->uploadStatus == Visit::NOT_DONE && $visitObject->stateInvestigatorForm == Visit::NOT_DONE) { |
| 325 | 325 | return 1; |
| 326 | - }else if ($visitObject->stateInvestigatorForm == Visit::NOT_DONE) { |
|
| 326 | + } else if ($visitObject->stateInvestigatorForm == Visit::NOT_DONE) { |
|
| 327 | 327 | return 3; |
| 328 | - }else if ($visitObject->uploadStatus == Visit::NOT_DONE) { |
|
| 328 | + } else if ($visitObject->uploadStatus == Visit::NOT_DONE) { |
|
| 329 | 329 | return 2; |
| 330 | 330 | } |
| 331 | - }else if ($visitObject->qcStatus == Visit::QC_NOT_DONE) { |
|
| 331 | + } else if ($visitObject->qcStatus == Visit::QC_NOT_DONE) { |
|
| 332 | 332 | return 4; |
| 333 | - }else if ($visitObject->qcStatus == Visit::QC_CORRECTIVE_ACTION_ASKED) { |
|
| 333 | + } else if ($visitObject->qcStatus == Visit::QC_CORRECTIVE_ACTION_ASKED) { |
|
| 334 | 334 | return 5; |
| 335 | - }else if ($visitObject->qcStatus == Visit::QC_REFUSED) { |
|
| 335 | + } else if ($visitObject->qcStatus == Visit::QC_REFUSED) { |
|
| 336 | 336 | return 6; |
| 337 | - }else if ($visitObject->reviewStatus == Visit::NOT_DONE) { |
|
| 337 | + } else if ($visitObject->reviewStatus == Visit::NOT_DONE) { |
|
| 338 | 338 | return 7; |
| 339 | - }else if ($visitObject->reviewStatus == Visit::REVIEW_ONGOING) { |
|
| 339 | + } else if ($visitObject->reviewStatus == Visit::REVIEW_ONGOING) { |
|
| 340 | 340 | return 8; |
| 341 | - }else if ($visitObject->reviewStatus == Visit::REVIEW_WAIT_ADJUDICATION) { |
|
| 341 | + } else if ($visitObject->reviewStatus == Visit::REVIEW_WAIT_ADJUDICATION) { |
|
| 342 | 342 | return 9; |
| 343 | - }else if ($visitObject->reviewStatus == Visit::REVIEW_DONE) { |
|
| 343 | + } else if ($visitObject->reviewStatus == Visit::REVIEW_DONE) { |
|
| 344 | 344 | return 10; |
| 345 | - }else { |
|
| 345 | + } else { |
|
| 346 | 346 | //If none of these case return -1, should not happen |
| 347 | 347 | return -1; |
| 348 | 348 | } |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | $visitDetails['idVisit']=$visitObject->id_visit; |
| 44 | 44 | $visitDetails['visitType']=$visitObject->visitType; |
| 45 | 45 | $visitDetails['visitStatus']=$visitObject->reviewStatus; |
| 46 | - $visitDetails['reviewAvailable']= ($visitObject->isAwaitingReviewForReviewerUser($username) && $visitObject->reviewAvailable); |
|
| 46 | + $visitDetails['reviewAvailable']=($visitObject->isAwaitingReviewForReviewerUser($username) && $visitObject->reviewAvailable); |
|
| 47 | 47 | $visitDetails['visitModality']=$visitObject->visitGroupObject->groupModality; |
| 48 | 48 | |
| 49 | 49 | $dicomDetailsObject=$visitObject->getStudyDicomDetails(); |
@@ -93,14 +93,14 @@ discard block |
||
| 93 | 93 | $this->failList['Wrong PatientNumber length'][]=$patientNumber; |
| 94 | 94 | |
| 95 | 95 | }else if (!$isNewPatient) { |
| 96 | - if( !empty($patientRegistrationDate) ){ |
|
| 97 | - $updated = $this->tryUpdateRegistrationDate($patientNumber, $patientRegistrationDate->format('Y-m-d')); |
|
| 98 | - if($updated){ |
|
| 96 | + if (!empty($patientRegistrationDate)) { |
|
| 97 | + $updated=$this->tryUpdateRegistrationDate($patientNumber, $patientRegistrationDate->format('Y-m-d')); |
|
| 98 | + if ($updated) { |
|
| 99 | 99 | $this->sucessList[]=$patientNumber.' - Updated Registration Date'; |
| 100 | - }else{ |
|
| 100 | + }else { |
|
| 101 | 101 | $this->failList['Patient already in Database'][]=$patientNumber; |
| 102 | 102 | } |
| 103 | - }else{ |
|
| 103 | + }else { |
|
| 104 | 104 | $this->failList['Patient already in Database'][]=$patientNumber; |
| 105 | 105 | } |
| 106 | 106 | |
@@ -118,10 +118,10 @@ discard block |
||
| 118 | 118 | |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | - private function tryUpdateRegistrationDate($patientNumber, $patientRegistrationDate){ |
|
| 122 | - $patientObject = new Patient($patientNumber, $this->linkpdo); |
|
| 121 | + private function tryUpdateRegistrationDate($patientNumber, $patientRegistrationDate) { |
|
| 122 | + $patientObject=new Patient($patientNumber, $this->linkpdo); |
|
| 123 | 123 | //If patient with default registration date, update to the new one |
| 124 | - if($patientObject->patientRegistrationDate == '1900-01-01' && $patientRegistrationDate !== $patientObject->patientRegistrationDate ) { |
|
| 124 | + if ($patientObject->patientRegistrationDate == '1900-01-01' && $patientRegistrationDate !== $patientObject->patientRegistrationDate) { |
|
| 125 | 125 | $patientObject->editPatientRegistrationDate($patientRegistrationDate); |
| 126 | 126 | return true; |
| 127 | 127 | } |