Commit f3d00a9f authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Ménage

parent 03da3578

module/Application/config/aaa_module.config.php

+0 −5
Original line number Diff line number Diff line
@@ -173,10 +173,7 @@ $config = [ 
            Service\PaysService::class                             => Service\PaysService::class,

            Service\DepartementService::class                      => Service\DepartementService::class,

            Service\VoirieService::class                           => Service\VoirieService::class,

            Service\GradeService::class                            => Service\GradeService::class,

            Service\CorpsService::class                            => Service\CorpsService::class,

            Service\FichierService::class                          => Service\FichierService::class,

            Service\TauxHoraireHETDService::class                  => Service\TauxHoraireHETDService::class,

            Service\TypeValidationService::class                   => Service\TypeValidationService::class,

            Service\ValidationService::class                       => Service\ValidationService::class,

        ],
@@ -211,9 +208,7 @@ $config = [ 
        ],

        'factories'  => [

            UserProfileSelectRadioItem::class      => UserProfileSelectRadioItemFactory::class,

            //            \UnicaenUtilisateur\View\Helper\UserProfileSelectRadioItem::class  => View\Helper\UserProfileSelectRadioItemFactory::class,

            \UnicaenApp\View\Helper\AppLink::class => View\Helper\AppLinkFactory::class,

//            \UnicaenUtilisateur\View\Helper\UserCurrent::class                 => View\Helper\UserCurrentFactory::class,

            'tab'                                  => View\Helper\TabViewHelperFactory::class,

        ],

        'invokables' => [

module/Application/config/intervenant.config.php

+1 −0
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ return [ 
        'invokables' => [

            Service\CiviliteService::class => Service\CiviliteService::class,

            Service\GradeService::class    => Service\GradeService::class,

            Service\CorpsService::class    => Service\CorpsService::class,

        ],

    ],

    'view_helpers'    => [

module/Application/src/Service/TauxHoraireHETDService.php

deleted100755 → 0
+0 −70
Original line number Diff line number Diff line 
<?php



namespace Application\Service;



use Application\Entity\Db\TauxHoraireHETD;



/**

 * Description of TauxHoraireHETDService

 *

 * @author LECLUSE Laurent <laurent.lecluse at unicaen.fr>

 *

 * @method TauxHoraireHETD get($id)

 * @method TauxHoraireHETD[] getList(\Doctrine\ORM\QueryBuilder $qb = null, $alias = null)

 * @method TauxHoraireHETD newEntity()

 *

 */

class TauxHoraireHETDService extends AbstractEntityService

{



    /**

     * retourne la classe des entités

     *

     * @return string

     * @throws RuntimeException

     */

    public function getEntityClass()

    {

        return TauxHoraireHETD::class;

    }







    /**

     * Retourne l'alias d'entité courante

     *

     * @return string

     */

    public function getAlias()

    {

        return 'thh';

    }







    /**

     * @param \DateTime|null $date

     *

     * @return TauxHoraireHETD

     * @throws \Doctrine\ORM\NonUniqueResultException

     */

    public function getByDate(\DateTime $date = null)

    {

        if (!$date) $date = new \DateTime();



        $date = $date->format('Y-m-d');



        $sql = "

        SELECT id

        FROM taux_horaire_hetd t 

        WHERE TO_DATE(:date,'YYYY-MM-DD') BETWEEN t.histo_creation AND COALESCE(t.histo_destruction,SYSDATE) AND rownum = 1

        ORDER BY histo_creation DESC

        ";



        $res = $this->getEntityManager()->getConnection()->fetchAllAssociative($sql, ['date' => $date]);

        $id  = (int)$res[0]['ID'];



        return $this->getEntityManager()->getRepository(TauxHoraireHETD::class)->find($id);

    }



}
 
 No newline at end of file

module/Application/src/Service/Traits/TauxHoraireHETDServiceAwareTrait.php

deleted100755 → 0
+0 −40
Original line number Diff line number Diff line 
<?php



namespace Application\Service\Traits;



use Application\Service\TauxHoraireHETDService;



/**

 * Description of TauxHoraireHETDServiceAwareTrait

 *

 * @author UnicaenCode

 */

trait TauxHoraireHETDServiceAwareTrait

{

    protected ?TauxHoraireHETDService $serviceTauxHoraireHETD = null;







    /**

     * @param TauxHoraireHETDService $serviceTauxHoraireHETD

     *

     * @return self

     */

    public function setServiceTauxHoraireHETD(?TauxHoraireHETDService $serviceTauxHoraireHETD)

    {

        $this->serviceTauxHoraireHETD = $serviceTauxHoraireHETD;



        return $this;

    }







    public function getServiceTauxHoraireHETD(): ?TauxHoraireHETDService

    {

        if (empty($this->serviceTauxHoraireHETD)) {

            $this->serviceTauxHoraireHETD = \Application::$container->get(TauxHoraireHETDService::class);

        }



        return $this->serviceTauxHoraireHETD;

    }

}
 
 No newline at end of file

module/Contrat/src/Controller/ContratController.php

+0 −2
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ use Contrat\Entity\Db\ContratServiceListe; 
use Contrat\Service\ContratServiceListeServiceAwareTrait;

use Dossier\Service\Traits\DossierServiceAwareTrait;

use Application\Service\Traits\ParametresServiceAwareTrait;

use Application\Service\Traits\TauxHoraireHETDServiceAwareTrait;

use Application\Service\Traits\WorkflowServiceAwareTrait;

use BjyAuthorize\Exception\UnAuthorizedException;

use Contrat\Assertion\ContratAssertion;
@@ -53,7 +52,6 @@ class ContratController extends AbstractController 
    use ContratRetourFormAwareTrait;

    use ParametresServiceAwareTrait;

    use ContratProcessusAwareTrait;

    use TauxHoraireHETDServiceAwareTrait;

    use DossierServiceAwareTrait;

    use WorkflowServiceAwareTrait;

    use EnvoiMailContratFormAwareTrait;