Commit 2d183637 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Possibilité de filtrer la liste des imports/synchros par nom

parent dc39cd6b
Loading
Loading
Loading
Loading
+14 −2
Changes for src/UnicaenDbImport/Controller/ImportController.php: 14 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@

namespace UnicaenDbImport\Controller;

use Laminas\Http\PhpEnvironment\Response;
use Laminas\Mvc\Controller\AbstractActionController;
use Laminas\View\Model\JsonModel;
use UnicaenDbImport\Domain\ImportInterface;
@@ -12,6 +13,7 @@ use UnicaenDbImport\Service\Traits\ImportServiceAwareTrait;

/**
 * @method \Laminas\Mvc\Plugin\FlashMessenger\FlashMessenger flashMessenger()
 * @method \Laminas\Mvc\Plugin\Prg\PostRedirectGet prg($redirect = null, $redirectToUrl = false)
 */
class ImportController extends AbstractActionController
{
@@ -21,11 +23,20 @@ class ImportController extends AbstractActionController
    /**
     * Listage des imports.
     *
     * @return array
     * @return array|\Laminas\Http\PhpEnvironment\Response
     */
    public function indexAction(): array
    public function indexAction()
    {
        $prg = $this->prg(null, true);
        if ($prg instanceof Response) {
            return $prg;
        }

        if ($text = $this->params()->fromQuery('text')) {
            $imports = $this->importService->getImportsFilteredBy(['text' => $text]);
        } else {
            $imports = $this->importService->getImports();
        }

        $importLogs = [];
        foreach ($imports as $import) {
@@ -36,6 +47,7 @@ class ImportController extends AbstractActionController
        return [
            'imports' => $imports,
            'importLogs' => $importLogs,
            'text' => $text,
        ];
    }

+14 −2
Changes for src/UnicaenDbImport/Controller/SynchroController.php: 14 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@

namespace UnicaenDbImport\Controller;

use Laminas\Http\PhpEnvironment\Response;
use Laminas\Mvc\Controller\AbstractActionController;
use Laminas\View\Model\JsonModel;
use UnicaenDbImport\Domain\Result;
@@ -12,6 +13,7 @@ use UnicaenDbImport\Service\Traits\SynchroServiceAwareTrait;

/**
 * @method \Laminas\Mvc\Plugin\FlashMessenger\FlashMessenger flashMessenger()
 * @method \Laminas\Mvc\Plugin\Prg\PostRedirectGet prg($redirect = null, $redirectToUrl = false)
 */
class SynchroController extends AbstractActionController
{
@@ -21,11 +23,20 @@ class SynchroController extends AbstractActionController
    /**
     * Listage des synchros.
     *
     * @return array
     * @return array|\Laminas\Http\PhpEnvironment\Response
     */
    public function indexAction(): array
    public function indexAction()
    {
        $prg = $this->prg(null, true);
        if ($prg instanceof Response) {
            return $prg;
        }

        if ($text = $this->params()->fromQuery('text')) {
            $synchros = $this->synchroService->getSynchrosFilteredBy(['text' => $text]);
        } else {
            $synchros = $this->synchroService->getSynchros();
        }

        $importLogs = $diffCounts = [];
        foreach ($synchros as $synchro) {
@@ -38,6 +49,7 @@ class SynchroController extends AbstractActionController
            'synchros' => $synchros,
            'importLogs' => $importLogs,
            'diffCounts' => $diffCounts,
            'text' => $text,
        ];
    }

+1 −8
Changes for src/UnicaenDbImport/Domain/ImportInterface.php: 1 added line, 8 removed lines.
Original line number Diff line number Diff line
@@ -2,15 +2,8 @@

namespace UnicaenDbImport\Domain;

interface ImportInterface
interface ImportInterface extends NameAwareInterface
{
    /**
     * Retourne le petit nom de cet import.
     *
     * @return string
     */
    public function getName(): string;

    /**
     * Retourne l'instance de la source de cet import.
     *
+13 −0
Changes for src/UnicaenDbImport/Domain/NameAwareInterface.php: 13 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace UnicaenDbImport\Domain;

interface NameAwareInterface
{
    /**
     * Retourne le petit nom de cette instance.
     *
     * @return string
     */
    public function getName(): string;
}
 No newline at end of file
+1 −8
Changes for src/UnicaenDbImport/Domain/SynchroInterface.php: 1 added line, 8 removed lines.
Original line number Diff line number Diff line
@@ -2,15 +2,8 @@

namespace UnicaenDbImport\Domain;

interface SynchroInterface extends ImportInterface
interface SynchroInterface extends NameAwareInterface
{
    /**
     * Retourne le petit nom de cette synchro.
     *
     * @return string
     */
    public function getName(): string;

    /**
     * Retourne l'instance de la source de cette synchro.
     *
Loading