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

CHangement de l'affichage des rôles pour Libelle + Structure_Sigle

parent 2fbc5f6d

module/Application/config/others/utilisateur.config.php

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ use Application\Service\Individu\IndividuServiceFactory; 
use Application\Service\Utilisateur\UtilisateurService;

use Application\Service\Utilisateur\UtilisateurServiceFactory;

use Application\View\Helper\IndividuUsurpationHelperFactory;

use Application\View\Helper\RoleHelper;

use UnicaenAuth\Guard\PrivilegeController;

use Zend\Router\Http\Literal;

use Zend\Router\Http\Segment;
@@ -251,6 +252,9 @@ return [ 
        ],

    ],

    'view_helpers'  => [

        'invokables' => [

            'role' => RoleHelper::class,

        ],

        'factories'  => [

            'individuUsurpation' => IndividuUsurpationHelperFactory::class,

        ],

module/Application/src/Application/Service/Role/RoleService.php

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ class RoleService extends BaseService 
                $roleId = $roleModele->getLibelle() . " " . $structure->getCode();

            } else {

                $sourceCode = $this->sourceCodeStringHelper->addDefaultPrefixTo($roleModele->getRoleCode() . "_" . $structure->getSourceCode());

                $roleId = $roleModele->getLibelle() . " " . $structure->getSourceCode();

                $roleId = $roleModele->getLibelle() . " " . $structure->getSigle();

            }



            $role = $this->createRole($roleModele->getRoleCode(), $roleModele->getLibelle(), $sourceCode);

module/Application/src/Application/View/Helper/RoleHelper.php

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?php



namespace Application\View\Helper;



use Application\Entity\Db\Role;

use Zend\Form\View\Helper\AbstractHelper;

use Zend\View\Renderer\PhpRenderer;

use Zend\View\Resolver\TemplatePathStack;



class RoleHelper extends AbstractHelper

{

    /**

     * @param Role $role

     * @param array $options

     * @return string

     */

    public function render(Role $role, $options = []) {



        /** @var PhpRenderer $view */

//        $view = $this->getView();

//        $view->resolver()->attach(new TemplatePathStack(['script_paths' => [__DIR__ . "/partial"]]));

//        $texte = $view->partial('role', ['role' => $role, 'options' => $options]);

        $texte = $role->getLibelle();

        if ($role->getStructure()) $texte .= " " . $role->getStructure()->getSigle();

        return $texte;

    }

}
 
 No newline at end of file

module/Application/src/Application/View/Helper/partial/role.phtml

0 → 100644
+15 −0
Original line number Diff line number Diff line 
<?php



use Application\Entity\Db\Role;



/**

 * @var Role $role

 */



?>



<?php echo $role->getLibelle(); ?>

<?php if ($role->getStructure()) : ?>

    <?php echo $role->getStructure()->getSigle(); ?>

<?php endif; ?>

module/Application/view/application/profil/gerer-roles.phtml

+4 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
            <?php foreach ($profil->getRoles() as $role) : ?>

                <tr>

                    <td>

                        <?php echo $role->getRoleId(); ?>

                        <?php echo $this->role()->render($role); ?>

                    </td>

                    <td>

                        <a href="<?php echo $this->url('profil/gerer-roles/retirer', ['profil' => $profil->getId(), 'role' => $role->getId()], [], true); ?>">
@@ -61,7 +61,9 @@ 
        <form method="POST" action="<?php echo $this->url('profil/gerer-roles/ajouter', ['profil' => $profil->getId()], [], true); ?>">

            <select name="role">

                <?php foreach ($rolesDisponibles as $role) : ?>

                    <option value="<?php echo $role->getId(); ?>"> <?php echo $role->getRoleId(); ?></option>

                    <option value="<?php echo $role->getId(); ?>">

                        <?php echo $this->role()->render($role); ?>

                    </option>

                <?php endforeach; ?>

            </select>

            <br/>