Skip to content
GitLab
Commit 120247af authored by Laurent Lécluse's avatar Laurent Lécluse
Browse files

Optimisations suite injection massive d'effectifs

parent 3728b9d8
Expand all Hide whitespace changes
Inline Side-by-side
composer.json
View file @ 120247af
......@@ -17,7 +17,7 @@
"zendframework/zend-file": "2.8.3",
"unicaen/code" : "3.0.2",
"unicaen/import" : "3.1.5",
"unicaen/tbl" : "4.1",
"unicaen/tbl" : "4.2",
"unicaen/open-document" : "3.0.2",
"ocramius/proxy-manager" : "2.2.3"
},
......
composer.lock
View file @ 120247af
......@@ -420,16 +420,16 @@
},
{
"name": "doctrine/dbal",
"version": "2.13.3",
"version": "2.13.4",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
"reference": "0d7adf4cadfee6f70850e5b163e6cdd706417838"
"reference": "2411a55a2a628e6d8dd598388ab13474802c7b6e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/0d7adf4cadfee6f70850e5b163e6cdd706417838",
"reference": "0d7adf4cadfee6f70850e5b163e6cdd706417838",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/2411a55a2a628e6d8dd598388ab13474802c7b6e",
"reference": "2411a55a2a628e6d8dd598388ab13474802c7b6e",
"shasum": ""
},
"require": {
......@@ -442,8 +442,8 @@
"require-dev": {
"doctrine/coding-standard": "9.0.0",
"jetbrains/phpstorm-stubs": "2021.1",
"phpstan/phpstan": "0.12.96",
"phpunit/phpunit": "^7.5.20|^8.5|9.5.5",
"phpstan/phpstan": "0.12.99",
"phpunit/phpunit": "^7.5.20|^8.5|9.5.10",
"psalm/plugin-phpunit": "0.16.1",
"squizlabs/php_codesniffer": "3.6.0",
"symfony/cache": "^4.4",
......@@ -521,7 +521,7 @@
"type": "tidelift"
}
],
"time": "2021-09-12T19:11:48+00:00"
"time": "2021-10-02T15:59:26+00:00"
},
{
"name": "doctrine/deprecations",
......@@ -1813,20 +1813,20 @@
},
{
"name": "psr/container",
"version": "1.1.1",
"version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/container.git",
"reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
"reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
"reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
"url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
"reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
"shasum": ""
},
"require": {
"php": ">=7.2.0"
"php": ">=7.4.0"
},
"type": "library",
"autoload": {
......@@ -1853,7 +1853,7 @@
"container-interop",
"psr"
],
"time": "2021-03-05T17:36:06+00:00"
"time": "2021-11-05T16:50:12+00:00"
},
{
"name": "psr/log",
......@@ -1952,22 +1952,22 @@
},
{
"name": "ramsey/uuid",
"version": "3.9.4",
"version": "3.9.6",
"source": {
"type": "git",
"url": "https://github.com/ramsey/uuid.git",
"reference": "be2451bef8147b7352a28fb4cddb08adc497ada3"
"reference": "ffa80ab953edd85d5b6c004f96181a538aad35a3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ramsey/uuid/zipball/be2451bef8147b7352a28fb4cddb08adc497ada3",
"reference": "be2451bef8147b7352a28fb4cddb08adc497ada3",
"url": "https://api.github.com/repos/ramsey/uuid/zipball/ffa80ab953edd85d5b6c004f96181a538aad35a3",
"reference": "ffa80ab953edd85d5b6c004f96181a538aad35a3",
"shasum": ""
},
"require": {
"ext-json": "*",
"paragonie/random_compat": "^1 | ^2 | ^9.99.99",
"php": "^5.4 | ^7 | ^8",
"php": "^5.4 | ^7.0 | ^8.0",
"symfony/polyfill-ctype": "^1.8"
},
"replace": {
......@@ -1976,14 +1976,16 @@
"require-dev": {
"codeception/aspect-mock": "^1 | ^2",
"doctrine/annotations": "^1.2",
"goaop/framework": "1.0.0-alpha.2 | ^1 | ^2.1",
"jakub-onderka/php-parallel-lint": "^1",
"goaop/framework": "1.0.0-alpha.2 | ^1 | >=2.1.0 <=2.3.2",
"mockery/mockery": "^0.9.11 | ^1",
"moontoast/math": "^1.1",
"nikic/php-parser": "<=4.5.0",
"paragonie/random-lib": "^2",
"php-mock/php-mock-phpunit": "^0.3 | ^1.1",
"phpunit/phpunit": "^4.8 | ^5.4 | ^6.5",
"squizlabs/php_codesniffer": "^3.5"
"php-mock/php-mock-phpunit": "^0.3 | ^1.1 | ^2.6",
"php-parallel-lint/php-parallel-lint": "^1.3",
"phpunit/phpunit": ">=4.8.36 <9.0.0 | >=9.3.0",
"squizlabs/php_codesniffer": "^3.5",
"yoast/phpunit-polyfills": "^1.0"
},
"suggest": {
"ext-ctype": "Provides support for PHP Ctype functions",
......@@ -2045,7 +2047,7 @@
"type": "tidelift"
}
],
"time": "2021-08-06T20:32:15+00:00"
"time": "2021-09-25T23:07:42+00:00"
},
{
"name": "setasign/fpdi",
......@@ -2117,16 +2119,16 @@
},
{
"name": "symfony/console",
"version": "v4.4.30",
"version": "v4.4.33",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "a3f7189a0665ee33b50e9e228c46f50f5acbed22"
"reference": "8dbd23ef7a8884051482183ddee8d9061b5feed0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/a3f7189a0665ee33b50e9e228c46f50f5acbed22",
"reference": "a3f7189a0665ee33b50e9e228c46f50f5acbed22",
"url": "https://api.github.com/repos/symfony/console/zipball/8dbd23ef7a8884051482183ddee8d9061b5feed0",
"reference": "8dbd23ef7a8884051482183ddee8d9061b5feed0",
"shasum": ""
},
"require": {
......@@ -2200,7 +2202,7 @@
"type": "tidelift"
}
],
"time": "2021-08-25T19:27:26+00:00"
"time": "2021-10-25T16:36:08+00:00"
},
{
"name": "symfony/polyfill-ctype",
......@@ -6494,16 +6496,16 @@
},
{
"name": "phpdocumentor/reflection-docblock",
"version": "5.2.2",
"version": "5.3.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
"reference": "069a785b2141f5bcf49f3e353548dc1cce6df556"
"reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556",
"reference": "069a785b2141f5bcf49f3e353548dc1cce6df556",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
"reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
"shasum": ""
},
"require": {
......@@ -6514,7 +6516,8 @@
"webmozart/assert": "^1.9.1"
},
"require-dev": {
"mockery/mockery": "~1.3.2"
"mockery/mockery": "~1.3.2",
"psalm/phar": "^4.8"
},
"type": "library",
"extra": {
......@@ -6542,20 +6545,20 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
"time": "2020-09-03T19:13:55+00:00"
"time": "2021-10-19T17:43:47+00:00"
},
{
"name": "phpdocumentor/type-resolver",
"version": "1.4.0",
"version": "1.5.1",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0"
"reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
"reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/a12f7e301eb7258bb68acd89d4aefa05c2906cae",
"reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae",
"shasum": ""
},
"require": {
......@@ -6563,7 +6566,8 @@
"phpdocumentor/reflection-common": "^2.0"
},
"require-dev": {
"ext-tokenizer": "*"
"ext-tokenizer": "*",
"psalm/phar": "^4.8"
},
"type": "library",
"extra": {
......@@ -6587,7 +6591,7 @@
}
],
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"time": "2020-09-17T18:55:26+00:00"
"time": "2021-10-02T14:08:47+00:00"
},
{
"name": "phpspec/prophecy",
......@@ -6931,16 +6935,16 @@
},
{
"name": "phpunit/phpunit",
"version": "8.5.20",
"version": "8.5.21",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "9deefba183198398a09b927a6ac6bc1feb0b7b70"
"reference": "50a58a60b85947b0bee4c8ecfe0f4bbdcf20e984"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9deefba183198398a09b927a6ac6bc1feb0b7b70",
"reference": "9deefba183198398a09b927a6ac6bc1feb0b7b70",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/50a58a60b85947b0bee4c8ecfe0f4bbdcf20e984",
"reference": "50a58a60b85947b0bee4c8ecfe0f4bbdcf20e984",
"shasum": ""
},
"require": {
......@@ -7020,27 +7024,27 @@
"type": "github"
}
],
"time": "2021-08-31T06:44:38+00:00"
"time": "2021-09-25T07:37:20+00:00"
},
{
"name": "sabre/event",
"version": "5.1.2",
"version": "5.1.4",
"source": {
"type": "git",
"url": "https://github.com/sabre-io/event.git",
"reference": "c120bec57c17b6251a496efc82b732418b49d50a"
"reference": "d7da22897125d34d7eddf7977758191c06a74497"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sabre-io/event/zipball/c120bec57c17b6251a496efc82b732418b49d50a",
"reference": "c120bec57c17b6251a496efc82b732418b49d50a",
"url": "https://api.github.com/repos/sabre-io/event/zipball/d7da22897125d34d7eddf7977758191c06a74497",
"reference": "d7da22897125d34d7eddf7977758191c06a74497",
"shasum": ""
},
"require": {
"php": "^7.1 || ^8.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "~2.16.1",
"friendsofphp/php-cs-fixer": "~2.17.1",
"phpstan/phpstan": "^0.12",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.0"
},
......@@ -7081,7 +7085,7 @@
"reactor",
"signal"
],
"time": "2020-10-03T11:02:22+00:00"
"time": "2021-11-04T06:51:17+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
......@@ -7667,7 +7671,6 @@
"type": "github"
}
],
"abandoned": true,
"time": "2020-11-30T07:30:19+00:00"
},
{
......@@ -7806,16 +7809,16 @@
},
{
"name": "squizlabs/php_codesniffer",
"version": "3.6.0",
"version": "3.6.1",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
"reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625"
"reference": "f268ca40d54617c6e06757f83f699775c9b3ff2e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ffced0d2c8fa8e6cdc4d695a743271fab6c38625",
"reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/f268ca40d54617c6e06757f83f699775c9b3ff2e",
"reference": "f268ca40d54617c6e06757f83f699775c9b3ff2e",
"shasum": ""
},
"require": {
......@@ -7853,7 +7856,7 @@
"phpcs",
"standards"
],
"time": "2021-04-09T00:54:41+00:00"
"time": "2021-10-11T04:00:11+00:00"
},
{
"name": "theseer/tokenizer",
......
data/ddl/package/UNICAEN_TBL/body.sql
View file @ 120247af
This diff is collapsed.
data/ddl/package/UNICAEN_TBL/definition.sql
View file @ 120247af
......@@ -2,14 +2,23 @@ CREATE OR REPLACE PACKAGE "UNICAEN_TBL" AS
ACTIV_TRIGGERS BOOLEAN DEFAULT TRUE;
ACTIV_CALCULS BOOLEAN DEFAULT TRUE;
CALCUL_PROC_PARAM VARCHAR2(30);
CALCUL_PROC_VALUE VARCHAR2(80);
TYPE t_params IS RECORD (
p1 VARCHAR2(30), v1 VARCHAR2(80),
p2 VARCHAR2(30), v2 VARCHAR2(80),
p3 VARCHAR2(30), v3 VARCHAR2(80),
p4 VARCHAR2(30), v4 VARCHAR2(80),
p5 VARCHAR2(30), v5 VARCHAR2(80)
);
CALCUL_PROC_PARAMS t_params;
FUNCTION QUERY_APPLY_PARAM( sqlQuery VARCHAR2, param VARCHAR2, value VARCHAR2) RETURN CLOB;
FUNCTION MAKE_WHERE(param VARCHAR2 DEFAULT NULL, value VARCHAR2 DEFAULT NULL, alias VARCHAR2 DEFAULT NULL) RETURN VARCHAR2;
PROCEDURE CALCULER( TBL_NAME VARCHAR2 );
PROCEDURE CALCULER( TBL_NAME VARCHAR2, param VARCHAR2, value VARCHAR2 );
PROCEDURE CALCULER(TBL_NAME VARCHAR2, params t_params);
PROCEDURE DEMANDE_CALCUL( TBL_NAME VARCHAR2, param VARCHAR2, value VARCHAR2 );
PROCEDURE ANNULER_DEMANDES;
......@@ -18,22 +27,22 @@ CREATE OR REPLACE PACKAGE "UNICAEN_TBL" AS
-- AUTOMATIC GENERATION --
PROCEDURE C_AGREMENT(param VARCHAR2, value VARCHAR2);
PROCEDURE C_CHARGENS(param VARCHAR2, value VARCHAR2);
PROCEDURE C_CHARGENS_SEUILS_DEF(param VARCHAR2, value VARCHAR2);
PROCEDURE C_CLOTURE_REALISE(param VARCHAR2, value VARCHAR2);
PROCEDURE C_CONTRAT(param VARCHAR2, value VARCHAR2);
PROCEDURE C_DMEP_LIQUIDATION(param VARCHAR2, value VARCHAR2);
PROCEDURE C_DOSSIER(param VARCHAR2, value VARCHAR2);
PROCEDURE C_PAIEMENT(param VARCHAR2, value VARCHAR2);
PROCEDURE C_PIECE_JOINTE(param VARCHAR2, value VARCHAR2);
PROCEDURE C_PIECE_JOINTE_DEMANDE(param VARCHAR2, value VARCHAR2);
PROCEDURE C_PIECE_JOINTE_FOURNIE(param VARCHAR2, value VARCHAR2);
PROCEDURE C_SERVICE(param VARCHAR2, value VARCHAR2);
PROCEDURE C_SERVICE_REFERENTIEL(param VARCHAR2, value VARCHAR2);
PROCEDURE C_SERVICE_SAISIE(param VARCHAR2, value VARCHAR2);
PROCEDURE C_VALIDATION_ENSEIGNEMENT(param VARCHAR2, value VARCHAR2);
PROCEDURE C_VALIDATION_REFERENTIEL(param VARCHAR2, value VARCHAR2);
PROCEDURE C_AGREMENT(useParams BOOLEAN DEFAULT FALSE);
PROCEDURE C_CHARGENS(useParams BOOLEAN DEFAULT FALSE);
PROCEDURE C_CHARGENS_SEUILS_DEF(useParams BOOLEAN DEFAULT FALSE);
PROCEDURE C_CLOTURE_REALISE(useParams BOOLEAN DEFAULT FALSE);
PROCEDURE C_CONTRAT(useParams BOOLEAN DEFAULT FALSE);
PROCEDURE C_DMEP_LIQUIDATION(useParams BOOLEAN DEFAULT FALSE);
PROCEDURE C_DOSSIER(useParams BOOLEAN DEFAULT FALSE);
PROCEDURE C_PAIEMENT(useParams BOOLEAN DEFAULT FALSE);
PROCEDURE C_PIECE_JOINTE(useParams BOOLEAN DEFAULT FALSE);
PROCEDURE C_PIECE_JOINTE_DEMANDE(useParams BOOLEAN DEFAULT FALSE);
PROCEDURE C_PIECE_JOINTE_FOURNIE(useParams BOOLEAN DEFAULT FALSE);
PROCEDURE C_SERVICE(useParams BOOLEAN DEFAULT FALSE);
PROCEDURE C_SERVICE_REFERENTIEL(useParams BOOLEAN DEFAULT FALSE);
PROCEDURE C_SERVICE_SAISIE(useParams BOOLEAN DEFAULT FALSE);
PROCEDURE C_VALIDATION_ENSEIGNEMENT(useParams BOOLEAN DEFAULT FALSE);
PROCEDURE C_VALIDATION_REFERENTIEL(useParams BOOLEAN DEFAULT FALSE);
-- END OF AUTOMATIC GENERATION --
......
data/privileges.php
View file @ 120247af
......@@ -255,9 +255,8 @@ return [
'unicaen-tbl' => [
'libelle' => 'Tableaux de bord',
'privileges' => [
'admin' => 'Gestion des tableaux de bord',
'update-actuproc' => 'Mise à jour des procédures d\'actualisation',
'actualisation' => 'Actualisation',
'admin' => 'Gestion des tableaux de bord',
'actualisation' => 'Actualisation',
],
],
......
module/Application/src/Application/Provider/Chargens/ChargensProvider.php
View file @ 120247af
......@@ -4,12 +4,10 @@ namespace Application\Provider\Chargens;
use Application\Connecteur\Bdd\BddConnecteurAwareTrait;
use Application\Entity\Chargens\Noeud;
use Application\Entity\Db\Annee;
use Application\Entity\Db\Etape;
use Application\Entity\Db\Scenario;
use Application\Entity\Db\Structure;
use Application\Entity\Db\Traits\StructureAwareTrait;
use Application\Entity\Db\TypeHeures;
use Application\Service\Traits\ContextServiceAwareTrait;
use Application\Service\Traits\SourceServiceAwareTrait;
use Application\Service\Traits\TypeHeuresServiceAwareTrait;
......
module/Application/src/Application/Service/SeuilChargeService.php
View file @ 120247af
......@@ -148,8 +148,14 @@ class SeuilChargeService extends AbstractEntityService
{
parent::save($entity);
$this->getServiceTableauBord()->calculer('chargens_seuils_def', 'ANNEE_ID', $entity->getAnnee()->getId());
$this->getServiceTableauBord()->calculer('chargens', 'ANNEE_ID', $entity->getAnnee()->getId());
$params = [
'ANNEE_ID' => $entity->getAnnee()->getId(),
'SCENARIO_ID' => $entity->getScenario()->getId(),
'TYPE_INTERVENTION_ID' => $entity->getTypeIntervention()->getId(),
];
$this->getServiceTableauBord()->calculer('chargens_seuils_def', $params);
$this->getServiceTableauBord()->calculer('chargens', $params);
return $entity;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment