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

Partie interface des contenus

parent bd511be7
Loading
Loading
Loading
Loading
+71 −65
Changes for module/UnicaenDocument/config/merged/contenu.config.php: 71 added lines, 65 removed lines.
Original line number Diff line number Diff line
@@ -2,11 +2,16 @@

use UnicaenDocument\Controller\ContenuController;
use UnicaenDocument\Controller\ContenuControllerFactory;
use UnicaenDocument\Form\Contenu\ContenuForm;
use UnicaenDocument\Form\Contenu\ContenuFormFactory;
use UnicaenDocument\Form\Contenu\ContenuHydrator;
use UnicaenDocument\Form\Contenu\ContenuHydratorFactory;
use UnicaenDocument\Provider\Privilege\DocumentcontentPrivileges;
use UnicaenDocument\Service\Contenu\ContenuService;
use UnicaenDocument\Service\Contenu\ContenuServiceFactory;
use UnicaenPrivilege\Guard\PrivilegeController;
use Zend\Router\Http\Literal;
use Zend\Router\Http\Segment;

return [
    'bjyauthorize' => [
@@ -16,6 +21,7 @@ return [
                    'controller' => ContenuController::class,
                    'action' => [
                        'index',
                        'afficher',
                    ],
                    'privileges' => [
                        DocumentcontentPrivileges::DOCUMENTCONTENU_INDEX,
@@ -98,69 +104,69 @@ return [
                                'action' => 'index',
                            ],
                        ],
//                        'may_terminate' => true,
//                        'child_routes' => [
//                            'generer-json' => [
//                                'type' => Literal::class,
//                                'options' => [
//                                    'route' => '/generer-json',
//                                    'defaults' => [
//                                        'controller' => MacroController::class,
//                                        'action' => 'generer-json',
//                                    ],
//                                ],
//                            ],
//                            'ajouter' => [
//                                'type' => Literal::class,
//                                'options' => [
//                                    'route' => '/ajouter',
//                                    'defaults' => [
//                                        'controller' => MacroController::class,
//                                        'action' => 'ajouter',
//                                    ],
//                                ],
//                            ],
//                            'modifier' => [
//                                'type' => Segment::class,
//                                'options' => [
//                                    'route' => '/modifier/:macro',
//                                    'defaults' => [
//                                        'controller' => MacroController::class,
//                                        'action' => 'modifier',
//                                    ],
//                                ],
//                            ],
//                            'historiser' => [
//                                'type' => Segment::class,
//                                'options' => [
//                                    'route' => '/historiser/:macro',
//                                    'defaults' => [
//                                        'controller' => MacroController::class,
//                                        'action' => 'historiser',
//                                    ],
//                                ],
//                            ],
//                            'restaurer' => [
//                                'type' => Segment::class,
//                                'options' => [
//                                    'route' => '/restaurer/:macro',
//                                    'defaults' => [
//                                        'controller' => MacroController::class,
//                                        'action' => 'restaurer',
//                                    ],
//                                ],
//                            ],
//                            'supprimer' => [
//                                'type' => Segment::class,
//                                'options' => [
//                                    'route' => '/supprimer/:macro',
//                                    'defaults' => [
//                                        'controller' => MacroController::class,
//                                        'action' => 'supprimer',
//                                    ],
//                                ],
//                            ],
//                        ],
                        'may_terminate' => true,
                        'child_routes' => [
                            'afficher' => [
                                'type' => Segment::class,
                                'options' => [
                                    'route' => '/afficher/:contenu',
                                    'defaults' => [
                                        'controller' => ContenuController::class,
                                        'action' => 'afficher',
                                    ],
                                ],
                            ],
                            'ajouter' => [
                                'type' => Literal::class,
                                'options' => [
                                    'route' => '/ajouter',
                                    'defaults' => [
                                        'controller' => ContenuController::class,
                                        'action' => 'ajouter',
                                    ],
                                ],
                            ],
                            'modifier' => [
                                'type' => Segment::class,
                                'options' => [
                                    'route' => '/modifier/:contenu',
                                    'defaults' => [
                                        'controller' => ContenuController::class,
                                        'action' => 'modifier',
                                    ],
                                ],
                            ],
                            'restaurer' => [
                                'type' => Segment::class,
                                'options' => [
                                    'route' => '/restaurer/:contenu',
                                    'defaults' => [
                                        'controller' => ContenuController::class,
                                        'action' => 'restaurer',
                                    ],
                                ],
                            ],
                            'historiser' => [
                                'type' => Segment::class,
                                'options' => [
                                    'route' => '/historiser/:contenu',
                                    'defaults' => [
                                        'controller' => ContenuController::class,
                                        'action' => 'historiser',
                                    ],
                                ],
                            ],
                            'detruire' => [
                                'type' => Segment::class,
                                'options' => [
                                    'route' => '/detruire/:contenu',
                                    'defaults' => [
                                        'controller' => ContenuController::class,
                                        'action' => 'detruire',
                                    ],
                                ],
                            ],
                        ],
                    ],
                ],
            ],
@@ -174,12 +180,12 @@ return [
    ],
    'form_elements' => [
        'factories' => [
//            MacroForm::class => MacroFormFactory::class,
            ContenuForm::class => ContenuFormFactory::class,
        ],
    ],
    'hydrators' => [
        'factories' => [
//            MacroHydrator::class => MacroHydratorFactory::class,
            ContenuHydrator::class => ContenuHydratorFactory::class,
        ],
    ],
    'controllers'     => [
+114 −1
Changes for module/UnicaenDocument/src/UnicaenDocument/Controller/ContenuController.php: 114 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -2,13 +2,126 @@

namespace UnicaenDocument\Controller;

use UnicaenDocument\Entity\Db\Content;
use UnicaenDocument\Form\Contenu\ContenuFormAwareTrait;
use UnicaenDocument\Service\Contenu\ContenuServiceAwareTrait;
use UnicaenDocument\Service\Macro\MacroServiceAwareTrait;
use Zend\Http\Request;
use Zend\Mvc\Controller\AbstractActionController;
use Zend\View\Model\ViewModel;

class ContenuController extends AbstractActionController {
    use ContenuServiceAwareTrait;
    use MacroServiceAwareTrait;
    use ContenuFormAwareTrait;

    public function indexAction()
    {
        return new ViewModel();
        $contenus = $this->getContenuService()->getContenus();

        return new ViewModel([
            'contenus' => $contenus,
        ]);
    }

    public function afficherAction()
    {
        $contenu = $this->getContenuService()->getRequestedContenu($this);

        return new ViewModel([
            'title' => "Affichage du contenu",
            'contenu' => $contenu,
        ]);
    }

    public function ajouterAction()
    {
        $contenu = new Content();

        $form = $this->getContenuForm();
        $form->setAttribute('action', $this->url()->fromRoute('contenu/contenu/ajouter', [], [], true));
        $form->bind($contenu);

        $request = $this->getRequest();
        if ($request->isPost()) {
            $data = $request->getPost();
            $form->setData($data);
            if ($form->isValid()) {
                $this->getContenuService()->create($contenu);
            }
        }

        $vm = new ViewModel();
        $vm->setTemplate('unicaen-document/contenu/modifier');
        $vm->setVariables([
            'title' => "Création d'un contenu",
            'form' => $form,
        ]);
        return $vm;
    }

    public function modifierAction()
    {
        $contenu = $this->getContenuService()->getRequestedContenu($this);

        $form = $this->getContenuForm();
        $form->setAttribute('action', $this->url()->fromRoute('contenu/contenu/modifier', ['contenu' => $contenu->getId()], [], true));
        $form->bind($contenu);

        $request = $this->getRequest();
        if ($request->isPost()) {
            $data = $request->getPost();
            $form->setData($data);
            if ($form->isValid()) {
                $this->getContenuService()->update($contenu);
            }
        }

        return new ViewModel([
            'title' => "Modification d'un contenu",
            'form' => $form,
        ]);
    }

    public function historiserAction()
    {
        $contenu = $this->getContenuService()->getRequestedContenu($this);
        $this->getContenuService()->historise($contenu);

        return $this->redirect()->toRoute('contenu/contenu', [], [], true);
    }

    public function restaurerAction()
    {
        $contenu = $this->getContenuService()->getRequestedContenu($this);
        $this->getContenuService()->restore($contenu);

        return $this->redirect()->toRoute('contenu/contenu', [], [], true);
    }

    public function detruireAction()
    {
        $contenu = $this->getContenuService()->getRequestedContenu($this);

        /** @var Request $request */
        $request = $this->getRequest();
        if ($request->isPost()) {
            $data = $request->getPost();
            if ($data["reponse"] === "oui") {
                $this->getContenuService()->delete($contenu);
            }
            exit();
        }

        $vm = new ViewModel();
        if ($contenu !== null) {
            $vm->setTemplate('application/default/confirmation');
            $vm->setVariables([
                'title' => "Suppression du contenu [" . $contenu->getCode() . "]",
                'text' => "La suppression est définitive êtes-vous sûr·e de vouloir continuer ?",
                'action' => $this->url()->fromRoute('contenu/detruire', ["contenu" => $contenu->getId()], [], true),
            ]);
        }
        return $vm;
    }
}
 No newline at end of file
+14 −0
Changes for module/UnicaenDocument/src/UnicaenDocument/Controller/ContenuControllerFactory.php: 14 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@
namespace UnicaenDocument\Controller;

use Interop\Container\ContainerInterface;
use UnicaenDocument\Form\Contenu\ContenuForm;
use UnicaenDocument\Service\Contenu\ContenuService;

class ContenuControllerFactory {

@@ -12,7 +14,19 @@ class ContenuControllerFactory {
     */
    public function __invoke(ContainerInterface $container)
    {
        /**
         * @var ContenuService $contenuService
         */
        $contenuService = $container->get(ContenuService::class);

        /**
         * @var ContenuForm $contentForm
         */
        $contentForm = $container->get('FormElementManager')->get(ContenuForm::class);

        $controller = new ContenuController();
        $controller->setContenuService($contenuService);
        $controller->setContenuForm($contentForm);
        return $controller;
    }
}
 No newline at end of file
+12 −12
Changes for module/UnicaenDocument/src/UnicaenDocument/Entity/Db/Content.php: 12 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ class Content implements HistoriqueAwareInterface {
    /**
     * @return int
     */
    public function getId(): int
    public function getId()
    {
        return $this->id;
    }
@@ -36,7 +36,7 @@ class Content implements HistoriqueAwareInterface {
     * @param int $id
     * @return Content
     */
    public function setId(int $id): Content
    public function setId(int $id)
    {
        $this->id = $id;
        return $this;
@@ -45,7 +45,7 @@ class Content implements HistoriqueAwareInterface {
    /**
     * @return string
     */
    public function getCode(): string
    public function getCode()
    {
        return $this->code;
    }
@@ -54,7 +54,7 @@ class Content implements HistoriqueAwareInterface {
     * @param string $code
     * @return Content
     */
    public function setCode(string $code): Content
    public function setCode(string $code)
    {
        $this->code = $code;
        return $this;
@@ -63,7 +63,7 @@ class Content implements HistoriqueAwareInterface {
    /**
     * @return string
     */
    public function getDescription(): string
    public function getDescription()
    {
        return $this->description;
    }
@@ -72,7 +72,7 @@ class Content implements HistoriqueAwareInterface {
     * @param string $description
     * @return Content
     */
    public function setDescription(string $description): Content
    public function setDescription(string $description)
    {
        $this->description = $description;
        return $this;
@@ -81,7 +81,7 @@ class Content implements HistoriqueAwareInterface {
    /**
     * @return string
     */
    public function getType(): string
    public function getType()
    {
        return $this->type;
    }
@@ -90,7 +90,7 @@ class Content implements HistoriqueAwareInterface {
     * @param string $type
     * @return Content
     */
    public function setType(string $type): Content
    public function setType(string $type)
    {
        $this->type = $type;
        return $this;
@@ -99,7 +99,7 @@ class Content implements HistoriqueAwareInterface {
    /**
     * @return string
     */
    public function getComplement(): string
    public function getComplement()
    {
        return $this->complement;
    }
@@ -108,7 +108,7 @@ class Content implements HistoriqueAwareInterface {
     * @param string $complement
     * @return Content
     */
    public function setComplement(string $complement): Content
    public function setComplement(string $complement)
    {
        $this->complement = $complement;
        return $this;
@@ -117,7 +117,7 @@ class Content implements HistoriqueAwareInterface {
    /**
     * @return string
     */
    public function getContent(): string
    public function getContent()
    {
        return $this->content;
    }
@@ -126,7 +126,7 @@ class Content implements HistoriqueAwareInterface {
     * @param string $content
     * @return Content
     */
    public function setContent(string $content): Content
    public function setContent(string $content)
    {
        $this->content = $content;
        return $this;
+1 −1
Changes for module/UnicaenDocument/src/UnicaenDocument/Entity/Db/Mapping/UnicaenDocument.Entity.Db.Content.dcm.xml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@
        <field name="description"       column="description"            type="string"    length="4096"    nullable="false" />
        <field name="type"              column="document_type"          type="string"    length="256"     nullable="false" />
        <field name="complement"        column="document_complement"    type="string"    length="4096"    nullable="false" />
        <field name="content"           column="docuement_content"      type="string"    length="4096"    nullable="false" />
        <field name="content"           column="document_content"      type="string"    length="4096"    nullable="false" />

        <!-- HISTORISATION ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
        <field name="histoCreation"     type="datetime"                 column="histo_creation"     nullable="false"/>
Loading