Commit 95b79f75 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Merge remote-tracking branch 'origin/b24' into b24

parents 7f2605f7 1c7966dd
Loading
Loading
Loading
Loading
Loading
+57 −2
Changes for module/Intervenant/src/Controller/IntervenantController.php: 57 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -332,17 +332,62 @@ class IntervenantController extends AbstractController
            $form->activerEditionAvancee();
        }

        $canViewAdresseIntervenant = $isNew || $this->isAllowed(Privileges::getResourceId(Privileges::INTERVENANT_ADRESSE));
        $canEditContactIntervenant = $isNew || $this->isAllowed(Privileges::getResourceId(Privileges::DOSSIER_CONTACT_EDITION));
        $canViewIdentiteIntervenant = $isNew || $this->isAllowed(Privileges::getResourceId(Privileges::DOSSIER_IDENTITE_VISUALISATION));
        $canEditIdentiteIntervenant = $isNew || $this->isAllowed(Privileges::getResourceId(Privileges::DOSSIER_IDENTITE_EDITION));
        $canViewInseeIntervenant = $isNew || $this->isAllowed(Privileges::getResourceId(Privileges::DOSSIER_INSEE_VISUALISATION));
        $canEditInseeIntervenant = $isNew || $this->isAllowed(Privileges::getResourceId(Privileges::DOSSIER_INSEE_EDITION));

        $protectedFields = [];
        if (!$canViewAdresseIntervenant) {
            $protectedFields = array_merge($protectedFields, [
                'code',
                'codeRh',
                'emailPerso',
                'telPerso',
                'utilisateur',
                'intervenant-edition-login',
                'intervenant-edition-password',
            ]);
        }
        if (!$canEditContactIntervenant) {
            $protectedFields = array_merge($protectedFields, ['emailPerso', 'telPerso']);
        }
        if (!$canViewIdentiteIntervenant || !$canEditIdentiteIntervenant) {
            $protectedFields[] = 'dateNaissance';
        }
        if (!$canViewInseeIntervenant || !$canEditInseeIntervenant) {
            $protectedFields[] = 'numeroInsee';
        }

        if (!empty($protectedFields)) {
            $protectedFields = array_unique($protectedFields);
            $form->protegerChamps($protectedFields);
        }

        $ancienStatut = $intervenant->getStatut();

        $request = $this->getRequest();
        if ($request->isPost()) {
            $oriData = $form->getHydrator()->extract($intervenant);
            $postData = $request->getPost()->toArray();
            if (!empty($protectedFields)) {
                // Ces valeurs sensibles restent celles déjà portées par l'entité :
                // elles ne sont ni rendues dans la page, ni acceptées depuis le POST.
                foreach ($protectedFields as $elementName) {
                    unset($postData[$elementName]);
                }
            }

            if (!$canViewAdresseIntervenant) {
                $postData['userChange'] = '0';
            }
            $data = array_merge($oriData, $postData);
            $form->setData($data);
            if ((!$form->isReadOnly()) && $form->isValid()) {
                try {
                    if ($form->get('intervenant-edition-login')->getValue() && $form->get('intervenant-edition-password')->getValue()) {
                    if ($canViewAdresseIntervenant && $form->get('intervenant-edition-login')->getValue() && $form->get('intervenant-edition-password')->getValue()) {
                        $nom = $intervenant->getNomUsuel();
                        $prenom = $intervenant->getPrenom();
                        $dateNaissance = $intervenant->getDateNaissance();
@@ -386,7 +431,17 @@ class IntervenantController extends AbstractController

        $vm = new ViewModel();
        $vm->setTemplate('intervenant/intervenant/saisir');
        $vm->setVariables(compact('intervenant', 'form', 'errors', 'title', 'definiParDefaut', 'actionDetail'));
        $vm->setVariables(compact(
            'intervenant',
            'form',
            'errors',
            'title',
            'definiParDefaut',
            'actionDetail',
            'canViewAdresseIntervenant',
            'canViewIdentiteIntervenant',
            'canViewInseeIntervenant'
        ));

        return $vm;
    }
+20
Changes for module/Intervenant/src/Form/EditionForm.php: 20 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -508,6 +508,26 @@ class EditionForm extends AbstractForm



    public function protegerChamps(array $elements)
    {
        foreach ($elements as $elementName) {
            if (!$this->has($elementName)) {
                continue;
            }

            /** @var Element $element */
            $element = $this->get($elementName);
            $element->setAttribute('readonly', true);
            $element->setAttribute('disabled', true);

            if (array_key_exists($elementName, $this->hydratorElements)) {
                $this->getHydrator()->setReadOnly($elementName, true);
            }
        }
    }



    public function protection($object)
    {
        // Le formulaire pouvant être réutilisé, on retire d'abord les protections
+17 −2
Changes for module/Intervenant/view/intervenant/intervenant/saisir.phtml: 17 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@
 * @var $errors                    array
 * @var $definiParDefaut           bool
 * @var $actionDetail              string
 * @var $canViewAdresseIntervenant bool
 * @var $canViewIdentiteIntervenant bool
 * @var $canViewInseeIntervenant bool
 */

if ($intervenant && 'dupliquer' == $actionDetail) {
@@ -34,11 +37,14 @@ if ($errors) {
                            <?= $this->formControlGroup($form->get('prenom')); ?>
                        </div>
                    </div>
                    <?php if ($canViewIdentiteIntervenant): ?>
                        <div class="row">
                            <div class="col-md-12">
                                <?= $this->formControlGroup($form->get('dateNaissance')); ?>
                            </div>
                        </div>
                    <?php endif; ?>
                    <?php if ($canViewAdresseIntervenant): ?>
                        <div class="row">
                            <div class="col-md-6">
                                <?= $this->formControlGroup($form->get('code')); ?>
@@ -47,12 +53,15 @@ if ($errors) {
                                <?= $this->formControlGroup($form->get('codeRh')); ?>
                            </div>
                        </div>
                    <?php endif; ?>
                    <!--INSEE ET NUMERO DE PRISE EN CHARGE-->
                    <div class="row">

                        <?php if ($canViewInseeIntervenant): ?>
                            <div class="col-md-6">
                                <?= $this->formControlGroup($form->get('numeroInsee')); ?>
                            </div>
                        <?php endif; ?>
                        <div class="col-md-6">
                            <?= $this->formControlGroup($form->get('numeroPec')); ?>
                        </div>
@@ -84,10 +93,12 @@ if ($errors) {
                        <div class="col-md-4"><?= $this->formControlGroup($form->get('civilite')); ?></div>
                        <div class="col-md-8"><?= $this->formControlGroup($form->get('nomPatronymique')); ?></div>
                    </div>
                    <?php if ($canViewAdresseIntervenant): ?>
                        <div class="row">
                            <div class="col-md-6"><?= $this->formControlGroup($form->get('emailPerso')); ?></div>
                            <div class="col-md-6"><?= $this->formControlGroup($form->get('telPerso')); ?></div>
                        </div>
                    <?php endif; ?>
                    <div class="row">
                        <div class="col-md-6"><?= $this->formControlGroup($form->get('validiteDebut')); ?></div>
                        <div class="col-md-6"><?= $this->formControlGroup($form->get('validiteFin')); ?></div>
@@ -105,16 +116,19 @@ if ($errors) {
            <div class="card bg-default">
                <div class="card-header">Liens avec le système d'information</div>
                <div class="card-body">
                    <?php if ($canViewAdresseIntervenant): ?>
                    <div class="row">
                        <div class="col-md-12">
                            <!-- Nav tabs -->
                            <ul class="nav nav-tabs" role="tablist">
                                <li role="presentation" class="active">
                                    <a class="nav-link active" href="#exists-user" data-bs-target="#exists-user" aria-controls="exists-user" role="tab"
                                    <a class="nav-link active" href="#exists-user" data-bs-target="#exists-user"
                                       aria-controls="exists-user" role="tab"
                                       data-bs-toggle="tab">Compte existant</a>
                                </li>
                                <li role="presentation">
                                    <a class="nav-link" href="#new-user" data-bs-target="#new-user" aria-controls=new-user" role="tab" data-bs-toggle="tab">Créer
                                    <a class="nav-link" href="#new-user" data-bs-target="#new-user"
                                       aria-controls=new-user" role="tab" data-bs-toggle="tab">Créer
                                        un nouveau compte</a></li>
                            </ul>

@@ -132,6 +146,7 @@ if ($errors) {
                            </div>
                        </div>
                    </div>
                    <?php endif; ?>
                    <div class="row">
                        <div class="col-md-6"><?= $this->formControlGroup($form->get('source')); ?></div>
                        <div class="col-md-6"><?= $this->formControlGroup($form->get('sourceCode')); ?></div>