Commit 74f484b7 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Module + Service + Formulaire

parent ae65e34c
Loading
Loading
Loading
Loading
+1 −0
Changes for config/application.config.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ return [
        'Retraitement',
        'Soutenance',
        'Formation',
        'ComiteSuiviIndividuel',
        'RapportActivite',
        'Notification',
        'Information',
+44 −0
Changes for doc/release-notes/v5.2.6.md: 44 added lines, 0 removed lines.
Original line number Diff line number Diff line
# Version 5.2.6

## 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.2.6 && 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

```sql
-- table de membre du csi
-- /!\ referebce au même qualité que celle décrite dans le module soutenance

create table csi_membre
(
id                    serial                  constraint csi_membre_pkey primary key,
these_id              bigint not null         constraint membre_these_fk references these on delete cascade,
genre                 varchar(1) not null,
qualite               bigint not null         constraint membre_qualite_fk references soutenance_qualite on delete set null,
etablissement         varchar(128) not null,
role_id               varchar(64) not null,
exterieur             varchar(3),
email                 varchar(256),
acteur_id             bigint                   constraint soutemembre_acteur_fk references acteur on delete cascade,
visio                 boolean default false not null,
nom                   varchar(256),
prenom                varchar(256),
histo_creation        timestamp not null,
histo_createur_id     bigint not null          constraint membre_createur_fk references utilisateur,
histo_modification    timestamp not null,
histo_modificateur_id bigint not null          constraint membre_modificateur_fk references utilisateur,
histo_destruction     timestamp,
histo_destructeur_id  bigint                   constraint membre_destructeur_fk references utilisateur,
);
```
 No newline at end of file
+6 −0
Changes for module/Application/src/Application/Controller/Factory/Rapport/RapportCsiControllerFactory.php: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ use Application\Entity\Db\TypeRapport;
use Application\Entity\Db\TypeValidation;
use Application\Form\Rapport\RapportForm;
use Application\Form\RapportCsiForm;
use ComiteSuiviIndividuel\Service\Membre\MembreService;
use Fichier\Service\Fichier\FichierService;
use Individu\Service\IndividuService;
use Application\Service\Notification\NotifierService;
@@ -36,6 +37,8 @@ class RapportCsiControllerFactory
         * @var IndividuService       $individuService
         * @var ValidationService     $validationService
         * @var RapportForm           $rapportForm
         *
         * @var MembreService $membreService
         */
        $theseService = $container->get('TheseService');
        $fichierService = $container->get(FichierService::class);
@@ -49,6 +52,8 @@ class RapportCsiControllerFactory
        $typeRapport = $rapportService->findTypeRapportByCode(TypeRapport::RAPPORT_CSI);
        $typeValidation = $validationService->findTypeValidationByCode(TypeValidation::CODE_RAPPORT_CSI);

        $membreService = $container->get(MembreService::class);

        $controller = new RapportCsiController();
        $controller->setTheseService($theseService);
        $controller->setRapportService($rapportService);
@@ -61,6 +66,7 @@ class RapportCsiControllerFactory
        $controller->setAnneesUnivs($theseAnneeUnivService);
        $controller->setTypeRapport($typeRapport);
        $controller->setTypeValidation($typeValidation);
        $controller->setMembreService($membreService);

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

+1 −0
Changes for module/Application/src/Application/Controller/Rapport/RapportController.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ use Application\EventRouterReplacerAwareTrait;
use Application\Filter\IdifyFilter;
use Application\Filter\IdifyFilterAwareTrait;
use Application\Form\Rapport\RapportForm;
use ComiteSuiviIndividuel\Service\Membre\MembreServiceAwareTrait;
use Fichier\Service\Fichier\FichierServiceAwareTrait;
use Fichier\Service\Fichier\FichierStorageServiceAwareTrait;
use Individu\Service\IndividuServiceAwareTrait;
+50 −0
Changes for module/Application/src/Application/Controller/Rapport/RapportCsiController.php: 50 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -3,9 +3,15 @@
namespace Application\Controller\Rapport;

use Application\Provider\Privilege\RapportPrivileges;
use ComiteSuiviIndividuel\Service\Membre\MembreServiceAwareTrait;
use Laminas\Http\Response;
use Laminas\View\Model\ViewModel;

class RapportCsiController extends RapportController
{
    use MembreServiceAwareTrait;


    protected $routeName = 'rapport-csi';

    protected $privilege_TELEVERSER_TOUT = RapportPrivileges::RAPPORT_CSI_TELEVERSER_TOUT;
@@ -18,4 +24,48 @@ class RapportCsiController extends RapportController
//    protected $privilege_VALIDER_SIEN = RapportPrivileges::RAPPORT_CSI_VALIDER_SIEN;
//    protected $privilege_DEVALIDER_TOUT = RapportPrivileges::RAPPORT_CSI_DEVALIDER_TOUT;
//    protected $privilege_DEVALIDER_SIEN = RapportPrivileges::RAPPORT_CSI_DEVALIDER_SIEN;

    /**
     * @return Response|ViewModel
     */
    public function consulterAction()
    {
        $this->these = $this->requestedThese();
        $this->fetchRapportsTeleverses();

        $membres = $this->getMembreService()->getMembresByThese($this->these);

        // gestion d'une éventuelle requête POST d'ajout d'un rapport
        $result = $this->ajouterAction();
        if ($result instanceof Response) {
            return $result;
        }

        return new ViewModel([
            'rapports' => $this->rapportsTeleverses,
            'these' => $this->these,
            'form' => $this->form,
            'isTeleversementPossible' => $this->isTeleversementPossible(),
            'membres' => $membres,

            'typeValidation' => $this->typeValidation,
            'routeName' => $this->routeName,
            'privilege_LISTER_TOUT' => $this->privilege_LISTER_TOUT,
            'privilege_LISTER_SIEN' => $this->privilege_LISTER_SIEN,
            'privilege_TELEVERSER_TOUT' => $this->privilege_TELEVERSER_TOUT,
            'privilege_TELEVERSER_SIEN' => $this->privilege_TELEVERSER_SIEN,
            'privilege_SUPPRIMER_TOUT' => $this->privilege_SUPPRIMER_TOUT,
            'privilege_SUPPRIMER_SIEN' => $this->privilege_SUPPRIMER_SIEN,
            'privilege_RECHERCHER_TOUT' => $this->privilege_RECHERCHER_TOUT,
            'privilege_RECHERCHER_SIEN' => $this->privilege_RECHERCHER_SIEN,
            'privilege_TELECHARGER_TOUT' => $this->privilege_TELECHARGER_TOUT,
            'privilege_TELECHARGER_SIEN' => $this->privilege_TELECHARGER_SIEN,
            'privilege_TELECHARGER_ZIP' => $this->privilege_TELECHARGER_ZIP,
            'privilege_VALIDER_TOUT' => $this->privilege_VALIDER_TOUT,
            'privilege_VALIDER_SIEN' => $this->privilege_VALIDER_SIEN,
            'privilege_DEVALIDER_TOUT' => $this->privilege_DEVALIDER_TOUT,
            'privilege_DEVALIDER_SIEN' => $this->privilege_DEVALIDER_SIEN,
        ]);
    }

}
Loading