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

Merge branch 'fix-notif-bug'

parents d77b3c3f 60224f01
Loading
Loading
Loading
Loading
+3 −0
Changes for module/Application/src/Application/Controller/TheseController.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ use UnicaenApp\Traits\MessageAwareInterface;
use UnicaenApp\Util;
use Zend\Form\Element\Hidden;
use Zend\Http\Response;
use Zend\Log\Logger;
use Zend\Log\Writer\Noop;
use Zend\Stdlib\ParametersInterface;
use Zend\View\Model\ViewModel;

@@ -267,6 +269,7 @@ class TheseController extends AbstractController
    {
        $these = $this->requestedThese();

        $this->importService->setLogger((new Logger())->addWriter(new Noop()));
        $this->importService->updateThese($these);

        $redirect = $this->params()->fromQuery('redirect', '/');
+10 −0
Changes for module/Application/src/Application/Service/Notification/NotifierService.php: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ class NotifierService extends \Notification\Service\NotifierService
     * Notification du BDD concernant l'évolution des résultats de thèses.
     *
     * @param array $data
     * @return ResultatTheseModifieNotification
     */
    public function triggerBdDUpdateResultat(array $data)
    {
@@ -76,15 +77,20 @@ class NotifierService extends \Notification\Service\NotifierService
        $notif->setEmailBdd($emailBdd);

        $this->trigger($notif);

        return $notif;
    }

    /**
     * Notification des doctorants dont le résultat de la thèse est passé à Admis.
     *
     * @param array $data
     * @return ResultatTheseAdmisNotification[]
     */
    public function triggerDoctorantResultatAdmis(array $data)
    {
        $notifs = [];

        foreach ($data as $array) {
            $these = $array['these'];
            /* @var These $these */
@@ -96,7 +102,11 @@ class NotifierService extends \Notification\Service\NotifierService
            $notif->setEmailBdd($emailBdd);

            $this->trigger($notif);

            $notifs[] = $notif;
        }

        return $notifs;
    }

    /**
+3 −3
Changes for module/Application/tests/ApplicationUnitTest/Service/ImportObservResultService/NotifCorrectionAttendueTest.php: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ use Application\Entity\Db\ImportObservResult;
use Application\Entity\Db\Repository\ImportObservResultRepository;
use Application\Entity\Db\These;
use Application\Rule\NotificationDepotVersionCorrigeeAttenduRule;
use Application\Service\ImportObservResult\ImportObservResultService;
use Import\Service\ImportObservResult\ImportObservResultService;
use Application\Service\Notification\NotifierService;
use Application\Service\These\TheseService;
use ApplicationUnitTest\Test\Asset\EntityAsset;
@@ -19,7 +19,7 @@ class NotifCorrectionAttendueTest extends \PHPUnit_Framework_TestCase
    use MockProviderAwareTrait;

    /**
     * @var ImportObservResultService
     * @var \Import\Service\ImportObservResult\ImportObservResultService
     */
    protected $service;

@@ -198,7 +198,7 @@ class NotifCorrectionAttendueTest extends \PHPUnit_Framework_TestCase

    /**
     * @param ImportObservResult $record
     * @return ImportObservResultService
     * @return \Import\Service\ImportObservResult\ImportObservResultService
     */
    protected function _init_test_pour_correction_attendue(ImportObservResult $record)
    {
+7 −5
Changes for module/Import/Module.php: 7 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ class Module

    public function getConfig()
    {
        $paths = array_merge(
            [__DIR__ . '/config/module.config.php']
        );
        return ConfigFactory::fromFiles($paths);
        return ConfigFactory::fromFiles([
            __DIR__ . '/config/synchro.config.php',
            __DIR__ . '/config/import.config.php',
        ]);
    }

    public function getAutoloaderConfig()
@@ -48,8 +48,10 @@ class Module
            // command
            'import-all --etablissement=' => "Importer toutes les données de tous les serviceq d'un établissement.",
            // parameters
            // parameters
            ['--etablissement', "Requis. Identifiant de l'établissement, ex: 'UCN'"],

            // command
            'process-observed-import-results' => "Traitement des résultats d'observation de certains changements durant la synchro.",
        ];
    }
}
+26 −6
Changes for module/Import/config/import.config.php: 26 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ use Zend\Mvc\Router\Console\Simple;
use Zend\Mvc\Router\Http\Literal;
use Zend\Mvc\Router\Http\Segment;

return array(
return [
    'bjyauthorize'    => [
        'guards' => [
            \UnicaenAuth\Guard\PrivilegeController::class => [
@@ -176,6 +176,26 @@ return array(
            ],
        ],
    ],
    'navigation' => [
        'default' => [
            'home' => [
                'pages' => [
                    'ws' => [
                        'label' => "Import",
                        'order' => 0,
                        'route'    => 'home-import',
                        'pages' => [
                            'problems'               => [
                                'label' => "Lancement",
                                'route' => 'home-import',
                                'resource'    => \UnicaenAuth\Guard\PrivilegeController::getResourceId('Import\Controller\Import', 'index'),
                            ],
                        ],
                    ],
                ],
            ],
        ],
    ],
    'service_manager' => [
        'invokables' => [
            CallService::class => CallService::class,
@@ -199,9 +219,9 @@ return array(
            Import\Controller\ImportController::class => Import\Controller\Factory\ImportControllerFactory::class,
        ],
    ],
    'view_manager' => array(
        'template_path_stack' => array(
    'view_manager' => [
        'template_path_stack' => [
            __DIR__ . '/../view',
        ),
    ),
);
        ],
    ],
];
Loading