projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fusion: fetch ax_id when comparing promotions
[platal.git]
/
modules
/
fusionax.php
diff --git
a/modules/fusionax.php
b/modules/fusionax.php
index
d223feb
..
1fbfc49
100644
(file)
--- a/
modules/fusionax.php
+++ b/
modules/fusionax.php
@@
-517,7
+517,7
@@
class FusionAxModule extends PLModule
function handler_promo($page, $action = '')
{
$page->changeTpl('fusionax/promo.tpl');
function handler_promo($page, $action = '')
{
$page->changeTpl('fusionax/promo.tpl');
- $res = XDB::iterator("SELECT pid, private_name, promo_etude_xorg, promo_sortie_xorg, promo_etude_ax, promo
+ $res = XDB::iterator("SELECT pid,
ax_id,
private_name, promo_etude_xorg, promo_sortie_xorg, promo_etude_ax, promo
FROM fusionax_promo
WHERE !(promo_etude_ax + 1 = promo_etude_xorg AND promo_etude_xorg + 3 = promo_sortie_xorg)
AND !(promo_etude_ax + 1 = promo_etude_xorg AND promo_etude_xorg + 4 = promo_sortie_xorg)
FROM fusionax_promo
WHERE !(promo_etude_ax + 1 = promo_etude_xorg AND promo_etude_xorg + 3 = promo_sortie_xorg)
AND !(promo_etude_ax + 1 = promo_etude_xorg AND promo_etude_xorg + 4 = promo_sortie_xorg)
@@
-527,7
+527,7
@@
class FusionAxModule extends PLModule
$page->assign('nbMissmatchingPromos', $res->total());
$page->assign('missmatchingPromos', $res);
$page->assign('nbMissmatchingPromos', $res->total());
$page->assign('missmatchingPromos', $res);
- $res = XDB::iterator("SELECT pid, private_name, promo_etude_xorg, promo_sortie_xorg, promo_etude_ax, promo
+ $res = XDB::iterator("SELECT pid,
ax_id,
private_name, promo_etude_xorg, promo_sortie_xorg, promo_etude_ax, promo
FROM fusionax_promo
WHERE promo_etude_ax = promo_etude_xorg + 1 AND groupe_promo = 'X'
ORDER BY promo_etude_xorg");
FROM fusionax_promo
WHERE promo_etude_ax = promo_etude_xorg + 1 AND groupe_promo = 'X'
ORDER BY promo_etude_xorg");
@@
-535,7
+535,7
@@
class FusionAxModule extends PLModule
$page->assign('nbMissmatchingPromos1', $res->total());
$page->assign('missmatchingPromos1', $res);
$page->assign('nbMissmatchingPromos1', $res->total());
$page->assign('missmatchingPromos1', $res);
- $res = XDB::iterator("SELECT pid, private_name, promo_etude_xorg, promo_sortie_xorg, promo_etude_ax, promo
+ $res = XDB::iterator("SELECT pid,
ax_id,
private_name, promo_etude_xorg, promo_sortie_xorg, promo_etude_ax, promo
FROM fusionax_promo
WHERE promo_etude_ax + 1 = promo_etude_xorg AND promo_etude_xorg + 3 = promo_sortie_xorg AND groupe_promo = 'X'
ORDER BY promo_etude_xorg");
FROM fusionax_promo
WHERE promo_etude_ax + 1 = promo_etude_xorg AND promo_etude_xorg + 3 = promo_sortie_xorg AND groupe_promo = 'X'
ORDER BY promo_etude_xorg");
@@
-543,7
+543,7
@@
class FusionAxModule extends PLModule
$page->assign('nbMissmatchingPromos2', $res->total());
$page->assign('missmatchingPromos2', $res);
$page->assign('nbMissmatchingPromos2', $res->total());
$page->assign('missmatchingPromos2', $res);
- $res = XDB::iterator("SELECT pid, private_name, promo_etude_xorg, promo_sortie_xorg, promo_etude_ax, promo
+ $res = XDB::iterator("SELECT pid,
ax_id,
private_name, promo_etude_xorg, promo_sortie_xorg, promo_etude_ax, promo
FROM fusionax_promo
WHERE promo_etude_ax + 1 = promo_etude_xorg AND promo_etude_xorg + 4 = promo_sortie_xorg AND groupe_promo = 'X'
ORDER BY promo_etude_xorg");
FROM fusionax_promo
WHERE promo_etude_ax + 1 = promo_etude_xorg AND promo_etude_xorg + 4 = promo_sortie_xorg AND groupe_promo = 'X'
ORDER BY promo_etude_xorg");
@@
-551,7
+551,7
@@
class FusionAxModule extends PLModule
$page->assign('nbMissmatchingPromos3', $res->total());
$page->assign('missmatchingPromos3', $res);
$page->assign('nbMissmatchingPromos3', $res->total());
$page->assign('missmatchingPromos3', $res);
- $res = XDB::iterator("SELECT pid, private_name, promo_etude_xorg, promo_sortie_xorg, promo_etude_ax, promo
+ $res = XDB::iterator("SELECT pid,
ax_id,
private_name, promo_etude_xorg, promo_sortie_xorg, promo_etude_ax, promo
FROM fusionax_promo
WHERE groupe_promo = 'M'
ORDER BY promo_etude_xorg");
FROM fusionax_promo
WHERE groupe_promo = 'M'
ORDER BY promo_etude_xorg");
@@
-560,7
+560,7
@@
class FusionAxModule extends PLModule
$page->assign('missmatchingPromosM', $res);
$page->assign('missmatchingPromosM', $res);
- $res = XDB::iterator("SELECT pid, private_name, promo_etude_xorg, promo_sortie_xorg, promo_etude_ax, promo
+ $res = XDB::iterator("SELECT pid,
ax_id,
private_name, promo_etude_xorg, promo_sortie_xorg, promo_etude_ax, promo
FROM fusionax_promo
WHERE groupe_promo = 'D'
ORDER BY promo_etude_xorg");
FROM fusionax_promo
WHERE groupe_promo = 'D'
ORDER BY promo_etude_xorg");