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

Chemins des logos : utilisation du service FileService pour faire comme pour...

Chemins des logos : utilisation du service FileService pour faire comme pour les fichiers de thèses.
parent 238908d8
Loading
Loading
Loading
Loading
+3 −0
Changes for module/Application/config/others/fichier.config.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ use Application\Controller\Factory\FichierTheseControllerFactory;
use Application\Provider\Privilege\ThesePrivileges;
use Application\Provider\Privilege\ValidationPrivileges;
use Application\Service\Fichier\FichierServiceFactory;
use Application\Service\File\FileService;
use Application\Service\File\FileServiceFactory;
use Application\Service\ValiditeFichier\ValiditeFichierService;
use Application\Service\VersionFichier\VersionFichierService;
use UnicaenAuth\Guard\PrivilegeController;
@@ -247,6 +249,7 @@ return array(
            'ValiditeFichierService' => ValiditeFichierService::class,
        ),
        'factories' => array(
            FileService::class => FileServiceFactory::class,
            'FichierService' => FichierServiceFactory::class,
            'ValidationFichierCinesCommand' => ValidationFichierCinesCommandFactory::class,
            'CheckWSValidationFichierCinesCommand' => CheckWSValidationFichierCinesCommandFactory::class,
+22 −24
Changes for module/Application/src/Application/Controller/EcoleDoctoraleController.php: 22 added lines, 24 removed lines.
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ use Application\Entity\Db\TypeStructure;
use Application\Form\EcoleDoctoraleForm;
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;
@@ -24,6 +25,7 @@ class EcoleDoctoraleController extends AbstractController
    use RoleServiceAwareTrait;
    use EtablissementServiceAwareTrait;
    use StructureServiceAwareTrait;
    use FileServiceAwareTrait;

    public function indexAction()
    {
@@ -100,6 +102,7 @@ class EcoleDoctoraleController extends AbstractController
            // action d'affacement du logo
            if (isset($data['supprimer-logo'])) {
                $this->supprimerLogoEcoleDoctorale();

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

@@ -116,9 +119,11 @@ class EcoleDoctoraleController extends AbstractController
                $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);
        }

@@ -127,6 +132,7 @@ class EcoleDoctoraleController extends AbstractController
            'form' => $this->ecoleDoctoraleForm,
        ]);
        $viewModel->setTemplate('application/ecole-doctorale/modifier');

        return $viewModel;
    }

@@ -160,6 +166,7 @@ class EcoleDoctoraleController extends AbstractController
                $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);
            }
        }
@@ -218,6 +225,7 @@ class EcoleDoctoraleController extends AbstractController
    {
        $structureId = $this->params()->fromRoute("ecoleDoctorale");
        $this->supprimerLogoEcoleDoctorale();

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

@@ -232,10 +240,11 @@ class EcoleDoctoraleController extends AbstractController
        $ecole = $this->getEcoleDoctoraleService()->getRepository()->findByStructureId($ecoleId);

        $this->getEcoleDoctoraleService()->deleteLogo($ecole);
        $filename   = EcoleDoctoraleController::getLogoFilename($ecole, true);
        if (file_exists($filename)) {
            $result = unlink($filename);
            if ($result) {

        $logoFilepath = $this->fileService->computeLogoPathForStructure($ecole);
        if (file_exists($logoFilepath)) {
            $ok = unlink($logoFilepath);
            if ($ok) {
                $this->flashMessenger()->addSuccessMessage("Le logo de l'école doctorale {$ecole->getLibelle()} vient d'être supprimé.");
            } else {
                $this->flashMessenger()->addErrorMessage("Erreur lors de l'effacement du logo de l'école doctorale <strong>{$ecole->getLibelle()}.</strong>");
@@ -243,13 +252,13 @@ class EcoleDoctoraleController extends AbstractController
        } else {
            $this->flashMessenger()->addWarningMessage("Aucun logo à supprimer pour l'école doctorale <strong>{$ecole->getLibelle()}.</strong>");
        }

    }

    /**
     * Ajoute le logo associé à une école doctorale:
     * - modification base de donnée (champ CHEMIN_LOG <- /public/Logos/ED/LOGO_NAME)
     * - enregistrement du fichier sur le serveur
     *
     * @param string         $cheminLogoUploade chemin vers le fichier temporaire associé au logo
     * @param EcoleDoctorale $ecole
     */
@@ -257,6 +266,7 @@ class EcoleDoctoraleController extends AbstractController
    {
        if ($cheminLogoUploade === null || $cheminLogoUploade === '') {
            $this->flashMessenger()->addErrorMessage("Fichier logo invalide.");

            return;
        }

@@ -264,28 +274,16 @@ class EcoleDoctoraleController extends AbstractController
            $ecoleId = $this->params()->fromRoute("ecoleDoctorale");
            $ecole = $this->getEcoleDoctoraleService()->getRepository()->findByStructureId($ecoleId);
        }
        $chemin     = EcoleDoctoraleController::getLogoFilename($ecole, false);
        $filename   = EcoleDoctoraleController::getLogoFilename($ecole, true);
        $result = rename($cheminLogoUploade, $filename);
        if ($result) {

        $logoFilename = $this->fileService->computeLogoFilenameForStructure($ecole);
        $logoFilepath = $this->fileService->computeLogoPathForStructure($ecole);

        $ok = rename($cheminLogoUploade, $logoFilepath);
        if ($ok) {
            $this->flashMessenger()->addSuccessMessage("Le logo de l'école doctorale {$ecole->getLibelle()} vient d'être ajouté.");
            $this->getEcoleDoctoraleService()->setLogo($ecole,$chemin);
            $this->getEcoleDoctoraleService()->setLogo($ecole, $logoFilename);
        } else {
            $this->flashMessenger()->addErrorMessage("Erreur lors de l'enregistrement du logo de l'école doctorale <strong>{$ecole->getLibelle()}.</strong>");
        }
    }

    /**
     * Retourne le chemin vers le logo d'une école doctorale
     * @param EcoleDoctorale $ecole
     * @param bool $fullpath            si true chemin absolue sinon chemin relatif au répertoire de l'application
     * @return string                   le chemin vers le logo de l'école doctorale $ecole
     */
    static public function getLogoFilename(EcoleDoctorale $ecole, $fullpath=true)
    {
        $chemin = "";
        if ($fullpath) $chemin .= Structure::PATH;
        $chemin .= "/ressources/Logos/ED/".$ecole->getSourceCode()."-".$ecole->getSigle().".png";
        return $chemin;
    }
}
 No newline at end of file
+30 −26
Changes for module/Application/src/Application/Controller/EtablissementController.php: 30 added lines, 26 removed lines.
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ use Application\Entity\Db\StructureConcreteInterface;
use Application\Entity\Db\TypeStructure;
use Application\Form\EtablissementForm;
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;
@@ -27,6 +28,7 @@ class EtablissementController extends AbstractController
    use IndividuServiceAwareTrait;
    use RoleServiceAwareTrait;
    use StructureServiceAwareTrait;
    use FileServiceAwareTrait;

    /**
     * @var EtablissementForm $etablissementForm
@@ -50,14 +52,19 @@ class EtablissementController extends AbstractController
     * - 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
     */
    public function indexAction()
    {
        $etablissements = $this->getStructureService()->getAllStructuresAffichablesByType(TypeStructure::CODE_ETABLISSEMENT);

        $etablissementsPrincipaux = array_filter($etablissements, function(Etablissement $e) { return $e->estMembre(); });
        $etablissementsExternes = array_filter($etablissements, function(Etablissement $e) { return !$e->estMembre(); });
        $etablissementsPrincipaux = array_filter($etablissements, function (Etablissement $e) {
            return $e->estMembre();
        });
        $etablissementsExternes = array_filter($etablissements, function (Etablissement $e) {
            return !$e->estMembre();
        });

        return new ViewModel([
            'etablissementsSygal'    => $etablissementsPrincipaux,
@@ -139,6 +146,7 @@ class EtablissementController extends AbstractController
                $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);
            }
        }
@@ -189,6 +197,7 @@ class EtablissementController extends AbstractController
            // action d'affacement du logo
            if (isset($data['supprimer-logo'])) {
                $this->supprimerLogoEtablissement();

                return $this->redirect()->toRoute(null, [], [], true);
            }

@@ -205,9 +214,11 @@ class EtablissementController extends AbstractController
                $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);
        }

@@ -216,6 +227,7 @@ class EtablissementController extends AbstractController
            'form' => $this->etablissementForm,
        ]);
        $viewModel->setTemplate('application/etablissement/modifier');

        return $viewModel;

    }
@@ -236,6 +248,7 @@ class EtablissementController extends AbstractController
    {
        $structureId = $this->params()->fromRoute("etablissement");
        $this->supprimerLogoEtablissement();

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

@@ -250,10 +263,12 @@ class EtablissementController extends AbstractController
        $etablissement = $this->getEtablissementService()->getRepository()->findByStructureId($structureId);

        $this->getEtablissementService()->deleteLogo($etablissement);
        $filename   = EtablissementController::getLogoFilename($etablissement, true);
        if (file_exists($filename)) {
            $result = unlink($filename);
            if ($result) {

        $logoFilepath = $this->fileService->computeLogoPathForStructure($etablissement);

        if (file_exists($logoFilepath)) {
            $ok = unlink($logoFilepath);
            if ($ok) {
                $this->flashMessenger()->addSuccessMessage("Le logo de l'école doctorale {$etablissement->getLibelle()} vient d'être supprimé.");
            } else {
                $this->flashMessenger()->addErrorMessage("Erreur lors de l'effacement du logo de l'établissement <strong>{$etablissement->getLibelle()}.</strong>");
@@ -268,6 +283,7 @@ class EtablissementController extends AbstractController
     * Ajoute le logo associé à une établissement:
     * - modification base de donnée (champ CHEMIN_LOG <- /public/Logos/Etab/LOGO_NAME)
     * - enregistrement du fichier sur le serveur
     *
     * @param string        $cheminLogoUploade chemin vers le fichier temporaire associé au logo
     * @param Etablissement $etablissement
     */
@@ -275,6 +291,7 @@ class EtablissementController extends AbstractController
    {
        if ($cheminLogoUploade === null || $cheminLogoUploade === '') {
            $this->flashMessenger()->addErrorMessage("Fichier logo invalide.");

            return;
        }

@@ -282,29 +299,16 @@ class EtablissementController extends AbstractController
            $structureId = $this->params()->fromRoute("etablissement");
            $etablissement = $this->getEtablissementService()->getRepository()->findByStructureId($structureId);
        }
        $chemin         = EtablissementController::getLogoFilename($etablissement, false);
        $filename       = EtablissementController::getLogoFilename($etablissement, true);
        $result = rename($cheminLogoUploade, $filename);
        if ($result) {

        $logoFilename = $this->fileService->computeLogoFilenameForStructure($etablissement);
        $logoFilepath = $this->fileService->computeLogoPathForStructure($etablissement);

        $ok = rename($cheminLogoUploade, $logoFilepath);
        if ($ok) {
            $this->flashMessenger()->addSuccessMessage("Le logo de l'établissement {$etablissement->getLibelle()} vient d'être ajouté.");
            $this->getEtablissementService()->setLogo($etablissement,$chemin);
            $this->getEtablissementService()->setLogo($etablissement, $logoFilename);
        } else {
            $this->flashMessenger()->addErrorMessage("Erreur lors de l'enregistrement du logo de l'établissement <strong>{$etablissement->getLibelle()}.</strong> ");
        }
    }

    /**
     * Retourne le chemin vers le logo d'une établissement
     * @param Etablissement $etablissement
     * @param bool $fullpath            si true chemin absolue sinon chemin relatif au répertoire de l'application
     * @return string                   le chemin vers le logo de l'établissement $etablissement
     */
    static public function getLogoFilename(Etablissement $etablissement, $fullpath=true)
    {
        $chemin = "";
        if ($fullpath) $chemin .= Structure::PATH;
        if ($etablissement->getStructure()->getCode()) $chemin .= "/ressources/Logos/Etab/".$etablissement->getStructure()->getCode().".png";
        else $chemin .= "/ressources/Logos/Etab/". uniqid().".png";
        return $chemin;
    }
}
 No newline at end of file
+7 −0
Changes for module/Application/src/Application/Controller/Factory/EcoleDoctoraleControllerFactory.php: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ use Application\Controller\EcoleDoctoraleController;
use Application\Form\EcoleDoctoraleForm;
use Application\Service\EcoleDoctorale\EcoleDoctoraleService;
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;
@@ -39,6 +40,11 @@ class EcoleDoctoraleControllerFactory
        $structureService = $sl->get(StructureService::class);
        $roleService = $sl->get('RoleService');

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

        $controller = new EcoleDoctoraleController();
        $controller->setEcoleDoctoraleService($ecoleDoctoralService);
        $controller->setIndividuService($individuService);
@@ -46,6 +52,7 @@ class EcoleDoctoraleControllerFactory
        $controller->setEtablissementService($this->locateEtablissementService($sl));
        $controller->setEcoleDoctoraleForm($form);
        $controller->setStructureService($structureService);
        $controller->setFileService($fileService);

        return $controller;
    }
+13 −4
Changes for module/Application/src/Application/Controller/Factory/EtablissementControllerFactory.php: 13 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ namespace Application\Controller\Factory;
use Application\Controller\EtablissementController;
use Application\Form\EtablissementForm;
use Application\Service\Etablissement\EtablissementService;
use Application\Service\File\FileService;
use Application\Service\Individu\IndividuService;
use Application\Service\Role\RoleService;
use Application\Service\Structure\StructureService;
@@ -20,6 +21,8 @@ class EtablissementControllerFactory
     */
    public function __invoke(ControllerManager $controllerManager)
    {
        $sl = $controllerManager->getServiceLocator();

        /** @var EtablissementForm $form */
        $form = $controllerManager->getServiceLocator()->get('FormElementManager')->get('EtablissementForm');

@@ -29,10 +32,15 @@ class EtablissementControllerFactory
         * @var RoleService $roleService
         * @var StructureService $structureService
         */
        $etablissmentService = $controllerManager->getServiceLocator()->get('EtablissementService');
        $individuService = $controllerManager->getServiceLocator()->get('IndividuService');
        $roleService = $controllerManager->getServiceLocator()->get('RoleService');
        $structureService = $controllerManager->getServiceLocator()->get(StructureService::class);
        $etablissmentService = $sl->get('EtablissementService');
        $individuService = $sl->get('IndividuService');
        $roleService = $sl->get('RoleService');
        $structureService = $sl->get(StructureService::class);

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

        $controller = new EtablissementController();
        $controller->setEtablissementService($etablissmentService);
@@ -40,6 +48,7 @@ class EtablissementControllerFactory
        $controller->setRoleService($roleService);
        $controller->setStructureService($structureService);
        $controller->setEtablissementForm($form);
        $controller->setFileService($fileService);

        return $controller;
    }
Loading