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

Mes indicateurs et roles autorisés + fiabilisation

parent 7fa59868

src/UnicaenIndicateur/Controller/AbonnementControllerFactory.php

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ use UnicaenIndicateur\Service\Abonnement\AbonnementService; 
use UnicaenIndicateur\Service\Indicateur\IndicateurService;

use UnicaenUtilisateur\Service\User\UserService;



;



class AbonnementControllerFactory

{

src/UnicaenIndicateur/Controller/IndexController.php

+10 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ namespace UnicaenIndicateur\Controller; 
use Laminas\Mvc\Controller\AbstractActionController;

use Laminas\View\Model\ViewModel;

use UnicaenIndicateur\Entity\Db\Abonnement;

use UnicaenIndicateur\Entity\Db\Indicateur;

use UnicaenIndicateur\Service\Abonnement\AbonnementServiceAwareTrait;

use UnicaenIndicateur\Service\Indicateur\IndicateurServiceAwareTrait;

use UnicaenUtilisateur\Service\User\UserServiceAwareTrait;
@@ -17,7 +18,14 @@ class IndexController extends AbstractActionController { 
    public function indexAction() : ViewModel

    {

        $user = $this->getUserService()->getConnectedUser();

        $role = $this->getUserService()->getConnectedRole();



        $abonnements = $this->getAbonnementService()->getAbonnementsByUser($user);

        $abonnements = array_filter($abonnements, function (Abonnement $abonnement) use ($role) {

            $indicateur = $abonnement->getIndicateur();

            $rolesAutorises = $indicateur->getRolesAutorises();

            return in_array(Indicateur::TOUS_LES_ROLES, $rolesAutorises) or in_array($role->getRoleId(), $rolesAutorises);

        });



        $result = [];

        foreach ($abonnements as $abonnement) {
@@ -35,7 +43,8 @@ class IndexController extends AbstractActionController { 
    public function abonnementAction() : ViewModel

    {

        $user = $this->getUserService()->getConnectedUser();

        $indicateurs = $this->getIndicateurService()->getIndicateurs();

        $role = $this->getUserService()->getConnectedRole();

        $indicateurs = $this->getIndicateurService()->getIndicateursWithRole($role);



        $request = $this->getRequest();

        if ($request->isPost()) {

src/UnicaenIndicateur/Controller/TableauDeBordControllerFactory.php

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ namespace UnicaenIndicateur\Controller; 
use Psr\Container\ContainerExceptionInterface;

use Psr\Container\ContainerInterface;

use Psr\Container\NotFoundExceptionInterface;

use UnicaenIndicateur\Entity\Db\TableauDeBord;

use UnicaenIndicateur\Form\TableauDeBord\TableauDeBordForm;

use UnicaenIndicateur\Service\Indicateur\IndicateurService;

use UnicaenIndicateur\Service\TableauDeBord\TableauDeBordService;

src/UnicaenIndicateur/Entity/Db/Categorie.php

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ class Categorie { 
        $this->indicateurs = $indicateurs;

    }



    public function setId(int $id)

    public function setId(int $id): void

    {

        $this->id = $id;

    }

src/UnicaenIndicateur/Entity/Db/Indicateur.php

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ use DateTime; 
use Doctrine\Common\Collections\ArrayCollection;

use Doctrine\Common\Collections\Collection;

use UnicaenIndicateur\Service\Perimetre\PerimetreServiceInterface;

use UnicaenParametre\Service\Parametre\ParametreService;

use UnicaenUtilisateur\Entity\Db\RoleInterface;



class Indicateur {