X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Ffusionax.php;h=31f6fd433afcd89f61ea3f1fc361c8ce80f95c69;hb=63c386f8106ae27322f8c712962f24e9cbcc5d77;hp=020eaeed273004937de53475943d59cb234e4b05;hpb=a8cfc697c46a08cf42f09eb3a6d5548d25db5ec7;p=platal.git diff --git a/modules/fusionax.php b/modules/fusionax.php index 020eaee..31f6fd4 100644 --- a/modules/fusionax.php +++ b/modules/fusionax.php @@ -1,6 +1,6 @@ merge->state == 'pending') { return array( - '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'), - 'fusionax/names' => $this->make_hook('names', AUTH_MDP, 'admin'), - 'fusionax/edu' => $this->make_hook('edu', AUTH_MDP, 'admin') + 'fusionax' => $this->make_hook('index', AUTH_PASSWD, 'admin'), + 'fusionax/import' => $this->make_hook('import', AUTH_PASSWD, 'admin'), + 'fusionax/view' => $this->make_hook('view', AUTH_PASSWD, 'admin'), + 'fusionax/ids' => $this->make_hook('ids', AUTH_PASSWD, 'admin'), + 'fusionax/deceased' => $this->make_hook('deceased', AUTH_PASSWD, 'admin'), + 'fusionax/promo' => $this->make_hook('promo', AUTH_PASSWD, 'admin'), + 'fusionax/names' => $this->make_hook('names', AUTH_PASSWD, 'admin'), + 'fusionax/edu' => $this->make_hook('edu', AUTH_PASSWD, 'admin'), + 'fusionax/corps' => $this->make_hook('corps', AUTH_PASSWD, 'admin') ); } elseif (Platal::globals()->merge->state == 'done') { return array( - 'fusionax' => $this->make_hook('index', AUTH_MDP, 'admin,edit_directory'), - 'fusionax/issues' => $this->make_hook('issues', AUTH_MDP, 'admin,edit_directory'), - 'fusionax/issues/deathdate' => $this->make_hook('issues_deathdate', AUTH_MDP, 'admin,edit_directory'), - 'fusionax/issues/promo' => $this->make_hook('issues_promo', AUTH_MDP, 'admin,edit_directory'), + 'fusionax' => $this->make_hook('index', AUTH_PASSWD, 'admin,edit_directory'), + 'fusionax/issues' => $this->make_hook('issues', AUTH_PASSWD, 'admin,edit_directory'), + 'fusionax/issues/deathdate' => $this->make_hook('issues_deathdate', AUTH_PASSWD, 'admin,edit_directory'), + 'fusionax/issues/promo' => $this->make_hook('issues_promo', AUTH_PASSWD, 'admin,edit_directory'), ); } } - function handler_index(&$page) + function handler_index($page) { if (Platal::globals()->merge->state == 'pending') { $page->changeTpl('fusionax/index.tpl'); @@ -86,8 +87,9 @@ class FusionAxModule extends PLModule } /** Import de l'annuaire de l'AX depuis l'export situé dans le home de jacou */ - function handler_import(&$page, $action = 'index', $file = '') + function handler_import($page, $action = 'index', $file = '') { + global $globals; if ($action == 'index') { $page->changeTpl('fusionax/import.tpl'); return; @@ -110,19 +112,22 @@ class FusionAxModule extends PLModule } 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.[0-9]\{4\}[MD][0-9]\{3\}.Etudiant" ' . $file . ' > ' . $spoolpath . 'Formations_MD.txt'); + exec('grep "^FO.[0-9]\{4\}[MD][0-9]\{3\}.Doct. de" ' . $file . ' >> ' . $spoolpath . 'Formations_MD.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'); + exec('mv -f ' . $spoolpath . 'Formations_MD_out.txt ' . $spoolpath . 'Formations_MD.txt'); $report[] = 'Fichier parsé.'; $report[] = 'Import dans la base en cours...'; + XDB::execute("UPDATE profiles + SET ax_id = NULL + WHERE ax_id = ''"); $next = 'integrateSQL'; } } elseif ($action == 'integrateSQL') { @@ -133,11 +138,17 @@ class FusionAxModule extends PLModule 1 => 'Adresses.sql', 2 => 'Anciens.sql', 3 => 'Formations.sql', - 4 => 'Entreprises.sql' + 4 => 'Entreprises.sql', + 5 => 'Formations_MD.sql' ); if ($file != '') { // récupère le contenu du fichier sql $queries = explode(';', file_get_contents($modulepath . $filesSQL[$file])); + $db = mysqli_init(); + $db->options(MYSQLI_OPT_LOCAL_INFILE, true); + $db->real_connect($globals->dbhost, $globals->dbuser, $globals->dbpwd, $globals->dbdb); + $db->autocommit(true); + $db->set_charset($globals->dbcharset); foreach ($queries as $q) { if (trim($q)) { // coupe le fichier en requêtes individuelles @@ -148,15 +159,19 @@ class FusionAxModule extends PLModule $report[] = addslashes($l); } // exécute la requête - XDB::execute(str_replace('{?}', $spoolpath, $q)); + $res = $db->query(str_replace('{?}', $spoolpath, $q)); + if ($res === false) { + throw new XDBException($q, $db->error); + } } } + $db->close(); // trouve le prochain fichier à exécuter $nextfile = $file + 1; } else { $nextfile = 0; } - if ($nextfile > 4) { + if ($nextfile > 5) { // tous les fichiers ont été exécutés, on passe à l'étape suivante $next = 'adds1920'; } else { @@ -170,8 +185,6 @@ class FusionAxModule extends PLModule 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); @@ -180,12 +193,16 @@ class FusionAxModule extends PLModule $entry_year = 1920; $grad_year = 1923; $promo = 'X1920'; - $sex = PlUser::GENDER_MALE; + $hrpromo = '1920'; + $sex = 'male'; $xorgId = 19200000; $type = 'x'; - while (list($firstname, $lastname, $ax_id) = $res->next()) { - $hrid = self::getHrid($firstname, $lastname, $promo); + while ($new = $res->next()) { + $firstname = $new['prenom']; + $lastname = $new['Nom_complet']; + $ax_id = $new['ax_id']; + $hrid = User::makeHrid($firstname, $lastname, $hrpromo); $res1 = XDB::query('SELECT COUNT(*) FROM accounts WHERE hruid = {?}', $hrid); @@ -199,29 +216,26 @@ class FusionAxModule extends PLModule $directoryName = $lastname . ' ' . $firstname; ++$xorgId; - XDB::execute('REPLACE INTO profiles (hrpid, xorg_id, ax_id, sex) - VALUES ({?}, {?}, {?}, {?})', + XDB::execute('INSERT 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 ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})', + XDB::execute('INSERT INTO profile_public_names (pid, lastname_initial, firstname_initial, lastname_main, firstname_main) + VALUES ({?}, {?}, {?}, {?}, {?})', + $pid, $lastname, $firstname, $lastname, $firstname); + XDB::execute('INSERT 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 ({?}, {?}, {?}, {?}, {?}, {?})', + XDB::execute('INSERT 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); + XDB::execute('INSERT INTO accounts (hruid, type, is_admin, state, full_name, directory_name, display_name, lastname, firstname, sex) + VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})', + $hrid, $type, 0, 'pending', $fullName, $directoryName, $firstname, $lastname, $firstname, $sex); $uid = XDB::insertId(); - XDB::execute('REPLACE INTO account_profiles (uid, pid, perms) - VALUES ({?}, {?}, {?})', + XDB::execute('INSERT INTO account_profiles (uid, pid, perms) + VALUES ({?}, {?}, {?})', $uid, $pid, 'owner'); } $report[] = 'Promo 1920 ajoutée.'; @@ -231,11 +245,11 @@ class FusionAxModule extends PLModule 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)'); + INNER JOIN profile_display AS pd ON (pd.pid = p.pid)'); $next = 'clean'; } elseif ($action == 'clean') { // nettoyage du fichier temporaire - exec('rm -Rf ' . $spoolpath); + //exec('rm -Rf ' . $spoolpath); $report[] = 'Import finit.'; } foreach($report as $t) { @@ -250,27 +264,32 @@ class FusionAxModule extends PLModule exit; } - function handler_view(&$page, $action = '') + 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 + 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'); + WHERE p.deathdate != a.Date_deces OR (p.deathdate IS NULL AND a.Date_deces != '0000-00-00')"); 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, + 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.groupe_promo, 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 profile_education AS pe ON (p.pid = pe.pid AND FIND_IN_SET('primary', pe.flags)) 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)'); + WHERE (f.groupe_promo = 'X' AND pd.promo != CONCAT('X', f.promotion_etude) + AND !(f.promotion_etude = pe.entry_year + 1 AND pe.grad_year = pe.entry_year + 4) + AND !(f.promotion_etude = pe.entry_year + 2 AND pe.grad_year = pe.entry_year + 5) + AND f.promotion_etude != 0) + OR (f.groupe_promo = 'D' AND f.promotion_etude != pe.grad_year) + OR (f.groupe_promo = 'M' AND f.promotion_etude != pe.entry_year) + GROUP BY p.pid"); $page->trigSuccess('Les VIEW ont bien été créées.'); } } @@ -288,15 +307,16 @@ class FusionAxModule extends PLModule } /* 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)*/ + * (mises à part les promo 1921, 1922, 1923, 1924, 1925, 1927, 1928, 1929 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 + return XDB::iterator('SELECT u.promo, u.pid, u.private_name, u.ax_id 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\''); + AND u.ax_id IS NOT NULL + AND promo NOT IN (\'X1921\', \'X1922\', \'X1923\', \'X1924\', \'X1925\', \'X1927\', \'X1928\', \'X1929\')'); } /** Lier les identifiants d'un ancien dans les deux annuaires @@ -331,12 +351,12 @@ class FusionAxModule extends PLModule { $easy_to_link = 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, + CONCAT(ax.prenom, ' ', ax.nom_complet, ' (', ax.groupe_promo, 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 u.promo = CONCAT(ax.groupe_promo, 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)) @@ -347,7 +367,7 @@ class FusionAxModule extends PLModule } 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, + CONCAT(ax.prenom, ' ', ax.nom_complet, ' (', ax.groupe_promo, 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) @@ -355,14 +375,14 @@ class FusionAxModule extends PLModule 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)) + AND u.promo < CONCAT(ax.groupe_promo, ax.promotion_etude + 2) + AND u.promo > CONCAT(ax.groupe_promo, 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', $pid = null, $ax_id = null) + function handler_ids($page, $part = 'main', $pid = null, $ax_id = null) { $nbToLink = 100; $page->assign('xorg_title', 'Polytechnique.org - Fusion - Mise en correspondance simple'); @@ -372,7 +392,8 @@ class FusionAxModule extends PLModule $page->changeTpl('fusionax/idsMissingInAx.tpl'); $missingInAX = XDB::iterator('SELECT promo, pid, private_name FROM fusionax_xorg_anciens - WHERE ax_id IS NULL'); + WHERE ax_id IS NULL + ORDER BY promo'); $page->assign('missingInAX', $missingInAX); return; } @@ -380,10 +401,11 @@ class FusionAxModule extends PLModule // locate all persons from AX's database that are not here $page->changeTpl('fusionax/idsMissingInXorg.tpl'); $missingInXorg = XDB::iterator("SELECT CONCAT(a.prenom, ' ', a.Nom_usuel) AS private_name, - a.promotion_etude AS promo, a.ax_id + CONCAT(a.groupe_promo, 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"); + WHERE fusionax_import.pid IS NULL + ORDER BY promo"); $page->assign('missingInXorg', $missingInXorg); return; } @@ -449,12 +471,12 @@ class FusionAxModule extends PLModule } } - function handler_deceased(&$page, $action = '') + function handler_deceased($page, $action = '') { if ($action == 'updateXorg') { XDB::execute('UPDATE fusionax_deceased SET deces_xorg = deces_ax - WHERE deces_xorg = "0000-00-00"'); + WHERE deces_xorg IS NULL'); } if ($action == 'updateAX') { XDB::execute('UPDATE fusionax_deceased @@ -475,7 +497,7 @@ class FusionAxModule extends PLModule $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" + WHERE deces_xorg IS NULL LIMIT 10'); $page->assign('nbDeceasedMissingInXorg', $res->total()); $page->assign('deceasedMissingInXorg', $res); @@ -492,108 +514,250 @@ class FusionAxModule extends PLModule $page->assign('deceasedDifferent', $res); } - function handler_promo(&$page, $action = '') + 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) - AND !(promo_etude_ax = promo_etude_xorg + 1) - ORDER BY promo_etude_xorg'); + AND !(promo_etude_ax = promo_etude_xorg + 1) AND groupe_promo = 'X' + ORDER BY promo_etude_xorg"); $nbMissmatchingPromos = $res->total(); $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 - ORDER BY promo_etude_xorg'); + WHERE promo_etude_ax = promo_etude_xorg + 1 AND groupe_promo = 'X' + ORDER BY promo_etude_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 + $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 - ORDER BY promo_etude_xorg'); + 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"); $nbMissmatchingPromos += $res->total(); $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 - ORDER BY promo_etude_xorg'); + 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"); $nbMissmatchingPromos += $res->total(); $page->assign('nbMissmatchingPromos3', $res->total()); $page->assign('missmatchingPromos3', $res); + $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"); + $nbMissmatchingPromos += $res->total(); + $page->assign('nbMissmatchingPromosM', $res->total()); + $page->assign('missmatchingPromosM', $res); + + + $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"); + $nbMissmatchingPromos += $res->total(); + $page->assign('nbMissmatchingPromosD', $res->total()); + $page->assign('missmatchingPromosD', $res); + $page->assign('nbMissmatchingPromosTotal', $nbMissmatchingPromos); } - function handler_names(&$page, $action = '') + private function format($string) + { + return preg_replace('/(\s+|\-)/', '', $string); + } + + private function retrieve_firstnames() + { + $res = XDB::rawFetchAllAssoc('SELECT p.pid, p.ax_id, p.hrpid, + f.prenom, ppn.firstname_initial, ppn.firstname_main, ppn.firstname_ordinary + FROM fusionax_anciens AS f + INNER JOIN profiles AS p ON (f.ax_id = p.ax_id) + INNER JOIN profile_public_names AS ppn ON (p.pid = ppn.pid) + WHERE f.prenom NOT IN (ppn.firstname_initial, ppn.firstname_main, ppn.firstname_ordinary)'); + + $issues = array(); + foreach ($res as $item) { + if (!($item['firstname_ordinary'] != '' || $item['firstname_main'] != $item['firstname_initial'])) { + $ax = $this->format(mb_strtolower(replace_accent($item['prenom']))); + $xorg = $this->format(mb_strtolower(replace_accent($item['firstname_main']))); + if ($ax != $xorg) { + $issues[] = $item; + } + } + } + + return $issues; + } + + function handler_names($page, $action = '', $csv = false) { $page->changeTpl('fusionax/names.tpl'); - $res = XDB::query('SELECT COUNT(*) - FROM fusionax_anciens AS f - INNER JOIN profiles AS p ON (f.ax_id = p.ax_id)'); - $page->assign('total', $res->fetchOneCell()); - - // To be checked: - // | lastname | 1 | - // | lastname_marital | 2 | - // | lastname_ordinary | 3 | - // | firstname | 4 | - // | firstname_ordinary | 7 | - // | firstname_other | 8 | - // | name_other | 9 | - // | name_ini | 10 | - // | firstname_ini | 11 | - $res = XDB::query("SELECT COUNT(*) - FROM fusionax_anciens AS f - INNER JOIN profiles AS p ON (f.ax_id = p.ax_id) - LEFT JOIN profile_name AS pnp ON (p.pid = pnp.pid AND pnp.typeid = 1) - LEFT JOIN profile_name AS pnm ON (p.pid = pnm.pid AND pnm.typeid = 2) - LEFT JOIN profile_name AS pno ON (p.pid = pno.pid AND pno.typeid = 3) - LEFT JOIN profile_name AS pne ON (p.pid = pne.pid AND pne.typeid = 9) - LEFT JOIN profile_name AS pni ON (p.pid = pni.pid AND pni.typeid = 10) - WHERE IF(f.partic_patro, CONCAT(f.partic_patro, CONCAT(' ', f.Nom_patronymique)), f.Nom_patronymique) NOT IN (pnp.name, pno.name, pnm.name, pne.name, pni.name) - OR IF(f.partic_nom, CONCAT(f.partic_nom, CONCAT(' ', f.Nom_usuel)), f.Nom_usuel) NOT IN (pnp.name, pno.name, pnm.name, pne.name, pni.name) - OR f.Nom_complet NOT IN (pnp.name, pno.name, pnm.name, pne.name, pni.name)"); - $page->assign('lastnameIssues', $res->fetchOneCell()); - - $res = XDB::query('SELECT COUNT(*) - FROM fusionax_anciens AS f - INNER JOIN profiles AS p ON (f.ax_id = p.ax_id) - LEFT JOIN profile_name AS pnf ON (p.pid = pnf.pid AND pnf.typeid = 4) - LEFT JOIN profile_name AS pno ON (p.pid = pno.pid AND pno.typeid = 7) - LEFT JOIN profile_name AS pne ON (p.pid = pne.pid AND pne.typeid = 8) - LEFT JOIN profile_name AS pni ON (p.pid = pni.pid AND pni.typeid = 11) - WHERE f.prenom NOT IN (pnf.name, pno.name, pne.name, pni.name)'); - $page->assign('firstnameIssues', $res->fetchOneCell()); + if ($action == 'first') { + $res = $this->retrieve_firstnames(); + if ($csv) { + pl_cached_content_headers('text/x-csv', 'utf-8', 1, 'firstnames.csv'); + $csv = fopen('php://output', 'w'); + fputcsv($csv, array('pid', 'ax_id', 'hrpid', 'AX', 'initial', 'principal', 'ordinaire'), ';'); + foreach ($res as $item) { + fputcsv($csv, $item, ';'); + } + fclose($csv); + exit(); + } else { + $page->assign('firstnameIssues', $res); + } + } elseif ($action == 'last' || $action == 'last3' || $action == 'last2' || $action == 'last1') { + // Define some variables to build queries + function sql_trim_partic($sqlstring) { + $sqlstring = 'TRIM(LEADING \'d\\\'\' FROM ' . $sqlstring . ')'; + $sqlstring = 'TRIM(LEADING \'D\\\'\' FROM ' . $sqlstring . ')'; + $sqlstring = 'TRIM(LEADING \'de \' FROM ' . $sqlstring . ')'; + $sqlstring = 'TRIM(LEADING \'De \' FROM ' . $sqlstring . ')'; + $sqlstring = 'TRIM(LEADING \'du \' FROM ' . $sqlstring . ')'; + $sqlstring = 'TRIM(LEADING \'Du \' FROM ' . $sqlstring . ')'; + return $sqlstring; + } + //$field_ax_patro = 'IF(f.partic_patro, CONCAT(f.partic_patro, CONCAT(\' \', f.Nom_patronymique)), f.Nom_patronymique)'; + //$field_ax_usuel = 'IF(f.partic_nom, CONCAT(f.partic_nom, CONCAT(\' \', f.Nom_usuel)), f.Nom_usuel)'; + $fields_p_list = '(' . \ + sql_trim_partic('ppn.lastname_initial') . ', ' . \ + sql_trim_partic('ppn.lastname_main') . ', ' . \ + sql_trim_partic('ppn.lastname_marital') . ', ' . \ + sql_trim_partic('ppn.lastname_ordinary') . ')'; + $ax_patro = '(' . sql_trim_partic('f.Nom_patronymique') . ' NOT IN ' . $fields_p_list . ')'; + $ax_ordinary = '(' . sql_trim_partic('f.Nom_usuel') . ' NOT IN ' . $fields_p_list . ')'; + $ax_full = '(' . sql_trim_partic('f.Nom_complet') . ' NOT IN ' . $fields_p_list . ')'; + + switch ($action) { + case 'last': + $where = $ax_patro . ' OR ' . $ax_ordinary . ' OR ' . $ax_full; + break; + case 'last3': + $where = $ax_patro . ' AND ' . $ax_ordinary . ' AND ' . $ax_full; + break; + case 'last2': + $where = '(' . $ax_patro . ' AND ' . $ax_ordinary . ' AND NOT ' . $ax_full . ') OR (' + . $ax_patro . ' AND NOT ' . $ax_ordinary . ' AND ' . $ax_full . ') OR (' + . 'NOT ' . $ax_patro . ' AND ' . $ax_ordinary . ' AND ' . $ax_full . ')'; + break; + case 'last1': + $where = '(' . $ax_patro . ' AND NOT ' . $ax_ordinary . ' AND NOT ' . $ax_full . ') OR (' + . 'NOT ' . $ax_patro . ' AND NOT ' . $ax_ordinary . ' AND ' . $ax_full . ') OR (' + . 'NOT ' . $ax_patro . ' AND ' . $ax_ordinary . ' AND NOT ' . $ax_full . ')'; + break; + } + + $res = XDB::rawFetchAllAssoc('SELECT p.pid, p.ax_id, p.hrpid, + f.Nom_patronymique, f.Nom_usuel, f.Nom_complet, + ppn.lastname_initial, ppn.lastname_main, ppn.lastname_marital, ppn.lastname_ordinary, + ' . $ax_patro . ' AS cond_patro, + ' . $ax_ordinary . ' AS cond_ordinary, + ' . $ax_full . ' AS cond_full + FROM fusionax_anciens AS f + INNER JOIN profiles AS p ON (f.ax_id = p.ax_id) + INNER JOIN profile_public_names AS ppn ON (p.pid = ppn.pid) + WHERE ' . $where . ' + ORDER BY p.ax_id'); + + if ($csv) { + function format($string) + { + $string = preg_replace('/\-/', ' ', $string); + return preg_replace('/\s+/', ' ', $string); + } + + + pl_cached_content_headers('text/x-csv', 'utf-8', 1, 'lastnames.csv'); + + $csv = fopen('php://output', 'w'); + fputcsv($csv, array( + 'pid', 'ax_id', 'hrpid', + 'AX patro', 'AX usuel', 'AX complet', + 'initial', 'principal', 'marital', 'ordinaire', + 'pb patro', 'pb usuel', 'pb complet'), ';'); + foreach ($res as $item) { + $ax = array( + 'Nom_patronymique' => format(mb_strtolower(replace_accent($item['Nom_patronymique']))), + 'Nom_usuel' => format(mb_strtolower(replace_accent($item['Nom_usuel']))), + 'Nom_complet' => format(mb_strtolower(replace_accent($item['Nom_complet']))) + ); + $xorg = array( + 'lastname_initial' => format(mb_strtolower(replace_accent($item['lastname_initial']))), + 'lastname_main' => format(mb_strtolower(replace_accent($item['lastname_main']))), + 'lastname_ordinary' => format(mb_strtolower(replace_accent($item['lastname_ordinary']))) + ); + + if (!in_array($ax['Nom_patronymique'], $xorg) || !in_array($ax['Nom_usuel'], $xorg) || !in_array($ax['Nom_complet'], $xorg)) { + fputcsv($csv, $item, ';'); + } + } + fclose($csv); + exit(); + } else { + $page->assign('lastnameIssues', $res); + $page->assign('total', count($res)); + $page->assign('issuesTypes', array( + 'last' => "1, 2 ou 3 noms de l'AX manquant", + 'last1' => "1 nom de l'AX manquant", + 'last2' => "2 noms de l'AX manquant", + 'last3' => "3 noms de l'AX manquant" + )); + } + } else { + $res = XDB::query('SELECT COUNT(*) + FROM fusionax_anciens AS f + INNER JOIN profiles AS p ON (f.ax_id = p.ax_id)'); + $page->assign('total', $res->fetchOneCell()); + + $res = XDB::rawFetchOneCell("SELECT COUNT(*) + FROM fusionax_anciens AS f + INNER JOIN profiles AS p ON (f.ax_id = p.ax_id) + INNER JOIN profile_public_names AS ppn ON (p.pid = ppn.pid) + WHERE IF(f.partic_patro, CONCAT(f.partic_patro, CONCAT(' ', f.Nom_patronymique)), f.Nom_patronymique) NOT IN (ppn.lastname_initial, ppn.lastname_main, ppn.lastname_marital, ppn.lastname_ordinary) + OR IF(f.partic_nom, CONCAT(f.partic_nom, CONCAT(' ', f.Nom_usuel)), f.Nom_usuel) NOT IN (ppn.lastname_initial, ppn.lastname_main, ppn.lastname_marital, ppn.lastname_ordinary) + OR f.Nom_complet NOT IN (ppn.lastname_initial, ppn.lastname_main, ppn.lastname_marital, ppn.lastname_ordinary)"); + $page->assign('lastnameIssues', $res); + + $res = XDB::rawFetchOneCell('SELECT COUNT(*) + FROM fusionax_anciens AS f + INNER JOIN profiles AS p ON (f.ax_id = p.ax_id) + INNER JOIN profile_public_names AS ppn ON (p.pid = ppn.pid) + WHERE f.prenom NOT IN (ppn.firstname_initial, ppn.firstname_main, ppn.firstname_ordinary)'); + $page->assign('firstnameIssues', count($this->retrieve_firstnames())); + } + $page->assign('action', $action); } - function handler_edu(&$page, $action = '') + function handler_edu($page, $action = '') { $page->changeTpl('fusionax/education.tpl'); - $missingEducation = XDB::rawIterator("SELECT DISTINCT(f.Intitule_diplome) + $missingEducation = XDB::rawIterator("SELECT DISTINCT(f.Intitule_formation) FROM fusionax_formations AS f - WHERE f.Intitule_diplome != '' AND NOT EXISTS (SELECT * - FROM profile_education_enum AS e - WHERE f.Intitule_diplome = e.name)"); - $missingDegree = XDB::rawIterator("SELECT DISTINCT(f.Intitule_formation) + WHERE f.Intitule_formation != '' AND NOT EXISTS (SELECT * + FROM profile_education_enum AS e + WHERE f.Intitule_formation = e.name)"); + $missingDegree = XDB::rawIterator("SELECT DISTINCT(f.Intitule_diplome) FROM fusionax_formations AS f - WHERE f.Intitule_formation != '' AND NOT EXISTS (SELECT * - FROM profile_education_degree_enum AS e - WHERE f.Intitule_formation = e.abbreviation)"); - $missingCouple = XDB::rawIterator("SELECT DISTINCT(f.Intitule_diplome) AS edu, f.Intitule_formation AS degree, ee.id AS eduid, de.id AS degreeid + WHERE f.Intitule_diplome != '' AND NOT EXISTS (SELECT * + FROM profile_education_degree_enum AS e + WHERE f.Intitule_diplome = e.abbreviation)"); + $missingCouple = XDB::rawIterator("SELECT DISTINCT(f.Intitule_formation) AS edu, f.Intitule_diplome AS degree, ee.id AS eduid, de.id AS degreeid FROM fusionax_formations AS f - INNER JOIN profile_education_enum AS ee ON (f.Intitule_diplome = ee.name) - INNER JOIN profile_education_degree_enum AS de ON (f.Intitule_formation = de.abbreviation) + INNER JOIN profile_education_enum AS ee ON (f.Intitule_formation = ee.name) + INNER JOIN profile_education_degree_enum AS de ON (f.Intitule_diplome = de.abbreviation) WHERE f.Intitule_diplome != '' AND f.Intitule_formation != '' AND NOT EXISTS (SELECT * FROM profile_education_degree AS d @@ -607,7 +771,28 @@ class FusionAxModule extends PLModule $page->assign('missingCoupleCount', $missingCouple->total()); } - function handler_issues_deathdate(&$page, $action = '') + function handler_corps($page) + { + $page->changeTpl('fusionax/corps.tpl'); + + $missingCorps = XDB::rawIterator('SELECT DISTINCT(f.corps_sortie) AS name + FROM fusionax_anciens AS f + WHERE NOT EXISTS (SELECT * + FROM profile_corps_enum AS c + WHERE f.corps_sortie = c.abbreviation)'); + $missingGrade = XDB::rawIterator('SELECT DISTINCT(f.grade) AS name + FROM fusionax_anciens AS f + WHERE NOT EXISTS (SELECT * + FROM profile_corps_rank_enum AS c + WHERE f.grade = c.name)'); + + $page->assign('missingCorps', $missingCorps); + $page->assign('missingGrade', $missingGrade); + $page->assign('missingCorpsCount', $missingCorps->total()); + $page->assign('missingGradeCount', $missingGrade->total()); + } + + function handler_issues_deathdate($page, $action = '') { $page->changeTpl('fusionax/deathdate_issues.tpl'); if ($action == 'edit') { @@ -649,7 +834,7 @@ class FusionAxModule extends PLModule $page->assign('total', count($issues)); } - function handler_issues_promo(&$page, $action = '') + function handler_issues_promo($page, $action = '') { $page->changeTpl('fusionax/promo_issues.tpl'); if ($action == 'edit') { @@ -696,7 +881,7 @@ class FusionAxModule extends PLModule $page->assign('total', count($issues)); } - function handler_issues(&$page, $action = '') + function handler_issues($page, $action = '') { static $issueList = array( 'name' => 'noms', @@ -740,5 +925,5 @@ class FusionAxModule extends PLModule } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?>