| @@ -429,8 +429,9 @@ | ||
| 429 | 429 | <td><?=$patient->patientGender?></td> | 
| 430 | 430 | <td><?=$patient->patientBirthDate?></td> | 
| 431 | 431 | <td><?=$patient->patientRegistrationDate?></td> | 
| 432 | -						<td><?php if ($patient->patientWithdraw) echo ("Withdrawn"); | |
| 433 | -								else echo ("Included") ?></td> | |
| 432 | +						<td><?php if ($patient->patientWithdraw) { | |
| 433 | +	echo ("Withdrawn"); | |
| 434 | +} else echo ("Included") ?></td> | |
| 434 | 435 | <td><?=$patient->patientWithdrawDateString?></td> | 
| 435 | 436 | <td><?=htmlspecialchars($patient->patientWithdrawReason)?></td> | 
| 436 | 437 | </tr> | 
| @@ -17,7 +17,9 @@ | ||
| 17 | 17 | <div id="header-content"> | 
| 18 | 18 | <a href="/main"> | 
| 19 | 19 | <img id="logo-gaelo" src="assets/images/gaelo-logo-rectangle.png" alt="GaelO"> | 
| 20 | -			<div id="name-div"><?php if (defined('GAELO_PLATEFORM_NAME')) echo(htmlspecialchars(GAELO_PLATEFORM_NAME)); else echo('GaelO')?></div> | |
| 20 | +			<div id="name-div"><?php if (defined('GAELO_PLATEFORM_NAME')) { | |
| 21 | + echo(htmlspecialchars(GAELO_PLATEFORM_NAME)); | |
| 22 | +} else echo('GaelO')?></div> | |
| 21 | 23 | </a> | 
| 22 | 24 | </div> | 
| 23 | 25 | </header> | 
| 24 | 26 | \ No newline at end of file | 
| @@ -58,5 +58,8 @@ | ||
| 58 | 58 | } | 
| 59 | 59 | |
| 60 | 60 |  header("Content-Type: application/json; charset=UTF-8"); | 
| 61 | -if (empty($visitsResults)) echo(json_encode(json_decode("{}"))); | |
| 62 | -else echo (json_encode($visitsResults)); | |
| 61 | +if (empty($visitsResults)) { | |
| 62 | +	echo(json_encode(json_decode("{}"))); | |
| 63 | +} else { | |
| 64 | + echo (json_encode($visitsResults)); | |
| 65 | +} | |
| @@ -78,6 +78,6 @@ | ||
| 78 | 78 | default: | 
| 79 | 79 |  			die('Unknown chartId.'); | 
| 80 | 80 | } | 
| 81 | -}else { | |
| 81 | +} else { | |
| 82 | 82 | require 'includes/no_access.php'; | 
| 83 | 83 | } | 
| @@ -85,10 +85,10 @@ | ||
| 85 | 85 | $answer="Success"; | 
| 86 | 86 | echo(json_encode($answer)); | 
| 87 | 87 | |
| 88 | -	}else { | |
| 88 | +	} else { | |
| 89 | 89 | $visitType=$visitObject->getVisitCharacteristics(); | 
| 90 | 90 | require 'views/investigator/corrective_action_view.php'; | 
| 91 | 91 | } | 
| 92 | -}else { | |
| 92 | +} else { | |
| 93 | 93 | require 'includes/no_access.php'; | 
| 94 | 94 | } | 
| @@ -54,7 +54,8 @@ discard block | ||
| 54 | 54 | <label for="patientCodeLenght">Patient Code Lenght (max=18)</label><input name="patientCodeLenght" type="number" max="18" value="<?=GAELO_PATIENT_CODE_LENGHT?>"><br> | 
| 55 | 55 | <label for="parseDateImport">Parse Date Import : </label> | 
| 56 | 56 | <label>MM/DD/YYY</label> | 
| 57 | -		    	<input name="parseDateImport" type="radio" maxlength="10" value="m.d.Y" <?php if (GAELO_DATE_FORMAT == "m.d.Y") echo("checked")?>>
 | |
| 57 | +		    	<input name="parseDateImport" type="radio" maxlength="10" value="m.d.Y" <?php if (GAELO_DATE_FORMAT == "m.d.Y") { | |
| 58 | +	echo("checked")?>>
 | |
| 58 | 59 | <label>DD/MM/YYY</label> | 
| 59 | 60 |  		    	<input name="parseDateImport" type="radio" maxlength="10" value="d.m.Y" <?php if (GAELO_DATE_FORMAT == "d.m.Y") echo("checked")?>>
 | 
| 60 | 61 | <br> | 
| @@ -83,7 +84,9 @@ discard block | ||
| 83 | 84 | <label for="orthancPacsLogin">Orthanc Pacs Login</label><input name="orthancPacsLogin" type="text" maxlength="255" value="<?=GAELO_ORTHANC_PACS_LOGIN?>"><br> | 
| 84 | 85 | <label for="orthancPacsPassword">Orthanc Pacs Password</label><input name="orthancPacsPassword" type="password" maxlength="255" value="<?=GAELO_ORTHANC_PACS_PASSWORD?>"><br> | 
| 85 | 86 | |
| 86 | -			<label for="orthancPacsPassword">Use SMTP</label><input name="useSmtp" type="checkbox" value="1" <?php if (GAELO_USE_SMTP) echo('checked'); ?>><br>
 | |
| 87 | +			<label for="orthancPacsPassword">Use SMTP</label><input name="useSmtp" type="checkbox" value="1" <?php if (GAELO_USE_SMTP) echo('checked'); | |
| 88 | +} | |
| 89 | +?>><br> | |
| 87 | 90 | <label for="orthancPacsPassword">SMTP Host</label><input name="smtpHost" type="text" maxlength="255" value="<?=GAELO_SMTP_HOST?>"><br> | 
| 88 | 91 | <label for="orthancPacsPassword">SMTP Port</label><input name="smtpPort" type="text" value="<?=GAELO_SMTP_PORT?>"><br> | 
| 89 | 92 | <label for="orthancPacsPassword">SMTP User</label><input name="smtpUser" type="text" maxlength="255" value="<?=GAELO_SMTP_USER?>"><br> | 
| @@ -159,7 +159,9 @@ discard block | ||
| 159 | 159 | </tr> | 
| 160 | 160 | <tr> | 
| 161 | 161 | <td>Patient status</td> | 
| 162 | -			<td><?php if ($patientObject->patientWithdraw) echo("Withdrawn"); else echo("Included")?></td> | |
| 162 | +			<td><?php if ($patientObject->patientWithdraw) { | |
| 163 | +	echo("Withdrawn"); | |
| 164 | +} else echo("Included")?></td> | |
| 163 | 165 | <td> | 
| 164 | 166 | <button class='btn btn-danger' id='change_patient'>Modify</button> | 
| 165 | 167 | </td> | 
| @@ -212,7 +214,7 @@ discard block | ||
| 212 | 214 | <input class="btn btn-danger" type="button" value="Reactivate Visit" onclick="reactivateVisit(<?=$visit->id_visit?>)"> | 
| 213 | 215 | </td> | 
| 214 | 216 | <?php | 
| 215 | -			}else { ?> | |
| 217 | +			} else { ?> | |
| 216 | 218 | <td class="visitDetails" title="deleted" >Active</td> | 
| 217 | 219 | <?php | 
| 218 | 220 | } ?> | 
| @@ -50,15 +50,24 @@ discard block | ||
| 50 | 50 | }, 2000); | 
| 51 | 51 | |
| 52 | 52 |  								} else if (data['result'] == "Blocked") { | 
| 53 | -									$("#error").html("Your account has been blocked. Please contact <?php if (defined('GAELO_CORPORATION')) echo(GAELO_CORPORATION); else echo('GaelO')?> by clicking on “A request? Any questions? “, below this page"); | |
| 53 | +									$("#error").html("Your account has been blocked. Please contact <?php if (defined('GAELO_CORPORATION')) { | |
| 54 | + echo(GAELO_CORPORATION); | |
| 55 | +} else { | |
| 56 | +	echo('GaelO')?> by clicking on “A request? Any questions? “, below this page"); | |
| 54 | 57 | |
| 55 | 58 | |
| 56 | 59 |  								} else if (data['result'] == "Deactivated") { | 
| 57 | -									$("#error").html("Your account has been deactivated. Please contact <?php if (defined('GAELO_CORPORATION')) echo(GAELO_CORPORATION); else echo('GaelO')?> by clicking on “A request? Any questions? “, below this page"); | |
| 60 | +									$("#error").html("Your account has been deactivated. Please contact <?php if (defined('GAELO_CORPORATION')) echo(GAELO_CORPORATION); | |
| 61 | +} | |
| 62 | +else { | |
| 63 | +	echo('GaelO')?> by clicking on “A request? Any questions? “, below this page"); | |
| 58 | 64 | |
| 59 | 65 | |
| 60 | 66 |  								} else if (data['result'] == "unknown") { | 
| 61 | -									$("#error").html("The username you entered is not recognized by the platform. Please enter your correct username or contact <?php if (defined('GAELO_CORPORATION')) echo(GAELO_CORPORATION); else echo('GaelO')?> by clicking on \"A request? Any questions?\", below this page."); | |
| 67 | +									$("#error").html("The username you entered is not recognized by the platform. Please enter your correct username or contact <?php if (defined('GAELO_CORPORATION')) echo(GAELO_CORPORATION); | |
| 68 | +} | |
| 69 | +else { | |
| 70 | +	echo('GaelO')?> by clicking on \"A request? Any questions?\", below this page."); | |
| 62 | 71 | |
| 63 | 72 | |
| 64 | 73 |  								} else if (data['result'] == "NowBlocked") { | 
| @@ -108,7 +117,9 @@ discard block | ||
| 108 | 117 | <section id="logos"> | 
| 109 | 118 | <img id="logo-gaelo" src="assets/images/gaelo-logo-square.png" alt="GaelO"> | 
| 110 | 119 | <div id="name-div"> | 
| 111 | -			<?php if (defined('GAELO_PLATEFORM_NAME')) echo(GAELO_PLATEFORM_NAME); else echo('GaelO')?> | |
| 120 | +			<?php if (defined('GAELO_PLATEFORM_NAME')) echo(GAELO_PLATEFORM_NAME); | |
| 121 | +} | |
| 122 | +else echo('GaelO')?> | |
| 112 | 123 | </div> | 
| 113 | 124 | </section> | 
| 114 | 125 | |
| @@ -141,7 +141,7 @@ discard block | ||
| 141 | 141 | |
| 142 | 142 |  				if ($visit->correctiveActionDate == null) { | 
| 143 | 143 | $hasCorrectiveAction=false; | 
| 144 | -				}else { | |
| 144 | +				} else { | |
| 145 | 145 | $hasCorrectiveAction=true; | 
| 146 | 146 | } | 
| 147 | 147 | |
| @@ -226,7 +226,7 @@ discard block | ||
| 226 | 226 | $center=$patientObject->getPatientCenter(); | 
| 227 | 227 |  				if ($visit->correctiveActionDate == null) { | 
| 228 | 228 | $hasCorrectiveAction=false; | 
| 229 | -				}else { | |
| 229 | +				} else { | |
| 230 | 230 | $hasCorrectiveAction=true; | 
| 231 | 231 | } | 
| 232 | 232 | $responseQcArrayDetails['qcStatus']=$visit->qcStatus; | 
| @@ -298,14 +298,14 @@ discard block | ||
| 298 | 298 | |
| 299 | 299 |  					try { | 
| 300 | 300 | $reviews[]=$visit->getReviewsObject(true); | 
| 301 | -					}catch (Exception $e) { } | |
| 301 | +					} catch (Exception $e) { } | |
| 302 | 302 | |
| 303 | 303 |  					try { | 
| 304 | 304 | $reviewsReviewers=$visit->getReviewsObject(false); | 
| 305 | 305 |  						foreach ($reviewsReviewers as $expertReview) { | 
| 306 | 306 | $reviews[]=$expertReview; | 
| 307 | 307 | } | 
| 308 | -					}catch (Exception $e) { } | |
| 308 | +					} catch (Exception $e) { } | |
| 309 | 309 | |
| 310 | 310 | |
| 311 | 311 |  			foreach ($reviews as $review) { |