Commit 790b0269 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Merge remote-tracking branch 'origin/alc-offres-emplois' into alc-offres-emplois

parents b99fb14a d7bf39bd
Loading
Loading
Loading
Loading
+42 −0
Changes for admin/src/DataSource.php: 42 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -269,6 +269,48 @@ class DataSource



    public function TAUX_REMU()
    {
        $data = require $this->oseAdmin->getOseDir() . 'data/taux_remu.php';

        $tauxRemu = [];

        foreach ($data as $code => $taux) {
            $taux       = [
                'CODE'    => $code,
                'LIBELLE' => $taux['libelle'],

            ];
            $tauxRemu[] = $taux;
        }

        return $tauxRemu;
    }



    public function TAUX_REMU_VALEUR()
    {
        $data = require $this->oseAdmin->getOseDir() . 'data/taux_remu.php';

        $tauxValeurs = [];

        foreach ($data as $code => $taux) {
            foreach ($taux['valeurs'] as $dateEffet => $valeur) {
                $tauxValeur    = [
                    'TAUX_REMU_ID' => $code,
                    'DATE_EFFET'   => \DateTime::createFromFormat('d/m/Y', $dateEffet),
                    'VALEUR'       => $valeur,
                ];
                $tauxValeurs[] = $tauxValeur;
            }
        }

        return $tauxValeurs;
    }



    public function TYPE_INDICATEUR()
    {
        $data        = require $this->oseAdmin->getOseDir() . 'data/indicateurs.php';
+48 −0
Changes for code/test1.php: 48 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -7,3 +7,51 @@
 * @var $viewName   string
 * @var $viewFile   string
 */

/** @var \Mission\Service\MissionService $smi */
$smi = $container->get(\Mission\Service\MissionService::class);

$intervenant = $container->get(\Application\Service\IntervenantService::class)->get(1000000000);

$guid = '31-20230309-0900-1031-0-0';
$guid = '31-20230308-1400-1700-0-0';

$missionSuivi = $smi->suivi($intervenant, $guid);


//$missionSuivi->setDescription('test');
//$missionSuivi->setHeures(10);

$data = \Application\Controller\Plugin\Axios::extract($missionSuivi);

var_dump($data);

foreach( $missionSuivi->getVolumesHoraires() as $vhm ){
    $vhSpec = $vhm->axiosDefinition();
    $vhSpec[] = 'guid';
    $vhSpec[] = 'heureDebut';
    $vhSpec[] = 'horaireFin';
    $vhSpec[] = 'description';
    $vhSpec[] = 'nocturne';
    $vhSpec[] = 'formation';

    $vhData = \Application\Controller\Plugin\Axios::extract($vhm, $vhSpec);
    unset($vhData['histoCreateur']);
    unset($vhData['histoCreation']);
    unset($vhData['canValider']);
    unset($vhData['canDevalider']);
    unset($vhData['canSupprimer']);
    var_dump($vhData);
}


?>
<script>

    let date = new Date();



    console.log(Util.affDate(date, Util.FORMAT_DATE));

</script>
+3 −1
Changes for composer.json: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -10,7 +10,9 @@
    "require"     : {
        "php"                    : ">=8.0",
        "unicaen/app"            : "6.0.1",
        "unicaen/auth"           : "6.0.0",
        "unicaen/authentification" : "6.0.3",
        "unicaen/privilege"      : "6.0.1",
        "unicaen/utilisateur"    : "6.0.4",
        "laminas/laminas-file"   : "^2.8",
        "unicaen/code"           : "6.0.5",
        "unicaen/import"         : "6.0.0",
+195 −37
Changes for composer.lock: 195 added lines, 37 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": "2a24f58724430278ccdfb7e634b4b21f",
    "content-hash": "31334270953468b25e1aab57d2d598ab",
    "packages": [
        {
            "name": "beberlei/assert",
@@ -2731,16 +2731,16 @@
        },
        {
            "name": "laminas/laminas-hydrator",
            "version": "4.12.0",
            "version": "4.13.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laminas/laminas-hydrator.git",
                "reference": "78fa8f8a29a2866b1fccdf1b0c260557b6bb595e"
                "reference": "de6da92da20873d569532adec94afa7285f21157"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/laminas/laminas-hydrator/zipball/78fa8f8a29a2866b1fccdf1b0c260557b6bb595e",
                "reference": "78fa8f8a29a2866b1fccdf1b0c260557b6bb595e",
                "url": "https://api.github.com/repos/laminas/laminas-hydrator/zipball/de6da92da20873d569532adec94afa7285f21157",
                "reference": "de6da92da20873d569532adec94afa7285f21157",
                "shasum": ""
            },
            "require": {
@@ -2753,15 +2753,15 @@
                "zendframework/zend-hydrator": "*"
            },
            "require-dev": {
                "laminas/laminas-coding-standard": "~2.4.0",
                "laminas/laminas-eventmanager": "^3.6",
                "laminas/laminas-coding-standard": "~2.5.0",
                "laminas/laminas-eventmanager": "^3.10",
                "laminas/laminas-modulemanager": "^2.14.0",
                "laminas/laminas-serializer": "^2.14.0",
                "laminas/laminas-servicemanager": "^3.19",
                "phpbench/phpbench": "^1.2.7",
                "phpunit/phpunit": "^9.5.26",
                "psalm/plugin-phpunit": "^0.18.0",
                "vimeo/psalm": "^5.0"
                "laminas/laminas-servicemanager": "^3.20",
                "phpbench/phpbench": "^1.2.8",
                "phpunit/phpunit": "^9.5.28",
                "psalm/plugin-phpunit": "^0.18.4",
                "vimeo/psalm": "^5.6"
            },
            "suggest": {
                "laminas/laminas-eventmanager": "^3.2, to support aggregate hydrator usage",
@@ -2804,20 +2804,20 @@
                    "type": "community_bridge"
                }
            ],
            "time": "2022-12-21T04:00:01+00:00"
            "time": "2023-03-19T20:05:31+00:00"
        },
        {
            "name": "laminas/laminas-i18n",
            "version": "2.21.0",
            "version": "2.22.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laminas/laminas-i18n.git",
                "reference": "fbd2d0373aaced4769cba2bf3d1425d55f68abb1"
                "reference": "fc13d1314941bd9acda3861883cd9139d747f98f"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/fbd2d0373aaced4769cba2bf3d1425d55f68abb1",
                "reference": "fbd2d0373aaced4769cba2bf3d1425d55f68abb1",
                "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/fc13d1314941bd9acda3861883cd9139d747f98f",
                "reference": "fc13d1314941bd9acda3861883cd9139d747f98f",
                "shasum": ""
            },
            "require": {
@@ -2835,7 +2835,7 @@
                "laminas/laminas-cache": "^3.8",
                "laminas/laminas-cache-storage-adapter-memory": "^2.2.0",
                "laminas/laminas-cache-storage-deprecated-factory": "^1.0.1",
                "laminas/laminas-coding-standard": "~2.4.0",
                "laminas/laminas-coding-standard": "~2.5.0",
                "laminas/laminas-config": "^3.8.0",
                "laminas/laminas-eventmanager": "^3.7",
                "laminas/laminas-filter": "^2.28.1",
@@ -2890,7 +2890,7 @@
                    "type": "community_bridge"
                }
            ],
            "time": "2022-12-02T17:15:52+00:00"
            "time": "2023-03-12T01:03:50+00:00"
        },
        {
            "name": "laminas/laminas-i18n-resources",
@@ -3575,16 +3575,16 @@
        },
        {
            "name": "laminas/laminas-mvc",
            "version": "3.6.0",
            "version": "3.6.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laminas/laminas-mvc.git",
                "reference": "c54eaebe3810feaca834cc38ef0a962c89ff2431"
                "reference": "f12e801c31c04a4b35017354ff84070f5573879f"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/laminas/laminas-mvc/zipball/c54eaebe3810feaca834cc38ef0a962c89ff2431",
                "reference": "c54eaebe3810feaca834cc38ef0a962c89ff2431",
                "url": "https://api.github.com/repos/laminas/laminas-mvc/zipball/f12e801c31c04a4b35017354ff84070f5573879f",
                "reference": "f12e801c31c04a4b35017354ff84070f5573879f",
                "shasum": ""
            },
            "require": {
@@ -3592,8 +3592,8 @@
                "laminas/laminas-eventmanager": "^3.4",
                "laminas/laminas-http": "^2.15",
                "laminas/laminas-modulemanager": "^2.8",
                "laminas/laminas-router": "^3.5",
                "laminas/laminas-servicemanager": "^3.7",
                "laminas/laminas-router": "^3.11.1",
                "laminas/laminas-servicemanager": "^3.20.0",
                "laminas/laminas-stdlib": "^3.6",
                "laminas/laminas-view": "^2.14",
                "php": "~8.0.0 || ~8.1.0 || ~8.2.0"
@@ -3602,14 +3602,12 @@
                "zendframework/zend-mvc": "*"
            },
            "require-dev": {
                "http-interop/http-middleware": "^0.4.1",
                "laminas/laminas-coding-standard": "^2.4.0",
                "laminas/laminas-json": "^3.3",
                "laminas/laminas-psr7bridge": "^1.8",
                "laminas/laminas-stratigility": ">=2.0.1 <2.2",
                "phpspec/prophecy": "^1.15.0",
                "phpspec/prophecy-phpunit": "^2.0.1",
                "phpunit/phpunit": "^9.5.25"
                "phpunit/phpunit": "^9.5.25",
                "webmozart/assert": "^1.11"
            },
            "suggest": {
                "laminas/laminas-json": "(^2.6.1 || ^3.0) To auto-deserialize JSON body content in AbstractRestfulController extensions, when json_decode is unavailable",
@@ -3654,7 +3652,7 @@
                    "type": "community_bridge"
                }
            ],
            "time": "2022-12-05T14:02:56+00:00"
            "time": "2023-03-15T10:21:03+00:00"
        },
        {
            "name": "laminas/laminas-mvc-i18n",
@@ -6973,6 +6971,36 @@
            "description": "Module d'authentification pour les applications Unicaen",
            "time": "2023-01-26T15:43:30+00:00"
        },
        {
            "name": "unicaen/authentification",
            "version": "6.0.3",
            "source": {
                "type": "git",
                "url": "https://git.unicaen.fr/lib/unicaen/authentification.git",
                "reference": "8fecd370043a0364a54f867abed4839b476aa12f"
            },
            "require": {
                "jasig/phpcas": "1.5.*",
                "laminas/laminas-dependency-plugin": "^2.1",
                "ramsey/uuid": "^3.7",
                "unicaen/app": ">=6.0",
                "unicaen/bjy-authorize": "^5.0"
            },
            "require-dev": {
                "phpunit/phpunit": "^5.6"
            },
            "type": "library",
            "autoload": {
                "psr-0": {
                    "UnicaenAuthentification": "src/"
                },
                "classmap": [
                    "./Module.php"
                ]
            },
            "description": "Module d'authentification pour les applications Unicaen - Version Laminas",
            "time": "2023-03-21T08:19:01+00:00"
        },
        {
            "name": "unicaen/bjy-authorize",
            "version": "5.0.0",
@@ -7136,6 +7164,29 @@
            "description": "Module d'import de données vers une base Oracle",
            "time": "2023-02-03T15:01:18+00:00"
        },
        {
            "name": "unicaen/mail",
            "version": "6.0.2",
            "source": {
                "type": "git",
                "url": "https://git.unicaen.fr/lib/unicaen/mail.git",
                "reference": "bee0f5d6ad8376a12f0167ac5baea9979d39530a"
            },
            "require": {
                "laminas/laminas-dependency-plugin": "^2.2",
                "php": "^8.0",
                "unicaen/privilege": "^6.0"
            },
            "type": "library",
            "autoload": {
                "psr-0": [],
                "classmap": [
                    "./Module.php"
                ]
            },
            "description": "Module d'envoi de mail",
            "time": "2023-03-20T11:19:54+00:00"
        },
        {
            "name": "unicaen/open-document",
            "version": "6.0.1",
@@ -7156,6 +7207,33 @@
            "description": "Module Unicaen de traitement des fichiers au format OpenDocument",
            "time": "2023-02-08T10:58:46+00:00"
        },
        {
            "name": "unicaen/privilege",
            "version": "6.0.1",
            "source": {
                "type": "git",
                "url": "https://git.unicaen.fr/lib/unicaen/privilege.git",
                "reference": "574471c1763acc4b2ec441fd6dbc0fe6a599a877"
            },
            "require": {
                "laminas/laminas-dependency-plugin": "^2.1",
                "unicaen/app": ">=5.0"
            },
            "require-dev": {
                "phpunit/phpunit": ">=3.7"
            },
            "type": "library",
            "autoload": {
                "psr-0": {
                    "UnicaenPrivilege": "src/"
                },
                "classmap": [
                    "./Module.php"
                ]
            },
            "description": "Module reprenant la gestion des privileges  - Version laminas",
            "time": "2023-03-21T09:16:07+00:00"
        },
        {
            "name": "unicaen/siham",
            "version": "2.3",
@@ -7212,6 +7290,38 @@
            "description": "Module Unicaen de gestion de tableaux de bord Oracle",
            "time": "2023-02-03T14:58:23+00:00"
        },
        {
            "name": "unicaen/utilisateur",
            "version": "6.0.4",
            "source": {
                "type": "git",
                "url": "https://git.unicaen.fr/lib/unicaen/utilisateur.git",
                "reference": "92ce57bf68a4c00dcd113f350af8ad70a70abcde"
            },
            "require": {
                "laminas/laminas-dependency-plugin": "^2.1",
                "unicaen/app": ">=6.0",
                "unicaen/mail": ">=5.0"
            },
            "require-dev": {
                "phpunit/phpunit": ">=3.7"
            },
            "type": "library",
            "autoload": {
                "psr-0": {
                    "UnicaenUtilisateur": "src/"
                },
                "suggested": {
                    "UnicaenUtilisateurLdapAdaptater": "unicaen/utilisateur-ldap-adapter",
                    "UnicaenUtilisateurOctopusAdaptater": "unicaen/utilisateur-octopus-adapter"
                },
                "classmap": [
                    "./Module.php"
                ]
            },
            "description": "Module reprenant la gestion des utilisateurs, privileges et roles - Version laminas",
            "time": "2023-03-21T08:09:59+00:00"
        },
        {
            "name": "unicaen/zfc-user",
            "version": "5.0.0",
@@ -8051,24 +8161,27 @@
        },
        {
            "name": "phpdocumentor/type-resolver",
            "version": "1.6.2",
            "version": "1.7.0",
            "source": {
                "type": "git",
                "url": "https://github.com/phpDocumentor/TypeResolver.git",
                "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d"
                "reference": "1534aea9bde19a5c85c5d1e1f834ab63f4c5dcf5"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/48f445a408c131e38cab1c235aa6d2bb7a0bb20d",
                "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d",
                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/1534aea9bde19a5c85c5d1e1f834ab63f4c5dcf5",
                "reference": "1534aea9bde19a5c85c5d1e1f834ab63f4c5dcf5",
                "shasum": ""
            },
            "require": {
                "doctrine/deprecations": "^1.0",
                "php": "^7.4 || ^8.0",
                "phpdocumentor/reflection-common": "^2.0"
                "phpdocumentor/reflection-common": "^2.0",
                "phpstan/phpdoc-parser": "^1.13"
            },
            "require-dev": {
                "ext-tokenizer": "*",
                "phpbench/phpbench": "^1.2",
                "phpstan/extension-installer": "^1.1",
                "phpstan/phpstan": "^1.8",
                "phpstan/phpstan-phpunit": "^1.1",
@@ -8100,9 +8213,9 @@
            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
            "support": {
                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.2"
                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.0"
            },
            "time": "2022-10-14T12:47:21+00:00"
            "time": "2023-03-12T10:13:29+00:00"
        },
        {
            "name": "phpmd/phpmd",
@@ -8187,6 +8300,51 @@
            ],
            "time": "2022-09-10T08:44:15+00:00"
        },
        {
            "name": "phpstan/phpdoc-parser",
            "version": "1.16.1",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpdoc-parser.git",
                "reference": "e27e92d939e2e3636f0a1f0afaba59692c0bf571"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/e27e92d939e2e3636f0a1f0afaba59692c0bf571",
                "reference": "e27e92d939e2e3636f0a1f0afaba59692c0bf571",
                "shasum": ""
            },
            "require": {
                "php": "^7.2 || ^8.0"
            },
            "require-dev": {
                "php-parallel-lint/php-parallel-lint": "^1.2",
                "phpstan/extension-installer": "^1.0",
                "phpstan/phpstan": "^1.5",
                "phpstan/phpstan-phpunit": "^1.1",
                "phpstan/phpstan-strict-rules": "^1.0",
                "phpunit/phpunit": "^9.5",
                "symfony/process": "^5.2"
            },
            "type": "library",
            "autoload": {
                "psr-4": {
                    "PHPStan\\PhpDocParser\\": [
                        "src/"
                    ]
                }
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
                "MIT"
            ],
            "description": "PHPDoc parser with support for nullable, intersection and generic types",
            "support": {
                "issues": "https://github.com/phpstan/phpdoc-parser/issues",
                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.16.1"
            },
            "time": "2023-02-07T18:11:17+00:00"
        },
        {
            "name": "sabre/event",
            "version": "5.1.4",
+5 −1
Changes for config/application.config.php: 5 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -123,7 +123,11 @@ class AppConfig
            'DoctrineORMModule',
            'ZfcUser',
            'UnicaenApp',
            'UnicaenAuth',
            //'UnicaenAuth',
            'UnicaenAuthentification',
            'UnicaenMail',
            'UnicaenUtilisateur',
            'UnicaenPrivilege',
            'UnicaenImport',
            'UnicaenTbl',
            'UnicaenSiham',
Loading