Commit d1465b4d authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Prise en compte des filtres définis dans sync=>Tables pour la sync d'1 intervenant en particulier

parent 2a87ab5c

composer.json

+1 −1
Changes for composer.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
        "unicaen/bjy-authorize"  : "3.0.4",

        "zendframework/zend-file": "2.8.3",

        "unicaen/code"           : "3.0.2",

        "unicaen/import"         : "3.1.1",

        "unicaen/import"         : "3.1.2",

        "unicaen/tbl"            : "4.1",

        "unicaen/open-document"  : "3.0.2",

        "ocramius/proxy-manager" : "2.2.3"

composer.lock

+12 −12
Changes for composer.lock: 12 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",

        "This file is @generated automatically"

    ],

    "content-hash": "1d2680b5951f56654d1f0198ebece701",

    "content-hash": "f191a20ddf60f8ae6c8fa22905a096f3",

    "packages": [

        {

            "name": "beberlei/assert",
@@ -2160,7 +2160,7 @@ 
        },

        {

            "name": "symfony/polyfill-ctype",

            "version": "v1.22.0",

            "version": "v1.22.1",

            "source": {

                "type": "git",

                "url": "https://github.com/symfony/polyfill-ctype.git",
@@ -2236,16 +2236,16 @@ 
        },

        {

            "name": "symfony/polyfill-mbstring",

            "version": "v1.22.0",

            "version": "v1.22.1",

            "source": {

                "type": "git",

                "url": "https://github.com/symfony/polyfill-mbstring.git",

                "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13"

                "reference": "5232de97ee3b75b0360528dae24e73db49566ab1"

            },

            "dist": {

                "type": "zip",

                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f377a3dd1fde44d37b9831d68dc8dea3ffd28e13",

                "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13",

                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1",

                "reference": "5232de97ee3b75b0360528dae24e73db49566ab1",

                "shasum": ""

            },

            "require": {
@@ -2309,11 +2309,11 @@ 
                    "type": "tidelift"

                }

            ],

            "time": "2021-01-07T16:49:33+00:00"

            "time": "2021-01-22T09:19:47+00:00"

        },

        {

            "name": "symfony/polyfill-php73",

            "version": "v1.22.0",

            "version": "v1.22.1",

            "source": {

                "type": "git",

                "url": "https://github.com/symfony/polyfill-php73.git",
@@ -2389,7 +2389,7 @@ 
        },

        {

            "name": "symfony/polyfill-php80",

            "version": "v1.22.0",

            "version": "v1.22.1",

            "source": {

                "type": "git",

                "url": "https://github.com/symfony/polyfill-php80.git",
@@ -2772,11 +2772,11 @@ 
        },

        {

            "name": "unicaen/import",

            "version": "3.1.1",

            "version": "3.1.2",

            "source": {

                "type": "git",

                "url": "https://git.unicaen.fr/lib/unicaen/import.git",

                "reference": "079d89aee3d60086a7798ab4e14e5b098b6b5546"

                "reference": "a0fac328b3ee946f181d719bcfee1297d7c969f2"

            },

            "require": {

                "unicaen/auth": "dev-zf-3.x || ^3.0",
@@ -2796,7 +2796,7 @@ 
                ]

            },

            "description": "Module d'import de données vers une base Oracle",

            "time": "2021-02-11T16:31:50+00:00"

            "time": "2021-02-16T09:00:36+00:00"

        },

        {

            "name": "unicaen/open-document",

module/Application/src/Application/Controller/IntervenantController.php

+1 −1
Changes for module/Application/src/Application/Controller/IntervenantController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ class IntervenantController extends AbstractController 
            $query->setNotNull([]); // Aucune colonne ne doit être non nulle !!

            $query->setLimit(101);

            $query->setColValues(['ANNEE_ID' => $intervenant->getAnnee()->getId(), 'CODE' => $intervenant->getCode()]);

            $data = $this->getServiceDifferentiel()->make($query, $query::SQL_FULL, true)->fetchAll();

            $data = $this->getServiceDifferentiel()->make($query, $query::SQL_FULL, false)->fetchAll();

        }



        return compact('intervenant', 'isImportable', 'data');

module/Application/src/Application/Controller/IntervenantDossierController.php

+1 −3
Changes for module/Application/src/Application/Controller/IntervenantDossierController.php: 1 added line, 3 removed lines.
Original line number Diff line number Diff line
@@ -208,9 +208,7 @@ class IntervenantDossierController extends AbstractController 
        }

        try {

            $this->getServiceValidation()->validerDossier($intervenantDossier);

            if ($intervenant->getSourceCode() && $intervenant->getSource()->getImportable()) {

                $this->getProcessusImport()->execMaj('INTERVENANT', 'SOURCE_CODE', $intervenant->getSourceCode());

            }

            $this->getProcessusImport()->execMaj('INTERVENANT', 'CODE', $intervenant->getCode());

            $this->updateTableauxBord($intervenant, true);

            $this->flashMessenger()->addSuccessMessage("Validation des données personnelles <strong>enregistrée</strong> avec succès.");

        } catch (\Exception $e) {