Commit bf43820d authored by Thomas Hamel's avatar Thomas Hamel
Browse files

résolution pb validation codirection

parent 8c88240c
Loading
Loading
Loading
Loading
+4 −1
Changes for module/Admission/src/Admission/Config/ModuleConfig.php: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -90,7 +90,10 @@ class ModuleConfig
                    self::VALIDATION_GESTIONNAIRE => true,
                    self::VALIDATION_DIRECTION_THESE => true
                ],
                'enabled' => null,
                'enabled' => function(Admission $admission) {
                    return
                        $admission->getInscription()->first()->getCoDirection() !== null && $admission->getInscription()->first()->getCoDirection() == true;
                },
                'enabled_as_dql' => null,
            ],
            /**
+1 −1
Changes for module/Admission/view/admission/admission/partial/documentInfos.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ $canVerifierAdmission = $this->isAllowed(AdmissionPrivileges::getResourceId(Adm
                        'operation' => $operation,
                        'count' => $count,
                        'individu' => $individu,
                        'dataCodirection' => $dataForm['inscription']['coDirection'],
                        'dataCodirection' => isset($dataForm['inscription']['coDirection']) ? $dataForm['inscription']['coDirection'] : null,
                        'validation_en_attente' => $validation_en_attente
                    ]);
                    $count += 1;
+0 −1
Changes for module/Admission/view/admission/admission/partial/validation/operation-card.phtml: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ if ($operation instanceof AdmissionValidation) {
            'operation' => $operation,
            'count' => $count,
            'individu' => $individu,
            'dataCodirection' => $dataCodirection,
            'validation_en_attente' => $validation_en_attente
        ]);
    }
+1 −3
Changes for module/Admission/view/admission/admission/partial/validation/validation_etape_non_existante.phtml: 1 added line, 3 removed lines.
Original line number Diff line number Diff line
@@ -22,10 +22,8 @@ $canAjouterOperation =
        <?php
            if($validation_en_attente && $validation_en_attente == $operation->getTypeToString()){ ?>
                <span class="icon icon-hourglass circle_waiting"></span>
            <?php }else if(isset($dataCodirection) && $dataCodirection == 1) { ?>
                <div class="circle"><p><?= $count ?></p></div>
            <?php }else { ?>
                <div class="circle"><p><?= $count++ ?></p></div>
                <div class="circle"><p><?= $count ?></p></div>
            <?php } ?>
            <label><?php echo $operation->getTypeValidation()->getLibelle();?></label>
            <?php