X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Ffusionax.php;h=237336c2a3a2051e7406aad495febba13d8c885a;hb=34465ab035104f739a54ec62660f04f874448627;hp=28958be8913268ab17ce19048326810d0ed75d0d;hpb=f875fdc7a9cd2b879598a1e0ac0cb73456e4e809;p=platal.git

diff --git a/modules/fusionax.php b/modules/fusionax.php
index 28958be..237336c 100644
--- a/modules/fusionax.php
+++ b/modules/fusionax.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2007 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -43,6 +43,7 @@ class FusionAxModule extends PLModule
             'fusionax/view'     => $this->make_hook('view',     AUTH_MDP, 'admin'),
             'fusionax/ids'      => $this->make_hook('ids',      AUTH_MDP, 'admin'),
             'fusionax/deceased' => $this->make_hook('deceased', AUTH_MDP, 'admin'),
+            'fusionax/promo'    => $this->make_hook('promo',    AUTH_MDP, 'admin'),
         );
     }
 
@@ -65,7 +66,6 @@ class FusionAxModule extends PLModule
 
         if ($action == 'index') {
             $page->changeTpl('fusionax/import.tpl');
-            $page->addJsLink('jquery.js');
             if (isset($globals->fusionax) && isset($globals->fusionax->LastUpdate)) {
                 $page->assign(
                     'lastimport',
@@ -171,12 +171,12 @@ class FusionAxModule extends PLModule
             XDB::execute('DROP VIEW IF EXISTS fusionax_deceased');
             XDB::execute('CREATE VIEW  fusionax_deceased AS
                                SELECT  u.user_id, a.id_ancien, u.nom, u.prenom, u.promo, u.deces AS deces_xorg, a.Date_deces AS deces_ax
-                                 FROM  auth_user_md5 i  AS u
+                                 FROM  auth_user_md5    AS u
                            INNER JOIN  fusionax_anciens AS a ON (a.id_ancien = u.matricule_ax)
                                 WHERE  u.deces != a.Date_deces');
             XDB::execute('DROP VIEW IF EXISTS fusionax_promo');
             XDB::execute('CREATE VIEW  fusionax_promo AS
-                               SELECT  u.user_id, u.matricule_ax, u.nom, u.prenom, u.promo AS promo_etude_xorg,
+                               SELECT  u.user_id, u.matricule_ax, CONCAT(u.nom, " ", u.prenom) AS display_name, u.promo AS promo_etude_xorg,
                                        f.promotion_etude AS promo_etude_ax, u.promo_sortie AS promo_sortie_xorg
                                  FROM  auth_user_md5    AS u
                            INNER JOIN  fusionax_anciens AS f ON (u.matricule_ax = f.id_ancien)
@@ -277,7 +277,6 @@ class FusionAxModule extends PLModule
         $globals = Platal::globals();
         $nbToLink = 100;
 
-        $page->addJsLink('jquery.js');
         $page->assign('xorg_title', 'Polytechnique.org - Fusion - Mise en correspondance simple');
         if ($part == 'missingInAX') {
             // locate all persons from this database that are not in AX's
@@ -408,6 +407,24 @@ class FusionAxModule extends PLModule
         $page->assign('nbDeceasedDifferent', $res->total());
         $page->assign('deceasedDifferent', $res);
     }
+
+    function handler_promo(&$page, $action = '')
+    {
+        $page->changeTpl('fusionax/promo.tpl');
+        $res = XDB::iterator('SELECT  user_id, display_name, promo_etude_xorg, promo_sortie_xorg, promo_etude_ax
+                                FROM  fusionax_promo
+                               WHERE  !(promo_etude_ax + 1 = promo_etude_xorg AND promo_etude_xorg + 3 = promo_sortie_xorg)');
+        $nbMissmatchingPromos = $res->total();
+        $page->assign('nbMissmatchingPromos1', $res->total());
+        $page->assign('missmatchingPromos1', $res);
+        $res = XDB::iterator('SELECT  user_id, display_name, promo_etude_xorg, promo_sortie_xorg, promo_etude_ax
+                                FROM  fusionax_promo
+                               WHERE  promo_etude_ax + 1 = promo_etude_xorg AND promo_etude_xorg + 3 = promo_sortie_xorg');
+        $nbMissmatchingPromos += $res->total();
+        $page->assign('nbMissmatchingPromos2', $res->total());
+        $page->assign('missmatchingPromos2', $res);
+        $page->assign('nbMissmatchingPromos', $nbMissmatchingPromos);
+    }
 }
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:?>