Prepare combo list reload with revisions and fix box/storage in webgui

This commit is contained in:
thooge committed 2026-10-18 10:35:35 +02:00
1 parent ee947b772f
commit aee50ecb4f
17 files changed
+128 -43

No files matched your search

+3 -2
View File
@@ -576,10 +576,11 @@ CREATE TABLE recordlock (
UNIQUE KEY ix_lock_token (token) UNIQUE KEY ix_lock_token (token)
) ENGINE=MEMORY; ) ENGINE=MEMORY;
/* Use with: UPDATE revision SET changed=CURRENT_TIMESTAMP WHERE revid=? */ /* Use with: UPDATE revision SET changed=CURRENT_TIMESTAMP WHERE revtype=? AND revid=? */
CREATE TABLE revision ( CREATE TABLE revision (
revtype enum('dropdown','table') NOT NULL,
revid smallint(6) UNSIGNED NOT NULL, revid smallint(6) UNSIGNED NOT NULL,
changed timestamp NOT NULL, changed timestamp NOT NULL,
PRIMARY KEY (revid), PRIMARY KEY (revtype, revid),
INDEX ix_revision_ts (changed) -- for select by timestamp INDEX ix_revision_ts (changed) -- for select by timestamp
) ENGINE=MEMORY; ) ENGINE=MEMORY;
+10 -4
View File
@@ -50,6 +50,7 @@ switch ($submit = form_get_action()) {
$p[':content'] = gpc_get_string($_POST, 'content'); $p[':content'] = gpc_get_string($_POST, 'content');
$p[':remarks'] = gpc_get_string($_POST, 'remarks'); $p[':remarks'] = gpc_get_string($_POST, 'remarks');
$id = db_exec_insert('box', $p); $id = db_exec_insert('box', $p);
db_set_revision('table', TBL_BOXES);
$action = ACT_VIEW; $action = ACT_VIEW;
break; break;
@@ -88,10 +89,12 @@ if ($action == ACT_DEFAULT):
echo "<h1>$pagetitle</h1>\n"; echo "<h1>$pagetitle</h1>\n";
$sql = "SELECT boxid, boxtype, sid, label, color, content, weight, remarks " $sql = "SELECT b.boxid, b.boxtype, b.sid, b.label, b.color, b.content, b.weight, b.remarks "
. "FROM box " . "FROM box AS b JOIN storage AS s USING (sid) "
. "ORDER BY label"; . "WHERE s.vid=? "
$sth = $pdo->query($sql); . "ORDER BY b.label";
$sth = $pdo->prepare($sql);
$sth->execute([$user->vid]);
$res = $sth->fetchAll(); $res = $sth->fetchAll();
echo '<table class="table table-striped">', "\n"; echo '<table class="table table-striped">', "\n";
echo "<thead>\n"; echo "<thead>\n";
@@ -122,6 +125,9 @@ foreach ($res as $row) {
echo "</td>\n"; echo "</td>\n";
echo "</tr>\n"; echo "</tr>\n";
} }
// Table summary
$numrows = count($res);
table_rec_summary($i, $numrows, $numrows, 6);
echo "</table>\n"; echo "</table>\n";
form_add_button('box.php'); form_add_button('box.php');
+1
View File
@@ -47,6 +47,7 @@ switch ($submit = form_get_action()) {
$p[':conductors'] = gpc_get_int($_POST, 'conductors'); $p[':conductors'] = gpc_get_int($_POST, 'conductors');
$p[':xsection'] = gpc_get_float($_POST, 'xsection'); $p[':xsection'] = gpc_get_float($_POST, 'xsection');
$id = db_exec_insert('cable', $p); $id = db_exec_insert('cable', $p);
db_set_revision('table', TBL_CABLES);
$action = ACT_VIEW; $action = ACT_VIEW;
break; break;
+9 -2
View File
@@ -87,10 +87,17 @@ $res = $sth->fetchAll();
<?php <?php
foreach ($res as $row) { foreach ($res as $row) {
echo "<tr>\n"; echo "<tr>\n";
echo '<td>', $row['clid'], "</td>\n"; echo '<td>', $row['clid'];
echo '<a class="text-nowrap" title="', _('View'), '" href="', $g_scriptname, '?f=view&id=', $row['clid'], '"><i class="bi bi-eye ms-2"></i></a>', "\n";
// TODO view icon
echo "</td>\n";
echo '<td>', $row['title'], "</td>\n"; echo '<td>', $row['title'], "</td>\n";
echo '<td>', $row['clstate'], "</td>\n"; echo '<td>', $row['clstate'], "</td>\n";
form_action_buttons($g_scriptname, $row['clid']); // Edit current record button
echo '<td>';
echo '<a title="', _('Edit'), '" href="', $g_scriptname, '?f=edit&id=', $row['clid'], '"><i class="bi-pencil"></i></a>', "\n";
echo "</td>\n";
echo "</tr>\n"; echo "</tr>\n";
} }
// Table summary // Table summary
+1
View File
@@ -43,6 +43,7 @@ switch ($submit = form_get_action()) {
$p[':compname'] = gpc_get_string($_POST, 'compname'); $p[':compname'] = gpc_get_string($_POST, 'compname');
$p[':comptype'] = gpc_get_int($_POST, 'comptype'); $p[':comptype'] = gpc_get_int($_POST, 'comptype');
$id = db_exec_insert('company', $p); $id = db_exec_insert('company', $p);
db_set_revision('table', TBL_COMPANIES);
$action = ACT_VIEW; $action = ACT_VIEW;
break; break;
-2
View File
@@ -160,7 +160,6 @@ foreach ($sth->fetchAll() as $row) {
echo '</td>'; echo '</td>';
echo '<td>', $row['ddtext'], '</td>'; echo '<td>', $row['ddtext'], '</td>';
echo '<td>', $num[$row['ddval']] ?? 0, '</td>'; echo '<td>', $num[$row['ddval']] ?? 0, '</td>';
// form_action_buttons($g_scriptname, $row['ddval']);
echo "<td>"; echo "<td>";
if ($row['flags'] == 'locked') { if ($row['flags'] == 'locked') {
echo _('Locked'); echo _('Locked');
@@ -268,7 +267,6 @@ foreach ($sth->fetchAll() as $row) {
echo '<i class="bi-trash"></i>'; echo '<i class="bi-trash"></i>';
echo '</td>', "\n"; echo '</td>', "\n";
// TODO extend function to accept additional parameters // TODO extend function to accept additional parameters
// form_action_buttons($g_scriptname, $row['ddid'];
} }
echo "</tr>\n"; echo "</tr>\n";
} }
+1
View File
@@ -57,6 +57,7 @@ switch ($submit = form_get_action()) {
$p[':model'] = gpc_get_string($_POST, 'model'); $p[':model'] = gpc_get_string($_POST, 'model');
$p[':remarks'] = gpc_get_string($_POST, 'remarks', 150); $p[':remarks'] = gpc_get_string($_POST, 'remarks', 150);
$id = db_exec_insert('equipment', $p); $id = db_exec_insert('equipment', $p);
db_set_revision('table', TBL_EQUIPMENT);
$action = ACT_VIEW; $action = ACT_VIEW;
break; break;
+1
View File
@@ -49,6 +49,7 @@ switch ($submit = form_get_action()) {
$p[':location'] = gpc_get_int($_POST, 'location');; $p[':location'] = gpc_get_int($_POST, 'location');;
$p[':description'] = gpc_get_string($_POST, 'description'); $p[':description'] = gpc_get_string($_POST, 'description');
$id = db_exec_insert('fuse', $p); $id = db_exec_insert('fuse', $p);
db_set_revision('table', TBL_FUSES);
$action = ACT_VIEW; $action = ACT_VIEW;
break; break;
+46 -22
View File
@@ -64,6 +64,19 @@ define('DD_INVENTORY_CATEGORY', 13);
define('DD_BBN_VESSELDATA', 14); define('DD_BBN_VESSELDATA', 14);
define('DD_MEASUREMENT_CATEGORY', 15); define('DD_MEASUREMENT_CATEGORY', 15);
// table indices which are used for combo lists
define('TBL_VESSEL', 1);
define('TBL_USERS', 2);
define('TBL_COMPANIES', 3);
define('TBL_STORAGE', 4);
define('TBL_BOXES', 5);
define('TBL_EQUIPMENT', 6);
// define('TBL_INVENTORY', 7);
define('TBL_PROJECTS', 8);
define('TBL_CABLES', 9);
define('TBL_FUSES', 10);
define('TBL_TAGS', 11);
// ========== PAGE START CODE ================================================= // ========== PAGE START CODE =================================================
// global version string // global version string
@@ -840,27 +853,30 @@ function form_get_action() {
return strtolower($submit); return strtolower($submit);
} }
function form_create_input($fieldname, $label, $value) { function form_create_numeric($fieldname, $label, $value=NULL, $float=NULL) {
// TODO WIP // TODO WIP
echo '<div class="mb-3">', "\n"; echo '<div class="mb-3">', "\n";
echo "</div>\n"; echo "</div>\n";
} }
function form_create_text($fieldname, $label, $value) { function form_create_text($fieldname, $label, $value=NULL, $maxlen=NULL) {
// TODO WIP // create generic text entry with assigned label
// TODO maxlength, required, errortext
echo '<div class="mb-3">', "\n"; echo '<div class="mb-3">', "\n";
echo "</div>\n"; echo '<label for="', $fieldname, '" class="form-label">', $label, "</label>\n";
} echo '<input type="text" class="form-control" id="', $fieldname, '" name="', $fieldname;
if ($value !== NULL) {
function form_create_check($fieldname, $label, $checked) { echo ' value="', $value, '"';
// create single checkbox with assigned label
echo '<div class="mb-3">', "\n";
echo '<input type="checkbox" class="form-check-input" name="', $fieldname, '" id="', $fieldname, '"';
if ($checked) {
echo ' checked';
} }
echo ">\n"; echo '">', "\n";
echo '<label for="', $fieldname, '">', $label, "</label>\n"; echo "</div>\n";
}
function form_create_textarea($fieldname, $label, $value) {
// TBD
echo '<div class="mb-3">', "\n";
echo '<textarea>';
echo '</textarea>', "\n";
echo "</div>\n"; echo "</div>\n";
} }
@@ -879,6 +895,22 @@ function form_create_select($fieldname, $label, $optlist, $selval=NULL, $multipl
echo "</div>\n"; echo "</div>\n";
} }
function form_create_option($fieldname, $label) {
// TBD
}
function form_create_check($fieldname, $label, $checked) {
// create single checkbox with assigned label
echo '<div class="mb-3">', "\n";
echo '<input type="checkbox" class="form-check-input" name="', $fieldname, '" id="', $fieldname, '"';
if ($checked) {
echo ' checked';
}
echo ">\n";
echo '<label for="', $fieldname, '">', $label, "</label>\n";
echo "</div>\n";
}
function form_create_checks($fieldname, $label, $optlist, $selected = []) { function form_create_checks($fieldname, $label, $optlist, $selected = []) {
// create multiple combined checkboxes with title // create multiple combined checkboxes with title
echo '<fieldset class="mb-3">'; echo '<fieldset class="mb-3">';
@@ -897,14 +929,6 @@ function form_create_checks($fieldname, $label, $optlist, $selected = []) {
echo '</fieldset>'; echo '</fieldset>';
} }
// TODO DEPRECATED for touch multiple adjacent buttuns are not well suited.
function form_action_buttons($script, $id) {
echo "<td>";
echo '<a title="', _('View'), '" href="', $script, '?f=view&id=', $id, '"><i class="bi-eye"></i></a>', "\n";
echo '<a title="', _('Edit'), '" href="', $script, '?f=edit&id=', $id, '"><i class="bi-pencil"></i></a>', "\n";
echo "</td>\n";
}
function form_add_button($script, $id=NULL, $idname='id') { function form_add_button($script, $id=NULL, $idname='id') {
echo '<div class="container-fluid px-0 my-3">', "\n"; echo '<div class="container-fluid px-0 my-3">', "\n";
echo '<a href="', $script, '?f=add'; echo '<a href="', $script, '?f=add';
+2 -1
View File
@@ -49,6 +49,7 @@ switch ($submit = form_get_action()) {
$p[':model'] = gpc_get_string($_POST, 'model'); $p[':model'] = gpc_get_string($_POST, 'model');
$p[':remarks'] = gpc_get_string($_POST, 'remarks', 150); $p[':remarks'] = gpc_get_string($_POST, 'remarks', 150);
$id = db_exec_insert('vessel', $p); $id = db_exec_insert('vessel', $p);
db_set_revision('table', TBL_VESSEL);
// autoselect newly created vessel // autoselect newly created vessel
$sql = "UPDATE settings SET valint=? WHERE userid=? AND sno=1"; $sql = "UPDATE settings SET valint=? WHERE userid=? AND sno=1";
$sth = $pdo->prepare($sql); $sth = $pdo->prepare($sql);
@@ -179,7 +180,7 @@ if ($vessel->shipyard && $vessel->shipyard > 0) {
} }
if (strlen($vessel->remarks) > 0) { if (strlen($vessel->remarks) > 0) {
echo h($vessel->remarks, br:true); echo ' ', h($vessel->remarks, br:true);
} }
echo "</div>\n"; echo "</div>\n";
echo "</div>\n"; // row 2 echo "</div>\n"; // row 2
+7 -3
View File
@@ -180,10 +180,12 @@ $page = gpc_get_int($_REQUEST, 'p', 1);
$rows_pp = gpc_get_int($_REQUEST, 'n', $user->rows_pp); $rows_pp = gpc_get_int($_REQUEST, 'n', $user->rows_pp);
$lastpage = ceil($numrows/$rows_pp); $lastpage = ceil($numrows/$rows_pp);
$sql = "SELECT i.invid, i.invname, i.number, i.invcond, i.eid, s.sname AS container " $sql = "SELECT i.invid, i.invname, i.number, i.invcond, i.eid, s.sname AS container,"
. " IF(CHAR_LENGTH(i.remarks)>40, CONCAT(LEFT(i.remarks, 40), '&hellip;'), i.remarks) AS remarks "
. "FROM inventory AS i JOIN storage AS s ON (i.conttype='storage' AND i.sid=s.sid)"; . "FROM inventory AS i JOIN storage AS s ON (i.conttype='storage' AND i.sid=s.sid)";
$sql .= ' WHERE ' . $where; $sql .= ' WHERE ' . $where;
$sql .= " UNION SELECT i.invid, i.invname, i.number, i.invcond, i.eid, b.label AS container " $sql .= " UNION SELECT i.invid, i.invname, i.number, i.invcond, i.eid, b.label AS container,"
. " IF(CHAR_LENGTH(i.remarks)>40, CONCAT(LEFT(i.remarks, 40), '&hellip;'), i.remarks) AS remarks "
. "FROM inventory AS i JOIN box AS b ON (i.conttype='box' AND i.boxid=b.boxid) " . "FROM inventory AS i JOIN box AS b ON (i.conttype='box' AND i.boxid=b.boxid) "
. " JOIN storage AS s ON (b.sid=s.sid) "; . " JOIN storage AS s ON (b.sid=s.sid) ";
$sql .= ' WHERE ' . $where; $sql .= ' WHERE ' . $where;
@@ -275,6 +277,7 @@ echo "<th>", _('Name'), "</th>\n";
echo "<th>", _('Container'), "</th>\n"; echo "<th>", _('Container'), "</th>\n";
echo "<th>", _('Number'), "</th>\n"; echo "<th>", _('Number'), "</th>\n";
echo "<th>", _('Condition'), "</th>\n"; echo "<th>", _('Condition'), "</th>\n";
echo "<th>", _('Remarks'), "</th>\n";
echo "<th>", _('Tags'), "</th>\n"; echo "<th>", _('Tags'), "</th>\n";
echo "<td></td>\n"; echo "<td></td>\n";
echo "</tr>\n"; echo "</tr>\n";
@@ -293,6 +296,7 @@ foreach ($res as $row) {
echo "<td>", $row['container'], "</td>\n"; echo "<td>", $row['container'], "</td>\n";
echo "<td>", $row['number'], "</td>\n"; echo "<td>", $row['number'], "</td>\n";
echo "<td>", ($opt_invcond[$row['invcond']] ?? ''), "</td>\n"; echo "<td>", ($opt_invcond[$row['invcond']] ?? ''), "</td>\n";
echo "<td>", $row['remarks'], "</td>\n";
echo "<td>", _('No tags assigned'), "</td>\n"; echo "<td>", _('No tags assigned'), "</td>\n";
// Edit current record button // Edit current record button
echo "<td>"; echo "<td>";
@@ -301,7 +305,7 @@ foreach ($res as $row) {
echo "</tr>\n"; echo "</tr>\n";
} }
// Table summary // Table summary
table_rec_summary($i0, $i, $numrows, 7); table_rec_summary($i0, $i, $numrows, 8);
echo "</table>\n"; echo "</table>\n";
echo $pagination; echo $pagination;
+14
View File
@@ -53,6 +53,20 @@ function db_get_ddtext($ddid, $ddval) {
return $sth->fetchColumn(); return $sth->fetchColumn();
} }
function db_set_revision($revtype, $revid) {
global $pdo;
global $g_error;
$sql = "INSERT INTO revision (revtype, revid, changed) "
. "VALUES (?, ?, NOW()) "
. "ON DUPLICATE KEY UPDATE changed = NOW()";
try {
$sth = $pdo->prepare($sql);
$sth->execute([$revtype, $revid]);
} catch(PDOException $e) {
$g_error->Add($e->getMessage());
}
}
// ========== OPTION FUNCTIONS ================================================ // ========== OPTION FUNCTIONS ================================================
// Functions to get option lists (key/value) // Functions to get option lists (key/value)
+17 -3
View File
@@ -85,13 +85,18 @@ if ($action == ACT_DEFAULT):
echo '<h1>', $pagetitle, "</h1>\n"; echo '<h1>', $pagetitle, "</h1>\n";
// TODO This is not so beautiful. Make it prettier
$sql = "SELECT n.noteid, n.notetype, n.refid," $sql = "SELECT n.noteid, n.notetype, n.refid,"
. " IF(CHAR_LENGTH(n.annotation) > 60, CONCAT(LEFT(n.annotation, 60), '&hellip;'), n.annotation) AS annotation " . " IF(CHAR_LENGTH(n.annotation) > 60, CONCAT(LEFT(n.annotation, 60), '&hellip;'), n.annotation) AS annotation "
. "FROM note AS n JOIN task AS t ON (n.notetype='task' AND n.refid=t.taskid AND t.vid=:vid) " . "FROM note AS n LEFT OUTER JOIN task AS t ON (n.notetype='task' AND n.refid=t.taskid AND t.vid=:vid) "
. "UNION " . "UNION "
. "SELECT n.noteid, n.notetype, n.refid," . "SELECT n.noteid, n.notetype, n.refid,"
. " IF(CHAR_LENGTH(n.annotation) > 60, CONCAT(LEFT(n.annotation, 60), '&hellip;'), n.annotation) AS annotation " . " IF(CHAR_LENGTH(n.annotation) > 60, CONCAT(LEFT(n.annotation, 60), '&hellip;'), n.annotation) AS annotation "
. "FROM note AS n JOIN maintenance AS m ON (n.notetype='maint' AND n.refid=m.maintid AND m.vid=:vid) " . "FROM note AS n LEFT OUTER JOIN maintenance AS m ON (n.notetype='maint' AND n.refid=m.maintid AND m.vid=:vid) "
. "UNION "
. "SELECT n.noteid, n.notetype, n.refid,"
. " IF(CHAR_LENGTH(n.annotation) > 60, CONCAT(LEFT(n.annotation, 60), '&hellip;'), n.annotation) AS annotation "
. "FROM note AS n LEFT OUTER JOIN equipment AS e ON (n.notetype='equip' AND n.refid=e.eid AND e.vid=:vid) "
. "ORDER BY noteid"; . "ORDER BY noteid";
$sth = $pdo->prepare($sql); $sth = $pdo->prepare($sql);
$sth->execute([':vid' => $user->vid]); $sth->execute([':vid' => $user->vid]);
@@ -101,6 +106,7 @@ $res = $sth->fetchAll();
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th>#</th>
<th><?=_('ID')?></th> <th><?=_('ID')?></th>
<th><?=_('Reference')?></th> <th><?=_('Reference')?></th>
<th><?=_('Type')?></th> <th><?=_('Type')?></th>
@@ -109,13 +115,21 @@ $res = $sth->fetchAll();
</thead> </thead>
<?php <?php
$i = 0;
foreach ($res as $row) { foreach ($res as $row) {
$i++; // record number
echo "<tr>\n"; echo "<tr>\n";
echo '<td>', $i;
echo '<a class="text-nowrap" title="', _('View'), '" href="', $g_scriptname, '?f=view&id=', $row['noteid'], '"><i class="bi bi-eye ms-2"></i></a>', "\n";
echo "</td>\n";
echo "<td>", $row['noteid'], "</td>\n"; echo "<td>", $row['noteid'], "</td>\n";
echo "<td>", $row['refid'], "</td>\n"; echo "<td>", $row['refid'], "</td>\n";
echo "<td>", $row['notetype'], "</td>\n"; echo "<td>", $row['notetype'], "</td>\n";
echo "<td>", $row['annotation'], "</td>\n"; echo "<td>", $row['annotation'], "</td>\n";
form_action_buttons($g_scriptname, $row['noteid']); // Edit current record button
echo '<td>';
echo '<a title="', _('Edit'), '" href="', $g_scriptname, '?f=edit&id=', $row['noteid'], '"><i class="bi-pencil"></i></a>', "\n";
echo "</td>\n";
echo "</tr>\n"; echo "</tr>\n";
} }
+1
View File
@@ -69,6 +69,7 @@ switch ($submit = form_get_action()) {
$p[':responsible'] = gpc_get_int($_POST, 'responsible'); $p[':responsible'] = gpc_get_int($_POST, 'responsible');
$p[':remarks'] = gpc_get_string($_POST, 'remarks', 150); $p[':remarks'] = gpc_get_string($_POST, 'remarks', 150);
$id = db_exec_insert('project', $p); $id = db_exec_insert('project', $p);
db_set_revision('table', TBL_PROJECTS);
$action = ACT_VIEW; $action = ACT_VIEW;
break; break;
+7
View File
@@ -380,6 +380,13 @@ elseif ($action == ACT_VIEW_LIST):
echo '<h2>', _('Shopping list'), "</h2>\n"; echo '<h2>', _('Shopping list'), "</h2>\n";
// TODO Distinguish between provisions belonging to the boat and provisions
// that are freely available.
// - storage with vid
// - box in storage with vid
// - box without sid is free
// - prov without sid and boxid is free
$sql = "SELECT provid, provname, unit, target - number AS buy " $sql = "SELECT provid, provname, unit, target - number AS buy "
. "FROM provisions " . "FROM provisions "
. "WHERE target IS NOT NULL AND number < target " . "WHERE target IS NOT NULL AND number < target "
+7 -4
View File
@@ -33,6 +33,7 @@ switch ($submit = form_get_action()) {
$p[':sname'] = gpc_get_string($_POST, 'sname'); $p[':sname'] = gpc_get_string($_POST, 'sname');
$p[':stype'] = gpc_get_int($_POST, 'stype'); $p[':stype'] = gpc_get_int($_POST, 'stype');
$id = db_exec_insert('storage', $p); $id = db_exec_insert('storage', $p);
db_set_revision('table', TBL_STORAGE);
$action = ACT_VIEW; $action = ACT_VIEW;
break; break;
@@ -157,10 +158,12 @@ form_add_button($g_scriptname);
// Boxes // Boxes
echo "<h1>", _('Box'), "</h1>\n"; echo "<h1>", _('Box'), "</h1>\n";
$sql = "SELECT boxid, sid, label, color, content, remarks " $sql = "SELECT b.boxid, b.sid, b.label, b.color, b.content, b.remarks "
. "FROM box " . "FROM box AS b JOIN storage AS s USING (sid) "
. "ORDER BY label"; . "WHERE s.vid=? "
$sth = $pdo->query($sql); . "ORDER BY b.label";
$sth = $pdo->prepare($sql);
$sth->execute([$user->vid]);
$res = $sth->fetchAll(); $res = $sth->fetchAll();
echo '<table class="table table-striped">', "\n"; echo '<table class="table table-striped">', "\n";
echo "<thead>\n"; echo "<thead>\n";
+1
View File
@@ -40,6 +40,7 @@ switch ($submit = form_get_action()) {
case 'insert': case 'insert':
$p[':tagname'] = gpc_get_string($_POST, 'tagname');; $p[':tagname'] = gpc_get_string($_POST, 'tagname');;
$id = db_exec_insert('tag', $p); $id = db_exec_insert('tag', $p);
db_set_revision('table', TBL_TAGS);
$action = ACT_VIEW; $action = ACT_VIEW;
break; break;