Webgui: improve table summary generation

This commit is contained in:
2026-07-18 09:07:17 +02:00
parent 631f1cd2cf
commit 90bfdbc569
19 changed files with 357 additions and 61 deletions
+10 -5
View File
@@ -28,7 +28,7 @@ function create_ddval_form($script, $ddid, $formtype, $row=NULL) {
echo '<div class="form-floating">';
echo '<input type="text" name="ddtext" id="ddtext" class="form-control"';
if ($update) echo ' value="', $row['ddtext'],'"';
echo '><label for="ddtext">Description</label></div>', "\n";
echo '><label for="ddtext">', _('Description'), '</label></div>', "\n";
// all other fields in secondary row
echo '<div class="row my-3">';
@@ -36,17 +36,17 @@ function create_ddval_form($script, $ddid, $formtype, $row=NULL) {
echo '<div class="col"><div class="form-floating">';
echo '<input type="text" name="ddshort" id="ddshort"class="form-control"';
if ($update) echo ' value="', $row['ddshort'],'"';
echo '><label for="ddshort">Short description</label></div></div>', "\n";
echo '><label for="ddshort">', _('Short description'), '</label></div></div>', "\n";
echo '<div class="col"><div class="form-floating">';
echo '<input type="color" name="color" id="color" class="form-control"';
if ($update) echo ' value="#', $row['color'],'"';
echo '><label for="color">Color</label></div></div>', "\n";
echo '><label for="color">', _('Color'), '</label></div></div>', "\n";
echo '<div class="col"><div class="form-floating">';
echo '<input type="text" name="sort" id="sort" class="form-control"';
if ($update) echo ' value="', $row['sort'],'"';
echo '><label for="sort">Sort</label></div></div>', "\n";
echo '><label for="sort">', _('Sort'), '</label></div></div>', "\n";
echo '</div>'; // finish row
@@ -187,11 +187,12 @@ echo '<th>', _('Short'), "</th>";
echo '<th>', _('Color'), "</th>";
echo '<th>', _('Sort'), "</th>";
echo '<th>', _('Flags'), "</th>";
echo "<th></th>\n";
echo "</tr>\n";
echo "</thead>\n";
$i = 0;
foreach ($sth->fetchAll() as $row) {
$i++;
$flags = explode(',', $row['flags']);
$fixed = in_array('fixed', $flags);
echo '<tr>';
@@ -207,6 +208,7 @@ foreach ($sth->fetchAll() as $row) {
echo '<td>', ($fixed ? '<i class="bi bi-lock"></i>' : ''), '</td>';
echo "</tr>\n";
}
table_rec_summary(1, $i, $i, 6);
echo "</table>\n";
echo '<a href="', $g_scriptname, '" class="btn btn-secondary">', _('Back'), "</a>\n";
@@ -236,7 +238,9 @@ echo "<th></th>\n";
echo "</tr>\n";
echo "</thead>\n";
$i = 0;
foreach ($sth->fetchAll() as $row) {
$i++;
echo '<tr>';
if ($row['ddval'] == $v) {
echo '<td>', $row['ddval'], '</td>';
@@ -270,6 +274,7 @@ if ($v == -2) {
echo "<td></td>\n";
echo "</tr>";
}
table_rec_summary(1, $i, $i, 6);
echo "</table>\n";
echo '<a href="', $g_scriptname, '?f=add&id=', $id, '" class="btn btn-primary">', _('Add'), "</a>\n";