Skip to content
Snippets Groups Projects
Commit 7d119498 authored by lecluse's avatar lecluse
Browse files

Corection de bug si pb de modélisation plus d'erreur bloquante

parent 10805aab
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
composer.lock
+ 18
− 18
View file @ 7d119498
...@@ -1114,16 +1114,16 @@ ...@@ -1114,16 +1114,16 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v3.2.6", "version": "v3.2.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "28fb243a2b5727774ca309ec2d92da240f1af0dd" "reference": "c30243cc51f726812be3551316b109a2f5deaf8d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/28fb243a2b5727774ca309ec2d92da240f1af0dd", "url": "https://api.github.com/repos/symfony/console/zipball/c30243cc51f726812be3551316b109a2f5deaf8d",
"reference": "28fb243a2b5727774ca309ec2d92da240f1af0dd", "reference": "c30243cc51f726812be3551316b109a2f5deaf8d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1173,20 +1173,20 @@ ...@@ -1173,20 +1173,20 @@
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-03-06 19:30:27" "time": "2017-04-04 14:33:42"
}, },
{ {
"name": "symfony/debug", "name": "symfony/debug",
"version": "v3.2.6", "version": "v3.2.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/debug.git", "url": "https://github.com/symfony/debug.git",
"reference": "b90c9f91ad8ac37d9f114e369042d3226b34dc1a" "reference": "56f613406446a4a0a031475cfd0a01751de22659"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/b90c9f91ad8ac37d9f114e369042d3226b34dc1a", "url": "https://api.github.com/repos/symfony/debug/zipball/56f613406446a4a0a031475cfd0a01751de22659",
"reference": "b90c9f91ad8ac37d9f114e369042d3226b34dc1a", "reference": "56f613406446a4a0a031475cfd0a01751de22659",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1230,7 +1230,7 @@ ...@@ -1230,7 +1230,7 @@
], ],
"description": "Symfony Debug Component", "description": "Symfony Debug Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-02-18 17:28:00" "time": "2017-03-28 21:38:24"
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
...@@ -1293,7 +1293,7 @@ ...@@ -1293,7 +1293,7 @@
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v2.8.18", "version": "v2.8.19",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/process.git", "url": "https://github.com/symfony/process.git",
...@@ -1456,7 +1456,7 @@ ...@@ -1456,7 +1456,7 @@
"source": { "source": {
"type": "svn", "type": "svn",
"url": "https://svn.unicaen.fr/svn/UnicaenImport", "url": "https://svn.unicaen.fr/svn/UnicaenImport",
"reference": "/trunk/@34" "reference": "/trunk/@36"
}, },
"require": { "require": {
"unicaen/unicaen-auth": "1.*", "unicaen/unicaen-auth": "1.*",
...@@ -1476,7 +1476,7 @@ ...@@ -1476,7 +1476,7 @@
] ]
}, },
"description": "Boite à outils pour la programmation avec la bibliothèque Unicaen", "description": "Boite à outils pour la programmation avec la bibliothèque Unicaen",
"time": "2016-11-30 17:01:24" "time": "2017-04-06 16:32:25"
}, },
{ {
"name": "unicaen/unicaen-oracle", "name": "unicaen/unicaen-oracle",
...@@ -4740,16 +4740,16 @@ ...@@ -4740,16 +4740,16 @@
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "v3.2.6", "version": "v3.2.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/yaml.git", "url": "https://github.com/symfony/yaml.git",
"reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a" "reference": "62b4cdb99d52cb1ff253c465eb1532a80cebb621"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/093e416ad096355149e265ea2e4cc1f9ee40ab1a", "url": "https://api.github.com/repos/symfony/yaml/zipball/62b4cdb99d52cb1ff253c465eb1532a80cebb621",
"reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a", "reference": "62b4cdb99d52cb1ff253c465eb1532a80cebb621",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -4791,7 +4791,7 @@ ...@@ -4791,7 +4791,7 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-03-07 16:47:02" "time": "2017-03-20 09:45:15"
}, },
{ {
"name": "webmozart/assert", "name": "webmozart/assert",
......
data/Sql/charges.sql
+ 59
− 35
View file @ 7d119498
select * from etape where source_code like '%DEPHAR%'; select * from noeud where code = 'M.1SE61';
WITH sne AS (
SELECT
sne.scenario_noeud_id,
sne.etape_id,
SUM(sne.effectif) effectif
FROM
scenario_noeud_effectif sne
JOIN type_heures th ON th.id = sne.type_heures_id AND th.code = 'fi'
GROUP BY
sne.scenario_noeud_id,
sne.etape_id
)
SELECT
nep.id noeud_ep_id,
netp.id noeud_etape_id,
ep.id element_pedagogique_id,
ep.etape_id etape_id,
ep.structure_id structure_id,
ti.id type_intervention_id,
sn.scenario_id scenario_id,
--COALESCE(sns.ouverture, 1) ouverture,
--COALESCE(sns.dedoublement, csdd.dedoublement,1) dedoublement,
COALESCE(snep.effectif,0) effectif,
--CASE WHEN COALESCE(sne.effectif,0) < COALESCE(sns.ouverture, 1) THEN 0 ELSE
-- CEIL( COALESCE(sne.effectif,0) / COALESCE(sns.dedoublement, csdd.dedoublement,1) )
--END groupes,
CASE WHEN COALESCE(sne.effectif,0) < COALESCE(sns.ouverture, 1) THEN 0 ELSE
CEIL( COALESCE(sne.effectif,0) / COALESCE(sns.dedoublement, csdd.dedoublement,1) )
END * vhe.heures heures,
CASE WHEN COALESCE(sne.effectif,0) < COALESCE(sns.ouverture, 1) THEN 0 ELSE
CEIL( COALESCE(sne.effectif,0) / COALESCE(sns.dedoublement, csdd.dedoublement,1) )
END * vhe.heures * ti.taux_hetd_service hetd
FROM
noeud nep
JOIN element_pedagogique ep ON ep.id = nep.element_pedagogique_id
JOIN volume_horaire_ens vhe ON vhe.element_pedagogique_id = ep.id
AND vhe.histo_destruction IS NULL
AND vhe.heures > 0
select * from type_heures; JOIN type_intervention ti ON ti.id = vhe.type_intervention_id
select * from scenario_lien;
select * from etape where id = 24137;
-- contrôles
select 'select' import_action, count(*) from etape where histo_destruction is null
union select import_action, count(*) from v_diff_etape group by import_action;
select 'select' import_action, annee_id, count(*) from element_pedagogique where histo_destruction is null group by annee_id
union select import_action, annee_id, count(*) from v_diff_element_pedagogique group by import_action, annee_id;
select 'select' import_action, count(*) from chemin_pedagogique where histo_destruction is null
union select import_action, count(*) from v_diff_chemin_pedagogique group by import_action;
select 'select' import_action, count(*) from volume_horaire_ens where histo_destruction is null
union select import_action, count(*) from v_diff_volume_horaire_ens group by import_action;
select 'select' import_action, count(*) from lien where histo_destruction is null JOIN scenario_noeud sn ON sn.noeud_id = nep.id
union select import_action, count(*) from v_diff_lien group by import_action; AND sn.histo_destruction IS NULL
select 'select' import_action, count(*) from noeud where histo_destruction is null LEFT JOIN sne sne ON sne.scenario_noeud_id = sn.id
union select import_action, count(*) from v_diff_noeud group by import_action; AND sne.etape_id = ep.etape_id
LEFT JOIN v_chargens_seuils_ded_def csdd ON csdd.noeud_id = nep.id
AND csdd.scenario_id = sn.scenario_id
AND csdd.type_intervention_id = ti.id
LEFT JOIN noeud netp ON netp.etape_id = ep.etape_id
select * from v_diff_element_pedagogique where import_action = 'delete'; LEFT JOIN scenario_noeud snetp ON snetp.noeud_id = netp.id
AND snetp.histo_destruction IS NULL
AND snetp.scenario_id = sn.scenario_id
select * from src_element_pedagogique WHERE source_code like '%MOB341%'; LEFT JOIN scenario_noeud_seuil snsetp ON snsetp.scenario_noeud_id = snetp.id
select * from element_pedagogique WHERE source_code like '%MOB341%'; AND snsetp.type_intervention_id = ti.id
select annee_id, count(*) from ose_element_pedagogique2@apoprod group by annee_id;
select annee_id, count(*) from element_pedagogique where histo_destruction is null group by annee_id;
SELECT
*
FROM
etape e
WHERE WHERE
--e.histo_destruction is not null nep.histo_destruction IS NULL
e.annee_id = 2016 AND nep.id = 245981;
AND id in (select etape_id from element_pedagogique ep where ep.histo_destruction is null AND annee_id = 2016);
\ No newline at end of file select * from noeud where id = 245981;
\ No newline at end of file
module/Application/src/Application/Provider/Chargens/NoeudProvider.php
+ 2
− 0
View file @ 7d119498
...@@ -193,6 +193,8 @@ class NoeudProvider ...@@ -193,6 +193,8 @@ class NoeudProvider
"; ";
$data = $this->chargens->getBdd()->fetch($sql, ['annee' => $anneeId], 'ID'); $data = $this->chargens->getBdd()->fetch($sql, ['annee' => $anneeId], 'ID');
if (empty($data)) return $data;
$ids = implode(',', array_keys($data)); $ids = implode(',', array_keys($data));
/* Récup des liens associés (nombre uniquement) */ /* Récup des liens associés (nombre uniquement) */
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment