word edit: common function to format form input

diff --git a/writer.plp b/writer.plp
index 226aa4b6802db660de69caaa7c18462a9d4523b2..99a9736aa782bdd0ff393ffbd763b6558523c5e2 100644 (file)
--- a/writer.plp
+++ b/writer.plp
@@ -205,6 +205,44 @@ else {
 }
 
 my $title = $row->{id} ? "entry <small>#$row->{id}</small>" : 'new entry';
+
+package Shiar_Sheet::FormRow {
+       sub input {
+               my ($row, $col, $type, $label) = @_;
+               my $val = $row->{$col} // '';
+               $val = '{'.join(',', map {s/,/\\,/gr} @{$val}).'}' if ref $val eq 'ARRAY';
+               if (ref $type eq 'ARRAY') {
+                       return (
+                               sprintf('<select id="%s" name="%1$s">', $col),
+                               (map { sprintf('<option value="%s"%s>%s</option>',
+                                       $_, $val eq $_ && ' selected', $type->[$_]
+                               ) } 0 .. $#{$type}),
+                               '</select>',
+                       );
+               }
+               elsif ($type eq 'checkbox') {
+                       return sprintf(
+                               join('',
+                                       '<label>',
+                                       '<input id="%1$s" name="%1$s" value="0" type="hidden" />',
+                                       '<input id="%s" name="%1$s" value="1" type="%s"%s>',
+                                       ' %s</label>',
+                               ), $col, $type, !!$val && ' checked', $label
+                       );
+               }
+               else {
+                       my $html = '';
+                       $html .= qq( $_="$type->{$_}") for sort keys %{$type // {}};
+                       return (
+                               $label ? sprintf('<label for="%s">%s</label>', $col, $label) : (),
+                               sprintf('<input id="%s" name="%1$s" value="%s"%s />',
+                                       $col, PLP::Functions::EscapeHTML($val), $html
+                               ),
+                       );
+               }
+       }
+}
+bless $row, 'Shiar_Sheet::FormRow';
 :>
 <h1>Words <:= $title :></h1>
 
@@ -214,40 +252,21 @@ my $title = $row->{id} ? "entry <small>#$row->{id}</small>" : 'new entry';
 <input id="id" name="id" value="<:= $row->{id} // '' :>" type="hidden" />
 <ul>
 <:
-
 for my $colinfo (pairs @wordcols) {
        my ($col, $title) = @{$colinfo};
        defined $title or next;
-       my $val = $row->{$col} // '';
-       $val = '{'.join(',', map {s/,/\\,/gr} @{$val}).'}' if ref $val eq 'ARRAY';
        printf '<li><label for="%s">%s</label><p>', $col, $title;
                printf '<span class=inline>';
        if ($col eq 'prio') {
-               printf '<select id="%s" name="%1$s">', $col;
-               printf('<option value="%s"%s>%s</option>',
-                       $_, $row->{$col} eq $_ && ' selected', $prioenum[$_]
-               ) for 0 .. $#prioenum;
-               print '</select>';
-               printf(
-                       join('',
-                               '<label>',
-                               '<input id="%1$s" name="%1$s" value="0" type="hidden" />',
-                               '<input id="%s" name="%1$s" value="1" type="checkbox"%s>',
-                               ' %s</label>',
-                       ),
-                       'cover', !!$row->{cover} && ' checked', 'Highlighted'
-               );
-               printf('<label for="%s">%s</label><input id="%1$s" name="%1$s" value="%s" type="number" />',
-                       'grade', 'Order', Entity($row->{grade})
-               );
+               print $row->input($col => \@prioenum);
+               print $row->input(cover => 'checkbox', 'Highlighted');
+               print $row->input(grade => {type => 'number'}, 'Order');
        }
        else {
-               printf '<input id="%s" name="%1$s" value="%s" />', $col, Entity($val);
+               print $row->input($col);
                -e and printf '<img id="%spreview" src="/%s" alt="%s" />', $col, $_, $row->{form}
                        for $col eq 'thumb'  ? "data/word/eng/$row->{form}.jpg" : ();
-               printf('<label for="%s">%s</label><input id="%1$s" name="%1$s" value="%s" />',
-                       'ref', 'Reference', Entity($row->{ref})
-               ) if $col eq 'cat';
+               print $row->input(ref => {}, 'Reference') if $col eq 'cat';
        }
                print '</span>';
        -e and printf('<img id="%spreview" src="/%s" alt="%s" hidden />',