Commit 355aa043 authored by Florian Joriot's avatar Florian Joriot
Browse files

Merge remote-tracking branch 'origin/b24' into b24

parents 8d6bdfae 87f3063e

data/ddl/table/TYPE_PIECE_JOINTE_STATUT.php

+12 −0
Original line number Diff line number Diff line
@@ -57,6 +57,18 @@ return [ 
            'position'    => 12,

            'commentaire' => NULL,

        ],

        'FA'                    => [

            'name'        => 'FA',

            'type'        => 'bool',

            'bdd-type'    => 'NUMBER',

            'length'      => 0,

            'scale'       => NULL,

            'precision'   => 1,

            'nullable'    => FALSE,

            'default'     => '0',

            'position'    => 20,

            'commentaire' => NULL,

        ],

        'HISTO_CREATEUR_ID'     => [

            'name'        => 'HISTO_CREATEUR_ID',

            'type'        => 'int',

data/ddl/view/V_TBL_PIECE_JOINTE_DEMANDE.sql

+4 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ WITH i_h AS ( 
    s.intervenant_id,

    SUM(CASE WHEN vh.MOTIF_NON_PAIEMENT_ID IS NULL THEN vh.heures ELSE 0 END) heures,

    SUM(CASE WHEN vh.MOTIF_NON_PAIEMENT_ID IS NOT NULL THEN vh.heures ELSE 0 END) heures_non_payables,

    --SUM(ep.taux_fc) fc

    SUM(CASE WHEN ep.taux_fc > 0 THEN vh.heures ELSE 0 END) fc

    SUM(CASE WHEN ep.taux_fc > 0 THEN vh.heures ELSE 0 END) fc,

    SUM(CASE WHEN ep.taux_fa > 0 THEN vh.heures ELSE 0 END) fa

  FROM

         service               s

    JOIN type_volume_horaire tvh ON tvh.code = 'PREVU'
@@ -82,6 +82,8 @@ WHERE i.histo_destruction IS NULL 
      END = 1

  -- Filtre FC

  AND (tpjs.fc = 0 OR i_h.fc > 0)

-- Filtre FA

  AND (tpjs.fa = 0 OR i_h.fa > 0)

GROUP BY i.annee_id,

         i.id,

         i.code,

data/formules/FORMULE_ULHN_2021.ods

−13.4 KiB (220 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

front/Mission/ListeCandidatures.vue

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ export default { 
        },

        refuserCandidature(event)

        {

            popConfirm(event.target, (response) => {

            popConfirm(event.currentTarget, (response) => {

                this.reload();

            });

        },

front/Mission/OffreEmploi.vue

+2 −2
Original line number Diff line number Diff line
@@ -284,13 +284,13 @@ export default { 
        },

        supprimer(event)

        {

            popConfirm(event.target, (response) => {

            popConfirm(event.currentTarget, (response) => {

                this.$emit('supprimer', this.offre);

            });

        },

        postuler(event)

        {

            popConfirm(event.target, (response) => {

            popConfirm(event.currentTarget, (response) => {

                this.$emit('postuler', this.offre);

            });

        },