From a69b77add550d1dfa77b8614975c87d0e16f1aa9 Mon Sep 17 00:00:00 2001
From: patrick <patrick@algolibre.io>
Date: Sat, 22 Feb 2025 02:41:50 +0000
Subject: [PATCH] Re-add tour management
---
admin/tours_assignments.php | 51 +++++++++---------
admin/tours_manager.php | 17 +++---
admin/tours_sa.php | 3 +-
admin/tours_sa_config.php | 2 +-
admin/tours_sa_status.php | 19 +++++--
config_editor.inc.php | 5 +-
js/sfiab.js | 7 +--
register_participants_tours.php | 2 +-
tableeditor.class.php | 20 ++++----
theme/icons_science_ation/icons.php | 2 +-
theme/icons_science_ation/tours.png | Bin 0 -> 504 bytes
tours.class.php | 77 +++++++++++++++++-----------
translationseditor.inc.php | 2 +-
13 files changed, 122 insertions(+), 85 deletions(-)
create mode 100644 theme/icons_science_ation/tours.png
diff --git a/admin/tours_assignments.php b/admin/tours_assignments.php
index 683f9a45..19aed85f 100644
--- a/admin/tours_assignments.php
+++ b/admin/tours_assignments.php
@@ -32,8 +32,8 @@ require_once ('../user.inc.php');
user_auth_required('committee', 'admin');
/* Load Tours */
-$query = "SELECT * FROM tours WHERE
- year=?";
+$query = 'SELECT * FROM tours WHERE
+ year=?';
$r = $pdo->prepare($query);
$r->execute([$config['FAIRYEAR']]);
$tours = array();
@@ -45,22 +45,22 @@ while ($i = $r->fetch(PDO::FETCH_OBJ)) {
if (get_value_from_array($_GET, 'action') == 'info') {
$sid = intval($_GET['id']);
- $query = "SELECT * FROM students WHERE id=?
- AND year=?";
+ $query = 'SELECT * FROM students WHERE id=?
+ AND year=?';
$r = $pdo->prepare($query);
- $r->execute([$sid,$config['FAIRYEAR']]);
+ $r->execute([$sid, $config['FAIRYEAR']]);
$i = $r->fetch(PDO::FETCH_OBJ);
send_popup_header(i18n('Student Tour Rank Information - %1 %2',
array($i->firstname, $i->lastname)));
- $query = "SELECT * FROM tours_choice
+ $query = 'SELECT * FROM tours_choice
WHERE students_id=?
AND year=?
- ORDER BY rank";
+ ORDER BY rank';
$r = $pdo->prepare($query);
- $r->execute([$sid,$config['FAIRYEAR']]);
+ $r->execute([$sid, $config['FAIRYEAR']]);
echo '<table>';
- $count = $r->rowwCount();
+ $count = $r->rowCount();
while ($i = $r->fetch(PDO::FETCH_OBJ)) {
echo '<tr><td align="right">';
if ($i->rank == 0) {
@@ -156,8 +156,8 @@ if (get_value_from_array($_POST, 'action') == 'add' && $tours_id != 0 && count($
/* Make sure the student exists */
$sid = intval($sid);
- $q = $pdo->prepare("SELECT registrations_id FROM students
- WHERE id=?");
+ $q = $pdo->prepare('SELECT registrations_id FROM students
+ WHERE id=?');
$q->execute([$sid]);
$i = $q->fetch(PDO::FETCH_OBJ);
$rid = $i->registrations_id;
@@ -167,15 +167,18 @@ if (get_value_from_array($_POST, 'action') == 'add' && $tours_id != 0 && count($
students_id=? AND
year=? AND
rank='0'");
- $stmt->execute([$sid,$config['FAIRYEAR']]);
+ $stmt->execute([$sid, $config['FAIRYEAR']]);
/* Connect this student to this tour */
$stmt = $pdo->prepare("INSERT INTO tours_choice
(`students_id`,`registrations_id`,
`tour_id`,`year`,`rank`)
VALUES (
- ?,?,?,
- ?,'0')");
- $stmt->execute([$sid,$rid,$tours_id,$config['FAIRYEAR']]);
+ ?,
+ ?,
+ ?,
+ ?,
+ '0')");
+ $stmt->execute([$sid, $rid, $tours_id, $config['FAIRYEAR']]);
$added++;
}
if ($added == 1)
@@ -189,6 +192,7 @@ if (get_value_from_array($_POST, 'action') == 'add' && $tours_id != 0 && count($
}
$tours_id = intval(get_value_from_array($_GET, 'tours_id'));
+error_log("Tours ID: " . $tours_id);
$students_id = intval(get_value_from_array($_GET, 'students_id'));
if (get_value_from_array($_GET, 'action') == 'del' && $tours_id > 0 && $students_id > 0) {
@@ -196,17 +200,17 @@ if (get_value_from_array($_GET, 'action') == 'del' && $tours_id > 0 && $students
WHERE students_id=?
AND year=?
AND rank='0'");
- $stmt->execute([$students_id,$config['FAIRYEAR']]);
+ $stmt->execute([$students_id, $config['FAIRYEAR']]);
echo happy(i18n('Removed student from tour #%1 (%2)', array($tours[$tours_id]['num'], $tours[$tours_id]['name'])));
}
if (get_value_from_array($_GET, 'action') == 'empty' && $tours_id > 0) {
- $stmt = $po->prepare("DELETE FROM tours_choice WHERE
+ $stmt = $pdo->prepare("DELETE FROM tours_choice WHERE
tour_id=?
AND year=?
AND rank='0'");
- $stmt->execute([$tours_id,$config['FAIRYEAR']]);
+ $stmt->execute([$tours_id, $config['FAIRYEAR']]);
echo happy(i18n('Emptied all students from tour #%1 (%2)', array($tours[$tours_id]['num'], $tours[$tours_id]['name'])));
}
@@ -235,9 +239,8 @@ echo '<tr><td valign="top">';
* (rank=0), or if there is no selection, make
* rank NULL, and tours_id NULL
*/
-$querystr = "SELECT \tstudents.firstname, students.lastname,
- students.id,
- tours_choice.tour_id, tours_choice.rank
+$querystr = "SELECT students.firstname, students.lastname,
+ students.id, tours_choice.tour_id, tours_choice.rank
FROM
students
LEFT JOIN tours_choice ON (tours_choice.students_id=students.id AND tours_choice.rank=0)
@@ -245,15 +248,15 @@ $querystr = "SELECT \tstudents.firstname, students.lastname,
WHERE
students.year=? AND
(tours_choice.year=? OR
- \t tours_choice.year IS NULL) AND
- registrations.status='complete'
+ tours_choice.year IS NULL) AND
+ registrations.status='complete' OR registrations.status='paymentpending'
ORDER BY
students.lastname,
students.firstname,
tours_choice.rank";
$q = $pdo->prepare($querystr);
-$q->execute([$config['FAIRYEAR'],$config['FAIRYEAR']]);
+$q->execute([$config['FAIRYEAR'], $config['FAIRYEAR']]);
show_pdo_errors_if_any($pdo);
diff --git a/admin/tours_manager.php b/admin/tours_manager.php
index 6c1da4e7..82e65f4a 100644
--- a/admin/tours_manager.php
+++ b/admin/tours_manager.php
@@ -38,13 +38,13 @@ send_header('Tour Management',
'Administration' => 'admin/index.php',
'Tours' => 'admin/tours.php'));
-if ($_GET['action'] == 'renumber') {
- $q = $pdo->prepare("SELECT id FROM tours WHERE year=?");
+if (get_value_from_array($_GET, 'action') == 'renumber') {
+ $q = $pdo->prepare('SELECT id FROM tours WHERE year=?');
$q->execute([$config['FAIRYEAR']]);
$x = 1;
- while ($i = $q->fetch(PDP::FETCH_OBJ)) {
- $stmt = $pdo->prepare("UPDATE tours SET num=? WHERE id=?");
- $stmt->execute([$x,$i->id]);
+ while ($i = $q->fetch(PDO::FETCH_OBJ)) {
+ $stmt = $pdo->prepare('UPDATE tours SET num=? WHERE id=?');
+ $stmt->execute([$x, $i->id]);
$x++;
}
echo happy(i18n('Tours successfully renumbered'));
@@ -73,12 +73,13 @@ $icon_exitension = $config['icon_extension'];
$editor = new TableEditor('tours');
-// $editor->setDebug(true);
+tours::tableEditorSetup($editor);
+
$editor->filterList("(tours.year={$config['FAIRYEAR']} OR tours.year IS NULL)");
$editor->execute();
-if ($_GET['TableEditorAction'] == '') {
+//if (get_value_from_array($_GET, 'TableEditorAction') == '') {
echo i18n('You can automatically erase all the tour numbers and
re-number them (starting from 1) by clicking on the link below.
This will NOT affect any students who have already specified
@@ -90,7 +91,7 @@ if ($_GET['TableEditorAction'] == '') {
echo '<br /><br />';
echo '<a onclick="return confirmClick(\'Are you sure you re-number ALL the tours?\')" href="tours_manager.php?action=renumber">Renumber ALL Tours</a>';
-}
+//}
send_footer();
?>
diff --git a/admin/tours_sa.php b/admin/tours_sa.php
index 1a0a4afa..9a053d10 100644
--- a/admin/tours_sa.php
+++ b/admin/tours_sa.php
@@ -52,6 +52,7 @@ TRACE('<pre>');
function set_status($txt)
{
+ global $pdo;
TRACE("Status: $txt\n");
$stmt = $pdo->prepare("UPDATE config SET val=? WHERE
var='tours_assigner_activity' AND year=0");
@@ -62,7 +63,7 @@ $set_percent_last_percent = -1;
function set_percent($n)
{
- global $set_percent_last_percent;
+ global $pdo, $set_percent_last_percent;
$p = floor($n);
if ($p == $set_percent_last_percent)
return;
diff --git a/admin/tours_sa_config.php b/admin/tours_sa_config.php
index ac4fc264..69290871 100644
--- a/admin/tours_sa_config.php
+++ b/admin/tours_sa_config.php
@@ -121,7 +121,7 @@ if ($config['tours_assigner_percent'] == '-1') {
} else {
echo '<br />';
echo '<b>';
- echo i18n('Automatic assignemnts are currently in progress');
+ echo i18n('Automatic assignments are currently in progress');
echo '</b>';
echo '<br />';
echo '<br />';
diff --git a/admin/tours_sa_status.php b/admin/tours_sa_status.php
index 5b095cbc..cb7a8bb1 100644
--- a/admin/tours_sa_status.php
+++ b/admin/tours_sa_status.php
@@ -52,7 +52,20 @@ send_header('Scheduler Status',
'Administration' => 'admin/index.php',
'Tours' => 'admin/tours.php'));
require_once ('../ajax.inc.php');
-?>DBHOST'updatestatus').innerHTML="Updating...";
+?>
+
+<script type="text/javascript">
+var starttime=0;
+var startpercent=0;
+var deltatime=0;
+var deltapercent=0;
+var avgtimeperpercent=0;
+var remainingpercent=0;
+var remainingtime=0;
+
+function updateStatus()
+{
+ document.getElementById('updatestatus').innerHTML="Updating...";
var url="tours_sa_status.php?action=output";
http.open("GET",url,true);
http.onreadystatechange=handleResponse;
@@ -65,7 +78,7 @@ function clearUpdatingMessage()
}
-function handleResponse()DBHOST
+function handleResponse()
{
try {
@@ -105,7 +118,7 @@ function handleResponse()DBHOST
}
}
}
- catch(e)DBHOST
+ catch(e)
{
alert('caught error'+e);
diff --git a/config_editor.inc.php b/config_editor.inc.php
index 3b70a0f1..f27c48a7 100644
--- a/config_editor.inc.php
+++ b/config_editor.inc.php
@@ -219,9 +219,10 @@ function config_editor($category, $year, $array_name, $self)
*/
$var = config_editor_load($category, $year);
- if (($category == 'Tours' or $category == 'Volunteer Registration') and ($config['tours_enable'] !== 'yes' or $config['participant_regfee_items_enable'] !== 'yes'))
+ // FIXME
+ /*if (($category == 'Tours' or $category == 'Volunteer Registration') and ($config['tours_enable'] !== 'yes' or $config['participant_regfee_items_enable'] !== 'yes'))
echo "<form method=\"post\" style='pointer-events: none; opacity: 0.5;' action=\"$self\">";
-
+ */
echo "<form method=\"post\" action=\"$self\">";
echo '<table cellpadding="3">';
diff --git a/js/sfiab.js b/js/sfiab.js
index 267cee70..01135f2c 100644
--- a/js/sfiab.js
+++ b/js/sfiab.js
@@ -2,10 +2,11 @@
function confirmClick(msg)
{
var okay=confirm(msg);
- if(okay)
- return true;
- else
+ if(okay) {
+ return true;
+ } else {
return false;
+ }
}
function el(str,domain,name)
diff --git a/register_participants_tours.php b/register_participants_tours.php
index 1ff643b0..9befdd54 100644
--- a/register_participants_tours.php
+++ b/register_participants_tours.php
@@ -157,7 +157,7 @@ $tours = array();
$q = $pdo->prepare('SELECT * FROM tours WHERE year=? ORDER BY id');
$q->execute([$config['FAIRYEAR']]);
if ($q->rowCount() == 0) {
- echo notice(i18n('There is not tour information'));
+ echo notice(i18n('There is no tour information'));
send_footer();
exit;
}
diff --git a/tableeditor.class.php b/tableeditor.class.php
index 2ffd563a..e47db9d8 100644
--- a/tableeditor.class.php
+++ b/tableeditor.class.php
@@ -44,6 +44,8 @@
// cfdc
// $icon_path="/phpscripts/images/16";
// sfiab
+
+require_once "helper.inc.php";
global $icon_extension;
$icon_path = "{$config['SFIABDIRECTORY']}/images/16";
@@ -500,7 +502,7 @@ class TableEditor
$query .= $field . $n . ',';
}
- // rip off the last commaguix-system-vm-image-1.4.0.x86_64-linux.qcow2
+ // rip off the last comma
$query = substr($query, 0, -1);
if ($insert_mode) {
@@ -643,9 +645,9 @@ class TableEditor
}
} else {
if ($this->fieldValidation[$f])
- $editdata[$f] = "'" . $pdo->quote(stripslashes(preg_replace($this->fieldValidation[$f], '', $_POST[$f]))) . "'";
+ $editdata[$f] = $pdo->quote(stripslashes(preg_replace($this->fieldValidation[$f], '', $_POST[$f])));
else
- $editdata[$f] = "'" . $pdo->quote(stripslashes($_POST[$f])) . "'";
+ $editdata[$f] = $pdo->quote(stripslashes($_POST[$f]));
}
}
@@ -674,11 +676,11 @@ class TableEditor
$text_happy = 'saved';
}
- if ($pdo->errorInfo()) {
+ /*if (pdo_failed($pdo)) {
echo error(i18n("Error $text_error %1: %2", array($this->recordType, $pdo->errorInfo())));
} else {
echo happy(i18n("Successfully $text_happy %1", array($this->recordType)));
- }
+ }*/
}
if (get_value_from_array($_GET, 'TableEditorAction') == 'add' || (get_value_from_array($_GET, 'TableEditorAction') == 'edit' && get_value_from_array($_GET, 'edit'))) {
@@ -748,17 +750,17 @@ class TableEditor
switch ($inputtype) {
case 'text':
if ($this->fieldInputOptions[$f])
- echo '<input type="text" ' . $this->fieldInputOptions[$f] . " id=\"$f\" name=\"$f\" value=\"" . htmlspecialchars($editdata[$f]) . '"/>';
+ echo '<input type="text" ' . $this->fieldInputOptions[$f] . " id=\"$f\" name=\"$f\" value=\"" . htmlspecialchars(get_value_from_array($editdata, $f, '')) . '"/>';
else
- echo "<input type=\"text\" size=\"$inputsize\" maxlength=\"$inputmaxlen\" id=\"$f\" name=\"$f\" value=\"" . htmlspecialchars($editdata[$f]) . '"/>';
+ echo "<input type=\"text\" size=\"$inputsize\" maxlength=\"$inputmaxlen\" id=\"$f\" name=\"$f\" value=\"" . htmlspecialchars(get_value_from_array($editdata, $f, '')) . '"/>';
break;
case 'textarea':
$maxlen = ($inputmaxlen > 0) ? " onkeypress=\"return do_maxlength(this, $inputmaxlen);\" " : '';
if ($this->fieldInputOptions[$f])
- echo "<textarea id=\"$f\" name=\"$f\" $maxlen" . $this->fieldInputOptions[$f] . '>' . htmlspecialchars($editdata[$f]) . '</textarea>';
+ echo "<textarea id=\"$f\" name=\"$f\" $maxlen" . $this->fieldInputOptions[$f] . '>' . htmlspecialchars(get_value_from_array($editdata, $f, '')) . '</textarea>';
else
- echo "<textarea id=\"$f\" name=\"$f\" $maxlen rows=\"5\" cols=\"50\">" . htmlspecialchars($editdata[$f]) . '</textarea>';
+ echo "<textarea id=\"$f\" name=\"$f\" $maxlen rows=\"5\" cols=\"50\">" . htmlspecialchars(get_value_from_array($editdata, $f, '')) . '</textarea>';
break;
case 'select':
if ($this->fieldInputOptions[$f])
diff --git a/theme/icons_science_ation/icons.php b/theme/icons_science_ation/icons.php
index f5aa2f91..c53c4800 100644
--- a/theme/icons_science_ation/icons.php
+++ b/theme/icons_science_ation/icons.php
@@ -42,7 +42,7 @@
$theme_icons['icons']['translations_management']="kwordquiz.png";
$theme_icons['icons']['report_management']="document-multiple.png";
$theme_icons['icons']['volunteer_management']="user-group-new.png";
- $theme_icons['icons']['tour_management']="preferences-system-performance.png";
+ $theme_icons['icons']['tour_management']="tours.png";
$theme_icons['icons']['internal_document_management']="application-vnd.oasis.opendocument.text.png";
$theme_icons['icons']['registration_fee_items_management']="transfers_list.png";
$theme_icons['icons']['judging_score_entry']="transfers_list.png";
diff --git a/theme/icons_science_ation/tours.png b/theme/icons_science_ation/tours.png
new file mode 100644
index 0000000000000000000000000000000000000000..e129410e51442ca04165ba75f60f8c49a1724c6a
GIT binary patch
literal 504
zcmV<U0SEqxP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_00EduL_t(o!|m5WOBGQR2k@WcQ;H;X
z6BI2nZP6lJ^aToP->O9*6o?BKwQ=cpP$3K=@B`>4u+~BlM2kx36GQ|VnWa9*%^4Vm
z@x6KDd$oA)z-2CT?w#{L|MS0xJM_B^weSriL5ib)4J^S^Y+)56y$aN5;k$|Z7;D2+
z&j94hG#ulsb{r+G1Rz^@9c!`qEVhRw{HzKfqx}*dcOm<A{H{}iUA(KoK!V#C$1kju
zou(=PKH~xYo)W|<;BH_$<{S9bsR+~D^8kkh|1HeL{3SjXfX(A#WWU^LFG)gpX=E{4
z@L$E3@Tb_p<(z*C--DS~txix<Q&4v?SqOM1C*CKR2<Fz%>^6X}g^xDzEmyJ+L3sl+
zbz5<(5{!m_FUIr2n)7%Y``_b2w*h1Vo({E_iTPnpyt8#$an^{&aj)bQ<n3C?yFXEu
zD|m)Y?03Szi(ue5GO07N-hYTk-4tO}JBr{b7I3akC)~ken-Wy9W?8~j0Q|t4ptL79
upZ{tD00RI60F5?RvDfiT`|j7Qf9wRP8)|!JLTl6j0000<MNUMnLSTaM?Asdv
literal 0
HcmV?d00001
diff --git a/tours.class.php b/tours.class.php
index a333c377..78546efc 100644
--- a/tours.class.php
+++ b/tours.class.php
@@ -14,7 +14,7 @@ $tours_fields = array('name' => 'Tour Name',
class tours
{
/* Static members for the table editor */
- function tableEditorSetup($editor)
+ static function tableEditorSetup($editor)
{
global $tours_fields;
global $config;
@@ -66,7 +66,7 @@ class tours
/* Functions for $this */
- function tours($tour_id = NULL)
+ function __construct($tour_id = NULL)
{
if ($tour_id == NULL) {
$this->id = FALSE;
@@ -77,7 +77,7 @@ class tours
function tableEditorLoad()
{
- global $config;
+ global $config, $pdo;
$id = $this->id;
@@ -106,49 +106,64 @@ class tours
* if it's a number, then we want an UPDATE statement
*/
global $tours_fields;
- global $config;
+ global $config, $pdo;
$query = '';
/* Construct an insert query if we have to */
if ($this->id == false) {
- $query = "INSERT INTO tours (id) VALUES ('')";
+ // $query = "INSERT INTO tours (id, name, num, description, contact, location) VALUES ('', '', '', '', '', '')";
+ $query = 'INSERT INTO tours (year, name, num, description, capacity, grade_min, grade_max, contact, location) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)';
$stmt = $pdo->prepare($query);
- $stmt->execute();
+ $stmt->execute([
+ str_replace("'", ' ', $data['year']),
+ str_replace("'", ' ', $data['name']),
+ str_replace("'", ' ', $data['num']),
+ str_replace("'", ' ', $data['description']),
+ str_replace("'", ' ', $data['capacity']),
+ str_replace("'", ' ', $data['grade_min']),
+ str_replace("'", ' ', $data['grade_max']),
+ str_replace("'", ' ', $data['contact']),
+ str_replace("'", ' ', $data['location'])
+ ]);
$this->id = $pdo->lastInsertId();
+ } else {
+ /* Give it a proper year when saving */
+
+ /* Now just update the record */
+ $query = 'UPDATE `tours` SET ';
+
+ foreach ($tours_fields AS $f => $n) {
+ $n = $data[$f];
+ $query .= "`$f`=$n,";
+ }
+ // rip off the last comma
+ $query = substr($query, 0, -1);
+
+ $query .= ' WHERE id=?';
+
+ // echo $query;
+ $stmt = $pdo->prepare($query);
+ $stmt->execute([$this->id]);
}
-
- /* Give it a proper year when saving */
-
- /* Now just update the record */
- $query = 'UPDATE `tours` SET ';
-
- foreach ($tours_fields AS $f => $n) {
- $n = $data[$f];
- $query .= "`$f`=$n,";
- }
- // rip off the last comma
- $query = substr($query, 0, -1);
-
- $query .= " WHERE id=?";
-
- // echo $query;
- $stmt = $pdo->prepare($query);
- $stmt->execute([$this->id]);
}
function tableEditorDelete()
{
- global $config;
+ global $config, $pdo;
$id = $this->id;
- $stmt = $pdo->prepare("DELETE FROM tours_choice WHERE tour_id=? AND year=?");
- $stmt->execute([$id, $config['FAIRYEAR']]);
- $stmt = $pdo->prepare("DELETE FROM tours WHERE id=? AND year=?");
- $stmt->execute([$id, $config['FAIRYEAR']]);
-
- echo happy(i18n("Successfully removed tour from this year's fair"));
+ try {
+ $stmt = $pdo->prepare('DELETE FROM tours_choice WHERE tour_id=? AND year=?');
+ $stmt->execute([$id, $config['FAIRYEAR']]);
+ $stmt = $pdo->prepare('DELETE FROM tours WHERE id=? AND year=?');
+ $stmt->execute([$id, $config['FAIRYEAR']]);
+ echo happy(i18n("Successfully removed tour from this year's fair"));
+ } catch (PDOException $exception) {
+ echo error(i18n("Failed to remove tour from this year's fair"));
+ error_log($exception);
+ }
}
};
diff --git a/translationseditor.inc.php b/translationseditor.inc.php
index 44f3d4e1..0c23f156 100644
--- a/translationseditor.inc.php
+++ b/translationseditor.inc.php
@@ -26,7 +26,7 @@
* Boston, MA 02111-1307, USA.
*/
?>
-<script type="text/javascript" src="<?= $config['SFIABDIRECTORY'] ?>/translationseditor.js.php"></script>
+<script src="<?= $config['SFIABDIRECTORY'] ?>/translationseditor.js.php"></script>
<div style="display: none" title="<?= i18n('Translation Editor') ?>" id="translation_editor">
<form id="translationform" onsubmit="return save_translations()">
<input type="hidden" id="translate_str_hidden" name="translate_str_hidden">