'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/names' => $this->make_hook('names', AUTH_MDP, 'admin'),
+ 'fusionax/edu' => $this->make_hook('edu', AUTH_MDP, 'admin'),
+ 'fusionax/corps' => $this->make_hook('corps', AUTH_MDP, 'admin')
);
} elseif (Platal::globals()->merge->state == 'done') {
return array(
} 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...';
$next = 'integrateSQL';
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
} 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 {
$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 ({?}, {?}, {?})',
+ XDB::execute('INSERT INTO profile_name (pid, name, typeid)
+ VALUES ({?}, {?}, {?})',
$pid, $lastname, $nameTypes['name_ini']);
- XDB::execute('REPLACE INTO profile_name (pid, name, typeid)
- VALUES ({?}, {?}, {?})',
+ XDB::execute('INSERT 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_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 ({?}, {?}, {?}, {?}, {?}, {?}, {?})',
+ XDB::execute('INSERT 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 ({?}, {?}, {?})',
+ XDB::execute('INSERT INTO account_profiles (uid, pid, perms)
+ VALUES ({?}, {?}, {?})',
$uid, $pid, 'owner');
}
$report[] = 'Promo 1920 ajoutée.';
$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,
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
$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);
}
+ function handler_edu(&$page, $action = '')
+ {
+ $page->changeTpl('fusionax/education.tpl');
+
+ $missingEducation = XDB::rawIterator("SELECT DISTINCT(f.Intitule_formation)
+ FROM fusionax_formations AS f
+ 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_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_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
+ WHERE ee.id = d.eduid AND de.id = d.degreeid)");
+
+ $page->assign('missingEducation', $missingEducation);
+ $page->assign('missingDegree', $missingDegree);
+ $page->assign('missingCouple', $missingCouple);
+ $page->assign('missingEducationCount', $missingEducation->total());
+ $page->assign('missingDegreeCount', $missingDegree->total());
+ $page->assign('missingCoupleCount', $missingCouple->total());
+ }
+
+ 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');
projects / platal.git / blobdiff