Fixes a few errors.

diff --git a/include/userset.inc.php b/include/userset.inc.php
index ce536a4..5d66dc1 100644 (file)
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -187,9 +187,9 @@ class MinificheView extends MultipageView
                 ede1.name AS eduname1, ede1.url AS eduurl1, edd1.degree AS edudegree1,
                 edu1.grad_year AS edugrad_year1, f1.field AS edufield1, edu1.program AS eduprogram1,
                 ede2.name AS eduname2, ede2.url AS eduurl2, edd2.degree AS edudegree2,
-                edu2.grad_year AS edugrad_year2, f2.field AS edufield2, edu2gram AS eduprogram2,
+                edu2.grad_year AS edugrad_year2, f2.field AS edufield2, edu2.program AS eduprogram2,
                 ede3.name AS eduname3, ede3.url AS eduurl3, edd3.degree AS edudegree3,
-                edu3.grad_year AS edugrad_year3, f3.field AS edufield3, edu3gram AS eduprogram3,
+                edu3.grad_year AS edugrad_year3, f3.field AS edufield3, edu3.program AS eduprogram3,
                 adr.city, gp.a2, gp.pays AS countrytxt, gr.name AS region,
                 (COUNT(em.email) > 0 OR FIND_IN_SET('googleapps', u.mail_storage) > 0) AS actif,
                 nd.display AS name_display, nd.tooltip AS name_tooltip, nd.sort AS name_sort" .

diff --git a/modules/fusionax/Anciens.sql b/modules/fusionax/Anciens.sql
index c8bb51e..87fa8c8 100644 (file)
--- a/modules/fusionax/Anciens.sql
+++ b/modules/fusionax/Anciens.sql
@@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS fusionax_anciens (
   partic_nom VARCHAR(5) character set utf8 NOT NULL COMMENT 'Particule du nom usuel',
   Nom_complet VARCHAR(255) character set utf8 NOT NULL COMMENT 'Nom patronymique complet (avec la particule)',
   Civilite ENUM('', '.', 'M', 'MME', 'MLLE') character set utf8 NOT NULL COMMENT 'Civilité',
-  Code_nationalite CHAR(3) NOT NULL COMMENT 'Nationalité (code)',
+  Code_nationalite CHAR(4) NOT NULL COMMENT 'Nationalité (code)',
   Type_membre ENUM('', '*', 'F', 'FB', 'P', 'PB', 'T', 'TB', 'TA') character set binary NOT NULL COMMENT 'Type de membre (code compris seulement par AX)',
   corps_sortie VARCHAR(50) character set utf8 NOT NULL COMMENT 'Corps de sortie (ou D si aucun)',
   Date_deces DATE COMMENT 'Date de décès',
@@ -41,6 +41,8 @@ SET
     `Date_maj` = CONCAT(SUBSTRING(@StringDate_maj,7),'-',SUBSTRING(@StringDate_maj,4,2),'-',SUBSTRING(@StringDate_maj,1,2)),
     `Date_deces` = CONCAT(SUBSTRING(@StringDate_deces,7),'-',SUBSTRING(@StringDate_deces,4,2),'-',SUBSTRING(@StringDate_deces,1,2));
 
+ALTER TABLE fusionax_anciens ADD INDEX (id_ancien);
+
 -- Correspondances entre fiches X.org et fiches AX
 DROP TABLE IF EXISTS `fusionax_import`;
 

diff --git a/upgrade/merge-0.0.1/02_ax_data.sql b/upgrade/merge-0.0.1/02_ax_data.sql
index 3ebcc27..1fc96e8 100644 (file)
--- a/upgrade/merge-0.0.1/02_ax_data.sql
+++ b/upgrade/merge-0.0.1/02_ax_data.sql
@@ -1,6 +1,6 @@
 CREATE TABLE IF NOT EXISTS alumni_data (
   uid INT(11) NOT NULL,
-  matricule_ax INT(8) UNSIGNED NOT NULL,
+  matricule_ax CHAR(8) UNSIGNED NOT NULL,
   login_ax VARCHAR(15) NOT NULL,
   passwd_ax INT(11) UNSIGNED DEFAULT NULL,
   promo_type ENUM('', 'A', 'B', 'C', 'N', 'S') NOT NULL,
@@ -15,7 +15,7 @@ CREATE TABLE IF NOT EXISTS alumni_data (
 
 INSERT INTO  alumni_data (uid, matricule_ax, login_ax, passwd_ax, promo_type, membership_type,
              salutation, last_dues_paid_year, represents, checked)
-     SELECT  u.user_id, CONVERT(u.matricule_ax, UNSIGNED), f.Login, f.Password, f.Groupe_promo,
+     SELECT  u.user_id, u.matricule_ax, f.Login, f.Password, f.Groupe_promo,
              f.Type_membre, f.Civilite, f.annee_dernCot, f.Representant, 0
        FROM  fusionax_anciens AS f
  INNER JOIN  auth_user_md5    AS u ON (f.id_ancien = u.matricule_ax);