function _getDays($year, $month)
{
// give a 'no filter' option
- $months[0] = "----";
+ $days = array();
+ $days[0] = "----";
if ($year && $month) {
$day_max = Array(-1, 31, checkdate(2, 29, $year) ? 29 : 28 , 31,
function _getMonths($year)
{
// give a 'no filter' option
+ $months = array();
$months[0] = "----";
if ($year) {
function _getYears()
{
// give a 'no filter' option
+ $years = array();
$years[0] = "----";
// retrieve available years
$where = array();
if ($uid)
- array_push($where, "uid='$uid'");
+ array_push($where, "s.uid='$uid'");
// we were given at least a year
if ($year) {
}
// Loads the user identity using the environment.
- $user = User::get($login);
- if (!$user) {
+ if ($login) {
+ $user = User::get($login);
+ }
+ if (empty($user)) {
return;
}
}
// Handles specific requests (AX sync, su, ...).
- if(Post::has('logs_account')) {
+ if(Post::has('log_account')) {
pl_redirect("admin/logger?loguser=$login&year=".date('Y')."&month=".date('m'));
}
return null;
}
- private static function formatNewUser($infosLine, $separator, $promo, $size)
+ private static function formatNewUser(&$page, $infosLine, $separator, $promo, $size)
{
$infos = explode($separator, $infosLine);
- if (sizeof($infos) != $size) {
+ if (sizeof($infos) > $size || sizeof($infos) < 2) {
+ $page->trigError("La ligne $infosLine n'a pas été ajoutée.");
return false;
}
FROM profiles
WHERE hrpid = {?}', $hrid);
if (is_null($hrid) || $res1->fetchOneCell() > 0 || $res2->fetchOneCell() > 0) {
- $page->trigError("La ligne $line n'a pas été ajoutée.");
+ $page->trigError("La ligne $infosLine n'a pas été ajoutée.");
return false;
}
$infos['hrid'] = $hrid;
$eduSchools = array_flip($eduSchools);
$eduDegrees = DirEnum::getOptions(DirEnum::EDUDEGREES);
$eduDegrees = array_flip($eduDegrees);
- var_dump($eduDegrees);
switch (Env::t('edu_type')) {
case 'X':
$degreeid = $eduDegrees[Profile::DEGREE_X];
}
foreach ($lines as $line) {
- if (($infos = self::formatNewUser($line, $separator, $promotion, 6))
- && ($sex = self::formatSex($page, $infos[3], $line))) {
- $name = $infos[1] . ' ' . $infos[0];
- $birthDate = self::formatBirthDate($infos[2]);
- $xorgId = Profile::getXorgId($infos[4]);
-
- XDB::execute('INSERT INTO profiles (hrpid, xorg_id, ax_id, birthdate_ref, sex)
- VALUES ({?}, {?}, {?}, {?})',
- $infos['hrid'], $xorgId, $infos[5], $birthDate, $sex);
- $pid = XDB::insertId();
- XDB::execute('INSERT INTO profile_name (pid, name, typeid)
- VALUES ({?}, {?}, {?})',
- $pid, $infos[0], $nameTypes['name_ini']);
- XDB::execute('INSERT INTO profile_name (pid, name, typeid)
- VALUES ({?}, {?}, {?})',
- $pid, $infos[1], $nameTypes['firstname_ini']);
- XDB::execute('INSERT INTO profile_display (pid, yourself, public_name, private_name,
- directory_name, short_name, sort_name, promo)
- VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
- $pid, $infos[1], $name, $name, $name, $name, $infos[0] . ' ' . $infos[1], $promo);
- 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('INSERT INTO accounts (hruid, type, is_admin, state, full_name, display_name, sex)
- VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?})',
- $infos['hrid'], $type, 0, 'active', $name, $infos[1], $sex);
- $uid = XDB::insertId();
- XDB::execute('INSERT INTO account_profiles (uid, pid, perms)
- VALUES ({?}, {?}, {?})',
- $uid, $pid, 'owner');
+ if ($infos = self::formatNewUser($page, $line, $separator, $promotion, 6)) {
+ $sex = self::formatSex($page, $infos[3], $line);
+ if (!is_null($sex)) {
+ $name = $infos[1] . ' ' . $infos[0];
+ $birthDate = self::formatBirthDate($infos[2]);
+ $xorgId = Profile::getXorgId($infos[4]);
+ if (is_null($xorgId)) {
+ $page->trigError("La ligne $line n'a pas été ajoutée car le matricule École est mal renseigné.");
+ continue;
+ }
+
+ XDB::execute('INSERT INTO profiles (hrpid, xorg_id, ax_id, birthdate_ref, sex)
+ VALUES ({?}, {?}, {?}, {?}, {?})',
+ $infos['hrid'], $xorgId, $infos[5], $birthDate, $sex);
+ $pid = XDB::insertId();
+ XDB::execute('INSERT INTO profile_name (pid, name, typeid)
+ VALUES ({?}, {?}, {?})',
+ $pid, $infos[0], $nameTypes['name_ini']);
+ XDB::execute('INSERT INTO profile_name (pid, name, typeid)
+ VALUES ({?}, {?}, {?})',
+ $pid, $infos[1], $nameTypes['firstname_ini']);
+ XDB::execute('INSERT INTO profile_display (pid, yourself, public_name, private_name,
+ directory_name, short_name, sort_name, promo)
+ VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
+ $pid, $infos[1], $name, $name, $name, $name, $infos[0] . ' ' . $infos[1], $promo);
+ 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('INSERT INTO accounts (hruid, type, is_admin, state, full_name, display_name, sex)
+ VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?})',
+ $infos['hrid'], $type, 0, 'active', $name, $infos[1], $sex);
+ $uid = XDB::insertId();
+ XDB::execute('INSERT INTO account_profiles (uid, pid, perms)
+ VALUES ({?}, {?}, {?})',
+ $uid, $pid, 'owner');
+ }
}
}
} else if (Env::t('add_type') == 'account') {
$type = Env::t('type');
+ $newAccounts = array();
foreach ($lines as $line) {
- if (($infos = self::formatNewUser($line, $separator, $type, 4))
- && ($sex = self::formatSex(&$page, $infos[3], $line))) {
- XDB::execute('INSERT INTO accounts (hruid, type, is_admin, state, email, full_name, display_name, sex)
- VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
- $infos['hrid'], $type, 0, 'active', $infos[2], $infos[1] . ' ' . $infos[0], $infos[1], $sex);
+ if ($infos = self::formatNewUser($page, $line, $separator, $type, 4)) {
+ $sex = self::formatSex($page, $infos[3], $line);
+ if (!is_null($sex)) {
+ XDB::execute('INSERT INTO accounts (hruid, type, is_admin, state, email, full_name, display_name, sex)
+ VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
+ $infos['hrid'], $type, 0, 'active', $infos[2], $infos[1] . ' ' . $infos[0], $infos[1], $sex);
+ $newAccounts[$infos['hrid']] = $infos[1] . ' ' . $infos[0];
+ }
}
}
+ if (!empty($newAccounts)) {
+ $page->assign('newAccounts', $newAccounts);
+ }
} else if (Env::t('add_type') == 'ax_id') {
$type = 'x';
foreach ($lines as $line) {
- if ($infos = self::formatNewUser($line, $separator, $promotion, 3)) {
+ if ($infos = self::formatNewUser($page, $line, $separator, $promotion, 3)) {
XDB::execute('UPDATE profiles
SET ax_id = {?}
WHERE hrpid = {?}',
}
}
- if ($page->nb_errs == 0) {
+ $errors = $page->nb_errs();
+ if ($errors == 0) {
$page->trigSuccess("L'opération a été effectuée avec succès.");
} else {
- $page->trigSuccess("L'opération a été effectuée avec succès, sauf pour les "
- . $page->nb_errs . 'erreurs signalées ci-dessus.');
+ $page->trigSuccess('L\'opération a été effectuée avec succès, sauf pour '
+ . (($errors == 1) ? 'l\'erreur signalée' : "les $errors erreurs signalées") . ' ci-dessus.');
}
} else if (Env::has('add_type')) {
$res = XDB::query('SELECT type
if ($validate) {
S::assert_xsrf_token();
- $res = XDB::iterRow('SELECT p.hrpid, pd.directory_name, p.deathdate
+ $res = XDB::iterRow('SELECT p.pid, pd.directory_name, p.deathdate
FROM profiles AS p
INNER JOIN profile_display AS pd ON (p.pid = pd.pid)
WHERE pd.promo = {?}', $promo);
while (list($pid, $name, $death) = $res->next()) {
- $val = Env::v($pid);
- if($val == $deces || empty($val)) {
+ $val = Env::v('death_' . $pid);
+ if($val == $death || empty($val)) {
continue;
}
XDB::execute('UPDATE profiles
SET deathdate = {?}, deathdate_rec = NOW()
- WHERE hrpid = {?}', $val, $pid);
+ WHERE pid = {?}', $val, $pid);
$page->trigSuccess('Ajout du décès de ' . $name . ' le ' . $val . '.');
if($death == '0000-00-00' || empty($death)) {
$profile = Profile::get($pid);
}
}
- $res = XDB::iterator('SELECT p.hrpid, pd.directory_name, p.deathdate
+ $res = XDB::iterator('SELECT p.pid, pd.directory_name, p.deathdate
FROM profiles AS p
INNER JOIN profile_display AS pd ON (p.pid = pd.pid)
WHERE pd.promo = {?}
t.display_tel AS tel, f.display_tel AS fax, a.text AS address
FROM profile_job_enum AS e
LEFT JOIN profile_job_enum AS h ON (e.holdingid = h.id)
- LEFT JOIN profile_phones AS t ON (t.pid = e.id AND link_type = 'hq' AND tel_id = 0)
- LEFT JOIN profile_phones AS f ON (f.pid = e.id AND link_type = 'hq' AND tel_id = 1)
+ LEFT JOIN profile_phones AS t ON (t.pid = e.id AND t.link_type = 'hq' AND t.tel_id = 0)
+ LEFT JOIN profile_phones AS f ON (f.pid = e.id AND f.link_type = 'hq' AND f.tel_id = 1)
LEFT JOIN profile_addresses AS a ON (a.jobid = e.id AND a.type = 'hq')
WHERE e.id = {?}",
$id);
projects / platal.git / blobdiff