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

modification du service des references

parent 2a686eb8
Loading
Loading
Loading
Loading
+7 −7
Changes for module/Application/src/Application/Service/MetierReference/MetierReferenceService.php: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ use Doctrine\ORM\QueryBuilder;
use UnicaenApp\Exception\RuntimeException;
use Zend\Mvc\Controller\AbstractActionController;

class MetierReferenceService {
class MetierReferenceService
{
    use GestionEntiteHistorisationTrait;

    /** GESTION DES ENTITES *******************************************************************************************/
@@ -73,8 +74,8 @@ class MetierReferenceService {
    {
        $qb = $this->getEntityManager()->getRepository(MetierReference::class)->createQueryBuilder('reference')
            ->addSelect('metier')->join('reference.metier', 'metier')
            ->addSelect('referentiel')->join('reference.referentiel', 'referentiel')
        ;
            ->addSelect('categorie')->leftJoin('metier.categorie', 'categorie')
            ->addSelect('referentiel')->join('reference.referentiel', 'referentiel');

        return $qb;
    }
@@ -112,12 +113,11 @@ class MetierReferenceService {
     * @param integer $id
     * @return MetierReference
     */
    public function getMetierReference($id)
    public function getMetierReference(int $id)
    {
        $qb = $this->createQueryBuilder()
            ->andWhere('reference.id = :id')
            ->setParameter('id', $id)
        ;
            ->setParameter('id', $id);

        try {
            $result = $qb->getQuery()->getOneOrNullResult();
@@ -132,7 +132,7 @@ class MetierReferenceService {
     * @param string $param
     * @return MetierReference
     */
    public function getRequestedMetierReference($controller, $param = "reference")
    public function getRequestedMetierReference(AbstractActionController $controller, string $param = "reference")
    {
        $id = $controller->params()->fromRoute($param);
        $result = $this->getMetierReference($id);
+5 −8
Changes for module/Application/view/application/fiche-metier/ajouter-activite-existante.phtml: 5 added lines, 8 removed lines.
Original line number Diff line number Diff line
<?php

use Application\Form\FicheMetier\ActiviteExistanteForm;

/**
 * @see \Application\Controller\FicheMetierController::ajouterActiviteExistanteAction()
 * @var $form
 * @var ActiviteExistanteForm $form
 * @var array $options
 */
?>

<!--<h1 class="page-header">-->
<!--    Ajout d'une activité existante-->
<!--</h1>-->

?>

<div>
    <?php echo $this->form()->openTag($form); ?>
@@ -41,10 +40,8 @@
            if (text.length > 0) {
                $("div#" + text).show();
            } else {

                $("div#none").show();
            }

        });
    });