Commit 9d65aed3 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Alias des aides de vue 'type','etat','journal' renommés en... 

Alias des aides de vue 'type','etat','journal' renommés en 'evenementType','evenementEtat','evenementJournal' pour éviter les collisions avec celles de l'appli.
parent 918c071a

config/merged/etat.config.php

+1 −1
Changes for config/merged/etat.config.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ return [ 
    ],

    'view_helpers' => [

        'invokables' => [

            'etat'          => EtatViewHelper::class,

            'evenementEtat' => EtatViewHelper::class,

        ],

    ],

];
 
 No newline at end of file

config/merged/evenement.config.php

+1 −1
Changes for config/merged/evenement.config.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ return [ 
        'invokables' => [

            'evenement' => EvenementViewHelper::class,

            'evenements' => EvenementsViewHelper::class,

            'journal' => JournalViewHelper::class,

            'evenementJournal' => JournalViewHelper::class,

        ],

    ],

config/merged/type.config.php

+1 −1
Changes for config/merged/type.config.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ return [ 
    ],

    'view_helpers' => [

        'invokables' => [

            'type'          => TypeViewHelper::class,

            'evenementType' => TypeViewHelper::class,

        ],

    ],

src/UnicaenEvenement/View/Helper/partial/evenement.phtml

+2 −2
Changes for src/UnicaenEvenement/View/Helper/partial/evenement.phtml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -18,14 +18,14 @@ use UnicaenEvenement\Entity\Db\Evenement; 
        <tr>

            <th class="col-md-4"  colspan="1">État</th>

            <td class="col-md-8" colspan="2">

                <?php echo $this->etat($evenement->getEtat()); ?>

                <?php echo $this->evenementEtat($evenement->getEtat()); ?>

                <?php echo $evenement->getEtat()->getLibelle(); ?>

            </td>

        </tr>

        <tr>

            <th class="col-md-4"  colspan="1">Type</th>

            <td class="col-md-8" colspan="2">

                <?php echo $this->type($evenement->getType()); ?>

                <?php echo $this->evenementType($evenement->getType()); ?>

                <?php echo $evenement->getType()->getLibelle(); ?>

            </td>

        </tr>

src/UnicaenEvenement/View/Helper/partial/evenements.phtml

+4 −4
Changes for src/UnicaenEvenement/View/Helper/partial/evenements.phtml: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ usort($evenements, function (Evenement $a, Evenement $b) { return $a->getDatePla 
$types = []; foreach ($evenements as $evenement) { $types[$evenement->getType()->getId()] = $evenement->getType(); }

$etats = []; foreach ($evenements as $evenement) { $etats[$evenement->getEtat()->getId()] = $evenement->getEtat(); }

foreach($types as $t) {

    $listTypes[$t->getCode()] = $this->type($t)->renderIcon();

    $listTypes[$t->getCode()] = $this->evenementType($t)->renderIcon();

}

foreach($etats as $e) {

    $listEtats[$e->getCode()] = $this->etat($e)->renderIcon();

    $listEtats[$e->getCode()] = $this->evenementEtat($e)->renderIcon();

}



$canAfficher = $this->isAllowed(EvenementinstancePrivileges::getResourceId(EvenementinstancePrivileges::INSTANCE_CONSULTATION));
@@ -47,14 +47,14 @@ $canSupprimer = $this->isAllowed(EvenementinstancePrivileges::getResourceId(Even 
                <?php echo $event->getId(); ?>

            </td>

            <td data-order=" <?php echo $event->getNom(); ?>" data-filter=" <?php echo $event->getNom(); ?>">

                <?php echo $this->type($event->getType())->render(); ?>

                <?php echo $this->evenementType($event->getType())->render(); ?>

                <?php echo $event->getNom(); ?>

                <?php if ($event->getDescription()) : ?>

                    <span class="icon icon-information" data-bs-toggle="tooltip" data-bs-html="true"

                          title="<?php echo htmlentities($event->getDescription()); ?>"></span>

                <?php endif; ?>

            </td>

            <td data-order="<?php echo $event->getEtat()->getId() ?>">  <?php echo $this->etat($event->getEtat())->render(); ?> </td>

            <td data-order="<?php echo $event->getEtat()->getId() ?>">  <?php echo $this->evenementEtat($event->getEtat())->render(); ?> </td>

            <td data-order=" <?php echo ($event->getDateCreation()) ? $event->getDateCreation()->getTimestamp() : PHP_INT_MAX?>">

                <?php echo ($event->getDateCreation())?$event->getDateCreation()->format('d/m/Y').' <br/> '.$event->getDateCreation()->format('H:i:s'):"---"; ?>

            </td>