Commit cfd21537 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'master' of git.unicaen.fr:dsi/sygal

parents e7bce006 0362e0aa

module/Application/src/Application/Controller/UtilisateurController.php

+13 −1
Changes for module/Application/src/Application/Controller/UtilisateurController.php: 13 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -100,7 +100,18 @@ class UtilisateurController extends \UnicaenAuth\Controller\UtilisateurControlle 
            ->setItemCountPerPage((int)$maxi)

            ->setCurrentPageNumber((int)$page);



        $rolesStatiques = $this->roleService->getRoleModeleByStructures();

        $roleModeles = $this->roleService->getRoleModeleByStructures();



        $qb = $this->roleService->getRepository()->createQueryBuilder('r');

        $qb ->join('r.source', 's', Join::WITH, 's.importable = 0')

            ->andWhere('r.attributionAutomatique = 0')

            ->andWhere($qb->expr()->notIn('r.roleId', [

                Role::ROLE_ID_ECOLE_DOCT,

                Role::ROLE_ID_UNITE_RECH,

            ]))

            ->andWhere('1 = pasHistorise(r)')

            ->orderBy('r.roleId');

        $rolesStatiques = $qb->getQuery()->getResult();



        $qb = $this->roleService->getRepository()->createQueryBuilder('r')

            ->andWhere('r.attributionAutomatique = 1')
@@ -110,6 +121,7 @@ class UtilisateurController extends \UnicaenAuth\Controller\UtilisateurControlle 


        return new ViewModel([

            'utilisateurs'    => $paginator,

            'modeles'         => $roleModeles,

            'roles'           => $rolesStatiques,

            'rolesDynamiques' => $rolesDynamiques,

            'text'            => $text,

module/Application/view/application/these/partial/fiche.phtml

+2 −1
Changes for module/Application/view/application/these/partial/fiche.phtml: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ $acteursFormatter = new ActeursFormatter(); 
        <th>Établissement</th>

        <td>

            <?php

                if ($etablissement === null) echo "Non renseigné"; else echo $etablissement->getCode();

                $etablissement = $these->getEtablissement();

                if ($etablissement === null) echo "Non renseigné"; else echo $etablissement->getSigle();

                echo " - ";

                if ($etablissement === null) echo "Non renseigné"; else echo $etablissement->getLibelle();

            ?>

module/Application/view/application/utilisateur/index.phtml

+16 −37
Changes for module/Application/view/application/utilisateur/index.phtml: 16 added lines, 37 removed lines.
Original line number Diff line number Diff line 
<?php



use Application\Entity\Db\Role;

use Application\Entity\Db\RoleModele;

use Application\Entity\Db\Utilisateur;

use Application\Filter\RolesUtilisateurFormatter;

use Application\Provider\Privilege\UtilisateurPrivileges;
@@ -15,6 +16,7 @@ use Zend\Paginator\Paginator; 
 * @var Paginator   $utilisateurs

 * @var Role[]      $roles

 * @var Role[]      $rolesDynamiques

 * @var array       $modeles

 */



$rolesUtilisateurFormatter = new RolesUtilisateurFormatter();
@@ -30,14 +32,15 @@ $select = (new Select("roles")) 


<?php echo $this->messenger()->addCurrentMessagesFromFlashMessenger() ?>



<div class="alert alert-info alert-md">

<div class="alert alert-info alert-md pull-left" style="width:48%;">

    <span class="glyphicon glyphicon-info-sign"></span>

    <?php echo $this->translate("Sur cette page vous pouvez attribuer les rôles dépendant de structures."); ?>



    <ol>

    <?php foreach($roles as $structure => $roleModeles){

    <?php foreach($modeles as $structure => $roleModeles){

        echo "<li>" .$structure ."</li>";

        echo "<ul>";

        /** @var RoleModele $roleModele */

        foreach ($roleModeles as $roleModele) {

           echo "<li>".$roleModele->getLibelle() . "</li>";

        }
@@ -45,46 +48,22 @@ $select = (new Select("roles")) 
    }

    ?>

    </ol>



<!--    <ul>-->

<!--    --><?php //foreach ($roles as $r): ?>

<!--        <li>--><?php //echo $this->translate($r->getRoleId()) ?><!--</li>-->

<!--    --><?php //endforeach ?>

<!--    </ul>-->

</div>



<div class="row">

    <div class="col-md-5">

        <div class="alert alert-warning alert-sm">

            <p>

                <?php echo $this->translate("Si vous voulez attribuer le rôle &laquo;");?>

                <?php echo $this->translate(Role::ROLE_ID_ECOLE_DOCT); ?>

                <?php echo $this->translate("&raquo;, rendez-vous sur la page"); ?>

                <a href="<?php echo $this->url('ecole-doctorale', [], [], true) ?>">

                    <?php echo $this->translate("Écoles doctorales");?>

                </a>.

            </p>

            <p>

                <?php echo $this->translate("Si vous voulez attribuer le rôle &laquo;");?>

                <?php echo $this->translate(Role::ROLE_ID_UNITE_RECH); ?>

                <?php echo $this->translate("&raquo;, rendez-vous sur la page"); ?>

                <a href="<?php echo $this->url('unite-recherche', [], [], true) ?>">

                    <?php echo $this->translate("Unités de recherche");?>

                </a>.

            </p>

</div>

    </div>

    <div class="col-md-5">

        <div class="alert alert-danger alert-sm">

<div class="alert alert-danger alert-md pull-right" style="width:48%;">

    <span class="glyphicon glyphicon-warning-sign"></span>

    <?php echo $this->translate("Les rôles suivants sont attribués automatiquement à partir des données importées d'Apogée :"); ?>

    <ul>

                <?php foreach ($rolesDynamiques as $r): ?>

                    <li><?php echo $this->translate($r->getRoleId()) ?></li>

                <?php endforeach ?>

        <?php

        /** @var Role $r */

        foreach ($rolesDynamiques as $r) {

            echo "<li>";

            echo $this->translate($r->getRoleId());

        }

        ?>

    </ul>

</div>

    </div>

</div>







<div class="pull-left">

    <!-- Formulaire de filtrage -->