Commit 0fb11d1b authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'fusion-pdc-async'

parents cb10e892 8b375397
Loading
Loading
Loading
Loading
Loading

bin/merge.sh

0 → 100755
+4 −0
Changes for bin/merge.sh: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
#!/usr/bin/env bash

args=$*
php ../public/index.php fichier fusionner ${args}
 No newline at end of file
+16 −0
Changes for module/Application/Module.php: 16 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ namespace Application;
use Application\Event\UserAuthenticatedEventListener;
use Application\Event\UserRoleSelectedEventListener;
use Zend\Config\Factory as ConfigFactory;
use Zend\Console\Adapter\AdapterInterface as Console;
use Zend\Http\Request as HttpRequest;
use Zend\Mvc\ModuleRouteListener;
use Zend\Mvc\MvcEvent;
@@ -78,4 +79,19 @@ class Module
            ],
        ];
    }

    public function getConsoleUsage(Console $console)
    {
        return [
            // Describe available commands
            'fichier fusionner --these= --versionFichier= [--removeFirstPage] [--notifier=]' =>
                'Fusionner la page de couverture générée avec le manuscrit',

            // Describe expected parameters
            ['--these',           "Id de la thèse concernée"],
            ['--versionFichier',  "Version du fichier de thèse à utiliser (ex: 'VA', 'VOC')"],
            ['--removeFirstPage', "(facultatif) Témoin indiquant si la première page doit être retirée avant la fusion"],
            ['--notifier',        "(facultatif) Adresses électroniques auxquelles envoyer un courriel une fois la fusion terminée"],
        ];
    }
}
+38 −0
Changes for module/Application/config/others/fichier.config.php: 38 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -61,6 +61,20 @@ return array(
                    ],
                    'privileges' => ThesePrivileges::THESE_DEPOT_VERSION_CORRIGEE,
                ],
                [
                    'controller' => 'Application\Controller\FichierThese',
                    'action'     => [
                        'fusionnerConsole',
                    ],
                    'roles' => [],
                ],
                [
                    'controller' => 'Application\Controller\FichierThese',
                    'action'     => [
                        'recuperer-fusion',
                    ],
                    'roles' => [],
                ],
            ],
        ],
    ],
@@ -167,6 +181,15 @@ return array(
                                    ],
                                ],
                            ],
                            'recuperer-fusion' => [
                                'type'        => 'Segment',
                                'options'     => [
                                    'route' => '/recuperer-fusion/:outputFile',
                                    'defaults'    => [
                                        'action' => 'recuperer-fusion',
                                    ],
                                ],
                            ],
                        ],
                    ], // 'these'

@@ -185,6 +208,21 @@ return array(

        ),
    ),
    'console' => [
        'router' => [
            'routes' => [
                'fusionner' => [
                    'options' => [
                        'route'    => 'fichier fusionner --these= --versionFichier= [--removeFirstPage] [--notifier=]',
                        'defaults' => [
                            'controller' => 'Application\Controller\FichierThese',
                            'action'     => 'fusionnerConsole',
                        ],
                    ],
                ],
            ],
        ],
    ],
    'navigation'      => [
        'default' => [
            'home' => [
+1 −1
Changes for module/Application/config/others/these.config.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ return [
                    'rdv-bu' => [
                        'type'          => 'Segment',
                        'options'       => [
                            'route'       => '/rdv-bu/:these',
                            'route'       => '/rdv-bu/:these[/:asynchronous]',
                            'constraints' => [
                                'these' => '\d+',
                            ],
+11 −1
Changes for module/Application/src/Application/Command/AbstractCommand.php: 11 added lines, 1 removed line.
Original line number Diff line number Diff line
<?php

namespace Retraitement\Filter\Command;
namespace Application\Command;

use Retraitement\Exception\TimedOutCommandException;
use UnicaenApp\Exception\LogicException;
@@ -105,4 +105,14 @@ abstract class AbstractCommand implements CommandInterface
    {
        return $this->result;
    }

    /**
     * Retourne la ligne de commande générée par generate().
     *
     * @return string
     */
    public function getCommandLine()
    {
        return $this->commandLine;
    }
}
 No newline at end of file
Loading