arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Fix school import

Browse Source
This commit is contained in:
patrick 2025-02-18 05:30:51 +00:00
parent fc082d9253
commit cb2d7b6845
3 changed files with 58 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
admin/schools.php
View File

@ -264,8 +264,8 @@ if (get_value_from_array($_GET, 'action') == 'edit' || get_value_from_array($_GE
emit_province_selector('province_code', get_value_property_or_default($r, 'province_code', '')); emit_province_selector('province_code', get_value_property_or_default($r, 'province_code', ''));
echo "</td></tr>\n"; echo "</td></tr>\n";
echo '<tr><td>' . i18n($config['postalzip']) . '</td><td><input type="text" name="postalcode" value="' . get_value_property_or_default($r, 'postalcode') . "\" size=\"8\" maxlength=\"7\" /></td></tr>\n"; echo '<tr><td>' . i18n($config['postalzip']) . '</td><td><input type="text" name="postalcode" value="' . get_value_property_or_default($r, 'postalcode') . "\" size=\"8\" maxlength=\"7\" /></td></tr>\n";
echo '<tr><td>' . i18n('Phone') . '</td><td><input type="text" name="phone" value="' . htmlspecialchars(get_value_property_or_default($r, 'phone', '')) . "\" size=\"16\" maxlength=\"16\" /></td></tr>\n"; echo '<tr><td>' . i18n('Phone') . '</td><td><input type="tel" name="phone" value="' . htmlspecialchars(get_value_property_or_default($r, 'phone', '')) . "\" size=\"16\" maxlength=\"16\" /></td></tr>\n";
echo '<tr><td>' . i18n('Fax') . '</td><td><input type="text" name="fax" value="' . htmlspecialchars(get_value_property_or_default($r, 'fax', '')) . "\" size=\"16\" maxlength=\"16\" /></td></tr>\n"; echo '<tr><td>' . i18n('Fax') . '</td><td><input type="tel" name="fax" value="' . htmlspecialchars(get_value_property_or_default($r, 'fax', '')) . "\" size=\"16\" maxlength=\"16\" /></td></tr>\n";
if (get_value_property_or_default($r, 'principal_uid') > 0) if (get_value_property_or_default($r, 'principal_uid') > 0)
$pl = user_load_by_uid(get_value_property_or_default($r, 'principal_uid')); $pl = user_load_by_uid(get_value_property_or_default($r, 'principal_uid'));
@ -275,9 +275,9 @@ if (get_value_from_array($_GET, 'action') == 'edit' || get_value_from_array($_GE
$e = get_value_from_array($pl, 'email', 0) == '*' ? '' : get_value_from_array($pl, 'email'); $e = get_value_from_array($pl, 'email', 0) == '*' ? '' : get_value_from_array($pl, 'email');
echo '<tr><td>' . i18n('Principal') . '</td><td><input type="text" name="principal" value="' . htmlspecialchars(get_value_from_array($pl, 'name', '')) . "\" size=\"60\" maxlength=\"64\" /></td></tr>\n"; echo '<tr><td>' . i18n('Principal') . '</td><td><input type="text" name="principal" value="' . htmlspecialchars(get_value_from_array($pl, 'name', '')) . "\" size=\"60\" maxlength=\"64\" /></td></tr>\n";
echo '<tr><td>' . i18n('Principal Email') . '</td><td><input type="text" name="principalemail" value="' . htmlspecialchars(get_value_or_default($e, '')) . "\" size=\"60\" maxlength=\"128\" /></td></tr>\n"; echo '<tr><td>' . i18n('Principal Email') . '</td><td><input type="email" name="principalemail" value="' . htmlspecialchars(get_value_or_default($e, '')) . "\" size=\"60\" maxlength=\"128\" /></td></tr>\n";
echo '<tr><td>' . i18n('School Email') . '</td><td><input type="text" name="schoolemail" value="' . htmlspecialchars(get_value_property_or_default($r, 'schoolemail', '')) . "\" size=\"60\" maxlength=\"128\" /></td></tr>\n"; echo '<tr><td>' . i18n('School Email') . '</td><td><input type="email" name="schoolemail" value="' . htmlspecialchars(get_value_property_or_default($r, 'schoolemail', '')) . "\" size=\"60\" maxlength=\"128\" /></td></tr>\n";
echo '<tr><td>' . i18n('Access Code') . '</td><td><input type="text" name="accesscode" value="' . htmlspecialchars(get_value_property_or_default($r, 'accesscode', '')) . "\" size=\"32\" maxlength=\"32\" /></td></tr>\n"; echo '<tr><td>' . i18n('Access Code') . '</td><td><input type="text" name="accesscode" value="' . htmlspecialchars(get_value_property_or_default($r, 'accesscode', '')) . "\" size=\"32\" maxlength=\"32\" /></td></tr>\n";
echo '<tr><td colspan=2><br /><b>' . i18n('Science head/teacher or science fair contact at school') . '</b></td></tr>'; echo '<tr><td colspan=2><br /><b>' . i18n('Science head/teacher or science fair contact at school') . '</b></td></tr>';
if (get_value_property_or_default($r, 'sciencehead_uid', '') > 0) if (get_value_property_or_default($r, 'sciencehead_uid', '') > 0)
@ -285,10 +285,10 @@ if (get_value_from_array($_GET, 'action') == 'edit' || get_value_from_array($_GE
else else
$sh = array(); $sh = array();
/* Don't show autogenerated emails */ /* Don't show autogenerated emails */
$e = get_value_from_2d_array($sh, 'email', 0, '') == '*' ? '' : get_value_from_2d_array($sh, 'email', ''); $e = get_value_from_array($sh, 'email', '') == '*' ? '' : get_value_from_array($sh, 'email', '');
echo '<tr><td>' . i18n('Email') . '</td><td><input type="text" name="scienceheademail" value="' . htmlspecialchars(get_value_or_default($e, '')) . "\" size=\"60\" maxlength=\"128\" /></td></tr>\n"; echo '<tr><td>' . i18n('Email') . '</td><td><input type="email" name="scienceheademail" value="' . htmlspecialchars(get_value_or_default($e, '')) . "\" size=\"60\" maxlength=\"128\" /></td></tr>\n";
echo '<tr><td>' . i18n('Name') . '</td><td><input type="text" name="sciencehead" value="' . htmlspecialchars(get_value_from_array($sh, 'name', '')) . "\" size=\"60\" maxlength=\"64\" /></td></tr>\n"; echo '<tr><td>' . i18n('Name') . '</td><td><input type="text" name="sciencehead" value="' . htmlspecialchars(get_value_from_array($sh, 'name', '')) . "\" size=\"60\" maxlength=\"64\" /></td></tr>\n";
echo '<tr><td>' . i18n('Phone') . '</td><td><input type="text" name="scienceheadphone" value="' . htmlspecialchars(get_value_property_or_default($sh, 'phonework', '')) . "\" size=\"16\" maxlength=\"16\" /></td></tr>\n"; echo '<tr><td>' . i18n('Phone') . '</td><td><input type="tel" name="scienceheadphone" value="' . htmlspecialchars(get_value_property_or_default($sh, 'phonework', '')) . "\" size=\"16\" maxlength=\"16\" /></td></tr>\n";
if ($config['participant_registration_type'] == 'schoolpassword') { if ($config['participant_registration_type'] == 'schoolpassword') {
echo '<tr><td colspan=2><br /><b>' . i18n('Participant Registration Password') . '</b></td></tr>'; echo '<tr><td colspan=2><br /><b>' . i18n('Participant Registration Password') . '</b></td></tr>';
@ -378,13 +378,18 @@ if (get_value_from_array($_GET, 'action') == 'edit' || get_value_from_array($_GE
while ($r = $q->fetch(PDO::FETCH_OBJ)) { while ($r = $q->fetch(PDO::FETCH_OBJ)) {
echo "<tr>\n"; echo "<tr>\n";
echo " <td>$r->school</td>\n"; echo " <td>$r->school</td>\n";
echo " <td>$r->address, $r->city, $r->postalcode</td>\n"; if ($r->address != '' && $r->city != '' && $r->postalcode != '') {
echo " <td>$r->phone</td>\n"; echo " <td>$r->address, $r->city, $r->postalcode</td>\n";
} else {
echo " <td></td>\n";
}
echo " <td><a href='tel:$r->phone'>$r->phone</a></td>\n";
$sciencehead = ''; $sciencehead = '';
if ($r->sciencehead_uid > 0) { if ($r->sciencehead_uid != NULL && $r->sciencehead_uid > 0) {
$sh = user_load_by_uid($r->sciencehead_uid); $sh = user_load_by_uid($r->sciencehead_uid);
$sciencehead = $sh['name']; $sciencehead = $sh['name'] ?? '';
} }
echo " <td>$sciencehead</td>\n"; echo " <td>$sciencehead</td>\n";
if ($config['participant_registration_type'] == 'schoolpassword') if ($config['participant_registration_type'] == 'schoolpassword')

75
admin/schoolsimport.php
View File

@ -48,18 +48,18 @@ if (get_value_from_array($_POST, 'action') == 'import') {
if (count($CSVP->data) > 0) { if (count($CSVP->data) > 0) {
// okay it looks like we have something.. lets dump the current stuff // okay it looks like we have something.. lets dump the current stuff
if ($_POST['emptycurrent'] == 1) { if ($_POST['emptycurrent'] == 1) {
echo happy(i18n('Old school data erased')); try {
$stmt = $pdo->prepare('DELETE FROM schools WHERE year=?'); $stmt = $pdo->prepare('DELETE FROM schools WHERE year=?');
$stmt->execute([$config['FAIRYEAR']]); $stmt->execute([$config['FAIRYEAR']]);
echo happy(i18n('Old school data erased'));
} catch (PDOException $exception) {
echo error(i18n('Failed to erase old school data'));
}
} }
$loaded = 0; $loaded = 0;
foreach ($CSVP->data AS $raw_row) { foreach ($CSVP->data AS $raw_row) {
$row = explode(',', $raw_row[0]); $row = str_getcsv($raw_row[0], ',', '"', '\\');
for ($n = 0; $n < count($row); $n++) {
$row[$n] = trim(trim($row[$n]), '"');
}
// $email = $row[16]; // $email = $row[16];
// if ($email != '') { // if ($email != '') {
@ -89,37 +89,42 @@ if (get_value_from_array($_POST, 'action') == 'import') {
// user_save($principal); // user_save($principal);
// } // }
$stmt = $pdo->prepare('INSERT INTO schools $total = $row[22] != '' ? $row[22] : 'total';
(school, schoollang, schoollevel, board, district, phone, fax, address, city, province_code, postalcode, schoolemail, accesscode, registration_password, projectlimit, projectlimitper, year, principal_uid, sciencehead_uid) $limit = $row[21] != '' ? $row[21] : 0;
VALUES try {
(:school, :schoollang, :schoollevel, :board, :district, :phone, :fax, :address, :city, :province_code, :postalcode, :schoolemail, :accesscode, :registration_password, :projectlimit, :projectlimitper, :year, :principal_uid, :sciencehead_uid)'); $stmt = $pdo->prepare('INSERT INTO schools
(school, schoollang, schoollevel, designate, board, district, phone, fax, address, city, province_code, postalcode, schoolemail, accesscode, registration_password, projectlimit, projectlimitper, year, principal_uid, sciencehead_uid)
VALUES
(:school, :schoollang, :schoollevel, :designate, :board, :district, :phone, :fax, :address, :city, :province_code, :postalcode, :schoolemail, :accesscode, :registration_password, :projectlimit, :projectlimitper, :year, :principal_uid, :sciencehead_uid)');
$stmt->bindParam(':school', $row[0]); $stmt->bindValue(':school', htmlspecialchars($row[0]));
$stmt->bindParam(':schoollang', $row[1]); $stmt->bindParam(':schoollang', $row[1]);
$stmt->bindParam(':schoollevel', $row[2]); $stmt->bindParam(':schoollevel', $row[2]);
$stmt->bindParam(':board', $row[3]); $stmt->bindParam(':designate', $row[3]);
$stmt->bindParam(':district', $row[4]); $stmt->bindParam(':board', $row[4]);
$stmt->bindParam(':phone', $row[5]); $stmt->bindParam(':district', $row[5]);
$stmt->bindParam(':fax', $row[6]); $stmt->bindParam(':phone', $row[6]);
$stmt->bindParam(':address', $row[7]); $stmt->bindParam(':fax', $row[7]);
$stmt->bindParam(':city', $row[8]); $stmt->bindParam(':address', $row[8]);
$stmt->bindParam(':province_code', $row[9]); $stmt->bindParam(':city', $row[9]);
$stmt->bindParam(':postalcode', $row[10]); $stmt->bindParam(':province_code', $row[10]);
$stmt->bindParam(':schoolemail', $row[11]); $stmt->bindParam(':postalcode', $row[11]);
$stmt->bindParam(':accesscode', $row[12]); $stmt->bindParam(':schoolemail', $row[15]);
$stmt->bindParam(':registration_password', $row[13]); $stmt->bindParam(':accesscode', $row[19]);
$stmt->bindParam(':projectlimit', $row[14]); $stmt->bindParam(':registration_password', $row[20]);
$stmt->bindParam(':projectlimitper', $row[15]); $stmt->bindParam(':projectlimit', $limit);
$stmt->bindParam(':year', $config['FAIRYEAR']); $stmt->bindValue(':projectlimitper', $total);
$stmt->bindParam(':principal_uid', $principal['uid']); $stmt->bindParam(':year', $config['FAIRYEAR']);
$stmt->bindParam(':sciencehead_uid', $scienceHead['uid']); $stmt->bindParam(':principal_uid', $principal['uid']);
$stmt->bindParam(':sciencehead_uid', $scienceHead['uid']);
$stmt->execute(); $stmt->execute();
if ($pdo->errorInfo() != '00000') {
$loaded++; $loaded++;
} else { } catch (PDOException $exception) {
show_pdo_errors_if_any($pdo); error_log($exception);
echo error(i18n('Failed to load schools %2 at row %1', array($loaded++, $row[0])));
var_dump($row);
} }
} }
echo happy(i18n('Successfully loaded %1 schools', array($loaded))); echo happy(i18n('Successfully loaded %1 schools', array($loaded)));

4
csvimport.inc.php
View File

@ -56,12 +56,12 @@ class CSVParser
// End of line // End of line
if ($ch == "\n" && !$quoted) { if ($ch == "\n" && !$quoted) {
// Remove enclosure delimiters // Remove enclosure delimiters
for ($k = 0; $k < count($row); $k++) { /*for ($k = 0; $k < count($row); $k++) {
if ($row[$k] != '' && $row[$k][0] == $this->enclosure) { if ($row[$k] != '' && $row[$k][0] == $this->enclosure) {
$row[$k] = substr($row[$k], 1, strlen($row[$k]) - 2); $row[$k] = substr($row[$k], 1, strlen($row[$k]) - 2);
} }
$row[$k] = str_replace(str_repeat($this->enclosure, 2), $this->enclosure, $row[$k]); $row[$k] = str_replace(str_repeat($this->enclosure, 2), $this->enclosure, $row[$k]);
} }*/
// Append row into table // Append row into table
$this->data[] = $row; $this->data[] = $row;