Fixes for webgui and more native gui development
This commit is contained in:
@@ -18,6 +18,7 @@ $opt_storage = db_get_opt_storage($user->vid);
|
||||
$opt_box = db_get_opt_box($user->vid);
|
||||
$opt_invcond = db_load_enum('inventory', 'invcond', true, true);
|
||||
$opt_equipment = db_get_opt_equip($user->vid, [-1 => _('― none ―')]);
|
||||
$opt_icat = db_get_options(13);
|
||||
|
||||
// ========== ACTIONS START ===================================================
|
||||
|
||||
@@ -95,6 +96,8 @@ switch ($submit = form_get_action()) {
|
||||
$p[':price'] = gpc_get_currency($_POST, 'price');
|
||||
$p[':purchdate'] = gpc_get_date($_POST, 'purchdate');
|
||||
$p[':invcond'] = gpc_get_string($_POST, 'invcond');
|
||||
$p[':icat'] = gpc_get_int($_POST, 'icat');
|
||||
if ($p[':icat'] <= 0) $p[':icat'] = NULL;
|
||||
$p[':remarks'] = gpc_get_string($_POST, 'remarks', 150);
|
||||
$p[':eid'] = gpc_get_int($_POST, 'eid');
|
||||
if ($p[':eid'] <= 0) $p[':eid'] = NULL;
|
||||
@@ -343,7 +346,7 @@ elseif ($action == ACT_VIEW):
|
||||
// ========== VARIANT: view single record =====================================
|
||||
|
||||
$sql = "SELECT invname, conttype, sid, boxid, number, weight, price, purchdate,"
|
||||
. " invcond, remarks "
|
||||
. " invcond, icat, remarks "
|
||||
. "FROM inventory "
|
||||
. "WHERE invid=?";
|
||||
$sth = $pdo->prepare($sql);
|
||||
@@ -397,6 +400,7 @@ echo "<tr><th>", _('Weight'), "</th><td>", format_float($inventory->weight, 2, '
|
||||
echo "<tr><th>", _('Price'), "</th><td>", format_currency($inventory->price), "</td></tr>\n";
|
||||
echo "<tr><th>", _('Purchase date'), "</th><td>", format_date($inventory->purchdate), "</td></tr>\n";
|
||||
echo "<tr><th>", _('Condition'), "</th><td>", $opt_invcond[$inventory->invcond], "</td></tr>\n";
|
||||
echo "<tr><th>", _('Category'), "</th><td>", $opt_icat[$inventory->icat], "</td></tr>\n";
|
||||
echo "<tr><th>", _('Remarks'), "</th><td>", h($inventory->remarks, br:true), "</td></tr>\n";
|
||||
|
||||
$tags = db_load_taglist('inv', $id);
|
||||
@@ -462,7 +466,10 @@ foreach ($cond as $k => $v) {
|
||||
?>
|
||||
</select>
|
||||
</div>
|
||||
<?php form_create_select('eid', _('Equipment'), $opt_equipment, $inventory->eid); ?>
|
||||
<?php
|
||||
form_create_select('icat', _('Category'), $g_opt_none + $opt_icat, $inventory->icat);
|
||||
form_create_select('eid', _('Equipment'), $opt_equipment, $inventory->eid);
|
||||
?>
|
||||
<div class="mb-3">
|
||||
<label for="remarks" class="form-label"><?=_('Remarks')?></label>
|
||||
<textarea class="form-control" id="remarks" name="remarks" rows="3"><?=h($inventory->remarks, br:true)?></textarea>
|
||||
|
||||
Reference in New Issue
Block a user