Commit 0379a382 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Paramètrage paie par statut

parent 6b969d82
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,
        ],
    ],
];

+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) {
+7 −0
Changes for module/Intervenant/src/Form/StatutSaisieForm.php: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -65,6 +65,12 @@ class StatutSaisieForm extends AbstractForm
            'offreEmploiPostuler'           => 'Postuler à une offre d\'emploi',
            'modeEnseignementPrevisionnel'  => 'Mode de saisie pour les enseignements prévisionnels',
            'modeEnseignementRealise'       => 'Mode de saisie pour les enseignements réalisés',
            'modeCalcul'                    => 'Mode de calcul de la paie (ex : A, B etc...)',
            'codeIndemnite'                 => 'Code indémnité de la paie (ex : 0204, 2251 etc...)',
            'typePaie'                      => 'Code du type ou carte de la paie (ex : 20, P etc...)',
            'modeCalculPrime'               => 'Mode de calcul pour les primes (ex : A, B etc...)',
            'codeIndemnitePrime'            => 'Code indémnité pour les primes (ex : 0204, 2251 etc...)',
            'typePaiePrime'                 => 'Type ou carte pour les primes (ex : 20, P etc...)',

        ];

@@ -93,6 +99,7 @@ class StatutSaisieForm extends AbstractForm
            'offreEmploiPostuler',
            'modeEnseignementPrevisionnel',
            'modeEnseignementRealise',

        ];

        for ($i = 1; $i <= 5; $i++) {
+30 −0
Changes for module/Intervenant/view/intervenant/statut/saisie.phtml: 30 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -321,6 +321,36 @@ $canAdd = $this->isAllowed(Privileges::getResourceId(Privileges::INTERVENANT_STA
            </div>
        </div>

        <div class="card bg-default">
            <div class="card-header">Paramètrage de l'extraction paie</div>
            <div class="card-body">
                <div class="row">
                    <div class="col-md-6">
                        <?= $this->formControlGroup($form->get('modeCalcul')); ?>
                    </div>
                    <div class="col-md-6">
                        <?= $this->formControlGroup($form->get('modeCalculPrime')); ?>
                    </div>
                </div>
                <div class="row">
                    <div class="col-md-6">
                        <?= $this->formControlGroup($form->get('codeIndemnite')); ?>
                    </div>
                    <div class="col-md-6">
                        <?= $this->formControlGroup($form->get('codeIndemnitePrime')); ?>
                    </div>
                </div>
                <div class="row">
                    <div class="col-md-6">
                        <?= $this->formControlGroup($form->get('typePaie')); ?>
                    </div>
                    <div class="col-md-6">
                        <?= $this->formControlGroup($form->get('typePaiePrime')); ?>
                    </div>
                </div>
            </div>
        </div>


        <!-- Plafonds -->
        <div class="card bg-default">