Commit ac6ec818 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'test__admission_v2' into test

parents 0c5e8765 33a5f246

module/Admission/src/Admission/Assertion/CharteDoctorat/CharteDoctoratAssertion.php

+1 −1
Changes for module/Admission/src/Admission/Assertion/CharteDoctorat/CharteDoctoratAssertion.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ class CharteDoctoratAssertion extends AdmissionAbstractAssertion 
        try {

            switch ($action) {

                case 'generer-charte-doctorat':

                    $this->assertEtatAdmission($this->admission);

                    $this->assertEtatAdmission($this->admission, [Etat::CODE_EN_COURS_SAISIE, Etat::CODE_EN_COURS_VALIDATION, Etat::CODE_VALIDE]);

                    $this->assertAppartenanceAdmission($this->admission);

                    break;

            }

module/Admission/src/Admission/Assertion/ConventionFormationDoctorale/ConventionFormationDoctoraleAssertion.php

+1 −1
Changes for module/Admission/src/Admission/Assertion/ConventionFormationDoctorale/ConventionFormationDoctoraleAssertion.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ class ConventionFormationDoctoraleAssertion extends AdmissionAbstractAssertion 
        try {

            switch ($action) {

                case 'generer-convention-formation':

                    $this->assertEtatAdmission($this->admission);

                    $this->assertEtatAdmission($this->admission, [Etat::CODE_EN_COURS_SAISIE, Etat::CODE_EN_COURS_VALIDATION, Etat::CODE_VALIDE]);

                    $this->assertAppartenanceAdmission($this->admission);

                    $this->assertCanGenererConventionFormationAdmission();

                    break;

module/Admission/src/Admission/Controller/CharteDoctorat/CharteDoctoratController.php

+3 −14
Changes for module/Admission/src/Admission/Controller/CharteDoctorat/CharteDoctoratController.php: 3 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -6,10 +6,8 @@ use Admission\Rule\Operation\OperationRuleAwareTrait; 
use Admission\Service\Admission\AdmissionServiceAwareTrait;

use Admission\Service\Exporter\CharteDoctorat\CharteDoctoratExporterAwareTrait;

use Fichier\Service\Fichier\FichierStorageServiceAwareTrait;

use Laminas\Http\Response;

use Laminas\Mvc\Controller\AbstractActionController;

use Laminas\Mvc\Plugin\FlashMessenger\FlashMessenger;

use Laminas\View\Model\ViewModel;

use Structure\Service\Etablissement\EtablissementServiceAwareTrait;



/**
@@ -23,13 +21,6 @@ class CharteDoctoratController extends AbstractActionController 
    use EtablissementServiceAwareTrait;

    use OperationRuleAwareTrait;



    public function ajouterConventionFormationAction(): Response|ViewModel

    {

        $admission = $this->admissionService->getRepository()->findRequestedAdmission($this);



        // televersement

    }



    /**

     * @throws \Mpdf\MpdfException

     */
@@ -37,14 +28,12 @@ class CharteDoctoratController extends AbstractActionController 
    {

        $admission = $this->admissionService->getRepository()->findRequestedAdmission($this);



        // Récupération des opérations liées à la charte

        $filterCallback = fn($config) => in_array('charteDoctorat', $config['categories'] ?? []);

        $operations = $this->operationRule->getOperationsForTarget($admission, $filterCallback);

        /** @var \Admission\Entity\Db\AdmissionOperationInterface[] $operations */

        $operations = $this->operationRule->getOperationsForTarget($admission);



        $export = $this->charteDoctoratExporter;

        $export->setAdmission($admission);

        $export->setCharteDoctoratOperations($operations);

        //$export->setConventionFormationDoctoraleOperations([]);

        $export->setOperations($operations);

        $export->setWatermark("PROJET");

        $export->export('SYGAL_admission_charte_doctorat_' . $admission->getId() . ".pdf");

    }

module/Admission/src/Admission/Controller/ConventionFormationDoctorale/ConventionFormationDoctoraleController.php

+3 −4
Changes for module/Admission/src/Admission/Controller/ConventionFormationDoctorale/ConventionFormationDoctoraleController.php: 3 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -20,13 +20,12 @@ class ConventionFormationDoctoraleController extends AbstractActionController 
    {

        $admission = $this->admissionService->getRepository()->findRequestedAdmission($this);



        // Récupération des opérations liées à la convention de formation doctorale du dossier d'admission

        $filterCallback = fn($config) => in_array('conventionFormationDoctorale', $config['categories'] ?? []);

        $conventionFormationDoctoraleOperations = $this->operationRule->getOperationsForTarget($admission, $filterCallback);

        /** @var \Admission\Entity\Db\AdmissionOperationInterface[] $operations */

        $operations = $this->operationRule->getOperationsForTarget($admission);



        $export = $this->conventionFormationDoctoraleExporter;

        $export->setAdmission($admission);

        $export->setConventionFormationDoctoraleOperations($conventionFormationDoctoraleOperations);

        $export->setOperations($operations);

        $export->export('SYGAL_admission_convention_formation_doctorale_' . $admission->getId() . ".pdf");

    }

}
 
 No newline at end of file

module/Admission/src/Admission/Entity/Db/AdmissionAvis.php

+12 −1
Changes for module/Admission/src/Admission/Entity/Db/AdmissionAvis.php: 12 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
namespace Admission\Entity\Db;



use Application\Constants;

use Individu\Entity\Db\Individu;

use Laminas\Permissions\Acl\Resource\ResourceInterface;

use Operation\OperationInterface;

use UnicaenAvis\Entity\Db\Avis;
@@ -38,6 +37,8 @@ class AdmissionAvis implements HistoriqueAwareInterface, ResourceInterface, Admi 


    private Avis $avis;



    private ?array $config = null;



    public function getValeurToString(): string

    {

        return $this->getAvis()->getAvisValeur()->getValeur();
@@ -136,6 +137,16 @@ class AdmissionAvis implements HistoriqueAwareInterface, ResourceInterface, Admi 
        return $this->getAvis()->getAvisValeur()->getValeurBool();

    }



    public function setConfig(?array $config): void

    {

        $this->config = $config;

    }



    public function getConfig(): ?array

    {

        return $this->config;

    }



    public function getResourceId(): string

    {

        return self::RESOURCE_ID;