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

Changement gestion des onglet

parent 9c9c9480

src/UnicaenEvenement/Controller/EvenementConsoleController.php

+3 −0
Changes for src/UnicaenEvenement/Controller/EvenementConsoleController.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ class EvenementConsoleController extends AbstractConsoleController 
        if (!$request instanceof ConsoleRequest) {

            throw new \RuntimeException('Cette action doit être appelée depuis une console !');

        }

        if ($this->getJournalService()->isRunning()) {

            throw new \RuntimeException('Un traitement est déjà en cours !');

        }



        $journal = new Journal();

        $journal->setDate(new DateTime());

src/UnicaenEvenement/Controller/EvenementConsoleControllerFactory.php

+5 −1
Changes for src/UnicaenEvenement/Controller/EvenementConsoleControllerFactory.php: 5 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -10,7 +10,11 @@ use UnicaenEvenement\Service\Journal\JournalService; 


class EvenementConsoleControllerFactory {



    public function __invoke(ContainerInterface $container)

    /**

     * @param ContainerInterface $container

     * @return EvenementConsoleController

     */

    public function __invoke(ContainerInterface $container) : EvenementConsoleController

    {

        /**

         * @var EvenementService $evenementService

src/UnicaenEvenement/Service/Journal/JournalService.php

+10 −0
Changes for src/UnicaenEvenement/Service/Journal/JournalService.php: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ use Doctrine\ORM\ORMException; 
use Doctrine\ORM\QueryBuilder;

use UnicaenApp\Exception\RuntimeException;

use UnicaenApp\Service\EntityManagerAwareTrait;

use UnicaenEvenement\Entity\Db\Etat;

use UnicaenEvenement\Entity\Db\Journal;



class JournalService {
@@ -92,4 +93,13 @@ class JournalService { 
        return $result[0];

    }



    /**

     * @return bool

     */

    public function isRunning() : bool

    {

        $last = $this->getDernierJournal();

        return ($last->getEtat()->getCode() === Etat::EN_COURS);

    }



}
 
 No newline at end of file

view/unicaen-evenement/index/index.phtml

+19 −10
Changes for view/unicaen-evenement/index/index.phtml: 19 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -38,12 +38,12 @@ $this->headTitle("Les Évènements"); 
    <ul class="nav nav-tabs" role="tablist">

        <?php if($canVisualiserEvenement): ?>

        <li role="presentation" class="active">

            <a href="#tab-evenement" aria-controls="evenement" role="tab" data-toggle="tab" aria-expanded="true">

            <a href="#tab-evenement" aria-controls="tab-evenement" role="tab" data-toggle="tabz">

                Évènement <span class="badge"><?php echo $countEvents; ?></span>

            </a>

        </li>

            <li role="presentation">

                <a href="#tab-journal" aria-controls="journal" role="tab" data-toggle="tab" aria-expanded="true">

                <a href="#tab-journal" aria-controls="tab-journal" role="tab" data-toggle="tabz">

                    Journaux

                </a>

            </li>
@@ -51,13 +51,17 @@ $this->headTitle("Les Évènements"); 


        <?php if($canVisualiserType): ?>

        <li role="presentation">

            <a href="#tab-type" aria-controls="type" role="tab" data-toggle="tab" aria-expanded="true">Type</a>

            <a href="#tab-type" aria-controls="tab-type" role="tab" data-toggle="tabz">

                Type

            </a>

        </li>

        <?php endif; ?>



        <?php if($canVisualiserEtat): ?>

        <li role="presentation">

            <a href="#tab-etat" aria-controls="etat" role="tab" data-toggle="tab" aria-expanded="true">État</a>

            <a href="#tab-etat" aria-controls="tab-etat" role="tab" data-toggle="tabz">

                État

            </a>

        </li>

        <?php endif; ?>

    </ul>
@@ -72,7 +76,7 @@ $this->headTitle("Les Évènements"); 
                <?php echo $this->partial('liste-evenement', ['events' => $events, 'types' => $types, 'etats' => $etats]); ?>

            </div>

        </div>

        <div role="tabpanel" class="tab-pane fade in active" id="tab-journal">

        <div role="tabpanel" class="tab-pane fade" id="tab-journal">

            <div class="panel panel-default">

                <?php echo $this->partial('liste-journal', ['journaux' => $journaux]); ?>

            </div>
@@ -108,10 +112,15 @@ $this->headTitle("Les Évènements"); 
    });



    $(function() {

        // affichage de l'onglet renseigné dans l'Url

        var url = document.location.toString();

        if (url.match('#')) {

            $('.nav-tabs a[href="#' + url.split('#')[1] + '"]').tab('show');

        }

        let hash = $(location).attr('hash');

        let name = hash.substr(1);

        if (name === undefined || name === "") name = "tab-evenement";



        $('a[aria-controls=' + name + ']').tab('show');



        $('.nav-tabs a').click(function (e) {

            // No e.preventDefault() here

            $(this).tab('show');

        });

    });

</script>
 
 No newline at end of file