Commit 24f22865 authored by Florian Joriot's avatar Florian Joriot
Browse files

Modification temporaire de feuille de route (a verifier) 

modifier package ose paiement quand pas de valeur taux sur la date demandé

mise a jour de la V_CONTRAT_MAIN.sql pour l'etat de sortie mission
parent 3d15f917

data/ddl/package/OSE_PAIEMENT/body.sql

+1 −1
Changes for data/ddl/package/OSE_PAIEMENT/body.sql: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ CREATE OR REPLACE PACKAGE BODY "OSE_PAIEMENT" AS 


    EXCEPTION

    WHEN OTHERS THEN

       RETURN to_date('00/00/0000', 'dd/mm/YYYY');

       RETURN to_date('01/01/0001', 'dd/mm/YYYY');

  END get_taux_horaire_date;



END ose_paiement;
 
 No newline at end of file

data/ddl/view/V_CONTRAT_MAIN.sql

+8 −1
Changes for data/ddl/view/V_CONTRAT_MAIN.sql: 8 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -59,6 +59,9 @@ SELECT ct.annee_id, 
       ct."tauxNom",

       ct."debutValidite",

       ct."finValidite",

       ct."pays_nationalite",

       ct."date_creation",

       ct."date_contrat_lie",

       CASE ct.est_contrat

           WHEN 1 THEN -- contrat

               'Contrat de travail'
@@ -135,7 +138,10 @@ FROM ( SELECT c.*, 
             CASE WHEN LOWER(si.codes_corresp_2) = 'oui' THEN 1 ELSE 0 END                                                                                  est_atv,

             tm.libelle                                                                                                                                     "missionNom",

             to_char(c.debut_validite, 'dd/mm/YYYY')                                                                                                        "debutValidite",

             to_char(c.fin_validite, 'dd/mm/YYYY')                                                                                                          "finValidite"

             to_char(c.fin_validite, 'dd/mm/YYYY')                                                                                                          "finValidite",

             p.libelle                                                                                                                                      "pays_nationalite",

             COALESCE(v.histo_creation,c.histo_creation)                                                                                                    "date_creation",

             cp.date_retour_signe                                                                                                                           "date_contrat_lie"

        FROM

            contrat                         c

            JOIN type_contrat               tc ON tc.id = c.type_contrat_id
@@ -145,6 +151,7 @@ FROM ( SELECT c.*, 
            LEFT JOIN taux_remu             trs ON si.taux_remu_id = trs.id

            JOIN STRUCTURE                  s ON s.id = c.structure_id

            LEFT JOIN intervenant_dossier   d ON d.intervenant_id = i.id AND d.histo_destruction IS NULL

            LEFT JOIN pays                  p ON d.pays_nationalite_id = p.id

            JOIN civilite                   civ ON civ.id = COALESCE(d.civilite_id,i.civilite_id)

            LEFT JOIN validation            v ON v.id = c.validation_id AND v.histo_destruction IS NULL

            JOIN type_volume_horaire        tvh ON tvh.code = 'PREVU'

module/Application/src/View/Helper/Intervenant/FeuilleDeRouteViewHelper.php

+1 −0
Changes for module/Application/src/View/Helper/Intervenant/FeuilleDeRouteViewHelper.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ class FeuilleDeRouteViewHelper extends AbstractHtmlElement 
            case $franchissement == 0:

                if ($objectif === .0) {

                    $attrs   = [

                        'title' => 'À faire',

                        'class' => 'text-danger float-end',

                    ];

                    $content = $tag('span', ['class' => 'fas fa-xmark text-danger']);