Commit 646c8a70 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'release_5.1.1'

parents 815ad284 1c8c9f54
Loading
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
Journal des modifications
=========================

5.1.1
-----
- [FIX] Corrections suite à l'intégration du nouveau module Fichier.
- [FIX] Suppression à tort des "attestations" du 1er dépôt à la place de celles du 2nd dépôt.
- [FIX] Suppression physique de l'ancien fichier lors du changement de logo d'une structure.
- [FIX] Correction et amélioration du calcul du nom de fichier du logo (existant ou nouveau) d'une structure.
- Template de pagination : abandon du module/Application/view/paginator.phtml et généralisation du module/Application/view/application/paginator.phtml
- Suppression des injections inutiles de SourceCodeStringHelperAwareTrait.

5.1.0
-----
- Nouveau module "technique" Fichier proposant 2 modes de stockage des fichiers téléversés : Filesystem ou S3 
+19 −0
Original line number Diff line number Diff line
# Version 5.1.1

## 1. Sur le serveur d'application

- Placez-vous dans le répertoire de l'application puis lancez la commande suivante
  pour installer la nouvelle version :

```bash
git fetch --tags && git checkout --force 5.1.1 && bash ./install.sh
```

- Selon le moteur PHP que vous avez installé, rechargez le service, exemple :
    - php7.4-fpm         : `service php7.4-fpm reload`
    - apache2-mod-php7.4 : `service apache2 reload`


## 2. Dans la base de données

Néant
+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ use Laminas\Permissions\Acl\Resource\ResourceInterface;
 * Class RapportAssertion
 *
 * @property \Application\Assertion\Rapport\RapportEntityAssertion $entityAssertion
 * @property \Application\Assertion\Rapport\RapportActivite\RapportActiviteControllerAssertion $controllerAssertion
 * @property \Application\Assertion\Rapport\RapportActivite\RapportActivitePageAssertion $pageAssertion
 */
class RapportAssertion extends BaseAssertion
{
+0 −1
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ class CoEncadrantController extends AbstractActionController {
        $theses = $this->getTheseService()->getRepository()->fetchThesesByCoEncadrant($coencadrant->getIndividu());

        $logos = [];
//        $logos['etablissement'] = $this->fileService->computeLogoFilePathForStructure($coencadrant->getEtablissement());
        try {
            $logos['etablissement'] = $this->fichierStorageService->getFileForLogoStructure($coencadrant->getEtablissement());
        } catch (StorageAdapterException $e) {
+0 −76
Original line number Diff line number Diff line
<?php

namespace Application\Controller\Factory\Rapport;

use Application\Controller\Rapport\RapportActiviteController;
use Application\Entity\Db\TypeRapport;
use Application\Entity\Db\TypeValidation;
use Application\Form\Rapport\RapportForm;
use Application\Form\RapportActiviteForm;
use Application\Service\Fichier\FichierService;
use Application\Service\File\FileService;
use Individu\Service\IndividuService;
use Application\Service\Notification\NotifierService;
use Application\Service\Rapport\RapportService;
use Application\Service\These\TheseService;
use Application\Service\TheseAnneeUniv\TheseAnneeUnivService;
use Application\Service\Validation\ValidationService;
use Application\Service\VersionFichier\VersionFichierService;
use Interop\Container\ContainerInterface;

class RapportActiviteControllerFactory
{
    /**
     * Create service
     *
     * @param ContainerInterface $container
     * @return RapportActiviteController
     */
    public function __invoke(ContainerInterface $container): RapportActiviteController
    {
        /**
         * @var TheseService          $theseService
         * @var FileService           $fileService
         * @var FichierService        $fichierService
         * @var RapportService        $rapportService
         * @var VersionFichierService $versionFichierService
         * @var NotifierService       $notificationService
         * @var IndividuService       $individuService
         * @var ValidationService     $validationService
         * @var RapportForm           $rapportForm
         */
        $theseService = $container->get('TheseService');
        $fileService = $container->get(FileService::class);
        $fichierService = $container->get(FichierService::class);
        $rapportService = $container->get(RapportService::class);
        $versionFichierService = $container->get('VersionFichierService');
        $notificationService = $container->get(NotifierService::class);
        $individuService = $container->get(IndividuService::class);
        $rapportForm = $container->get('FormElementManager')->get(RapportActiviteForm::class);
        $validationService = $container->get(ValidationService::class);
        $theseAnneeUnivService = $container->get(TheseAnneeUnivService::class);
        $typeRapport = $rapportService->findTypeRapportByCode(TypeRapport::RAPPORT_ACTIVITE);
        $typeValidation = $validationService->findTypeValidationByCode(TypeValidation::CODE_RAPPORT_ACTIVITE);

        $controller = new RapportActiviteController();
        $controller->setTheseService($theseService);
        $controller->setRapportService($rapportService);
        $controller->setFileService($fileService);
        $controller->setFichierService($fichierService);
        $controller->setVersionFichierService($versionFichierService);
        $controller->setNotifierService($notificationService);
        $controller->setIndividuService($individuService);
        $controller->setForm($rapportForm);
        $controller->setValidationService($validationService);
        $controller->setTheseAnneeUnivService($theseAnneeUnivService);
        $controller->setTypeRapport($typeRapport);
        $controller->setTypeValidation($typeValidation);

        $theseService->attach($controller->getEventManager());

        return $controller;
    }
}


Loading