Commit 0581f4d2 authored by Jean-Baptiste Oellers's avatar Jean-Baptiste Oellers
Browse files

Ajout d'un lien vers les formulaires sur la page d'accueil

parent c553561f

module/Oscar/src/Oscar/Controller/PublicController.php

+7 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ use Oscar\Traits\UseUserParametersServiceTrait; 
use Laminas\EventManager\Event;

use Laminas\View\Model\ViewModel;

use UnicaenSignature\Service\SignatureServiceAwareTrait;

use UnicaenAutoform\Service\Formulaire\FormulaireServiceAwareTrait;



/**

 * @author  Stéphane Bouvry<stephane.bouvry@unicaen.fr>
@@ -33,7 +34,7 @@ use UnicaenSignature\Service\SignatureServiceAwareTrait; 
class PublicController extends AbstractOscarController implements UseTimesheetService, UsePersonService,

    UseUserParametersService

{

    use UseTimesheetServiceTrait, UsePersonServiceTrait, UseUserParametersServiceTrait, SignatureServiceAwareTrait;

    use UseTimesheetServiceTrait, UsePersonServiceTrait, UseUserParametersServiceTrait, SignatureServiceAwareTrait, FormulaireServiceAwareTrait;



    /** @var ActivityRequestService */

    public $activityRequestService;
@@ -246,6 +247,7 @@ class PublicController extends AbstractOscarController implements UseTimesheetSe 
        $requestValidations = false;

        $periodsRejected = [];

        $documentsWait = [];

        $formulairesConvention = [];



        $action = $this->params()->fromQuery('a');

        if ($action == 'menu') {
@@ -305,6 +307,8 @@ class PublicController extends AbstractOscarController implements UseTimesheetSe 
                    "Impossible de charger les demandes d'activité pour $person : " . $e->getMessage()

                );

            }



            $formulairesConvention = $this->getFormulaireService()->getFormulaires();

        }
@@ -315,7 +319,8 @@ class PublicController extends AbstractOscarController implements UseTimesheetSe 
            'isValidator' => $isValidator,

            'periodsRejected' => $periodsRejected,

            'documentsWait' => $documentsWait,

            'user' => $person

            'user' => $person,

            'formulairesConvention' => $formulairesConvention

        ];

    }

module/Oscar/src/Oscar/Controller/PublicControllerFactory.php

+3 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ use Interop\Container\ContainerInterface; 
use Oscar\Factory\AbstractOscarFactory;

use Oscar\Service\ActivityRequestService;

use UnicaenSignature\Service\SignatureService;

use UnicaenAutoform\Service\Formulaire\FormulaireService;



class PublicControllerFactory extends AbstractOscarFactory

{
@@ -22,6 +23,7 @@ class PublicControllerFactory extends AbstractOscarFactory 
        $this->init($c, $container);

        $c->setActivityRequestService($container->get(ActivityRequestService::class));

        $c->setSignatureService($container->get(SignatureService::class));

        $c->setFormulaireService($container->get(FormulaireService::class));

        return $c;

    }

module/Oscar/view/oscar/public/index.phtml

+12 −1
Original line number Diff line number Diff line
@@ -188,6 +188,17 @@ use function Oscar\_ot; ?> 
                        </div>



                    </div>



                    <div class="row">

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

                            <h4>Créer une nouvelle convention :</h4>

                            <ul>

                                <?php foreach($formulairesConvention as $formulairesConvention): ?>

                                <li><a href="<?= $this->url('autoform/formulaire/creer-instance', ["formulaire" => $formulairesConvention->getId()]) ?>"><?= $formulairesConvention->getLibelle() ?></a></li>

                                <?php endforeach; ?>

                            </ul>

                        </div>

                    </div>

                <?php endif; ?>

            </p>