X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Ffusionax.php;h=e5d853d8af9971b95e4639cf3d69196f95d719a8;hb=cecdf74795e71ed038411915dad5e0dff6ea51fa;hp=ff3e33d4418437de52ac186e4ea45078cf573017;hpb=7f12e3b4113791f3372f11572a205925d7bb6b97;p=platal.git
diff --git a/modules/fusionax.php b/modules/fusionax.php
index ff3e33d..e5d853d 100644
--- a/modules/fusionax.php
+++ b/modules/fusionax.php
@@ -1,6 +1,6 @@
ax_xorg_rsa_key =
- dirname(__FILE__).'/../configs/ax_xorg_rsa.pem';
- }
-
+class FusionAxModule extends PLModule
+{
function handlers()
{
return array(
- 'fusionax' => $this->make_hook('index', AUTH_MDP, 'admin'),
- 'fusionax/import' => $this->make_hook('import', AUTH_MDP,'admin'),
- 'fusionax/ids' => $this->make_hook('ids', AUTH_MDP, 'admin'),
- 'fusionax/misc' => $this->make_hook('misc', AUTH_MDP, 'admin'),
+ 'fusionax' => $this->make_hook('index', AUTH_MDP, 'admin'),
+ 'fusionax/import' => $this->make_hook('import', AUTH_MDP, 'admin'),
+ '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'),
);
}
function handler_index(&$page)
{
- global $globals;
$page->changeTpl('fusionax/index.tpl');
- $page->assign('xorg_title','Polytechnique.org - Fusion des annuaires');
- if (isset($globals->fusionax) &&
- isset($globals->fusionax->LastUpdate)) {
- $page->assign(
- 'lastimport',
- date("d-m-Y",$globals->fusionax->LastUpdate));
- }
+ $page->assign('xorg_title', 'Polytechnique.org - Fusion des annuaires');
}
-
- /** Import de l'annuaire de l'AX depuis l'export situé sur leur serveur */
- function handler_import(&$page, $action = 'index', $fileSQL = '')
+
+ /** Import de l'annuaire de l'AX depuis l'export situé dans le home de jacou */
+ function handler_import(&$page, $action = 'index', $file = '')
{
if ($action == 'index') {
$page->changeTpl('fusionax/import.tpl');
- $page->addJsLink('jquery.js');
- global $globals;
- if (isset($globals->fusionax) &&
- isset($globals->fusionax->LastUpdate)) {
- $page->assign(
- 'lastimport',
- "le ".date("d/m/Y Ã H:i",$globals->fusionax->LastUpdate));
- }
- if (!file_exists($this->ax_xorg_rsa_key)) {
- $page->assign(
- 'keymissing',
- $this->ax_xorg_rsa_key);
- }
return;
}
-
+
// toutes les actions sont faites en ajax en utilisant jquery
- header("Content-type: text/javascript; charset=utf-8");
-
+ header('Content-type: text/javascript; charset=utf-8');
+
// log des actions
$report = array();
-
- // création d'un fichier temporaire si nécessaire
- if (Env::has('tmpdir')) {
- $tmpdir = Env::v('tmpdir');
- } else {
- $tmpdir = tempnam('/tmp', 'fusionax');
- unlink($tmpdir);
- mkdir($tmpdir);
- chmod($tmpdir, 0700);
- // copie la clef d'authentification (paire de clef RSA dont la
- // partie publique est sur polytechniciens.com)
- if (!copy(
- $this->ax_xorg_rsa_key,
- $tmpdir.'/ax_xorg_rsa'))
- $report[] = 'Impossible de copier la clef pour se logger '.
- 'au serveur AX';
- chmod($tmpdir.'/ax_xorg_rsa', 0600);
- }
-
- $modulepath = realpath(dirname(__FILE__).'/fusionax/').'/';
- $olddir = getcwd();
- chdir($tmpdir);
-
+
+ $modulepath = realpath(dirname(__FILE__) . '/fusionax/') . '/';
+ $spoolpath = realpath(dirname(__FILE__) . '/../spool/fusionax/') . '/';
+
if ($action == 'launch') {
- // lancement : connexion en ssh et récupération du fichier depuis
- // polyechniciens.com, décompression de l'archive et séparation en
- // fichiers par tables
- exec($modulepath.'import-ax.sh', $report);
- $report[] = utf8_decode('Récupération du fichier terminé.');
- $report[] = 'Import dans la base en cours...';
- $next = 'integrateSQL';
- } else if ($action == 'integrateSQL') {
+ if ($file == '') {
+ $report[] = 'Nom de fichier non renseigné.';
+ } elseif (!file_exists(dirname(__FILE__) . '/../spool/fusionax/' . $file)) {
+ $report[] = 'Le fichier ne se situe pas au bon endroit.';
+ } else {
+ // séparation de l'archive en fichiers par tables
+ $file = $spoolpath . $file;
+ // Removes master and doctorate students
+ exec('grep -v "^[A-Z]\{2\}.[0-9]\{4\}[MD][0-9]\{3\}" ' . $file . ' > ' . $file . '.tmp');
+ exec('mv -f ' . $file . '.tmp ' . $file);
+ // Split export into specialised files
+ exec('grep "^AD" ' . $file . ' > ' . $spoolpath . 'Adresses.txt');
+ exec('grep "^AN" ' . $file . ' > ' . $spoolpath . 'Anciens.txt');
+ exec('grep "^FO" ' . $file . ' > ' . $spoolpath . 'Formations.txt');
+ exec('grep "^AC" ' . $file . ' > ' . $spoolpath . 'Activites.txt');
+ exec('grep "^EN" ' . $file . ' > ' . $spoolpath . 'Entreprises.txt');
+ exec($modulepath . 'formation.pl');
+ exec('mv -f ' . $spoolpath . 'Formations_out.txt ' . $spoolpath . 'Formations.txt');
+ $report[] = 'Fichier parsé.';
+ $report[] = 'Import dans la base en cours...';
+ $next = 'integrateSQL';
+ }
+ } elseif ($action == 'integrateSQL') {
// intégration des données dans la base MySQL
// liste des fichiers sql à exécuter
$filesSQL = array(
- 'Activites.sql',
- 'Adresses.sql',
- 'Anciens.sql',
- 'Formations.sql',
- 'Entreprises.sql');
- if ($fileSQL != '') {
+ 0 => 'Activites.sql',
+ 1 => 'Adresses.sql',
+ 2 => 'Anciens.sql',
+ 3 => 'Formations.sql',
+ 4 => 'Entreprises.sql'
+ );
+ if ($file != '') {
// récupère le contenu du fichier sql
- $queries = explode(';',file_get_contents($modulepath.$fileSQL));
- foreach ($queries as $q) if (trim($q)) {
- // coupe le fichier en requêtes individuelles
- if (substr($q,0,2) == '--') {
- // affiche les commentaires dans le report
- $lines = explode("\n",$q);
- $l = $lines[0];
- $report[] = addslashes(utf8_decode($l));
+ $queries = explode(';', file_get_contents($modulepath . $filesSQL[$file]));
+ foreach ($queries as $q) {
+ if (trim($q)) {
+ // coupe le fichier en requêtes individuelles
+ if (substr($q, 0, 2) == '--') {
+ // affiche les commentaires dans le report
+ $lines = explode("\n", $q);
+ $l = $lines[0];
+ $report[] = addslashes($l);
+ }
+ // exécute la requête
+ XDB::execute(str_replace('{?}', $spoolpath, $q));
}
- // exécute la requête
- XDB::execute($q);
}
// trouve le prochain fichier à exécuter
- $trans = array_flip($filesSQL);
- $nextfile = $trans[$fileSQL] + 1;
+ $nextfile = $file + 1;
} else {
$nextfile = 0;
}
- if (!isset($filesSQL[$nextfile])) {
- // tous les fichiers ont été exécutés, on passe à l'étape
- // suivante
- $next = 'clean';
+ if ($nextfile > 4) {
+ // tous les fichiers ont été exécutés, on passe à l'étape suivante
+ $next = 'adds1920';
} else {
// on passe au fichier suivant
- $next = 'integrateSQL/'.$filesSQL[$nextfile];
+ $next = 'integrateSQL/' . $nextfile;
}
- } else if ($action == 'clean') {
+ } elseif ($action == 'adds1920') {
+ // Adds promotion 1920 from AX db.
+ $report[] = 'Ajout de la promotion 1920';
+ $res = XDB::iterator('SELECT prenom, Nom_complet, ax_id
+ FROM fusionax_anciens
+ WHERE promotion_etude = 1920;');
+
+ $nameTypes = DirEnum::getOptions(DirEnum::NAMETYPES);
+ $nameTypes = array_flip($nameTypes);
+ $eduSchools = DirEnum::getOptions(DirEnum::EDUSCHOOLS);
+ $eduSchools = array_flip($eduSchools);
+ $eduDegrees = DirEnum::getOptions(DirEnum::EDUDEGREES);
+ $eduDegrees = array_flip($eduDegrees);
+ $degreeid = $eduDegrees[Profile::DEGREE_X];
+ $entry_year = 1920;
+ $grad_year = 1923;
+ $promo = 'X1920';
+ $sex = PlUser::GENDER_MALE;
+ $xorgId = 19200000;
+ $type = 'x';
+
+ while (list($firstname, $lastname, $ax_id) = $res->next()) {
+ $hrid = self::getHrid($firstname, $lastname, $promo);
+ $res1 = XDB::query('SELECT COUNT(*)
+ FROM accounts
+ WHERE hruid = {?}', $hrid);
+ $res2 = XDB::query('SELECT COUNT(*)
+ FROM profiles
+ WHERE hrpid = {?}', $hrid);
+ if (is_null($hrid) || $res1->fetchOneCell() > 0 || $res2->fetchOneCell() > 0) {
+ $report[] = $ax_id . ' non ajouté';
+ }
+ $fullName = $firstname . ' ' . $lastname;
+ $directoryName = $lastname . ' ' . $firstname;
+ ++$xorgId;
+
+ XDB::execute('REPLACE INTO profiles (hrpid, xorg_id, ax_id, sex)
+ VALUES ({?}, {?}, {?}, {?})',
+ $hrid, $xorgId, $ax_id, $sex);
+ $pid = XDB::insertId();
+ XDB::execute('REPLACE INTO profile_name (pid, name, typeid)
+ VALUES ({?}, {?}, {?})',
+ $pid, $lastname, $nameTypes['name_ini']);
+ XDB::execute('REPLACE INTO profile_name (pid, name, typeid)
+ VALUES ({?}, {?}, {?})',
+ $pid, $firstname, $nameTypes['firstname_ini']);
+ XDB::execute('REPLACE INTO profile_display (pid, yourself, public_name, private_name,
+ directory_name, short_name, sort_name, promo)
+ VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
+ $pid, $firstname, $fullName, $fullName, $directoryName, $fullName, $directoryName, $promo);
+ XDB::execute('REPLACE INTO profile_education (pid, eduid, degreeid, entry_year, grad_year, flags)
+ VALUES ({?}, {?}, {?}, {?}, {?}, {?})',
+ $pid, $eduSchools[Profile::EDU_X], $degreeid, $entry_year, $grad_year, 'primary');
+ XDB::execute('REPLACE INTO accounts (hruid, type, is_admin, state, full_name, directory_name, display_name, sex)
+ VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?})',
+ $hrid, $type, 0, 'active', $fullName, $directoryName, $lastname, $sex);
+ $uid = XDB::insertId();
+ XDB::execute('REPLACE INTO account_profiles (uid, pid, perms)
+ VALUES ({?}, {?}, {?})',
+ $uid, $pid, 'owner');
+ }
+ $report[] = 'Promo 1920 ajoutée.';
+ $next = 'view';
+ } elseif ($action == 'view') {
+ XDB::execute('CREATE OR REPLACE ALGORITHM=MERGE VIEW fusionax_xorg_anciens AS
+ SELECT p.pid, p.ax_id, pd.promo, pd.private_name, pd.public_name,
+ pd.sort_name, pd.short_name, pd.directory_name
+ FROM profiles AS p
+ INNER JOIN profile_display AS pd USING(pid)');
+ $next = 'clean';
+ } elseif ($action == 'clean') {
// nettoyage du fichier temporaire
- chdir($olddir);
- exec("rm -rf $tmpdir", $report);
- $report[] = 'Fin de l\'import';
- global $globals;
- // met à jour la date de dernier import
- $globals->change_dynamic_config(
- array('LastUpdate' => time()),
- 'FusionAx');
+ exec('rm -Rf ' . $spoolpath);
+ $report[] = 'Import finit.';
}
- $tmpdir = getcwd();
- chdir($olddir);
- foreach($report as $t)
+ foreach($report as $t) {
// affiche les lignes de report
- echo "$('#fusionax_import').append('".utf8_encode($t)."
');\n";
+ echo "$('#fusionax').append('" . $t . "
');\n";
+ }
if (isset($next)) {
// lance le prochain script s'il y en a un
- echo "$.getScript('fusionax/import/".$next."?tmpdir=".
- urlencode($tmpdir)."');";
+ echo "$.getScript('fusionax/import/" . $next . "');";
}
// exit pour ne pas afficher la page template par défaut
exit;
}
-
+
+ function handler_view(&$page, $action = '')
+ {
+ $page->changeTpl('fusionax/view.tpl');
+ if ($action == 'create') {
+ XDB::execute('DROP VIEW IF EXISTS fusionax_deceased');
+ XDB::execute('CREATE VIEW fusionax_deceased AS
+ SELECT p.pid, a.ax_id, pd.private_name, pd.promo, p.deathdate AS deces_xorg, a.Date_deces AS deces_ax
+ FROM profiles AS p
+ INNER JOIN profile_display AS pd ON (p.pid = pd.pid)
+ INNER JOIN fusionax_anciens AS a ON (a.ax_id = p.ax_id)
+ WHERE p.deathdate != a.Date_deces');
+ XDB::execute('DROP VIEW IF EXISTS fusionax_promo');
+ XDB::execute('CREATE VIEW fusionax_promo AS
+ SELECT p.pid, p.ax_id, pd.private_name, pd.promo, pe.entry_year AS promo_etude_xorg,
+ f.promotion_etude AS promo_etude_ax, pe.grad_year AS promo_sortie_xorg
+ FROM profiles AS p
+ INNER JOIN profile_display AS pd ON (p.pid = pd.pid)
+ INNER JOIN profile_education AS pe ON (p.pid = pe.pid)
+ INNER JOIN fusionax_anciens AS f ON (p.ax_id = f.ax_id)
+ WHERE pd.promo != CONCAT(\'X\', f.promotion_etude)
+ AND !(f.promotion_etude = pe.entry_year + 1 AND pe.grad_year = pe.entry_year + 4)');
+ $page->trigSuccess('Les VIEW ont bien été créées.');
+ }
+ }
+
+ /* Mets à NULL le matricule_ax de ces camarades pour marquer le fait qu'ils ne figurent pas dans l'annuaire de l'AX */
+ private static function clear_wrong_in_xorg($pid)
+ {
+ $res = XDB::execute('UPDATE fusionax_xorg_anciens
+ SET ax_id = NULL
+ WHERE pid = {?}', $pid);
+ if (!$res) {
+ return 0;
+ }
+ return XDB::affectedRows() / 2;
+ }
+
+ /* Cherche les les anciens présents dans Xorg avec un matricule_ax ne correspondant à rien dans la base de l'AX
+ * (mises à part les promo 1921 et 1923 qui ne figurent pas dans les données de l'AX)*/
+ private static function find_wrong_in_xorg($limit = 10)
+ {
+ return XDB::iterator('SELECT u.promo, u.pid, u.private_name
+ FROM fusionax_xorg_anciens AS u
+ WHERE NOT EXISTS (SELECT *
+ FROM fusionax_anciens AS f
+ WHERE f.ax_id = u.ax_id)
+ AND u.ax_id IS NOT NULL AND promo != \'X1921\' AND promo != \'X1923\'');
+ }
+
/** Lier les identifiants d'un ancien dans les deux annuaires
* @param user_id identifiant dans l'annuaire X.org
* @param matricule_ax identifiant dans l'annuaire de l'AX
* @return 0 si la liaison a échoué, 1 sinon
- */
- private static function link_by_ids($user_id, $matricule_ax)
+ */
+ private static function link_by_ids($pid, $ax_id)
{
- if (!XDB::execute("
- UPDATE fusionax_import AS i
- INNER JOIN fusionax_xorg_anciens AS u
- SET
- u.matricule_ax = i.id_ancien,
- i.user_id = u.user_id,
- i.date_match_id = NOW()
- WHERE
- i.id_ancien = {?} AND u.user_id = {?} AND (
- u.matricule_ax != {?} OR u.matricule_ax IS NULL OR
- i.user_id != {?} OR i.user_id IS NULL)",
- $matricule_ax,
- $user_id,
- $matricule_ax,
- $user_id))
- {
+ $res = XDB::execute('UPDATE fusionax_import AS i
+ INNER JOIN fusionax_xorg_anciens AS u
+ SET u.ax_id = i.ax_id,
+ i.pid = u.pid,
+ i.date_match_id = NOW()
+ WHERE i.ax_id = {?} AND u.pid = {?}
+ AND (u.ax_id != {?} OR u.ax_id IS NULL
+ OR i.pid != {?} OR i.pid IS NULL)',
+ $ax_id, $pid, $ax_id, $pid);
+ if (!$res) {
return 0;
}
- return XDB::affectedRows() / 2;
+ return XDB::affectedRows() / 2;
}
-
+
/** Recherche automatique d'anciens à lier entre les deux annuaires
* @param limit nombre d'anciens à trouver au max
* @param sure si true, ne trouve que des anciens qui sont quasi sûrs
* @return un XOrgDBIterator sur les entrées avec display_name, promo,
- * user_id, id_ancien et display_name_ax
- */
+ * pid, ax_id et display_name_ax
+ */
private static function find_easy_to_link($limit = 10, $sure = false)
{
$easy_to_link = XDB::iterator("
- SELECT
- xorg.display_name, xorg.promo, xorg.user_id, ax.id_ancien,
- CONCAT(ax.prenom,' ',ax.nom_complet,' (X ',ax.promotion_etude,')')
- AS display_name_ax,
- COUNT(*) AS nbMatches
- FROM fusionax_anciens AS ax
- INNER JOIN fusionax_import AS i ON (
- i.id_ancien = ax.id_ancien AND i.user_id IS NULL)
- LEFT JOIN fusionax_xorg_anciens AS xorg ON (
- xorg.matricule_ax IS NULL AND
- ax.Nom_complet = xorg.nom AND
- ax.prenom = xorg.prenom AND
- xorg.promo = ax.promotion_etude)
- GROUP BY xorg.user_id
- HAVING
- xorg.user_id IS NOT NULL AND
- nbMatches = 1
- ".($limit?('LIMIT '.$limit):''));
+ SELECT u.private_name, u.promo, u.pid, ax.ax_id,
+ CONCAT(ax.prenom, ' ', ax.nom_complet, ' (X', ax.promotion_etude, ')') AS display_name_ax,
+ COUNT(*) AS nbMatches
+ FROM fusionax_anciens AS ax
+ INNER JOIN fusionax_import AS i ON (i.ax_id = ax.ax_id AND i.pid IS NULL)
+ LEFT JOIN fusionax_xorg_anciens AS u ON (u.ax_id IS NULL
+ AND u.promo = CONCAT('X', ax.promotion_etude)
+ AND (CONCAT(ax.prenom, ' ', ax.nom_complet) = u.private_name
+ OR CONCAT(ax.prenom, ' ', ax.nom_complet) = u.public_name
+ OR CONCAT(ax.prenom, ' ', ax.nom_complet) = u.short_name))
+ GROUP BY u.pid
+ HAVING u.pid IS NOT NULL AND nbMatches = 1" . ($limit ? (' LIMIT ' . $limit) : ''));
if ($easy_to_link->total() > 0 || $sure) {
return $easy_to_link;
}
- return XDB::iterator("
- SELECT
- xorg.display_name, xorg.promo, xorg.user_id, ax.id_ancien,
- CONCAT(ax.prenom,' ',ax.nom_complet,' (X ',ax.promotion_etude,')')
- AS display_name_ax,
- COUNT(*) AS nbMatches
- FROM fusionax_anciens AS ax
- INNER JOIN fusionax_import AS i ON (
- i.id_ancien = ax.id_ancien AND i.user_id IS NULL)
- LEFT JOIN fusionax_xorg_anciens AS xorg ON (
- xorg.matricule_ax IS NULL AND
- (ax.Nom_complet = xorg.nom
- OR ax.Nom_complet LIKE CONCAT(xorg.nom,' %')
- OR ax.Nom_complet LIKE CONCAT(xorg.nom,'-%')
- OR ax.Nom_usuel = xorg.nom
- OR xorg.nom LIKE CONCAT('% ',ax.Nom_complet)) AND
- xorg.promo < ax.promotion_etude + 2 AND
- xorg.promo > ax.promotion_etude - 2)
- GROUP BY xorg.user_id
- HAVING
- xorg.user_id IS NOT NULL AND
- nbMatches = 1
- ".($limit?('LIMIT '.$limit):''));
+ return XDB::iterator("
+ SELECT u.private_name, u.promo, u.pid, ax.ax_id,
+ CONCAT(ax.prenom, ' ', ax.nom_complet, ' (X', ax.promotion_etude, ')') AS display_name_ax,
+ COUNT(*) AS nbMatches
+ FROM fusionax_anciens AS ax
+ INNER JOIN fusionax_import AS i ON (i.ax_id = ax.ax_id AND i.pid IS NULL)
+ LEFT JOIN fusionax_xorg_anciens AS u ON (u.ax_id IS NULL
+ AND (CONCAT(ax.prenom, ' ', ax.nom_complet) = u.private_name
+ OR CONCAT(ax.prenom, ' ', ax.nom_complet) = u.public_name
+ OR CONCAT(ax.prenom, ' ', ax.nom_complet) = u.short_name)
+ AND u.promo < CONCAT('X', ax.promotion_etude + 2)
+ AND u.promo > CONCAT('X', ax.promotion_etude - 2))
+ GROUP BY u.pid
+ HAVING u.pid IS NOT NULL AND nbMatches = 1" . ($limit ? (' LIMIT ' . $limit) : ''));
}
-
+
/** Module de mise en correspondance les ids */
- function handler_ids(
- &$page,
- $part = 'main',
- $user_id = null,
- $matricule_ax = null)
+ function handler_ids(&$page, $part = 'main', $pid = null, $ax_id = null)
{
- global $globals;
- $page->addJsLink('jquery.js');
-
- $page->assign(
- 'xorg_title',
- 'Polytechnique.org - Fusion - Mise en correspondance simple');
- if ($part == 'missingInAX')
- {
+ $nbToLink = 100;
+ $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
$page->changeTpl('fusionax/idsMissingInAx.tpl');
- $missingInAX = XDB::iterator("SELECT
- u.promo, u.user_id, u.display_name
- FROM fusionax_xorg_anciens AS u
- WHERE u.matricule_ax IS NULL
- LIMIT 20");
+ $missingInAX = XDB::iterator('SELECT promo, pid, private_name
+ FROM fusionax_xorg_anciens
+ WHERE ax_id IS NULL');
$page->assign('missingInAX', $missingInAX);
return;
}
- if ($part == 'missingInXorg')
- {
+ if ($part == 'missingInXorg') {
// locate all persons from AX's database that are not here
$page->changeTpl('fusionax/idsMissingInXorg.tpl');
- $missingInXorg = XDB::iterator("SELECT
- a.promotion_etude AS promo,
- CONCAT(a.prenom, ' ',a.Nom_usuel) AS display_name,
- a.id_ancien
- FROM fusionax_import
- INNER JOIN fusionax_anciens AS a USING (id_ancien)
- WHERE fusionax_import.user_id IS NULL
- LIMIT 20");
+ $missingInXorg = XDB::iterator("SELECT CONCAT(a.prenom, ' ', a.Nom_usuel) AS private_name,
+ a.promotion_etude AS promo, a.ax_id
+ FROM fusionax_import
+ INNER JOIN fusionax_anciens AS a USING (ax_id)
+ WHERE fusionax_import.pid IS NULL");
$page->assign('missingInXorg', $missingInXorg);
return;
}
- if ($part == 'link')
- {
- FusionAxModule::link_by_ids($user_id,$matricule_ax);
+ if ($part == 'wrongInXorg') {
+ // locate all persons from Xorg database that have a bad AX id
+ $page->changeTpl('fusionax/idswrongInXorg.tpl');
+ $wrongInXorg = FusionAxModule::find_wrong_in_xorg($nbToLink);
+ $page->assign('wrongInXorg', $wrongInXorg);
+ return;
+ }
+ if ($part == 'cleanwronginxorg') {
+ $linksToDo = FusionAxModule::find_wrong_in_xorg($nbToLink);
+ while ($l = $linksToDo->next()) {
+ FusionAxModule::clear_wrong_in_xorg($l['pid']);
+ }
+ pl_redirect('fusionax/ids/wrongInXorg');
+ }
+ if ($part == 'lier') {
+ if (Post::has('user_id') && Post::has('matricule_ax')) {
+ FusionAxModule::link_by_ids(Post::i('pid'), Post::v('ax_id'));
+ }
+ }
+ if ($part == 'link') {
+ FusionAxModule::link_by_ids($pid, $ax_id);
exit;
}
- if ($part == 'linknext')
- {
- $linksToDo = FusionAxModule::find_easy_to_link(10);
- while ($l = $linksToDo->next())
- {
- FusionAxModule::link_by_ids($l['user_id'],$l['id_ancien']);
+ if ($part == 'linknext') {
+ $linksToDo = FusionAxModule::find_easy_to_link($nbToLink);
+ while ($l = $linksToDo->next()) {
+ FusionAxModule::link_by_ids($l['pid'], $l['ax_id']);
}
pl_redirect('fusionax/ids#autolink');
}
- if ($part == 'linkall')
- {
+ if ($part == 'linkall') {
$linksToDo = FusionAxModule::find_easy_to_link(0);
- while ($l = $linksToDo->next())
- {
- FusionAxModule::link_by_ids($l['user_id'],$l['id_ancien']);
+ while ($l = $linksToDo->next()) {
+ FusionAxModule::link_by_ids($l['pid'], $l['ax_id']);
}
}
{
$page->changeTpl('fusionax/ids.tpl');
- $missingInAX = XDB::query(
- 'SELECT COUNT(*)
- FROM fusionax_xorg_anciens AS u
- WHERE u.matricule_ax IS NULL');
- if ($missingInAX)
- {
+ $missingInAX = XDB::query('SELECT COUNT(*)
+ FROM fusionax_xorg_anciens
+ WHERE ax_id IS NULL');
+ if ($missingInAX) {
$page->assign('nbMissingInAX', $missingInAX->fetchOneCell());
}
- $missingInXorg = XDB::query(
- 'SELECT COUNT(*)
- FROM fusionax_import AS i
- WHERE i.user_id IS NULL');
- if ($missingInXorg)
- {
- $page->assign(
- 'nbMissingInXorg',
- $missingInXorg->fetchOneCell());
+ $missingInXorg = XDB::query('SELECT COUNT(*)
+ FROM fusionax_import
+ WHERE pid IS NULL');
+ if ($missingInXorg) {
+ $page->assign('nbMissingInXorg', $missingInXorg->fetchOneCell());
+ }
+ $wrongInXorg = FusionAxModule::find_wrong_in_xorg($nbToLink);
+ if ($wrongInXorg->total() > 0) {
+ $page->assign('wrongInXorg', $wrongInXorg->total());
}
- $easyToLink = FusionAxModule::find_easy_to_link(10);
- if ($easyToLink->total() > 0)
- {
+ $easyToLink = FusionAxModule::find_easy_to_link($nbToLink);
+ if ($easyToLink->total() > 0) {
+ $page->assign('nbMatch', $easyToLink->total());
$page->assign('easyToLink', $easyToLink);
}
}
}
-
- function handler_misc(&$page)
+
+ function handler_deceased(&$page, $action = '')
{
- $page->changeTpl('fusionax/misc.tpl');
+ if ($action == 'updateXorg') {
+ XDB::execute('UPDATE fusionax_deceased
+ SET deces_xorg = deces_ax
+ WHERE deces_xorg = "0000-00-00"');
+ }
+ if ($action == 'updateAX') {
+ XDB::execute('UPDATE fusionax_deceased
+ SET deces_ax = deces_xorg
+ WHERE deces_ax = "0000-00-00"');
+ }
+ if ($action == 'update') {
+ if (Post::has('pid') && Post::has('date')) {
+ XDB::execute('UPDATE fusionax_deceased
+ SET deces_ax = {?}, deces_xorg = {?}
+ WHERE pid = {?}',
+ Post::v('date'), Post::v('date'), Post::i('pid'));
+ }
+ }
+ $page->changeTpl('fusionax/deceased.tpl');
// deceased
- $deceasedErrorsSql = XDB::query(
- 'SELECT COUNT(*) FROM fusionax_deceased');
- $page->assign('deceasedErrors',$deceasedErrorsSql->fetchOneCell());
- $page->assign('deceasedMissingInXorg',XDB::iterator(
- 'SELECT
- d.user_id,d.id_ancien,d.nom,d.prenom,d.promo,d.deces_ax,
- CONCAT(d.prenom, " ", d.nom) AS display_name
- FROM fusionax_deceased AS d
- WHERE d.deces_xorg = "0000-00-00"
- LIMIT 10'));
- $page->assign('deceasedMissingInAX',XDB::iterator(
- 'SELECT
- d.user_id,d.id_ancien,d.nom,d.prenom,d.promo,d.deces_xorg,
- CONCAT(d.prenom, " ", d.nom) AS display_name
- FROM fusionax_deceased AD d
- WHERE d.deces_ax = "0000-00-00"
- LIMIT 10'));
- $page->assign('deceasedDifferent',XDB::iterator(
- 'SELECT
- d.user_id,d.id_ancien,d.nom,d.prenom,d.promo,
- d.deces_ax,d.deces_xorg,
- CONCAT(d.prenom, " ", d.nom) AS display_name
- FROM fusionax_deceased AS d
- WHERE d.deces_xorg != "0000-00-00" AND d.deces_ax != "0000-00-00"
- LIMIT 10'));
+ $deceasedErrorsSql = XDB::query('SELECT COUNT(*) FROM fusionax_deceased');
+ $page->assign('deceasedErrors', $deceasedErrorsSql->fetchOneCell());
+ $res = XDB::iterator('SELECT pid, ax_id, promo, private_name, deces_ax
+ FROM fusionax_deceased
+ WHERE deces_xorg = "0000-00-00"
+ LIMIT 10');
+ $page->assign('nbDeceasedMissingInXorg', $res->total());
+ $page->assign('deceasedMissingInXorg', $res);
+ $res = XDB::iterator('SELECT pid, ax_id, promo, private_name, deces_xorg
+ FROM fusionax_deceased
+ WHERE deces_ax = "0000-00-00"
+ LIMIT 10');
+ $page->assign('nbDeceasedMissingInAX', $res->total());
+ $page->assign('deceasedMissingInAX', $res);
+ $res = XDB::iterator('SELECT pid, ax_id, promo, private_name, deces_xorg, deces_ax
+ FROM fusionax_deceased
+ WHERE deces_xorg != "0000-00-00" AND deces_ax != "0000-00-00"');
+ $page->assign('nbDeceasedDifferent', $res->total());
+ $page->assign('deceasedDifferent', $res);
+ }
+
+ 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
+ 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 pid, 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');
+ $nbMissmatchingPromos += $res->total();
+ $page->assign('nbMissmatchingPromos2', $res->total());
+ $page->assign('missmatchingPromos2', $res);
+ $page->assign('nbMissmatchingPromos', $nbMissmatchingPromos);
}
}