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

Ajout d'indications visuelles de l'usage de compte locale (identite, validation, ...)

parent aea93b74
Loading
Loading
Loading
Loading
+4 −0
Changes for module/Application/src/Application/Controller/Factory/TheseControllerFactory.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ use Application\Service\Role\RoleService;
use Application\Service\These\TheseRechercheService;
use Application\Service\These\TheseService;
use Application\Service\UniteRecherche\UniteRechercheService;
use Application\Service\Utilisateur\UtilisateurService;
use Application\Service\Validation\ValidationService;
use Application\Service\Variable\VariableService;
use Application\Service\VersionFichier\VersionFichierService;
@@ -50,6 +51,7 @@ class TheseControllerFactory
         * @var MailConfirmationService $mailConfirmationService
         * @var EntityManager           $entityManager
         * @var ImportService           $importService
         * @var UtilisateurService      $utilisateurService
         */
        $variableService = $sl->get('VariableService');
        $validationService = $sl->get('ValidationService');
@@ -65,6 +67,7 @@ class TheseControllerFactory
        $entityManager = $sl->get('doctrine.entitymanager.orm_default');
        $notifierService = $sl->get(NotifierService::class);
        $importService = $sl->get('ImportService');
        $utilisateurService = $sl->get('UtilisateurService');

        $controller = new TheseController();
        $controller->setTimeoutRetraitement($this->getTimeoutRetraitementFromOptions($options));
@@ -82,6 +85,7 @@ class TheseControllerFactory
        $controller->setEntityManager($entityManager);
        $controller->setNotifierService($notifierService);
        $controller->setImportService($importService);
        $controller->setUtilisateurService($utilisateurService);

        /**
         * @var SourceCodeStringHelper $sourceCodeHelper
+4 −0
Changes for module/Application/src/Application/Controller/Factory/ValidationControllerFactory.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ namespace Application\Controller\Factory;
use Application\Controller\ValidationController;
use Application\Service\Notification\NotifierService;
use Application\Service\Role\RoleService;
use Application\Service\Utilisateur\UtilisateurService;
use Application\Service\Validation\ValidationService;
use Application\Service\Variable\VariableService;
use Zend\Mvc\Controller\ControllerManager;
@@ -24,17 +25,20 @@ class ValidationControllerFactory
         * @var NotifierService $notifierService
         * @var RoleService $roleService
         * @var VariableService $variableService
         * @var UtilisateurService $utilisateurService
         */
        $validationService = $controllerManager->getServiceLocator()->get('ValidationService');
        $notifierService = $controllerManager->getServiceLocator()->get(NotifierService::class);
        $roleService = $controllerManager->getServiceLocator()->get('RoleService');
        $variableService = $controllerManager->getServiceLocator()->get('VariableService');
        $utilisateurService = $controllerManager->getServiceLocator()->get('UtilisateurService');

        $controller = new ValidationController();
        $controller->setValidationService($validationService);
        $controller->setNotifierService($notifierService);
        $controller->setRoleService($roleService);
        $controller->setVariableService($variableService);
        $controller->setUtilisateurService($utilisateurService);

        return $controller;
    }
+9 −0
Changes for module/Application/src/Application/Controller/TheseController.php: 9 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ use Application\Service\These\TheseRechercheServiceAwareTrait;
use Application\Service\These\TheseServiceAwareTrait;
use Application\Service\UniteRecherche\UniteRechercheServiceAwareTrait;
use Application\Service\UserContextServiceAwareTrait;
use Application\Service\Utilisateur\UtilisateurServiceAwareTrait;
use Application\Service\Validation\ValidationServiceAwareTrait;
use Application\Service\Variable\VariableServiceAwareTrait;
use Application\Service\VersionFichier\VersionFichierServiceAwareTrait;
@@ -81,6 +82,7 @@ class TheseController extends AbstractController
    use UserContextServiceAwareTrait;
    use VariableServiceAwareTrait;
    use SourceCodeStringHelperAwareTrait;
    use UtilisateurServiceAwareTrait;

    private $timeoutRetraitement;

@@ -219,6 +221,12 @@ class TheseController extends AbstractController
        $rattachements = null;
        if ($unite !== null) $rattachements = $this->getUniteRechercheService()->findEtablissementRattachement($unite);

        $utilisateurs = [];
        foreach ($these->getActeurs() as $acteur) {
            $utilisateur = $this->utilisateurService->getRepository()->findByIndividu($acteur->getIndividu());
            $utilisateurs[$acteur->getId()] = $utilisateur;
        }

        //TODO JP remplacer dans modifierPersopassUrl();
        $urlModification = $this->url()->fromRoute('doctorant/modifier-persopass',['back' => 1, 'doctorant' => $these->getDoctorant()->getId()], [], true);

@@ -235,6 +243,7 @@ class TheseController extends AbstractController
            'etatMailContact'           => $etatMailContact,
            'rattachements'             => $rattachements,
            'validationsDesCorrectionsEnAttente' => $validationsDesCorrectionsEnAttente,
            'utilisateurs'              => $utilisateurs,
        ]);
        $view->setTemplate('application/these/identite');

+11 −0
Changes for module/Application/src/Application/Controller/ValidationController.php: 11 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@

namespace Application\Controller;

use Application\Entity\Db\Acteur;
use Application\Entity\Db\Role;
use Application\Entity\Db\TypeValidation;
use Application\Notification\ValidationDepotTheseCorrigeeNotification;
@@ -11,6 +12,7 @@ use Application\Provider\Privilege\ValidationPrivileges;
use Application\Service\Notification\NotifierServiceAwareTrait;
use Application\Service\Role\RoleServiceAwareTrait;
use Application\Service\These\TheseServiceAwareTrait;
use Application\Service\Utilisateur\UtilisateurServiceAwareTrait;
use Application\Service\Validation\ValidationServiceAwareTrait;
use Application\Service\Variable\VariableServiceAwareTrait;
use Notification\Notification;
@@ -25,6 +27,7 @@ class ValidationController extends AbstractController
    use NotifierServiceAwareTrait;
    use RoleServiceAwareTrait;
    use VariableServiceAwareTrait;
    use UtilisateurServiceAwareTrait;

    public function pageDeCouvertureAction()
    {
@@ -156,6 +159,13 @@ class ValidationController extends AbstractController
    {
        $these = $this->requestedThese();

        $utilisateurs = [];
        /** @var Acteur $acteur */
        foreach ($these->getActeurs() as $acteur) {
            $individu = $acteur->getIndividu();
            $utilisateurs[$individu->getId()] = $this->utilisateurService->getRepository()->findByIndividu($individu);
        }

        $view = new ViewModel([
            'these'          => $these,
            'validerUrl'     => $this->urlThese()->validerCorrectionTheseUrl($these),
@@ -163,6 +173,7 @@ class ValidationController extends AbstractController
            'typeValidation' => $this->validationService->getTypeValidation($type = TypeValidation::CODE_CORRECTION_THESE),
            'validations'    => $these->getValidations($type),
            'attendues'      => $this->validationService->getValidationsAttenduesPourCorrectionThese($these),
            'utilisateurs'   => $utilisateurs,
        ]);

        $view->setTemplate('application/validation/these-corrigee/validation-correction');
+6 −0
Changes for module/Application/view/application/these/identite.phtml: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ use Application\Controller\TheseController;
use Application\Entity\Db\Acteur;
use Application\Entity\Db\MailConfirmation;
use Application\Entity\Db\These;
use Application\Entity\Db\Utilisateur;
use Application\Entity\Db\Validation;
use Application\Filter\ActeursFormatter;
use Application\Filter\FinancementFormatter;
@@ -23,6 +24,7 @@ use Application\View\Renderer\PhpRenderer;
 * @var string       $mailContact
 * @var string       $etatMailContact
 * @var Validation[] $validationsDesCorrectionsEnAttente
 * @var Utilisateur[] $utilisateurs
 *
 * @see TheseController::detailIdentiteAction()
 */
@@ -158,8 +160,12 @@ $financementFormatter->setDisplayAs(FinancementFormatter::DISPLAY_AS_LINE);
                    $ligne[] = $result["etablissement"];
                }
                if ($acteur->estDirecteur() && isset($result['alerte-supann-id'])) {
                    if ($utilisateurs[$acteur->getId()] === null) {
                        $ligne[] = sprintf('<span class="glyphicon glyphicon-warning-sign text-danger" title="%s"></span>',
                            $result['alerte-supann-id']);
                    } else {
                        $ligne[] = sprintf('<span class="glyphicon glyphicon-info-sign text-warning" title="Compte local"></span>');
                    }
                    if ($canCreate) {
                        $ligne[] = sprintf('<a href="%s" class="btn btn-sm btn-warning">Gérer l\'utilisateur</a>',
                            $this->url('utilisateur/gerer-utilisateur', ['individu' => $acteur->getIndividu()->getId()], [], true));
Loading