Commit 5ea7c7fc authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge branch 'master' of https://git.unicaen.fr/open-source/OSE

parents 3f1d226b b880c136

composer.lock

deleted100755 → 0
+0 −8162

File deleted.

Preview size limit exceeded, changes collapsed.

doc/Connecteurs-Import/Octopus/MV_INTERVENANT.sql

+2 −2
Original line number Diff line number Diff line
@@ -258,8 +258,8 @@ FROM i 
         JOIN induni

              ON i.code = induni.c_individu_chaine --AND induni.c_source IN ('HARP', 'OCTO', 'SIHAM'))

         LEFT JOIN octo.individu@octoprod ind ON ind.c_individu_chaine = induni.c_individu_chaine

         LEFT JOIN octo.v_individu_insee@octoprod vindinsee ON ind.c_individu_chaine = vindinsee.individu_id

         LEFT JOIN octo.v_individu_iban@octoprod vindiban ON vindiban.individu_id = ind.c_individu_chaine

         LEFT JOIN octo.v_via_individu_insee@octoprod vindinsee ON ind.c_individu_chaine = vindinsee.individu_id

         LEFT JOIN octo.v_via_individu_iban@octoprod vindiban ON vindiban.individu_id = ind.c_individu_chaine

         LEFT JOIN iban_dossier ibandossier ON ibandossier.code = ind.c_individu_chaine

         LEFT JOIN octo.v_individu@octoprod vind ON vind.c_individu_chaine = induni.c_individu_chaine

    --On récupére la structure principale de l'individu

doc/Connecteurs-Import/Octopus/SRC_VOIRIE.sql

0 → 100644
+13 −0
Original line number Diff line number Diff line 
CREATE OR REPLACE VIEW SRC_VOIRIE AS

SELECT

    vvsn.code         code,

    vvsn.libelle      libelle,

    src.id            source_id,

    vvsn.code         source_code,

    vvsn.code         core

FROM octo.v_via_siham_nomenclatures@octoprod vvsn

JOIN source src ON src.code = 'Octopus'

WHERE vvsn.cdstco = 'VNT'

module/Application/src/Application/Form/Adresse/AdresseFieldset.php

+3 −1
Original line number Diff line number Diff line
@@ -115,12 +115,14 @@ class AdresseFieldset extends AbstractFieldset 
        /**

         * voirie

         */

        $qb      = $this->getServiceVoirie()->finderByHistorique();

        $voiries = \UnicaenApp\Util::collectionAsOptions($this->getServiceVoirie()->getList($qb));

        $this->add([

            'name'       => 'voirie',

            'options'    => [

                'label'         => 'Voirie',

                'empty_option'  => ' ',

                'value_options' => \UnicaenApp\Util::collectionAsOptions($this->getServiceVoirie()->getList()),

                'value_options' => $voiries,

            ],

            'attributes' => [

                'class'            => 'selectpicker dossierElement',

module/ExportRh/view/export-rh/export-rh/siham/dataPEC.phtml

+3 −4
Original line number Diff line number Diff line
@@ -55,10 +55,9 @@ 
                    $adresse = (!empty($intervenantDossier->getAdresseLieuDit())) ? $intervenantDossier->getAdresseLieuDit() . '<br/>' : '';

                    $adresse .= (!empty($intervenantDossier->getAdresseNumero())) ? $intervenantDossier->getAdresseNumero() . ' ' : '';

                    $adresse .= (!empty($intervenantDossier->getAdresseNumeroCompl())) ? $intervenantDossier->getAdresseNumeroCompl() . ' ' : '';

                    $adresse .= (!empty($intervenantDossier->getAdresseVoirie())) ? strtoupper($intervenantDossier->getAdresseVoirie()) . ' ' : '';

                    $adresse .= (!empty($intervenantDossier->getAdresseVoie())) ? $intervenantDossier->getAdresseVoie() . ' ' : '';

                    $adresse .= (!empty($intervenantDossier->getAdressePrecisions())) ? '<br/>' . $intervenantDossier->getAdressePrecisions() . ' ' : '';

                    $adresse .= '<br/>';

                    $adresse .= (!empty($intervenantDossier->getAdresseVoirie()) && !empty(trim($intervenantDossier->getAdresseVoie()))) ? strtoupper($intervenantDossier->getAdresseVoirie()) . ' ' : '';

                    $adresse .= (!empty($intervenantDossier->getAdresseVoie())) ? $intervenantDossier->getAdresseVoie() . '<br/>' : '';

                    $adresse .= (!empty($intervenantDossier->getAdressePrecisions())) ? $intervenantDossier->getAdressePrecisions() . '<br/>' : '';

                    $adresse .= $intervenantDossier->getAdresseCodePostal() . ' ' . $intervenantDossier->getAdresseCommune();

                    echo $adresse;

                    ?>