Commit 4a08a2ec authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Extraction d'une classe mère commune au ED/UR/EtabController : StructureConcreteController.

parent e9f039c8
Loading
Loading
Loading
Loading
+36 −228
Changes for module/Application/src/Application/Controller/EcoleDoctoraleController.php: 36 added lines, 228 removed lines.
Original line number Diff line number Diff line
@@ -2,276 +2,84 @@

namespace Application\Controller;

use Application\Controller\Traits\LogoAwareControllerTrait;
use Application\Entity\Db\EcoleDoctorale;
use Application\Entity\Db\Individu;
use Application\Entity\Db\IndividuRole;
use Application\Entity\Db\Role;
use Application\Entity\Db\TypeStructure;
use Application\Form\EcoleDoctoraleForm;
use Application\Provider\Privilege\StructurePrivileges;
use Application\Service\EcoleDoctorale\EcoleDoctoraleService;
use Application\Service\EcoleDoctorale\EcoleDoctoraleServiceAwareTrait;
use Application\Service\Etablissement\EtablissementServiceAwareTrait;
use Application\Service\File\FileServiceAwareTrait;
use Application\Service\Individu\IndividuServiceAwareTrait;
use Application\Service\Role\RoleServiceAwareTrait;
use Application\Service\Structure\StructureServiceAwareTrait;
use BjyAuthorize\Exception\UnAuthorizedException;
use UnicaenApp\Exception\RuntimeException;
use Zend\Http\Response;
use Zend\View\Model\ViewModel;

class EcoleDoctoraleController extends AbstractController
class EcoleDoctoraleController extends StructureConcreteController
{
    use EcoleDoctoraleServiceAwareTrait;
    use IndividuServiceAwareTrait;
    use RoleServiceAwareTrait;
    use EtablissementServiceAwareTrait;
    use StructureServiceAwareTrait;
    use FileServiceAwareTrait;
    use LogoAwareControllerTrait;

    public function indexAction()
    {
        $consultationToutes = $this->isAllowed(StructurePrivileges::getResourceId(StructurePrivileges::STRUCTURE_CONSULTATION_TOUTES_STRUCTURES), StructurePrivileges::STRUCTURE_CONSULTATION_TOUTES_STRUCTURES);

        $ecolesDoctorales = [];
        if ($consultationToutes) {
            $ecolesDoctorales = $this->getStructureService()->getAllStructuresAffichablesByType(TypeStructure::CODE_ECOLE_DOCTORALE, 'libelle');
        } else {
            /** @var Role $role*/
            $role = $this->userContextService->getSelectedIdentityRole();
            if ($role->isEcoleDoctoraleDependant()) {
                $ecole = $this->getEcoleDoctoraleService()->getRepository()->findByStructureId($role->getStructure()->getId());
                $ecolesDoctorales[] = $ecole;
            }
        }
    protected $codeTypeStructure = TypeStructure::CODE_ECOLE_DOCTORALE;

        return new ViewModel([
            'ecoles' => $ecolesDoctorales,
        ]);
    }
    /**
     * @var string
     */
    protected $routeName = 'ecole-doctorale';

    public function informationAction()
    /**
     * @return EcoleDoctoraleService
     */
    protected function getStructureConcreteService()
    {
        $id = $this->params()->fromRoute('structure');
        $ecole = $this->getEcoleDoctoraleService()->getRepository()->findByStructureId($id);
        if ($ecole === null) {
            throw new RuntimeException("Aucune école doctorale ne possède l'identifiant renseigné.");
        }

        $consultationToutes = $this->isAllowed(StructurePrivileges::getResourceId(StructurePrivileges::STRUCTURE_CONSULTATION_TOUTES_STRUCTURES), StructurePrivileges::STRUCTURE_CONSULTATION_TOUTES_STRUCTURES);
        $consultationSes    = $this->isAllowed($ecole->getStructure(), StructurePrivileges::STRUCTURE_CONSULTATION_SES_STRUCTURES);

        if (! $consultationToutes && ! $consultationSes) {
            throw new UnAuthorizedException("Vous ne disposez pas des privilèges vous permettant d'accéder aux informations de cette école doctorale.");
        return $this->ecoleDoctoraleService;
    }

        $roleListings = [];
        $individuListings = [];
        $roles = $this->getRoleService()->getRolesByStructure($ecole->getStructure());
        $individus = $this->getRoleService()->getIndividuByStructure($ecole->getStructure());
        $individuRoles = $this->getRoleService()->getIndividuRoleByStructure($ecole->getStructure());

        /** @var Role $role */
        foreach ($roles as $role) {
            $roleListings [$role->getLibelle()] = 0;
        }

        /** @var Individu $individu */
        foreach ($individus as $individu) {
            $denomination = $individu->getNomComplet(false, false, false, true, false);
            $individuListings[$denomination] = [];
        }

        /** @var IndividuRole $individuRole */
        foreach ($individuRoles as $individuRole) {
            $denomination = $individuRole->getIndividu()->getNomComplet(false, false, false, true, false);
            $role = $individuRole->getRole()->getLibelle();
            $individuListings[$denomination][] = $role;
            $roleListings[$role]++;
        }
    /**
     * @return ViewModel
     */
    public function indexAction()
    {
        $vm = parent::indexAction();

        return new ViewModel([
            'ecole'           => $ecole,
            'roleListing'     => $roleListings,
            'individuListing' => $individuListings,
            'logoContent'     => $this->structureService->getLogoStructureContent($ecole),
            'ecoles' => $vm->getVariable('structures'),
        ]);
    }

    /**
     * Modifier permet soit d'afficher le formulaire associé à la modification soit de mettre à jour
     * les données associées à une école doctorale (Sigle, Libellé et Logo)
     *
     * @return \Zend\Http\Response|ViewModel
     *
     * TODO en cas de changement de SIGLE penser à faire un renommage du logo
     * @return ViewModel
     */
    public function modifierAction()
    public function informationAction()
    {
        /** @var EcoleDoctorale $ecole */
        $ecoleId = $this->params()->fromRoute("structure");
        $ecole  = $this->getEcoleDoctoraleService()->getRepository()->findByStructureId($ecoleId);
        $this->ecoleDoctoraleForm->bind($ecole);

        // si POST alors on revient du formulaire
        if ($data = $this->params()->fromPost()) {

            // récupération des données et des fichiers
            $request = $this->getRequest();
            $data = $request->getPost()->toArray();
            $file = $request->getFiles()->toArray();

            // action d'affacement du logo
            if (isset($data['supprimer-logo'])) {
                $this->supprimerLogoEcoleDoctorale();

                return $this->redirect()->toRoute('ecole-doctorale', [], ['query' => ['selected' => $ecoleId], "fragment" => $ecoleId], true);
            }
        $viewModel = parent::informationAction();

            // action de modification
            $this->ecoleDoctoraleForm->setData($data);
            if ($this->ecoleDoctoraleForm->isValid()) {

                // sauvegarde du logo si fourni
                if ($file['cheminLogo']['tmp_name'] !== '') {
                    $this->ajouterLogoEcoleDoctorale($file['cheminLogo']['tmp_name']);
                }
                // mise à jour des données relatives aux écoles doctorales
                $ecole = $this->ecoleDoctoraleForm->getData();
                $this->getEcoleDoctoraleService()->update($ecole);

                $this->flashMessenger()->addSuccessMessage("École doctorale '$ecole' modifiée avec succès");

                return $this->redirect()->toRoute('ecole-doctorale', [], ['query' => ['selected' => $ecoleId], "fragment" => $ecoleId], true);
            }
            $this->flashMessenger()->addErrorMessage("Echec de la mise à jour : données incorrectes saissie");

            return $this->redirect()->toRoute('ecole-doctorale', [], ['query' => ['selected' => $ecoleId], "fragment" => $ecoleId], true);
        }

        // envoie vers le formulaire de modification
        $viewModel = new ViewModel([
            'form' => $this->ecoleDoctoraleForm,
            'logoContent' => $this->structureService->getLogoStructureContent($ecole),
        ]);
        $viewModel->setTemplate('application/ecole-doctorale/modifier');
        $viewModel->setVariable('ecole', $viewModel->getVariable('structure'));

        return $viewModel;
    }

    /**
     * @return \Zend\Http\Response|ViewModel
     * @throws \Doctrine\ORM\OptimisticLockException
     * @return Response|ViewModel
     */
    public function ajouterAction()
    public function modifierAction()
    {
        if ($data = $this->params()->fromPost()) {

            // récupération des données et des fichiers
            $request = $this->getRequest();
            $data = $request->getPost()->toArray();
            $file = $request->getFiles()->toArray();

            $this->ecoleDoctoraleForm->setData($data);
            if ($this->ecoleDoctoraleForm->isValid()) {
                /** @var EcoleDoctorale $ecole */
                $ecole = $this->ecoleDoctoraleForm->getData();
                $ecole = $this->getEcoleDoctoraleService()->create($ecole, $this->userContextService->getIdentityDb());

                // sauvegarde du logo si fourni
                if ($file['cheminLogo']['tmp_name'] !== '') {
                    $this->ajouterLogoEcoleDoctorale($file['cheminLogo']['tmp_name'], $ecole);
                }

                //creation automatique des roles associés à une unité de recherche
                $this->roleService->addRoleByStructure($ecole);
        $viewModel = parent::modifierAction();

                $this->flashMessenger()->addSuccessMessage("École doctorale '$ecole' créée avec succès");

                $ecoleId = $ecole->getStructure()->getId();

                return $this->redirect()->toRoute('ecole-doctorale', [], ['query' => ['selected' => $ecoleId], "fragment" => $ecoleId], true);
            }
        if ($viewModel instanceof Response) {
            return $viewModel;
        }

        $this->ecoleDoctoraleForm->setAttribute('action', $this->url()->fromRoute('ecole-doctorale/ajouter'));

        $viewModel = new ViewModel([
            'form' => $this->ecoleDoctoraleForm,
        ]);
        $viewModel->setTemplate('application/ecole-doctorale/modifier');

        return $viewModel;
    }

    public function supprimerAction()
    {
        $ecoleId = $this->params()->fromRoute("structure");
        $ecole  = $this->getEcoleDoctoraleService()->getRepository()->findByStructureId($ecoleId);

        $this->getEcoleDoctoraleService()->deleteSoftly($ecole, $this->userContextService->getIdentityDb());

        $this->flashMessenger()->addSuccessMessage("École doctorale '$ecole' supprimée avec succès");

        return $this->redirect()->toRoute('ecole-doctorale', [], ['query' => ['selected' => $ecoleId], "fragment" => $ecoleId], true);
    }

    public function restaurerAction()
    {
        $ecoleId = $this->params()->fromRoute("structure");
        $ecole  = $this->getEcoleDoctoraleService()->getRepository()->findByStructureId($ecoleId);

        $this->getEcoleDoctoraleService()->undelete($ecole);

        $this->flashMessenger()->addSuccessMessage("École doctorale '$ecole' restaurée avec succès");

        return $this->redirect()->toRoute('ecole-doctorale', [], ['query' => ['selected' => $ecoleId], "fragment" => $ecoleId], true);
    }

    /**
     * @var EcoleDoctoraleForm
     */
    private $ecoleDoctoraleForm;

    /**
     * @param EcoleDoctoraleForm $form
     * @return $this
     * @return Response|ViewModel
     */
    public function setEcoleDoctoraleForm(EcoleDoctoraleForm $form)
    {
        $this->ecoleDoctoraleForm = $form;

        return $this;
    }

    public function supprimerLogoAction()
    {
        $structureId = $this->params()->fromRoute("structure");
        $this->supprimerLogoEcoleDoctorale();

        return $this->redirect()->toRoute('ecole-doctorale', [], ['query' => ['selected' => $structureId], "fragment" => $structureId], true);
    }

    public function supprimerLogoEcoleDoctorale()
    public function ajouterAction()
    {
        $ecoleId = $this->params()->fromRoute("structure");
        $ecole  = $this->getEcoleDoctoraleService()->getRepository()->findByStructureId($ecoleId);
        $viewModel = parent::ajouterAction();

        $this->supprimerLogoStructure($ecole);
        if ($viewModel instanceof Response) {
            return $viewModel;
        }

    /**
     * @param string         $cheminLogoUploade chemin vers le fichier temporaire associé au logo
     * @param EcoleDoctorale $ecole
     */
    public function ajouterLogoEcoleDoctorale($cheminLogoUploade, EcoleDoctorale $ecole = null)
    {
        if ($ecole === null) {
            $ecoleId = $this->params()->fromRoute("structure");
            $ecole = $this->getEcoleDoctoraleService()->getRepository()->findByStructureId($ecoleId);
        }
        $viewModel->setTemplate('application/ecole-doctorale/modifier');

        $this->ajouterLogoStructure($ecole, $cheminLogoUploade);
        return $viewModel;
    }
}
 No newline at end of file
+31 −169
Changes for module/Application/src/Application/Controller/EtablissementController.php: 31 added lines, 169 removed lines.
Original line number Diff line number Diff line
@@ -2,61 +2,47 @@

namespace Application\Controller;

use Application\Controller\Traits\LogoAwareControllerTrait;
use Application\Entity\Db\Etablissement;
use Application\Entity\Db\Individu;
use Application\Entity\Db\IndividuRole;
use Application\Entity\Db\Role;
use Application\Entity\Db\TypeStructure;
use Application\Form\EtablissementForm;
use Application\Service\Etablissement\EtablissementService;
use Application\Service\Etablissement\EtablissementServiceAwareTrait;
use Application\Service\File\FileServiceAwareTrait;
use Application\Service\Individu\IndividuServiceAwareTrait;
use Application\Service\Role\RoleServiceAwareTrait;
use Application\Service\Structure\StructureServiceAwareTrait;
use UnicaenApp\Exception\RuntimeException;
use Zend\Http\Response;
use Zend\View\Model\ViewModel;

/**
 * Class EtablissementController
 */
class EtablissementController extends AbstractController
class EtablissementController extends StructureConcreteController
{
    use EtablissementServiceAwareTrait;
    use IndividuServiceAwareTrait;
    use RoleServiceAwareTrait;
    use StructureServiceAwareTrait;
    use FileServiceAwareTrait;
    use LogoAwareControllerTrait;

    protected $codeTypeStructure = TypeStructure::CODE_ETABLISSEMENT;

    /**
     * @var EtablissementForm $etablissementForm
     * @var string
     */
    private $etablissementForm;
    protected $routeName = 'etablissement';

    /**
     * @param EtablissementForm $form
     * @return $this
     * @return EtablissementService
     */
    public function setEtablissementForm(EtablissementForm $form)
    protected function getStructureConcreteService()
    {
        $this->etablissementForm = $form;

        return $this;
        return $this->etablissementService;
    }

    /**
     * L'index récupére :
     * - la liste des établissements
     * - l'établissement sélectionné
     * - la liste des rôles associées à l'établissement
     * - un tableau de tableaux des rôles associés à chaque rôle
     *
     * @return \Zend\Http\Response|ViewModel
     * @return ViewModel
     */
    public function indexAction()
    {
        $etablissements = $this->getStructureService()->getAllStructuresAffichablesByType(TypeStructure::CODE_ETABLISSEMENT);
        $etablissements = $this->structureService->getAllStructuresAffichablesByType($this->codeTypeStructure);

        $etablissementsPrincipaux = array_filter($etablissements, function (Etablissement $e) {
            return $e->estMembre();
@@ -71,19 +57,22 @@ class EtablissementController extends AbstractController
        ]);
    }

    /**
     * @return ViewModel
     */
    public function informationAction()
    {
        $id = $this->params()->fromRoute('structure');
        $etablissement = $this->getEtablissementService()->getRepository()->findByStructureId($id);
        $etablissement = $this->getStructureConcreteService()->getRepository()->findByStructureId($id);
        if ($etablissement === null) {
            throw new RuntimeException("Aucun établissement ne possède l'identifiant renseigné.");
        }

        $roleListings = [];
        $individuListings = [];
        $roles = $this->getRoleService()->getRolesByStructure($etablissement->getStructure());
        $individus = $this->getRoleService()->getIndividuByStructure($etablissement->getStructure());
        $individuRoles = $this->getRoleService()->getIndividuRoleByStructure($etablissement->getStructure());
        $roles = $this->roleService->getRolesByStructure($etablissement->getStructure());
        $individus = $this->roleService->getIndividuByStructure($etablissement->getStructure());
        $individuRoles = $this->roleService->getIndividuRoleByStructure($etablissement->getStructure());

        /** @var Role $role */
        foreach ($roles as $role) {
@@ -114,164 +103,37 @@ class EtablissementController extends AbstractController
            'individuListing' => $individuListings,
            'logoContent'     => $this->structureService->getLogoStructureContent($etablissement),
        ]);

    }

    /**
     * @return \Zend\Http\Response|ViewModel
     * @throws \Doctrine\ORM\OptimisticLockException
     * @return Response|ViewModel
     */
    public function ajouterAction()
    public function modifierAction()
    {
        if ($data = $this->params()->fromPost()) {

            $request = $this->getRequest();
            $data = $request->getPost()->toArray();
            $file = $request->getFiles()->toArray();

            $this->etablissementForm->setData($data);
            if ($this->etablissementForm->isValid()) {
                /** @var Etablissement $etablissement */
                $etablissement = $this->etablissementForm->getData();
                $this->getEtablissementService()->create($etablissement, $this->userContextService->getIdentityDb());
        $viewModel = parent::modifierAction();

                // sauvegarde du logo si fourni
                if ($file['cheminLogo']['tmp_name'] !== '') {
                    $this->ajouterLogoEtablissement($file['cheminLogo']['tmp_name'], $etablissement);
                }

                //creation automatique des roles associés à une unité de recherche
                $this->roleService->addRoleByStructure($etablissement);

                $this->flashMessenger()->addSuccessMessage("Établissement '$etablissement' créée avec succès");

                $structureId = $etablissement->getStructure()->getId();

                return $this->redirect()->toRoute('etablissement', [], ['query' => ['selected' => $structureId], 'fragment' => $structureId], true);
            }
        if ($viewModel instanceof Response) {
            return $viewModel;
        }

        $this->etablissementForm->setAttribute('action', $this->url()->fromRoute('etablissement/ajouter'));
        $this->etablissementForm->bind(new Etablissement());

        $viewModel = new ViewModel([
            'form' => $this->etablissementForm,
        ]);
        $viewModel->setTemplate('application/etablissement/modifier');

        return $viewModel;
    }

    public function supprimerAction()
    {
        $structureId = $this->params()->fromRoute("structure");
        $etablissement = $this->getEtablissementService()->getRepository()->findByStructureId($structureId);

        $destructeur = $this->userContextService->getIdentityDb();
        $this->getEtablissementService()->deleteSoftly($etablissement, $destructeur);
        $this->flashMessenger()->addSuccessMessage("Établissement '$etablissement' supprimé avec succès");

        return $this->redirect()->toRoute('etablissement', [], ['query' => ['selected' => $structureId], "fragment" => $structureId], true);
    }

    public function modifierAction()
    /**
     * @return Response|ViewModel
     */
    public function ajouterAction()
    {
        /** @var Etablissement $etablissement */
        $structureId = $this->params()->fromRoute("structure");
        $etablissement = null;
        if ($structureId) {
            $etablissement = $this->getEtablissementService()->getRepository()->findByStructureId($structureId);
        } else {
            $etablissement = new Etablissement();
        }
        $this->etablissementForm->bind($etablissement);

        // si POST alors on revient du formulaire
        if ($data = $this->params()->fromPost()) {

            // récupération des données et des fichiers
            $request = $this->getRequest();
            $data = $request->getPost()->toArray();
            $file = $request->getFiles()->toArray();

            // action d'affacement du logo
            if (isset($data['supprimer-logo'])) {
                $this->supprimerLogoEtablissement();

                return $this->redirect()->toRoute(null, [], [], true);
            }
        $viewModel = parent::ajouterAction();

            // action de modification
            $this->etablissementForm->setData($data);
            if ($this->etablissementForm->isValid()) {

                // sauvegarde du logo si fourni
                if ($file['cheminLogo']['tmp_name'] !== '') {
                    $this->ajouterLogoEtablissement($file['cheminLogo']['tmp_name']);
                }
                // mise à jour des données relatives aux écoles doctorales
                $etablissement = $this->etablissementForm->getData();
                $this->getEtablissementService()->update($etablissement);

                $this->flashMessenger()->addSuccessMessage("Établissement '$etablissement' modifiée avec succès");

                return $this->redirect()->toRoute('etablissement', [], ['query' => ['selected' => $structureId], "fragment" => $structureId], true);
            }
            $this->flashMessenger()->addErrorMessage("Echec de la mise à jour : données incorrectes saissie");

            return $this->redirect()->toRoute('etablissement', [], ['query' => ['selected' => $structureId], "fragment" => $structureId], true);
        if ($viewModel instanceof Response) {
            return $viewModel;
        }

        // envoie vers le formulaire de modification
        $viewModel = new ViewModel([
            'form' => $this->etablissementForm,
            'logoContent' => $this->structureService->getLogoStructureContent($etablissement),
        ]);
        $viewModel->setTemplate('application/etablissement/modifier');

        return $viewModel;

    }

    public function restaurerAction()
    {
        $structureId = $this->params()->fromRoute("structure");
        $etablissement = $this->getEtablissementService()->getRepository()->findByStructureId($structureId);

        $this->getEtablissementService()->undelete($etablissement);

        $this->flashMessenger()->addSuccessMessage("Établissement '$etablissement' restauré avec succès");

        return $this->redirect()->toRoute('etablissement', [], ['query' => ['selected' => $structureId], "fragment" => $structureId], true);
    }

    public function supprimerLogoAction()
    {
        $structureId = $this->params()->fromRoute("etablissement");
        $this->supprimerLogoEtablissement();

        return $this->redirect()->toRoute('etablissement', [], ['query' => ['selected' => $structureId], "fragment" => $structureId], true);
    }

    public function supprimerLogoEtablissement()
    {
        $structureId = $this->params()->fromRoute("structure");
        $etablissement = $this->getEtablissementService()->getRepository()->findByStructureId($structureId);

        $this->supprimerLogoStructure($etablissement);
    }

    /**
     * @param string        $cheminLogoUploade chemin vers le fichier temporaire associé au logo
     * @param Etablissement $etablissement
     */
    public function ajouterLogoEtablissement($cheminLogoUploade, Etablissement $etablissement = null)
    {
        if ($etablissement === null) {
            $structureId = $this->params()->fromRoute("structure");
            $etablissement = $this->getEtablissementService()->getRepository()->findByStructureId($structureId);
        }

        $this->ajouterLogoStructure($etablissement, $cheminLogoUploade);
    }
}
 No newline at end of file
+1 −11

File changed.

Preview size limit exceeded, changes collapsed.

+2 −11

File changed.

Preview size limit exceeded, changes collapsed.

+1 −10
Changes for module/Application/src/Application/Controller/Factory/UniteRechercheControllerFactory.php: 1 added line, 10 removed lines.
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ use Application\Controller\UniteRechercheController;
use Application\Form\UniteRechercheForm;
use Application\Service\DomaineScientifiqueService;
use Application\Service\Etablissement\EtablissementServiceLocateTrait;
use Application\Service\File\FileService;
use Application\Service\Individu\IndividuService;
use Application\Service\Role\RoleService;
use Application\Service\Structure\StructureService;
@@ -38,25 +37,17 @@ class UniteRechercheControllerFactory
         * @var DomaineScientifiqueService $domaineService
         */
        $uniteRechercheService = $sl->get('UniteRechercheService');
        $individuService = $sl->get('IndividuService');
        $roleService = $sl->get('RoleService');
        $structureService = $sl->get(StructureService::class);
        $domaineService = $sl->get(DomaineScientifiqueService::class);

        /**
         * @var FileService $fileService
         */
        $fileService = $sl->get(FileService::class);

        $controller = new UniteRechercheController();
        $controller->setUniteRechercheService($uniteRechercheService);
        $controller->setIndividuService($individuService);
        $controller->setRoleService($roleService);
        $controller->setEtablissementService($this->locateEtablissementService($sl));
        $controller->setDomaineScientifiqueService($domaineService);
        $controller->setStructureService($structureService);
        $controller->setUniteRechercheForm($form);
        $controller->setFileService($fileService);
        $controller->setStructureForm($form);

        return $controller;
    }
Loading