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

Merge branch 'feature_avis_ed_optional_feature' into release_10.5.0

parents 77dba320 dbe8f0f6

composer.json

+2 −1
Changes for composer.json: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -119,7 +119,8 @@ 
            "ImportTest\\": "module/Import/tests",

            "RetraitementTest\\": "module/Retraitement/test/RetraitementTest",

            "SygalApiImplTest\\": "module/SygalApiImpl/tests/SygalApiImplTest",

            "InscriptionAdministrativeTest\\": "module/InscriptionAdministrative/tests/InscriptionAdministrativeTest"

            "InscriptionAdministrativeTest\\": "module/InscriptionAdministrative/tests/InscriptionAdministrativeTest",

            "FeatureTest\\": "module/Feature/tests/FeatureTest"

        }

    },

    "scripts": {

doc/release-notes/v10/10.5.0/01_soutenance.sql

+8 −0
Changes for doc/release-notes/v10/10.5.0/01_soutenance.sql: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -210,3 +210,11 @@ l''avis suivant vient d''être rendu :</p> 
        null,

        'Soutenance\Provider\Template',

        'twig');





---------------------- Feature ---------------------------



insert into feature(code, libelle)

values ('RequerirAvisEcoleDoctoralePourSoutenanceTheseFeature',

        'Requérir l''avis de la direction de l''ED sur le dossier de proposition de soutenance de thèse');

module/Application/src/Application/View/Renderer/PhpRenderer.php

+3 −0
Changes for module/Application/src/Application/View/Renderer/PhpRenderer.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ use Application\View\Helper\Etat\EtatViewHelper; 
use Depot\View\Helper\Url\UrlDepotHelper;

use Doctorant\Entity\Db\MissionEnseignement;

use Doctorant\View\Helper\MissionEnseignementViewHelper;

use Feature\View\Helper\FeatureViewHelper;

use Fichier\Entity\Db\Fichier;

use Fichier\View\Helper\Fichier\FichierViewHelper;

use Horodatage\Entity\Db\Horodatage;
@@ -186,6 +187,8 @@ use UnicaenIdref\View\Helper\IdrefLinkViewHelper; 
 * @method DernierHorodatageViewHelper dernierHorodatage(HasHorodatagesInterface $element, string $type, ?string $complement = null, array $options = [])

 * @method DerniersHorodatagesViewHelper derniersHorodatages(HasHorodatagesInterface $element, array $types, array $options = [])

 *

 * @method FeatureViewHelper feature()

 *

 * @author UnicaenCode

 */

class PhpRenderer extends \Laminas\View\Renderer\PhpRenderer {

module/Depot/config/others/depot.config.php

+4 −12
Changes for module/Depot/config/others/depot.config.php: 4 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ use Depot\Dispatch\Depot\DispatchServiceFactory as DepotDispatchServiceFactory; 
use Depot\Dispatch\Workflow\DispatchService as WorkflowDispatchService;

use Depot\Dispatch\Workflow\DispatchServiceFactory as WorkflowDispatchServiceFactory;

use Depot\Entity\Db\WfEtape;

use Depot\Feature\Features;

use Depot\Feature\FournirExemplairePapierTheseFeature;

use Depot\Form\Attestation\AttestationHydratorFactory;

use Depot\Form\Attestation\AttestationTheseFormFactory;
@@ -66,18 +65,13 @@ return [ 
     * Fonctionnalités.

     */

    'features' => [

        'factories' => [

            FournirExemplairePapierTheseFeature::class => InvokableFactory::class,

        ],

        'config' => [

            // Feature/fonctionnalité : Déposer un exemplaire papier de la thèse,

            // existante en bdd (table "feature").

            FournirExemplairePapierTheseFeature::class => [], // il s'agit d'un adpater

            // Autre format pour déclarer une feature avec adapter :

            //Features::FournirExemplairePapierTheseFeature => [

            //    // adapter optionnel permettant de mieux identifier la feature

            //    'adapter' => FournirExemplairePapierTheseFeature::class,

            //],

        ],

        'factories' => [

            Features::class => InvokableFactory::class,

        ],

    ],
@@ -110,9 +104,7 @@ return [ 
            'rules' => [

                RemiseExemplairePapierRule::class => [

                    'features' => [

                        Features::class => [

                            // éventuelles options écrasant/complétant les options globales

                        ],



                    ],

                    'options' => [

                        // options de la Rule

module/Depot/src/Depot/Feature/Features.php

deleted100644 → 0
+0 −12
Changes for module/Depot/src/Depot/Feature/Features.php: 0 added lines, 12 removed lines.
Original line number Diff line number Diff line 
<?php



namespace Depot\Feature;



/**

 * Fonctionnalités particulières du module.

 */

interface Features

{

    // Constantes correspondant à une "code" de la table "feature".

    public const FournirExemplairePapierTheseFeature = FournirExemplairePapierTheseFeature::CODE;

}
 
 No newline at end of file