@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | $documentationQuery=$this->linkpdo->prepare("SELECT id_documentation FROM documentation |
206 | 206 | WHERE study = :study"); |
207 | 207 | |
208 | - }else { |
|
208 | + } else { |
|
209 | 209 | $documentationQuery=$this->linkpdo->prepare("SELECT id_documentation FROM documentation |
210 | 210 | WHERE study = :study |
211 | 211 | AND ".$role."= 1 AND deleted=0"); |
@@ -294,7 +294,11 @@ discard block |
||
294 | 294 | )); |
295 | 295 | $result=$connecter->fetchAll(PDO::FETCH_COLUMN); |
296 | 296 | |
297 | - if (count($result) > 0) return false; else return true; |
|
297 | + if (count($result) > 0) { |
|
298 | + return false; |
|
299 | + } else { |
|
300 | + return true; |
|
301 | + } |
|
298 | 302 | |
299 | 303 | } |
300 | 304 |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | $mail->Username=$this->smtp_config['user']; // SMTP username |
88 | 88 | $mail->Password=$this->smtp_config['password']; // SMTP password |
89 | 89 | $mail->SMTPSecure=$this->smtp_config['SMTPSecure']; |
90 | - }else { |
|
90 | + } else { |
|
91 | 91 | //Add DKIM private key if exist |
92 | 92 | if (file_exists($_SERVER['DOCUMENT_ROOT'].'/data/_config/dkim.private')) { |
93 | 93 | $mail->DKIM_domain=GAELO_WEB_ADDRESS; |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | //Add Reply To |
105 | 105 | try { |
106 | 106 | $mail->addReplyTo($this->replyTo); |
107 | - }catch (Exception $e) { |
|
107 | + } catch (Exception $e) { |
|
108 | 108 | error_log("Reply to email problem".$e->getMessage()); |
109 | 109 | return false; |
110 | 110 | } |
@@ -114,19 +114,19 @@ discard block |
||
114 | 114 | foreach ($this->emailsDestinators as $value) { |
115 | 115 | try { |
116 | 116 | $mail->addBCC($value); |
117 | - }catch (Exception $e) { |
|
117 | + } catch (Exception $e) { |
|
118 | 118 | error_log('error adding email'.$e->getMessage()); |
119 | 119 | } |
120 | 120 | } |
121 | 121 | //Add message to mail object |
122 | 122 | $this->buildMessage($mail); |
123 | - }else if (sizeof($this->emailsDestinators) == 1) { |
|
123 | + } else if (sizeof($this->emailsDestinators) == 1) { |
|
124 | 124 | //If only one add regular adress |
125 | 125 | try { |
126 | 126 | $mail->addAddress($this->emailsDestinators[0]); |
127 | 127 | $userObject=User::getUserByEmail($this->emailsDestinators[0], $this->linkpdo); |
128 | 128 | $this->buildMessage($mail, $userObject->lastName, $userObject->firstName); |
129 | - }catch (Exception $e) { |
|
129 | + } catch (Exception $e) { |
|
130 | 130 | error_log('error adding email'.$e->getMessage()); |
131 | 131 | return false; |
132 | 132 | } |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | try { |
141 | 141 | $answer=$mail->send(); |
142 | 142 | return $answer; |
143 | - }catch (Exception $e) { |
|
143 | + } catch (Exception $e) { |
|
144 | 144 | error_log("Message could not be sent. Mailer Error: {$mail->ErrorInfo}"); |
145 | 145 | return false; |
146 | 146 | } |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | |
153 | 153 | if ($lastName == null && $firstName == null) { |
154 | 154 | $nameString="user"; |
155 | - }else { |
|
155 | + } else { |
|
156 | 156 | $nameString=$firstName.' '.$lastName; |
157 | 157 | } |
158 | 158 | |
@@ -457,8 +457,7 @@ discard block |
||
457 | 457 | Study : " . $study."<br> |
458 | 458 | Patient Number : " . $patientCode."<br> |
459 | 459 | Uploaded visit : " . $visitType."<br>"; |
460 | - } |
|
461 | - else { |
|
460 | + } else { |
|
462 | 461 | $message="A corrective action was applied on the following visit: <br> |
463 | 462 | Study : " . $study."<br> |
464 | 463 | Patient Number : " . $patientCode."<br> |
@@ -401,7 +401,7 @@ discard block |
||
401 | 401 | Image Series : ".$imageDecision." Comment :".$imageComment." <br>"; |
402 | 402 | |
403 | 403 | $this->setMessage($message); |
404 | - $this->subject = $study.' - Quality Control Patient '.$patientCode; |
|
404 | + $this->subject=$study.' - Quality Control Patient '.$patientCode; |
|
405 | 405 | $this->sendEmail(); |
406 | 406 | } |
407 | 407 | |
@@ -441,7 +441,7 @@ discard block |
||
441 | 441 | } |
442 | 442 | |
443 | 443 | public function sendReviewReadyMessage(String $study, int $patientCode, String $visitType) { |
444 | - $message = "The following visit is ready for review in the platform: <br> |
|
444 | + $message="The following visit is ready for review in the platform: <br> |
|
445 | 445 | Study : ".$study."<br> |
446 | 446 | Patient Number : ".$patientCode."<br> |
447 | 447 | Visit : ".$visitType."<br>"; |
@@ -466,7 +466,7 @@ discard block |
||
466 | 466 | |
467 | 467 | } |
468 | 468 | $this->setMessage($message); |
469 | - $this->subject= $study." - Corrective Action Patient ".$patientCode; |
|
469 | + $this->subject=$study." - Corrective Action Patient ".$patientCode; |
|
470 | 470 | $this->sendEmail(); |
471 | 471 | |
472 | 472 | } |
@@ -491,7 +491,7 @@ discard block |
||
491 | 491 | The visit is awaiting for your adjudication review"; |
492 | 492 | |
493 | 493 | $this->setMessage($message); |
494 | - $this->subject= $study." - Awaiting Adjudication Patient ".$patientCode ; |
|
494 | + $this->subject=$study." - Awaiting Adjudication Patient ".$patientCode; |
|
495 | 495 | $this->sendEmail(); |
496 | 496 | } |
497 | 497 | |
@@ -526,7 +526,7 @@ discard block |
||
526 | 526 | Uploaded visit : ".$visitType."<br>"; |
527 | 527 | |
528 | 528 | $this->setMessage($message); |
529 | - $this->subject= $study." - New upload Patient ".$patientCode; |
|
529 | + $this->subject=$study." - New upload Patient ".$patientCode; |
|
530 | 530 | $this->sendEmail(); |
531 | 531 | |
532 | 532 | } |
@@ -539,7 +539,7 @@ discard block |
||
539 | 539 | You can now resend a new version of this form <br>"; |
540 | 540 | |
541 | 541 | $this->setMessage($message); |
542 | - $this->subject= $study." - Form Deleted Patient ".$patientCode; |
|
542 | + $this->subject=$study." - Form Deleted Patient ".$patientCode; |
|
543 | 543 | $this->sendEmail(); |
544 | 544 | |
545 | 545 | } |
@@ -552,7 +552,7 @@ discard block |
||
552 | 552 | You can now resend a new version of this form <br>"; |
553 | 553 | |
554 | 554 | $this->setMessage($message); |
555 | - $this->subject= $study." - Form Unlocked Patient ".$patientCode; |
|
555 | + $this->subject=$study." - Form Unlocked Patient ".$patientCode; |
|
556 | 556 | $this->sendEmail(); |
557 | 557 | |
558 | 558 | } |
@@ -41,18 +41,18 @@ |
||
41 | 41 | if (!$userObject->isExistingUser) { |
42 | 42 | header('HTTP/1.1 420 Non existing user'); |
43 | 43 | |
44 | - }else if (!$userObject->passwordCorrect && $userObject->userStatus == User::ACTIVATED && $userObject->passwordDateValide) { |
|
44 | + } else if (!$userObject->passwordCorrect && $userObject->userStatus == User::ACTIVATED && $userObject->passwordDateValide) { |
|
45 | 45 | header('HTTP/1.1 420 Wrong Password '.$userObject->loginAttempt."/3 wrong attempt"); |
46 | 46 | |
47 | - }else if (!$userObject->passwordDateValide) { |
|
47 | + } else if (!$userObject->passwordDateValide) { |
|
48 | 48 | header('HTTP/1.1 420 Outdated Password, go to website to renew it'); |
49 | 49 | |
50 | - }else if ($userObject->userStatus != User::ACTIVATED) { |
|
50 | + } else if ($userObject->userStatus != User::ACTIVATED) { |
|
51 | 51 | header('HTTP/1.1 420 Account '.$userObject->userStatus); |
52 | 52 | } |
53 | 53 | |
54 | 54 | exit(); |
55 | 55 | |
56 | -}else { |
|
56 | +} else { |
|
57 | 57 | header("HTTP/1.1 200 OK"); |
58 | 58 | } |
@@ -80,7 +80,7 @@ |
||
80 | 80 | ?> |
81 | 81 | <label class="control-label">Declare patient withdrawal from the study</label> |
82 | 82 | <?php |
83 | - }else { |
|
83 | + } else { |
|
84 | 84 | ?> |
85 | 85 | <label class="control-label">Cancel Withdrawal (re-inclusion)</label> |
86 | 86 | <?php |
@@ -168,11 +168,17 @@ discard block |
||
168 | 168 | <table class='table table-striped'> |
169 | 169 | <tr> |
170 | 170 | <th>Filled in by</th> |
171 | - <td><?php if (!empty($localReviewObject)) echo(htmlspecialchars($localReviewObject->username)); ?></td> |
|
171 | + <td><?php if (!empty($localReviewObject)) { |
|
172 | + echo(htmlspecialchars($localReviewObject->username)); |
|
173 | +} |
|
174 | +?></td> |
|
172 | 175 | </tr> |
173 | 176 | <tr> |
174 | 177 | <th>Date</th> |
175 | - <td><?php if (!empty($localReviewObject)) echo($localReviewObject->reviewDate); ?></td> |
|
178 | + <td><?php if (!empty($localReviewObject)) { |
|
179 | + echo($localReviewObject->reviewDate); |
|
180 | +} |
|
181 | +?></td> |
|
176 | 182 | </tr> |
177 | 183 | </table> |
178 | 184 | |
@@ -194,16 +200,24 @@ discard block |
||
194 | 200 | <table class='table table-striped'> |
195 | 201 | <tr> |
196 | 202 | <th>Conclusion Date</th> |
197 | - <td><?php if (!empty($visitObject->reviewConclusionDate)) echo($visitObject->reviewConclusionDate); else echo("N/A") ?></td> |
|
203 | + <td><?php if (!empty($visitObject->reviewConclusionDate)) { |
|
204 | + echo($visitObject->reviewConclusionDate); |
|
205 | +} else { |
|
206 | + echo("N/A") ?></td> |
|
198 | 207 | </tr> |
199 | 208 | <tr> |
200 | 209 | <th>Conclusion Value</th> |
201 | - <td><?php if (!empty($visitObject->reviewConclusion)) echo(htmlspecialchars($visitObject->reviewConclusion)); else echo("N/A") ?></td> |
|
210 | + <td><?php if (!empty($visitObject->reviewConclusion)) echo(htmlspecialchars($visitObject->reviewConclusion)); |
|
211 | +} |
|
212 | +else { |
|
213 | + echo("N/A") ?></td> |
|
202 | 214 | </tr> |
203 | 215 | </table> |
204 | 216 | |
205 | 217 | <?php make_interface_tableau_review_supervisor($data_reviews)?> |
206 | - <?php makeHistoryTable("Form", $trackerVisitResponses, false); ?> |
|
218 | + <?php makeHistoryTable("Form", $trackerVisitResponses, false); |
|
219 | +} |
|
220 | +?> |
|
207 | 221 | </div> |
208 | 222 | |
209 | 223 | <?php |
@@ -211,11 +225,11 @@ discard block |
||
211 | 225 | |
212 | 226 | if ($actionGroup == "Visit") { |
213 | 227 | $actionArray=array("Create Visit", "Delete Visit", "Reactivate Visit"); |
214 | - }else if ($actionGroup == "Form") { |
|
228 | + } else if ($actionGroup == "Form") { |
|
215 | 229 | $actionArray=array("Save Form", "Unlock Form", "Delete Form"); |
216 | - }else if ($actionGroup == "Qc") { |
|
230 | + } else if ($actionGroup == "Qc") { |
|
217 | 231 | $actionArray=array("Reset QC", "Quality Control", "Corrective Action"); |
218 | - }else if ($actionGroup == "Serie") { |
|
232 | + } else if ($actionGroup == "Serie") { |
|
219 | 233 | $actionArray=array("Import Series", "Change Serie"); |
220 | 234 | } |
221 | 235 | ?> |
@@ -240,8 +254,12 @@ discard block |
||
240 | 254 | $details=json_decode($response['action_details'], true); |
241 | 255 | |
242 | 256 | if ($actionGroup == "Form") { |
243 | - if ($formInvestigator && $details['local_review'] == "0") continue(1); |
|
244 | - if (!$formInvestigator && $details['local_review'] == "1") continue(1); |
|
257 | + if ($formInvestigator && $details['local_review'] == "0") { |
|
258 | + continue(1); |
|
259 | + } |
|
260 | + if (!$formInvestigator && $details['local_review'] == "1") { |
|
261 | + continue(1); |
|
262 | + } |
|
245 | 263 | } |
246 | 264 | |
247 | 265 | ?> |
@@ -269,7 +287,7 @@ discard block |
||
269 | 287 | if (empty($dicomStudies)) { |
270 | 288 | //If no available studies, show all deleted studies in the DB |
271 | 289 | make_interface_tableau_study_supervisor($visitObject); |
272 | - }else { |
|
290 | + } else { |
|
273 | 291 | make_interface_tableau_series_supervisor($visitObject); |
274 | 292 | } |
275 | 293 | |
@@ -323,7 +341,7 @@ discard block |
||
323 | 341 | if (empty ($data_studies[$i]->studyDescription)) { ?> |
324 | 342 | <td>/</td> |
325 | 343 | <?php |
326 | - }else { ?> |
|
344 | + } else { ?> |
|
327 | 345 | <td><?=htmlspecialchars($data_studies[$i]->studyDescription)?></td> |
328 | 346 | <?php |
329 | 347 | } |
@@ -337,7 +355,7 @@ discard block |
||
337 | 355 | if (empty ($data_studies[$i]->studyAcquisitionDateTime)) { ?> |
338 | 356 | <td>/</td> |
339 | 357 | <?php |
340 | - }else { ?> |
|
358 | + } else { ?> |
|
341 | 359 | <td><?=htmlspecialchars($data_studies[$i]->studyAcquisitionDateTime)?></td> |
342 | 360 | <?php |
343 | 361 | } |
@@ -402,7 +420,7 @@ discard block |
||
402 | 420 | if (empty ($data_series[$i]->seriesNumber)) { ?> |
403 | 421 | <td>/</td> |
404 | 422 | <?php |
405 | - }else { ?> |
|
423 | + } else { ?> |
|
406 | 424 | <td>Serie <?=htmlspecialchars($data_series [$i]->seriesNumber)?></td> |
407 | 425 | <?php |
408 | 426 | } |
@@ -416,7 +434,7 @@ discard block |
||
416 | 434 | if (empty ($data_series[$i]->seriesDescription)) { ?> |
417 | 435 | <td>/</td> |
418 | 436 | <?php |
419 | - }else { ?> |
|
437 | + } else { ?> |
|
420 | 438 | <td><?=htmlspecialchars($data_series [$i]->seriesDescription)?></td> |
421 | 439 | <?php |
422 | 440 | } |
@@ -430,7 +448,7 @@ discard block |
||
430 | 448 | if (empty ($data_series[$i]->manufacturer)) { ?> |
431 | 449 | <td>/</td> |
432 | 450 | <?php |
433 | - }else { ?> |
|
451 | + } else { ?> |
|
434 | 452 | <td><?=htmlspecialchars($data_series [$i]->manufacturer)?></td> |
435 | 453 | <?php |
436 | 454 | } |
@@ -444,7 +462,7 @@ discard block |
||
444 | 462 | if (empty ($data_series[$i]->modality)) { ?> |
445 | 463 | <td>/</td> |
446 | 464 | <?php |
447 | - }else { ?> |
|
465 | + } else { ?> |
|
448 | 466 | <td><?=htmlspecialchars($data_series [$i]->modality)?></td> |
449 | 467 | <?php |
450 | 468 | } |
@@ -458,7 +476,7 @@ discard block |
||
458 | 476 | if (empty ($data_series[$i]->acquisitionDateTime)) { ?> |
459 | 477 | <td>/</td> |
460 | 478 | <?php |
461 | - }else { ?> |
|
479 | + } else { ?> |
|
462 | 480 | <td><?=htmlspecialchars($data_series [$i]->acquisitionDateTime)?></td> |
463 | 481 | <?php |
464 | 482 | } |
@@ -472,7 +490,7 @@ discard block |
||
472 | 490 | if (empty ($data_series[$i]->injectedDose)) { ?> |
473 | 491 | <td>/</td> |
474 | 492 | <?php |
475 | - }else { ?> |
|
493 | + } else { ?> |
|
476 | 494 | <td><?=htmlspecialchars(($data_series [$i]->injectedDose/10**6)) ?></td> |
477 | 495 | <?php |
478 | 496 | } |
@@ -486,7 +504,7 @@ discard block |
||
486 | 504 | if (empty ($data_series[$i]->injectedDateTime)) { ?> |
487 | 505 | <td>/</td> |
488 | 506 | <?php |
489 | - }else { ?> |
|
507 | + } else { ?> |
|
490 | 508 | <td><?=htmlspecialchars($data_series [$i]->injectedDateTime) ?></td> |
491 | 509 | <?php |
492 | 510 | } |
@@ -500,7 +518,7 @@ discard block |
||
500 | 518 | if (empty ($data_series[$i]->injectedActivity)) { ?> |
501 | 519 | <td>/</td> |
502 | 520 | <?php |
503 | - }else { ?> |
|
521 | + } else { ?> |
|
504 | 522 | <td><?=htmlspecialchars(($data_series [$i]->injectedActivity/10**6)) ?></td> |
505 | 523 | <?php |
506 | 524 | } |
@@ -514,7 +532,7 @@ discard block |
||
514 | 532 | if (empty ($data_series[$i]->patientWeight)) { ?> |
515 | 533 | <td>/</td> |
516 | 534 | <?php |
517 | - }else { ?> |
|
535 | + } else { ?> |
|
518 | 536 | <td><?=htmlspecialchars($data_series [$i]->patientWeight)?></td> |
519 | 537 | <?php |
520 | 538 | } |
@@ -528,7 +546,7 @@ discard block |
||
528 | 546 | if (empty ($data_series[$i]->numberInstances)) { ?> |
529 | 547 | <td>/</td> |
530 | 548 | <?php |
531 | - }else { ?> |
|
549 | + } else { ?> |
|
532 | 550 | <td><?=$data_series [$i]->numberInstances?></td> |
533 | 551 | <?php |
534 | 552 | } |
@@ -542,7 +560,7 @@ discard block |
||
542 | 560 | if (empty ($data_series[$i]->uploadDate)) { ?> |
543 | 561 | <td>/</td> |
544 | 562 | <?php |
545 | - }else { ?> |
|
563 | + } else { ?> |
|
546 | 564 | <td><?=$data_series [$i]->uploadDate?></td> |
547 | 565 | <?php |
548 | 566 | } |
@@ -642,8 +660,12 @@ discard block |
||
642 | 660 | for ($i=0; $i < $res_nb_reviews; $i++) { |
643 | 661 | ?> |
644 | 662 | <td><?=$data_reviews[$i]->username?> |
645 | - <?php if ($data_reviews[$i]->isLocal) echo('- Local Investigator'); |
|
646 | - if ($data_reviews[$i]->isAdjudication) echo('- Adjudication Form'); |
|
663 | + <?php if ($data_reviews[$i]->isLocal) { |
|
664 | + echo('- Local Investigator'); |
|
665 | +} |
|
666 | + if ($data_reviews[$i]->isAdjudication) { |
|
667 | + echo('- Adjudication Form'); |
|
668 | + } |
|
647 | 669 | ?> |
648 | 670 | </td> |
649 | 671 | <?php |
@@ -681,7 +703,11 @@ discard block |
||
681 | 703 | ?> |
682 | 704 | <td> |
683 | 705 | <?php |
684 | - if ($data_reviews[$i]->validated) echo('Validated'); else echo('Draft'); |
|
706 | + if ($data_reviews[$i]->validated) { |
|
707 | + echo('Validated'); |
|
708 | + } else { |
|
709 | + echo('Draft'); |
|
710 | + } |
|
685 | 711 | ?> |
686 | 712 | </td> |
687 | 713 | <?php |
@@ -702,7 +728,7 @@ discard block |
||
702 | 728 | </td> |
703 | 729 | <?php |
704 | 730 | //if not validated (not locked) show only delete button |
705 | - }else { |
|
731 | + } else { |
|
706 | 732 | ?> |
707 | 733 | <td> |
708 | 734 | <a href="scripts/delete_form.php?id_review=<?=$data_reviews[$i]->id_review?>&id_visit=<?=$data_reviews[$i]->id_visit?>" class="ajaxLinkConfirm refreshVisitSupervisor"><input class="btn btn-danger" type="button" value="Delete Form"> </a> |
@@ -710,7 +736,7 @@ discard block |
||
710 | 736 | <?php |
711 | 737 | } |
712 | 738 | |
713 | - }else { |
|
739 | + } else { |
|
714 | 740 | ?> |
715 | 741 | <td></td> |
716 | 742 | <?php |
@@ -124,52 +124,72 @@ |
||
124 | 124 | </td> |
125 | 125 | <td> |
126 | 126 | <?php |
127 | - if ($supervisorEvent['action_type'] == "Edit Patient") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>'); |
|
127 | + if ($supervisorEvent['action_type'] == "Edit Patient") { |
|
128 | + echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>'); |
|
129 | + } |
|
128 | 130 | ?> |
129 | 131 | </td> |
130 | 132 | <td> |
131 | 133 | <?php |
132 | - if ($supervisorEvent['action_type'] == "Patient Withdraw") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>'); |
|
134 | + if ($supervisorEvent['action_type'] == "Patient Withdraw") { |
|
135 | + echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>'); |
|
136 | + } |
|
133 | 137 | ?> |
134 | 138 | </td> |
135 | 139 | <td> |
136 | 140 | <?php |
137 | - if ($supervisorEvent['action_type'] == "Delete Visit") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>'); |
|
141 | + if ($supervisorEvent['action_type'] == "Delete Visit") { |
|
142 | + echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>'); |
|
143 | + } |
|
138 | 144 | ?> |
139 | 145 | </td> |
140 | 146 | <td> |
141 | 147 | <?php |
142 | - if ($supervisorEvent['action_type'] == "Change Serie") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>'); |
|
148 | + if ($supervisorEvent['action_type'] == "Change Serie") { |
|
149 | + echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>'); |
|
150 | + } |
|
143 | 151 | ?> |
144 | 152 | </td> |
145 | 153 | <td> |
146 | 154 | <?php |
147 | - if ($supervisorEvent['action_type'] == "Reset QC") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>'); |
|
155 | + if ($supervisorEvent['action_type'] == "Reset QC") { |
|
156 | + echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>'); |
|
157 | + } |
|
148 | 158 | ?> |
149 | 159 | </td> |
150 | 160 | <td> |
151 | 161 | <?php |
152 | - if ($supervisorEvent['action_type'] == "Unlock Form") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>'); |
|
162 | + if ($supervisorEvent['action_type'] == "Unlock Form") { |
|
163 | + echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>'); |
|
164 | + } |
|
153 | 165 | ?> |
154 | 166 | </td> |
155 | 167 | <td> |
156 | 168 | <?php |
157 | - if ($supervisorEvent['action_type'] == "Delete Form") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>'); |
|
169 | + if ($supervisorEvent['action_type'] == "Delete Form") { |
|
170 | + echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>'); |
|
171 | + } |
|
158 | 172 | ?> |
159 | 173 | </td> |
160 | 174 | <td> |
161 | 175 | <?php |
162 | - if ($supervisorEvent['action_type'] == "Add Documentation") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>'); |
|
176 | + if ($supervisorEvent['action_type'] == "Add Documentation") { |
|
177 | + echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>'); |
|
178 | + } |
|
163 | 179 | ?> |
164 | 180 | </td> |
165 | 181 | <td> |
166 | 182 | <?php |
167 | - if ($supervisorEvent['action_type'] == "Update Documentation") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>'); |
|
183 | + if ($supervisorEvent['action_type'] == "Update Documentation") { |
|
184 | + echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>'); |
|
185 | + } |
|
168 | 186 | ?> |
169 | 187 | </td> |
170 | 188 | <td> |
171 | 189 | <?php |
172 | - if ($supervisorEvent['action_type'] == "Reactivate Visit") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>'); |
|
190 | + if ($supervisorEvent['action_type'] == "Reactivate Visit") { |
|
191 | + echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>'); |
|
192 | + } |
|
173 | 193 | ?> |
174 | 194 | </td> |
175 | 195 |
@@ -66,10 +66,12 @@ |
||
66 | 66 | <tr> |
67 | 67 | <td><?=$investigatorEvent['date']?></td> |
68 | 68 | <td><?=htmlspecialchars($investigatorEvent['username'])?></td> |
69 | - <td><?php if ($investigatorEvent['action_type'] == "Create Visit") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>')?></td> |
|
69 | + <td><?php if ($investigatorEvent['action_type'] == "Create Visit") { |
|
70 | + echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>')?></td> |
|
70 | 71 | <td><?php if ($investigatorEvent['action_type'] == "Upload Series") echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>')?></td> |
71 | 72 | <td><?php if ($investigatorEvent['action_type'] == "Save Form") { |
72 | 73 | $specificForm=$eventDetails['raw_data']; |
74 | +} |
|
73 | 75 | unset($eventDetails['raw_data']); |
74 | 76 | echo('<pre><code>'.json_encode($eventDetails, JSON_PRETTY_PRINT|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS).'</code></pre>'); |
75 | 77 | ?> |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | } |
101 | 101 | |
102 | 102 | <?php |
103 | - }else if (($_SESSION['role']) == User::REVIEWER) { |
|
103 | + } else if (($_SESSION['role']) == User::REVIEWER) { |
|
104 | 104 | ?> |
105 | 105 | $('#contenu').empty(); |
106 | 106 | //Refresh the tree |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | <input class="btn btn-dark" type="button" id="draft" name="draft" value="draft" /> |
136 | 136 | <input class="btn btn-dark" type="button" id="validate" name="validate" value="validate" /> |
137 | 137 | <?php |
138 | - }else { |
|
138 | + } else { |
|
139 | 139 | //Add Ask Unlock Button |
140 | 140 | if (!$local || ($local && $visitObject->qcStatus != Visit::QC_ACCEPTED && $visitObject->qcStatus != Visit::QC_REFUSED)) { |
141 | 141 | ?> |
@@ -19,13 +19,13 @@ |
||
19 | 19 | <?php |
20 | 20 | if ($visitObject->formQualityControl == true) { |
21 | 21 | ?> $('input:radio[name="formDecision"]').filter('[value="accepted"]').attr("checked", true); <?php |
22 | - }else { |
|
22 | + } else { |
|
23 | 23 | ?> $('input:radio[name="formDecision"]').filter('[value="refused"]').attr("checked", true); <?php |
24 | 24 | } |
25 | 25 | |
26 | 26 | if ($visitObject->imageQualityControl == true) { |
27 | 27 | ?> $('input:radio[name="imageDecision"]').filter('[value="accepted"]').attr("checked", true); <?php |
28 | - }else { |
|
28 | + } else { |
|
29 | 29 | ?> $('input:radio[name="imageDecision"]').filter('[value="refused"]').attr("checked", true); <?php |
30 | 30 | } |
31 | 31 | ?> |