Commit c55f5525 authored by Florian Joriot's avatar Florian Joriot
Browse files

Merge remote-tracking branch 'origin/master'

parents 9b11bdf3 997400ca
Loading
Loading
Loading
Loading
+1 −1
Changes for composer.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@
        "laminas/laminas-file"                        : "^2.8",
        "unicaen/code"                                : "6.0.8",
        "unicaen/import"                              : "6.0.1",
        "unicaen/tbl"                                 : "6.0.1",
        "unicaen/tbl"                                 : "6.0.2",
        "unicaen/open-document"                       : "6.0.2",
        "unicaen/siham"                               : "6.0.2",
        "unicaen/mail"                                : "6.0.6",
+12 −12
Changes for composer.lock: 12 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
    "content-hash": "c70ab234d57dd3dc50210776e9d2f703",
    "content-hash": "020b1449aba9921ccdb1ca6155b510fb",
    "packages": [
        {
            "name": "beberlei/assert",
@@ -1036,28 +1036,28 @@
        },
        {
            "name": "doctrine/inflector",
            "version": "2.0.6",
            "version": "2.0.8",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/inflector.git",
                "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024"
                "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/doctrine/inflector/zipball/d9d313a36c872fd6ee06d9a6cbcf713eaa40f024",
                "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024",
                "url": "https://api.github.com/repos/doctrine/inflector/zipball/f9301a5b2fb1216b2b08f02ba04dc45423db6bff",
                "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff",
                "shasum": ""
            },
            "require": {
                "php": "^7.2 || ^8.0"
            },
            "require-dev": {
                "doctrine/coding-standard": "^10",
                "doctrine/coding-standard": "^11.0",
                "phpstan/phpstan": "^1.8",
                "phpstan/phpstan-phpunit": "^1.1",
                "phpstan/phpstan-strict-rules": "^1.3",
                "phpunit/phpunit": "^8.5 || ^9.5",
                "vimeo/psalm": "^4.25"
                "vimeo/psalm": "^4.25 || ^5.4"
            },
            "type": "library",
            "autoload": {
@@ -1107,7 +1107,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/inflector/issues",
                "source": "https://github.com/doctrine/inflector/tree/2.0.6"
                "source": "https://github.com/doctrine/inflector/tree/2.0.8"
            },
            "funding": [
                {
@@ -1123,7 +1123,7 @@
                    "type": "tidelift"
                }
            ],
            "time": "2022-10-20T09:10:12+00:00"
            "time": "2023-06-16T13:40:37+00:00"
        },
        {
            "name": "doctrine/instantiator",
@@ -7233,11 +7233,11 @@
        },
        {
            "name": "unicaen/tbl",
            "version": "6.0.1",
            "version": "6.0.2",
            "source": {
                "type": "git",
                "url": "https://git.unicaen.fr/lib/unicaen/tbl.git",
                "reference": "53cbc6c1006dfa15d14d1d84e834b04affa71d87"
                "reference": "d5caa44f99aef1b1a225ee9284638b165422a776"
            },
            "require": {
                "unicaen/app": "^6.0"
@@ -7252,7 +7252,7 @@
                ]
            },
            "description": "Module Unicaen de gestion de tableaux de bord Oracle",
            "time": "2023-03-21T10:39:32+00:00"
            "time": "2023-06-19T14:10:00+00:00"
        },
        {
            "name": "unicaen/utilisateur",
+1 −1
Changes for module/Application/src/ConfigFactory.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ class ConfigFactory
            }
        }

        /* On détecte le type s'il n'eiste pas déjà */
        /* On détecte le type s'il n'existe pas déjà */
        if (!isset($config['type']) && isset($config['options']['route']) && !$isConsole) {
            if (false !== strpos($config['options']['route'], ':')) {
                $config['type'] = 'Segment';
+4 −3
Changes for module/Application/src/Form/Droits/AffectationForm.php: 4 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -86,6 +86,10 @@ class AffectationForm extends AbstractForm
                'label'         => 'Structure',
                'value_options' => Util::collectionAsOptions($structures),
            ],
            'attributes' => [
                'class'            => 'selectpicker',
                'data-live-search' => true,
            ],
        ]);

        $this->add([
@@ -128,9 +132,6 @@ class AffectationForm extends AbstractForm
}





class AffectationFormHydrator implements HydratorInterface
{
    use StructureServiceAwareTrait;
+0 −95
Changes for module/Application/src/Service/TypeIntervenantService.php: 0 added lines, 95 removed lines.
Original line number Diff line number Diff line
<?php

namespace Application\Service;

use Intervenant\Entity\Db\TypeIntervenant;
use Doctrine\ORM\QueryBuilder;

/**
 * Description of TypeIntervenantService
 *
 * @author Laurent LÉCLUSE <laurent.lecluse at unicaen.fr>
 */
class TypeIntervenantService extends AbstractEntityService
{

    /**
     * retourne la classe des entités
     *
     * @return string
     * @throws RuntimeException
     */
    public function getEntityClass()
    {
        return TypeIntervenant::class;
    }



    /**
     * Retourne le type d'intervenant Permanent
     *
     * @return TypeIntervenant
     */
    public function getPermanent()
    {
        return $this->getRepo()->findOneBy(['code' => TypeIntervenant::CODE_PERMANENT]);
    }



    /**
     * Retourne le type d'intervenant Extérieur
     *
     * @return TypeIntervenant
     */
    public function getExterieur()
    {
        return $this->getRepo()->findOneBy(['code' => TypeIntervenant::CODE_EXTERIEUR]);
    }



    /**
     * Retourne l'alias d'entité courante
     *
     * @return string
     */
    public function getAlias()
    {
        return 'type_int';
    }



    /**
     *
     * @param QueryBuilder|null $qb
     * @param string|null       $alias
     *
     * @return QueryBuilder
     */
    public function orderBy(QueryBuilder $qb = null, $alias = null)
    {
        [$qb, $alias] = $this->initQuery($qb, $alias);
        $qb->addOrderBy("$alias.code", 'DESC');

        return $qb;
    }



    /**
     *
     * @param string $code
     *
     * @return TypeIntervenant
     */
    public function getByCode($code)
    {
        if (null == $code) return null;

        return $this->getRepo()->findOneBy(['code' => $code]);
    }

}
 No newline at end of file
Loading