word edit: columns declare nested suboptions

[sheet.git] / writer.plp

diff --git a/writer.plp b/writer.plp
index 99a9736aa782bdd0ff393ffbd763b6558523c5e2..0e1058221ad4dc984c28c03b77d3fa15e3109968 100644 (file)
--- a/writer.plp
+++ b/writer.plp
@@ -105,20 +105,25 @@ my $db = eval {
        });
 } or Abort('Database error', 501, $@);
 
-my @wordcols = (
+my @wordcols = pairkeys
+my %wordcol = (
        lang    => 'Language',
-       cat     => 'Category',
-       ref     => undef, # included with cat
-       grade   => undef, # "
-       prio    => 'Level',
-       cover   => undef, # included with prio
+       cat     => [{-label => 'Category'}, 'ref'],
+       ref     => {-label => 'Reference'},
+       prio    => [
+               {-label => 'Level', -select => [qw(
+                       essential basic common distinctive rare invisible
+               )]},
+               'cover', 'grade',
+       ],
+       cover   => {-label => 'Highlighted', type => 'checkbox'},
+       grade   => {-label => 'Order', type => 'number'},
        form    => 'Title',
        alt     => 'Synonyms',
        wptitle => 'Wikipedia',
        source  => 'Image',
        thumb   => 'Convert options',
 );
-my @prioenum = qw( essential basic common distinctive rare invisible );
 my %langflag = (
        nld => "\N{REGIONAL INDICATOR SYMBOL LETTER N}\N{REGIONAL INDICATOR SYMBOL LETTER L}",
        eng => "\N{REGIONAL INDICATOR SYMBOL LETTER G}\N{REGIONAL INDICATOR SYMBOL LETTER B}",
@@ -137,7 +142,7 @@ if (exists $get{copy}) {
 }
 elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
        my $replace = $row;
-       $row = {%post{ pairkeys @wordcols }};
+       $row = {%post{keys %wordcol}};
        $_ = length ? $_ : undef for values %{$row};
 
        eval {
@@ -150,7 +155,7 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
                next;
        };
 
-       my $imgpath = "data/word/org/$row->{id}.jpg";
+       my $imgpath = Shiar_Sheet::FormRow::imagepath($row, 'source');
        my $reimage = eval {
                ($row->{source} // '') ne ($replace->{source} // '') or return;
                # copy changed remote url to local file
@@ -169,7 +174,7 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
        $reimage ||= $row->{cover} ~~ $replace->{cover};  # resize
        $reimage++ if $fields{rethumb};  # force refresh
 
-       my $thumbpath = "data/word/eng/$row->{form}.jpg";
+       my $thumbpath = Shiar_Sheet::FormRow::imagepath($row => 'thumb');
        if ($reimage) {
                if (-e $imgpath) {
                        my $xyres = $row->{cover} ? '600x400' : '300x200';
@@ -208,39 +213,54 @@ my $title = $row->{id} ? "entry <small>#$row->{id}</small>" : 'new entry';
 
 package Shiar_Sheet::FormRow {
        sub input {
-               my ($row, $col, $type, $label) = @_;
+               my ($row, $col, $attr) = @_;
                my $val = $row->{$col} // '';
                $val = '{'.join(',', map {s/,/\\,/gr} @{$val}).'}' if ref $val eq 'ARRAY';
-               if (ref $type eq 'ARRAY') {
+               my $html = '';
+               $html .= qq( $_="$attr->{$_}") for sort grep {!/^-/} keys %{$attr // {}};
+
+               if (my $options = $attr->{-select}) {
                        return (
                                sprintf('<select id="%s" name="%1$s">', $col),
                                (map { sprintf('<option value="%s"%s>%s</option>',
-                                       $_, $val eq $_ && ' selected', $type->[$_]
-                               ) } 0 .. $#{$type}),
+                                       $_, $val eq $_ && ' selected', $options->[$_]
+                               ) } 0 .. $#{$options}),
                                '</select>',
                        );
                }
-               elsif ($type eq 'checkbox') {
+               elsif ($attr->{type} eq 'checkbox') {
+                       $html .= ' checked' if $val;
                        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>',
+                                       '<input name="%1$s" value="0" type="hidden" />',
+                                       '<input id="%s" name="%1$s" value="1"%s>',
                                        ' %s</label>',
-                               ), $col, $type, !!$val && ' checked', $label
+                               ), $col, $html, $attr->{-label}
                        );
                }
                else {
-                       my $html = '';
-                       $html .= qq( $_="$type->{$_}") for sort keys %{$type // {}};
                        return (
-                               $label ? sprintf('<label for="%s">%s</label>', $col, $label) : (),
+                               (map {
+                                       sprintf('<label for="%s">%s</label>', $col, $_)
+                               } $attr->{-label} // ()),
                                sprintf('<input id="%s" name="%1$s" value="%s"%s />',
                                        $col, PLP::Functions::EscapeHTML($val), $html
                                ),
+                               (map {
+                                       sprintf '<img id="%spreview" src="/%s" alt="%s"%s />',
+                                               $col, $_, $row->{form}, $col eq 'source' ? ' hidden' : '';
+                               } grep { -e } $row->imagepath($col)),
                        );
                }
        }
+
+       sub imagepath {
+               my ($row, $col) = @_;
+               return "data/word/org/$row->{id}.jpg"   if $col eq 'source';
+               return "data/word/eng/$row->{form}.jpg" if $col eq 'thumb';
+               return;
+       }
 }
 bless $row, 'Shiar_Sheet::FormRow';
 :>
@@ -252,26 +272,15 @@ bless $row, 'Shiar_Sheet::FormRow';
 <input id="id" name="id" value="<:= $row->{id} // '' :>" type="hidden" />
 <ul>
 <:
-for my $colinfo (pairs @wordcols) {
-       my ($col, $title) = @{$colinfo};
-       defined $title or next;
+for my $col (@wordcols) {
+       my $info = $wordcol{$col} or next;
+       my ($attr, @span) = ref $info eq 'ARRAY' ? @{$info} : $info;
+       my $title = ref $attr ? delete $attr->{-label} : $attr;
        printf '<li><label for="%s">%s</label><p>', $col, $title;
                printf '<span class=inline>';
-       if ($col eq 'prio') {
-               print $row->input($col => \@prioenum);
-               print $row->input(cover => 'checkbox', 'Highlighted');
-               print $row->input(grade => {type => 'number'}, 'Order');
-       }
-       else {
-               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" : ();
-               print $row->input(ref => {}, 'Reference') if $col eq 'cat';
-       }
+               print $row->input($col => $attr);
+               print $row->input($_ => delete $wordcol{$_}) for @span;
                print '</span>';
-       -e and printf('<img id="%spreview" src="/%s" alt="%s" hidden />',
-               $col, $_, $row->{form}
-       ) for $col eq 'source' ? "data/word/org/$row->{id}.jpg" : ();
        say '</p></li>';
 }