Commit 77dba320 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Extraction d'un module Rule.

parent 8448e309

composer.json

+1 −0
Changes for composer.json: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ 
            "Notification\\": "module/Notification/src",

            "RapportActivite\\": "module/RapportActivite/src",

            "Retraitement\\": "module/Retraitement/src",

            "Rule\\": "module/Rule/src",

            "Soutenance\\": "module/Soutenance/src",

            "StepStar\\": "module/StepStar/src",

            "Structure\\": "module/Structure/src",

config/application.config.php

+1 −0
Changes for config/application.config.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ return [ 
        'ComiteSuiviIndividuel',

        'RapportActivite',

        'Notification',

        'Rule',

        'Information',

        'Doctorant',

        'StepStar',

module/Acteur/src/Acteur/Rule/ActeurRuleInterface.php

+1 −1
Changes for module/Acteur/src/Acteur/Rule/ActeurRuleInterface.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ namespace Acteur\Rule; 


use Acteur\Entity\Db\ActeurHDR;

use Acteur\Entity\Db\ActeurThese;

use Application\Rule\RuleInterface;

use Laminas\Form\Fieldset;

use Rule\RuleInterface;



interface ActeurRuleInterface extends RuleInterface

{

module/Admission/src/Admission/Rule/Operation/Notification/OperationAttendueNotificationRule.php

+5 −7
Changes for module/Admission/src/Admission/Rule/Operation/Notification/OperationAttendueNotificationRule.php: 5 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


namespace Admission\Rule\Operation\Notification;



use Acteur\Service\ActeurThese\ActeurTheseServiceAwareTrait;

use Admission\Entity\Db\AdmissionOperationInterface;

use Admission\Notification\AdmissionOperationAttenduNotification;

use Admission\Rule\Email\ExtractionEmailRuleAwareTrait;

use Admission\Rule\Operation\AdmissionOperationRuleAwareTrait;

use Application\Rule\RuleInterface;

use Application\Service\Role\ApplicationRoleServiceAwareTrait;

use Acteur\Service\ActeurThese\ActeurTheseServiceAwareTrait;

use Rule\RuleInterface;

use UnicaenApp\Traits\MessageAwareTrait;



/**
@@ -35,7 +35,7 @@ class OperationAttendueNotificationRule implements RuleInterface 
        return $this;

    }



    public function execute(): self

    public function execute(): void

    {

        // On notifie à propos de l'opération suivante attendue, quelle qu'elle soit.
@@ -43,7 +43,7 @@ class OperationAttendueNotificationRule implements RuleInterface 
        if ($operationAttendue === null) {

            // Aucune opération après : bye !

            $this->notificationRequired = false;

            return $this;

            return;

        }



        $operationAttendueConfig = $this->admissionOperationRule->getConfigForOperation($operationAttendue);
@@ -51,14 +51,12 @@ class OperationAttendueNotificationRule implements RuleInterface 
        if ($operationAttendueIsAuto) {

            // L'opération attendue ensuite est "automatique" (sans intervention humaine), personne à notifier : bye !

            $this->notificationRequired = false;

            return $this;

            return;

        }



        $this->operationAttendue = $operationAttendue;



        $this->handleOperationAttendue();



        return $this;

    }



    private function handleOperationAttendue()

module/Application/config/others/rule.config.php

deleted100644 → 0
+0 −14
Changes for module/Application/config/others/rule.config.php: 0 added lines, 14 removed lines.
Original line number Diff line number Diff line 
<?php



namespace Application;



use Application\Rule\PluginManager\RulePluginManager;

use Application\Rule\PluginManager\RulePluginManagerFactory;



return [

    'service_manager' => [

        'factories' => [

            RulePluginManager::class => RulePluginManagerFactory::class,

        ],

    ],

];
 
 No newline at end of file