Commit 250d438a authored by Florian Joriot's avatar Florian Joriot
Browse files

Merge remote-tracking branch 'origin/master'

parents 7a0fdf83 5a45ee86
Loading
Loading
Loading
Loading
+72 −0
Changes for data/ddl/table/STATUT.php: 72 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1125,6 +1125,78 @@ return [
            'position'    => 4,
            'commentaire' => NULL,
        ],
        'MODE_CALCUL'                => [
            'name'        => 'MODE_CALCUL',
            'type'        => 'string',
            'bdd-type'    => 'VARCHAR2',
            'length'      => 1000,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 86,
            'commentaire' => NULL,
        ],
        'MODE_CALCUL_PRIME'                => [
            'name'        => 'MODE_CALCUL_PRIME',
            'type'        => 'string',
            'bdd-type'    => 'VARCHAR2',
            'length'      => 1000,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 86,
            'commentaire' => NULL,
        ],
        'CODE_INDEMNITE'                => [
            'name'        => 'CODE_INDEMNITE',
            'type'        => 'string',
            'bdd-type'    => 'VARCHAR2',
            'length'      => 1000,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 86,
            'commentaire' => NULL,
        ],
        'CODE_INDEMNITE_PRIME'                => [
            'name'        => 'CODE_INDEMNITE_PRIME',
            'type'        => 'string',
            'bdd-type'    => 'VARCHAR2',
            'length'      => 1000,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 86,
            'commentaire' => NULL,
        ],
        'TYPE_PAIE'                => [
            'name'        => 'TYPE_PAIE',
            'type'        => 'string',
            'bdd-type'    => 'VARCHAR2',
            'length'      => 1000,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 86,
            'commentaire' => NULL,
        ],
        'TYPE_PAIE_PRIME'                => [
            'name'        => 'TYPE_PAIE_PRIME',
            'type'        => 'string',
            'bdd-type'    => 'VARCHAR2',
            'length'      => 1000,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 86,
            'commentaire' => NULL,
        ],
    ],
];

+12 −5
Changes for data/ddl/view/V_EXPORT_PAIEMENT_SIHAM.sql: 12 added lines, 5 removed lines.
Original line number Diff line number Diff line
CREATE OR REPLACE FORCE VIEW V_EXPORT_PAIEMENT_SIHAM AS
--CREATE OR REPLACE FORCE VIEW V_EXPORT_PAIEMENT_SIHAM AS
SELECT annee_id,
       type_intervenant_id,
       structure_id,
       periode_id,
       'P'                                                               type,
       CASE WHEN type_paie IS NOT NULL THEN type_paie ELSE 'P' END       type,
       code_rh                                                           matricule,
       CASE WHEN type_intervenant_code = 'P' THEN '0204' ELSE '1578' END code_indemnite_retenu,
       CASE WHEN code_indemnite IS NOT NULL THEN code_indemnite ELSE
       		CASE WHEN type_intervenant_code = 'P' THEN '0204' ELSE '1578' END END code_indemnite_retenu,
       ose_paiement.get_format_mois_du()                                 du_mois,
       '20' || ose_paiement.get_annee_extraction_paie()                  annee_de_paye,
       ose_paiement.get_mois_extraction_paie()                           mois_de_paye,
@@ -19,7 +20,7 @@ SELECT annee_id,
       'DN ' || type_intervenant_code || ' '
           || substr(UPPER(structure_libelle), 0, 10)
           || ' ' || annee_libelle                                       libelle,
       'B'                                                               mode_de_calcul,
        CASE WHEN mode_calcul IS NOT NULL THEN mode_calcul ELSE 'B' END  mode_de_calcul,
       code_origine                                                      code_origine
FROM (SELECT i.annee_id                                                                                        annee_id,
             a.libelle                                                                                         annee_libelle,
@@ -41,7 +42,13 @@ FROM (SELECT i.annee_id
             CASE WHEN ind <> ceil(t2.nbu / max_nbu) THEN max_nbu ELSE t2.nbu - max_nbu * (ind - 1) END        nbu,
             t2.nbu                                                                                            tnbu,
             (SELECT taux_hetd FROM annee ann WHERE ann.id = i.annee_id)                                       montant,
             COALESCE(t2.unite_budgetaire, '') || ' ' || to_char(i.annee_id) || ' ' || to_char(i.annee_id + 1) libelle
             COALESCE(t2.unite_budgetaire, '') || ' ' || to_char(i.annee_id) || ' ' || to_char(i.annee_id + 1) libelle,
             si.code_indemnite																				   code_indemnite,
             si.type_paie																					   type_paie,
             si.mode_calcul																				       mode_calcul,
             si.code_indemnite_prime																			   code_indemnite_prime,
             si.type_paie_prime																				   type_paie_prime,
             si.mode_calcul_prime																			   mode_calcul_prime
      FROM (SELECT structure_id,
                   periode_paiement_id,
                   intervenant_id,
+11 −4
Changes for data/ddl/view/V_EXPORT_PAIEMENT_WINPAIE.sql: 11 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -6,11 +6,12 @@ SELECT annee_id,
       intervenant_id,
       insee,
       nom,
       '20'                                                                carte,
       CASE WHEN type_paie IS NOT NULL THEN type_paie ELSE '20' END    carte,
       code_origine,
       CASE WHEN type_intervenant_code = 'P' THEN '0204' ELSE '2251' END   retenue,
       CASE WHEN code_indemnite IS NOT NULL THEN code_indemnite ELSE
              CASE WHEN type_intervenant_code = 'P' THEN '0204' ELSE '2251' END END   retenue,
       '0'                                                                 sens,
       'B'                                                                 mc,
       CASE WHEN mode_calcul IS NOT NULL THEN mode_calcul ELSE 'B' END                 mc,
       nbu,
       montant,
       libelle || ' ' || lpad(to_char(floor(nbu)), 2, '00') || ' H' ||
@@ -33,7 +34,13 @@ FROM (SELECT i.annee_id
             CASE WHEN ind <> ceil(t2.nbu / max_nbu) THEN max_nbu ELSE t2.nbu - max_nbu * (ind - 1) END        nbu,
             t2.nbu                                                                                            tnbu,
             (select taux_hetd from annee ann where ann.id = i.annee_id)                         montant,
             COALESCE(t2.unite_budgetaire, '') || ' ' || to_char(i.annee_id) || ' ' || to_char(i.annee_id + 1) libelle
             COALESCE(t2.unite_budgetaire, '') || ' ' || to_char(i.annee_id) || ' ' || to_char(i.annee_id + 1) libelle,
             si.code_indemnite																				   code_indemnite,
             si.type_paie																					   type_paie,
             si.mode_calcul																				       mode_calcul,
             si.code_indemnite_prime																			   code_indemnite_prime,
             si.type_paie_prime																				   type_paie_prime,
             si.mode_calcul_prime																			   mode_calcul_prime
      FROM (SELECT structure_id,
                   periode_paiement_id,
                   intervenant_id,
+9 −2
Changes for module/Intervenant/src/Entity/Db/Mapping/Intervenant.Entity.Db.Statut.dcm.xml: 9 added lines, 2 removed lines.
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<doctrine-mapping xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                  xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
    <entity name="Intervenant\Entity\Db\Statut" table="STATUT">
        <id name="id" type="integer" column="ID">
@@ -114,6 +114,13 @@
        <field name="modeEnseignementPrevisionnel" type="string" column="MODE_ENSEIGNEMENT_PREVISIONNEL" length="1000" nullable="true"/>
        <field name="modeEnseignementRealise" type="string" column="MODE_ENSEIGNEMENT_REALISE" length="1000" nullable="true"/>

        <field name="modeCalcul" type="string" column="MODE_CALCUL" length="1000" nullable="true"/>
        <field name="codeIndemnite" type="string" column="CODE_INDEMNITE" length="1000" nullable="true"/>
        <field name="typePaie" type="string" column="TYPE_PAIE" length="1000" nullable="true"/>
        <field name="modeCalculPrime" type="string" column="MODE_CALCUL_PRIME" length="1000" nullable="true"/>
        <field name="codeIndemnitePrime" type="string" column="CODE_INDEMNITE_PRIME" length="1000" nullable="true"/>
        <field name="typePaiePrime" type="string" column="TYPE_PAIE_PRIME" length="1000" nullable="true"/>


        <field name="histoCreation" type="datetime" column="HISTO_CREATION" nullable="false"/>
        <many-to-one field="histoCreateur" target-entity="Application\Entity\Db\Utilisateur">
+144 −0
Changes for module/Intervenant/src/Entity/Db/Statut.php: 144 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -198,6 +198,18 @@ class Statut implements ParametreEntityInterface, RoleInterface, ResourceInterfa

    private ?string     $modeEnseignementRealise            = null;

    private ?string     $modeCalcul                         = null;

    private ?string     $codeIndemnite                      = null;

    private ?string     $typePaie                           = null;

    private ?string     $modeCalculPrime                    = null;

    private ?string     $codeIndemnitePrime                 = null;

    private ?string     $typePaiePrime                      = null;



    public function __toString (): string
@@ -1541,6 +1553,138 @@ class Statut implements ParametreEntityInterface, RoleInterface, ResourceInterfa



    /**
     * @return string|null
     */
    public function getModeCalcul (): ?string
    {
        return $this->modeCalcul;
    }



    /**
     * @param string|null $modeCalcul
     */
    public function setModeCalcul (?string $modeCalcul): Statut
    {
        $this->modeCalcul = $modeCalcul;

        return $this;
    }



    /**
     * @return string|null
     */
    public function getCodeIndemnite (): ?string
    {
        return $this->codeIndemnite;
    }



    /**
     * @param string|null $codeIndemnite
     */
    public function setCodeIndemnite (?string $codeIndemnite): Statut
    {
        $this->codeIndemnite = $codeIndemnite;

        return $this;
    }



    /**
     * @return string|null
     */
    public function getTypePaie (): ?string
    {
        return $this->typePaie;
    }



    /**
     * @param string|null $typePaie
     */
    public function setTypePaie (?string $typePaie): Statut
    {
        $this->typePaie = $typePaie;

        return $this;
    }



    /**
     * @return string|null
     */
    public function getModeCalculPrime (): ?string
    {
        return $this->modeCalculPrime;
    }



    /**
     * @param string|null $modeCalculPrime
     */
    public function setModeCalculPrime (?string $modeCalculPrime): Statut
    {
        $this->modeCalculPrime = $modeCalculPrime;

        return $this;
    }



    /**
     * @return string|null
     */
    public function getCodeIndemnitePrime (): ?string
    {
        return $this->codeIndemnitePrime;
    }



    /**
     * @param string|null $codeIndemnitePrime
     */
    public function setCodeIndemnitePrime (?string $codeIndemnitePrime): Statut
    {
        $this->codeIndemnitePrime = $codeIndemnitePrime;

        return $this;
    }



    /**
     * @return string|null
     */
    public function getTypePaiePrime (): ?string
    {
        return $this->typePaiePrime;
    }



    /**
     * @param string|null $typePaiePrime
     */
    public function setTypePaiePrime (?string $typePaiePrime): Statut
    {
        $this->typePaiePrime = $typePaiePrime;

        return $this;
    }



    public function isModeEnseignementSemestriel (?TypeVolumeHoraire $typeVolumeHoraire = null): bool
    {
        if ($typeVolumeHoraire instanceof TypeVolumeHoraire) {
Loading