Commit 7e882ab7 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Merge branch 'master' into alc-mission-extraction-paie

parents 0379a382 c55f5525
Loading
Loading
Loading
Loading
+11 −1
Changes for data/ddl/view/V_CONTRAT_MAIN.sql: 11 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -41,9 +41,14 @@ SELECT ct.annee_id,
       ct."numInsee",
       ct."statut",
       ct."totalHETD",
       ct."tauxNom",
       ct."tauxHoraireValeur",
       ct."tauxHoraireDate",
       ct."tauxId",
       ct."tauxMajoreNom",
       ct."tauxMajoreHoraireValeur",
       ct."tauxMajoreHoraireDate",
       ct."tauxMajoreId",
       ct."dateSignature",
       ct."modifieComplete",
       CASE WHEN ct.est_contrat = 1 THEN 1 ELSE NULL END                                                                    "contrat1",
@@ -53,10 +58,10 @@ SELECT ct.annee_id,
       'Exemplaire à conserver'                                                                                             "exemplaire1",
       'Exemplaire à retourner' || ct."exemplaire2"                                                                         "exemplaire2",
       ct."serviceTotal",
       ct."serviceTotal"/10                                                                                                 "total_divise_par_dix",
       ct."legendeAutresHeures",
       ct."enteteAutresHeures",
       ct."missionNom",
       ct."tauxNom",
       ct."debutValidite",
       ct."finValidite",
       ct."pays_nationalite",
@@ -111,6 +116,10 @@ FROM ( SELECT c.*,
             COALESCE(to_char(OSE_PAIEMENT.get_taux_horaire_date(COALESCE(trm.id, trs.id,tr.id), a.date_debut), 'dd/mm/YYYY'), 'TAUX INTROUVABLE')         "tauxHoraireDate",
             COALESCE(trm.id, trs.id,tr.id)                                                                                                                "tauxId",
             COALESCE(trm.libelle, trs.libelle,tr.libelle)                                                                                                 "tauxNom",
             REPLACE(ltrim(to_char(COALESCE(OSE_PAIEMENT.get_taux_horaire(COALESCE(tmm.id,trm.id, trs.id,tr.id), a.date_debut), 0), '999999.00')), '.', ',')"tauxMajoreHoraireValeur",
             COALESCE(to_char(OSE_PAIEMENT.get_taux_horaire_date(COALESCE(tmm.id,trm.id, trs.id,tr.id), a.date_debut), 'dd/mm/YYYY'), 'TAUX INTROUVABLE')   "tauxMajoreHoraireDate",
             COALESCE(tmm.id,trm.id, trs.id,tr.id)                                                                                                          "tauxMajoreId",
             COALESCE(tmm.libelle,trm.libelle, trs.libelle,tr.libelle)                                                                                       "tauxMajoreNom",
             to_char(COALESCE(v.histo_creation, a.date_debut), 'dd/mm/YYYY')                                                                               "dateSignature",
             CASE
                 WHEN c.structure_id <> COALESCE(cp.structure_id, 0) THEN 'modifié'
@@ -165,6 +174,7 @@ FROM ( SELECT c.*,
            LEFT JOIN mission               m ON c.mission_id = m.id
            LEFT JOIN type_mission          tm ON m.type_mission_id = tm.id
            LEFT JOIN taux_remu             trm ON tm.taux_remu_id = trm.id
            LEFT JOIN taux_remu             tmm ON tmm.id = m.taux_remu_majore_id
        WHERE
            c.histo_destruction IS NULL
) ct
 No newline at end of file
+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';
+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
+3 −0
Changes for module/Application/view/application/droits/privileges.phtml: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -179,6 +179,9 @@
        }
    });

    $(function(){
        WidgetInitializer.add('droits-tbl', 'droitsTbl');
    });


</script>
 No newline at end of file
+4 −1
Changes for module/Contrat/src/Controller/ContratController.php: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -472,6 +472,9 @@ class ContratController extends AbstractController
        /** @var Contrat $contrat */
        $contrat = $this->getEvent()->getParam('contrat');


        $title = 'Envoi du contrat à l\'intervenant';

        if (!$this->isAllowed($contrat, ContratAssertion::PRIV_EXPORT)) {
            throw new UnAuthorizedException("Interdiction d'envoyer le contrat par email");
        }
@@ -526,7 +529,7 @@ class ContratController extends AbstractController
            return $this->getResponse();
        }

        return compact('form');
        return compact('form', 'title');
    }


Loading