Commit 561a1f68 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Mise en place du plafond par enveloppe en euros pour les missions étudiantes

parent 92d551ad
Loading
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -105,6 +105,18 @@ return [
            'position'    => 5,
            'commentaire' => NULL,
        ],
        'PLAFOND_EN_EUROS'              => [
            'name'        => 'PLAFOND_EN_EUROS',
            'type'        => 'bool',
            'bdd-type'    => 'NUMBER',
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => 1,
            'nullable'    => FALSE,
            'default'     => '0',
            'position'    => 7,
            'commentaire' => NULL,
        ],
    ],
];

+21 −0
Original line number Diff line number Diff line
SELECT
  i.annee_id      				                    annee_id,
  s.id  						                    structure_id,
  MAX(i.id)                                         intervenant_id,
  vhm.type_volume_horaire_id 			 			type_volume_horaire_id,
  ROUND(SUM(vhm.heures * trv.valeur)) 				heures
FROM mission m
JOIN intervenant i ON i.id = m.intervenant_id
JOIN structure s ON s.id = m.structure_id
JOIN volume_horaire_mission vhm ON vhm.mission_id = m.id AND vhm.type_volume_horaire_id = 1
JOIN type_volume_horaire tvh ON tvh.id = vhm.type_volume_horaire_id
JOIN taux_remu tr  ON tr.id = m.taux_remu_id
JOIN taux_remu_valeur trv ON trv.taux_remu_id = COALESCE(tr.taux_remu_id, tr.id)
 AND trv.date_effet = (
      SELECT MAX(trv2.date_effet)
      FROM taux_remu_valeur trv2
      WHERE trv2.taux_remu_id = COALESCE(tr.taux_remu_id, tr.id)
        AND trv2.date_effet <= m.date_debut
 )
GROUP BY
  i.annee_id,s.id, vhm.type_volume_horaire_id
 No newline at end of file
+6 −0
Original line number Diff line number Diff line
@@ -67,5 +67,11 @@ return [
            'message'   => 'Durée du travail dépassant le maximum autorisé (a. D811-3) pour :sujet',
            'requete'   => file_get_contents($sqlDir . '19.sql'),
        ],
        21 => [
            'libelle' => 'Plafond enveloppe en € des missions étudiantes par composante',
            'perimetre' => 'structure',
            'message' => 'Enveloppe en € des missions étudiantes pour :sujet',
            'requete' => file_get_contents($sqlDir . '21.sql'),
        ],
    ],
];
 No newline at end of file
+14 −0
Original line number Diff line number Diff line
@@ -5,15 +5,29 @@ ARG APP_ENV
ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_PROXY
ARG UNOSERVER_VERSION=3.7

ENV TZ=$TZ
ENV HTTP_PROXY=$HTTP_PROXY
ENV HTTPS_PROXY=$HTTPS_PROXY
ENV NO_PROXY=$NO_PROXY
ENV DEBIAN_FRONTEND=noninteractive
ENV PATH="/opt/unoconvert/bin:${PATH}"

# Met à jour la liste des paquets
RUN apk update

RUN apk add --no-cache \
        python3 \
        py3-pip \
        py3-virtualenv \
    && python3 -m venv /opt/unoconvert \
    && /opt/unoconvert/bin/pip install \
        --no-cache-dir \
        "unoserver==${UNOSERVER_VERSION}" \
    && ln -s /opt/unoconvert/bin/unoconvert /usr/local/bin/unoconvert \
    && ln -s /opt/unoconvert/bin/unoping /usr/local/bin/unoping

#Nécessaire depuis nouvelle version php:8.2-fpm-alpine
RUN apk add --no-cache \
    autoconf \
+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@
        <field name="message" type="string" column="MESSAGE" length="500" nullable="true"/>
        <field name="requete" type="string" column="REQUETE" length="4000" nullable="false"/>
        <field name="ok" type="boolean" column="OK" nullable="false"/>
        <field name="plafondEnEuros" type="boolean" column="PLAFOND_EN_EUROS" nullable="false"/>
        <field name="messageErreur" type="string" column="MESSAGE_ERREUR" length="2000" nullable="true"/>


Loading