Loading module/Admission/src/Admission/Controller/AdmissionController.php +6 −6 Changes for module/Admission/src/Admission/Controller/AdmissionController.php: 6 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -113,12 +113,12 @@ class AdmissionController extends AdmissionAbstractController { /** @var Inscription $inscription */ $inscription = $admission->getInscription()->first(); $etablissementInscription = $inscription?->getEtablissementInscription(); $etablissementInscription = $inscription instanceof Inscription ? $inscription->getEtablissementInscription() : null; if($etablissementInscription && $etablissementInscription->getStructure()->getSigle()){ //Enregistrement des templates si l'établissement ne les possèdes pas encore $this->admissionService->createTemplatesForEtablissement($etablissementInscription); $texteHandicap = $this->contenuService->generateRenduByTemplateCode(TexteTemplates::ADMISSION_INFO_HANDICAP."_".$etablissementInscription->getStructure()->getSigle()); $texteVae = $this->contenuService->generateRenduByTemplateCode(TexteTemplates::ADMISSION_INFO_VAE."_".$etablissementInscription->getStructure()->getSigle()); $texteHandicap = $this->contenuService->generateRenduByTemplateCode(TexteTemplates::ADMISSION_INFO_HANDICAP."/".$etablissementInscription->getStructure()->getSigle()); $texteVae = $this->contenuService->generateRenduByTemplateCode(TexteTemplates::ADMISSION_INFO_VAE."/".$etablissementInscription->getStructure()->getSigle()); } } Loading Loading @@ -156,10 +156,10 @@ class AdmissionController extends AdmissionAbstractController { } /** @var Inscription $inscription */ $inscription = $admission->getInscription()->first(); $etablissementInscription = $inscription?->getEtablissementInscription(); $etablissementInscription = $inscription instanceof Inscription ? $inscription?->getEtablissementInscription() : null; if($etablissementInscription && $etablissementInscription->getStructure()->getSigle()){ $texteCotutelle = $this->contenuService->generateRenduByTemplateCode(TexteTemplates::ADMISSION_INFO_COTUTELLE."_".$etablissementInscription->getStructure()->getSigle()); $texteCoencadrement = $this->contenuService->generateRenduByTemplateCode(TexteTemplates::ADMISSION_INFO_COENCADREMENT."_".$etablissementInscription->getStructure()->getSigle()); $texteCotutelle = $this->contenuService->generateRenduByTemplateCode(TexteTemplates::ADMISSION_INFO_COTUTELLE."/".$etablissementInscription->getStructure()->getSigle()); $texteCoencadrement = $this->contenuService->generateRenduByTemplateCode(TexteTemplates::ADMISSION_INFO_COENCADREMENT."/".$etablissementInscription->getStructure()->getSigle()); } } Loading module/Admission/view/admission/admission/partial/etudiantInfos.phtml +12 −4 Changes for module/Admission/view/admission/admission/partial/etudiantInfos.phtml: 12 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -169,9 +169,13 @@ $canModifier = $this->isAllowed(DocumenttemplatePrivileges::getResourceId(Docume </p> <?php elseif($role->getCode() === Role::CODE_ADMIN_TECH): /** @see TemplateController::modifierAction */ $lien = $canModifier ? $this->url('contenu/template/modifier', ['template' => $texteHandicap->getTemplate()->getId()], [], true) : "#"; ?> $lien = $canModifier ? $this->url('contenu/template/modifier', ['template' => $texteHandicap->getTemplate()->getId()], [], true) : "#"; $texteToggle = $admission?->getInscription()->first() && ($etablissementInscription = $admission?->getInscription()->first()->getEtablissementInscription()) ? "Personnaliser ce texte pour l'établissement d'inscription renseigné (".$etablissementInscription->getSigle().")" : "Modifier ce texte"; ?> <a href="<?php echo $lien; ?>" class="ajax-modal" data-event="modification-template"> <p class="admission-field-information information-modifiable" data-bs-toggle="tooltip" title="Modifier ce champ"> <p class="admission-field-information information-modifiable" data-bs-toggle="tooltip" title="<?= $texteToggle ?>"> <?= $texteHandicapCorps ?> <span class="icon icon-modifier edit-icon"></span> </p> Loading Loading @@ -220,9 +224,13 @@ $canModifier = $this->isAllowed(DocumenttemplatePrivileges::getResourceId(Docume </p> <?php elseif($role->getCode() === Role::CODE_ADMIN_TECH): /** @see TemplateController::modifierAction */ $lien = $canModifier ? $this->url('contenu/template/modifier', ['template' => $texteVae->getTemplate()->getId()], [], true) : "#"; ?> $lien = $canModifier ? $this->url('contenu/template/modifier', ['template' => $texteVae->getTemplate()->getId()], [], true) : "#"; $texteToggle = $admission?->getInscription()->first() && ($etablissementInscription = $admission?->getInscription()->first()->getEtablissementInscription()) ? "Personnaliser ce texte pour l'établissement d'inscription renseigné (".$etablissementInscription->getSigle().")" : "Modifier ce texte"; ?> <a href="<?php echo $lien; ?>" class="ajax-modal" data-event="modification-template"> <p class="admission-field-information information-modifiable" data-bs-toggle="tooltip" title="Modifier ce champ"> <p class="admission-field-information information-modifiable" data-bs-toggle="tooltip" title="<?= $texteToggle ?>"> <?= $texteVaeCorps ?> <span class="icon icon-modifier edit-icon"></span> </p> Loading module/Admission/view/admission/admission/partial/inscriptionInfos.phtml +12 −4 Changes for module/Admission/view/admission/admission/partial/inscriptionInfos.phtml: 12 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -170,9 +170,13 @@ $canModifier = $this->isAllowed(DocumenttemplatePrivileges::getResourceId(Docume </p> <?php elseif($role->getCode() === Role::CODE_ADMIN_TECH): /** @see TemplateController::modifierAction */ $lien = $canModifier ? $this->url('contenu/template/modifier', ['template' => $texteCotutelle->getTemplate()->getId()], [], true) : "#"; ?> $lien = $canModifier ? $this->url('contenu/template/modifier', ['template' => $texteCotutelle->getTemplate()->getId()], [], true) : "#"; $texteToggle = $admission?->getInscription()->first() && ($etablissementInscription = $admission?->getInscription()->first()->getEtablissementInscription()) ? "Personnaliser ce texte pour l'établissement d'inscription renseigné (".$etablissementInscription->getSigle().")" : "Modifier ce texte"; ?> <a href="<?php echo $lien; ?>" class="ajax-modal" data-event="modification-template"> <p class="admission-field-information information-modifiable" data-bs-toggle="tooltip" title="Modifier ce champ"> <p class="admission-field-information information-modifiable" data-bs-toggle="tooltip" title="<?= $texteToggle ?>"> <?= $texteCotutelleCorps ?> <span class="icon icon-modifier edit-icon"></span> </p> Loading Loading @@ -252,9 +256,13 @@ $canModifier = $this->isAllowed(DocumenttemplatePrivileges::getResourceId(Docume </p> <?php elseif($role->getCode() === Role::CODE_ADMIN_TECH): /** @see TemplateController::modifierAction */ $lien = $canModifier ? $this->url('contenu/template/modifier', ['template' => $texteCoencadrement->getTemplate()->getId()], [], true) : "#"; ?> $lien = $canModifier ? $this->url('contenu/template/modifier', ['template' => $texteCoencadrement->getTemplate()->getId()], [], true) : "#"; $texteToggle = $admission?->getInscription()->first() && ($etablissementInscription = $admission?->getInscription()->first()->getEtablissementInscription()) ? "Personnaliser ce texte pour l'établissement d'inscription renseigné (".$etablissementInscription->getSigle().")" : "Modifier ce texte"; ?> <a href="<?php echo $lien; ?>" class="ajax-modal" data-event="modification-template"> <p class="admission-field-information information-modifiable" data-bs-toggle="tooltip" title="Modifier ce champ"> <p class="admission-field-information information-modifiable" data-bs-toggle="tooltip" title="<?= $texteToggle ?>"> <?= $texteCoencadrementCorps ?> <span class="icon icon-modifier edit-icon"></span> </p> Loading Loading
module/Admission/src/Admission/Controller/AdmissionController.php +6 −6 Changes for module/Admission/src/Admission/Controller/AdmissionController.php: 6 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -113,12 +113,12 @@ class AdmissionController extends AdmissionAbstractController { /** @var Inscription $inscription */ $inscription = $admission->getInscription()->first(); $etablissementInscription = $inscription?->getEtablissementInscription(); $etablissementInscription = $inscription instanceof Inscription ? $inscription->getEtablissementInscription() : null; if($etablissementInscription && $etablissementInscription->getStructure()->getSigle()){ //Enregistrement des templates si l'établissement ne les possèdes pas encore $this->admissionService->createTemplatesForEtablissement($etablissementInscription); $texteHandicap = $this->contenuService->generateRenduByTemplateCode(TexteTemplates::ADMISSION_INFO_HANDICAP."_".$etablissementInscription->getStructure()->getSigle()); $texteVae = $this->contenuService->generateRenduByTemplateCode(TexteTemplates::ADMISSION_INFO_VAE."_".$etablissementInscription->getStructure()->getSigle()); $texteHandicap = $this->contenuService->generateRenduByTemplateCode(TexteTemplates::ADMISSION_INFO_HANDICAP."/".$etablissementInscription->getStructure()->getSigle()); $texteVae = $this->contenuService->generateRenduByTemplateCode(TexteTemplates::ADMISSION_INFO_VAE."/".$etablissementInscription->getStructure()->getSigle()); } } Loading Loading @@ -156,10 +156,10 @@ class AdmissionController extends AdmissionAbstractController { } /** @var Inscription $inscription */ $inscription = $admission->getInscription()->first(); $etablissementInscription = $inscription?->getEtablissementInscription(); $etablissementInscription = $inscription instanceof Inscription ? $inscription?->getEtablissementInscription() : null; if($etablissementInscription && $etablissementInscription->getStructure()->getSigle()){ $texteCotutelle = $this->contenuService->generateRenduByTemplateCode(TexteTemplates::ADMISSION_INFO_COTUTELLE."_".$etablissementInscription->getStructure()->getSigle()); $texteCoencadrement = $this->contenuService->generateRenduByTemplateCode(TexteTemplates::ADMISSION_INFO_COENCADREMENT."_".$etablissementInscription->getStructure()->getSigle()); $texteCotutelle = $this->contenuService->generateRenduByTemplateCode(TexteTemplates::ADMISSION_INFO_COTUTELLE."/".$etablissementInscription->getStructure()->getSigle()); $texteCoencadrement = $this->contenuService->generateRenduByTemplateCode(TexteTemplates::ADMISSION_INFO_COENCADREMENT."/".$etablissementInscription->getStructure()->getSigle()); } } Loading
module/Admission/view/admission/admission/partial/etudiantInfos.phtml +12 −4 Changes for module/Admission/view/admission/admission/partial/etudiantInfos.phtml: 12 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -169,9 +169,13 @@ $canModifier = $this->isAllowed(DocumenttemplatePrivileges::getResourceId(Docume </p> <?php elseif($role->getCode() === Role::CODE_ADMIN_TECH): /** @see TemplateController::modifierAction */ $lien = $canModifier ? $this->url('contenu/template/modifier', ['template' => $texteHandicap->getTemplate()->getId()], [], true) : "#"; ?> $lien = $canModifier ? $this->url('contenu/template/modifier', ['template' => $texteHandicap->getTemplate()->getId()], [], true) : "#"; $texteToggle = $admission?->getInscription()->first() && ($etablissementInscription = $admission?->getInscription()->first()->getEtablissementInscription()) ? "Personnaliser ce texte pour l'établissement d'inscription renseigné (".$etablissementInscription->getSigle().")" : "Modifier ce texte"; ?> <a href="<?php echo $lien; ?>" class="ajax-modal" data-event="modification-template"> <p class="admission-field-information information-modifiable" data-bs-toggle="tooltip" title="Modifier ce champ"> <p class="admission-field-information information-modifiable" data-bs-toggle="tooltip" title="<?= $texteToggle ?>"> <?= $texteHandicapCorps ?> <span class="icon icon-modifier edit-icon"></span> </p> Loading Loading @@ -220,9 +224,13 @@ $canModifier = $this->isAllowed(DocumenttemplatePrivileges::getResourceId(Docume </p> <?php elseif($role->getCode() === Role::CODE_ADMIN_TECH): /** @see TemplateController::modifierAction */ $lien = $canModifier ? $this->url('contenu/template/modifier', ['template' => $texteVae->getTemplate()->getId()], [], true) : "#"; ?> $lien = $canModifier ? $this->url('contenu/template/modifier', ['template' => $texteVae->getTemplate()->getId()], [], true) : "#"; $texteToggle = $admission?->getInscription()->first() && ($etablissementInscription = $admission?->getInscription()->first()->getEtablissementInscription()) ? "Personnaliser ce texte pour l'établissement d'inscription renseigné (".$etablissementInscription->getSigle().")" : "Modifier ce texte"; ?> <a href="<?php echo $lien; ?>" class="ajax-modal" data-event="modification-template"> <p class="admission-field-information information-modifiable" data-bs-toggle="tooltip" title="Modifier ce champ"> <p class="admission-field-information information-modifiable" data-bs-toggle="tooltip" title="<?= $texteToggle ?>"> <?= $texteVaeCorps ?> <span class="icon icon-modifier edit-icon"></span> </p> Loading
module/Admission/view/admission/admission/partial/inscriptionInfos.phtml +12 −4 Changes for module/Admission/view/admission/admission/partial/inscriptionInfos.phtml: 12 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -170,9 +170,13 @@ $canModifier = $this->isAllowed(DocumenttemplatePrivileges::getResourceId(Docume </p> <?php elseif($role->getCode() === Role::CODE_ADMIN_TECH): /** @see TemplateController::modifierAction */ $lien = $canModifier ? $this->url('contenu/template/modifier', ['template' => $texteCotutelle->getTemplate()->getId()], [], true) : "#"; ?> $lien = $canModifier ? $this->url('contenu/template/modifier', ['template' => $texteCotutelle->getTemplate()->getId()], [], true) : "#"; $texteToggle = $admission?->getInscription()->first() && ($etablissementInscription = $admission?->getInscription()->first()->getEtablissementInscription()) ? "Personnaliser ce texte pour l'établissement d'inscription renseigné (".$etablissementInscription->getSigle().")" : "Modifier ce texte"; ?> <a href="<?php echo $lien; ?>" class="ajax-modal" data-event="modification-template"> <p class="admission-field-information information-modifiable" data-bs-toggle="tooltip" title="Modifier ce champ"> <p class="admission-field-information information-modifiable" data-bs-toggle="tooltip" title="<?= $texteToggle ?>"> <?= $texteCotutelleCorps ?> <span class="icon icon-modifier edit-icon"></span> </p> Loading Loading @@ -252,9 +256,13 @@ $canModifier = $this->isAllowed(DocumenttemplatePrivileges::getResourceId(Docume </p> <?php elseif($role->getCode() === Role::CODE_ADMIN_TECH): /** @see TemplateController::modifierAction */ $lien = $canModifier ? $this->url('contenu/template/modifier', ['template' => $texteCoencadrement->getTemplate()->getId()], [], true) : "#"; ?> $lien = $canModifier ? $this->url('contenu/template/modifier', ['template' => $texteCoencadrement->getTemplate()->getId()], [], true) : "#"; $texteToggle = $admission?->getInscription()->first() && ($etablissementInscription = $admission?->getInscription()->first()->getEtablissementInscription()) ? "Personnaliser ce texte pour l'établissement d'inscription renseigné (".$etablissementInscription->getSigle().")" : "Modifier ce texte"; ?> <a href="<?php echo $lien; ?>" class="ajax-modal" data-event="modification-template"> <p class="admission-field-information information-modifiable" data-bs-toggle="tooltip" title="Modifier ce champ"> <p class="admission-field-information information-modifiable" data-bs-toggle="tooltip" title="<?= $texteToggle ?>"> <?= $texteCoencadrementCorps ?> <span class="icon icon-modifier edit-icon"></span> </p> Loading