X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Felements%2Fsearch.html;h=6cf574164d9ef519175548306e23e44d2fce8f7a;hp=6bd6b03637f5229d80aa555214667547c9667b73;hb=1a033848671cad2cbe7687b37fc718b3b2a68b83;hpb=c81e70997ada061babb872d95190ea8c4cfc5a14

diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html
index 6bd6b0363..6cf574164 100644
--- a/httemplate/search/elements/search.html
+++ b/httemplate/search/elements/search.html
@@ -1,5 +1,83 @@
 <%
 
+  # options example...  
+  # (everything not commented required is optional)
+  #
+  # # basic options, required
+  # 'title'       => 'Page title',
+  # 'name'        => 'items', #name for the records returned
+  #
+  # # some HTML callbacks...
+  # 'menubar'          => '', #menubar arrayref
+  # 'html_init'        => '', #after the header/menubar and before the pager
+  # 'html_foot'        => '', #at the bottom
+  # 'html_posttotal'   => '', #at the bottom
+  #                           # (these three can be strings or coderefs)
+  # 
+  #
+  # #literal SQL query string or qsearch hashref, required
+  # 'query'       => {
+  #                    'table'     => 'tablename',
+  #                    #everything else is optional...
+  #                    'hashref'   => { 'field' => 'value',
+  #                                     'field' => { 'op'    => '<',
+  #                                                  'value' => '54',
+  #                                                },
+  #                                   },
+  #                    'select'    => '*',
+  #                    'addl_from' => '', #'LEFT JOIN othertable USING ( key )',
+  #                    'extra_sql' => '', #'AND otherstuff', #'WHERE onlystuff',
+  #                    
+  #
+  #                  },
+  #                  # "select * from tablename";
+  #
+  # #required unless 'query' is an SQL query string (shouldn't be...)
+  # 'count_query' => 'SELECT COUNT(*) FROM tablename',
+  #
+  # 'count_addl' => [], #additional count fields listref of sprintf strings
+  #                     # [ $money_char.'%.2f total paid', ],
+  #
+  # #listref of column labels, <TH>
+  # #required unless 'query' is an SQL query string
+  # # (if not specified the database column names will be used)
+  # 'header'      => [ '#', 'Item' ],
+  #
+  # 'disable_download' => '', # set true to hide the CSV/Excel download links
+  # 'disable_nonefound' => '', # set true to disable the "No matching Xs found"
+  #                            # message
+  #
+  # #listref - each item is a literal column name (or method) or coderef
+  # #if not specified all columns will be shown
+  # 'fields'      => [
+  #                    'column',
+  #                    sub { my $row = shift; $row->column; },
+  #                  ],
+  #
+  # #listref of column footers
+  # 'footer'      => [],
+  # 
+  # #listref - each item is the empty string, or a listref of ...
+  # 'links'       =>
+  #
+  #
+  # 'align'       => 'lrc.', #one letter for each column, left/right/center/none
+  #                          # can also pass a listref with full values:
+  #                          # [ 'left', 'right', 'center', '' ]
+  #
+  # #listrefs...
+  # #currently only HTML, maybe eventually Excel too
+  # 'color'       => [],
+  # 'size'        => [],
+  # 'style'       => [],
+  # 
+  # #redirect if there's only one item...
+  # # listref of URL base and column name (or method)
+  # # or a coderef that returns the same
+  # 'redirect' =>
+
+  my $DEBUG = 0;
+
   my(%opt) = @_;
   #warn join(' / ', map { "$_ => $opt{$_}" } keys %opt ). "\n";
 
@@ -50,6 +128,7 @@
   my $header = $opt{'header'};
   my $rows;
   if ( ref($opt{'query'}) ) {
+
     #eval "use FS::$opt{'query'};";
     $rows = [ qsearch(
       $opt{'query'}->{'table'}, 
@@ -59,7 +138,9 @@
       '',
       (exists($opt{'query'}->{'addl_from'}) ? $opt{'query'}->{'addl_from'} : '')
     ) ];
+
   } else {
+
     my $sth = dbh->prepare("$opt{'query'} $limit")
       or die "Error preparing $opt{'query'}: ". dbh->errstr;
     $sth->execute
@@ -69,8 +150,15 @@
     $rows = $sth->fetchall_arrayref;
 
     $header ||= $sth->{NAME};
+
   }
 
+  warn scalar(@$rows). ' rows returned from '.
+       ( ref($opt{'query'}) ? 'qsearch query' : 'literal SQL query' )
+    if $DEBUG || $opt{'debug'};
+
+  # display the results - csv, xls or html
+
   if ( $type eq 'csv' ) {
 
     #http_header('Content-Type' => 'text/comma-separated-values' ); #IE chokes
@@ -91,7 +179,12 @@
 
         foreach my $field ( @{$opt{'fields'}} ) {
           if ( ref($field) eq 'CODE' ) {
-            push @line, &{$field}($row);
+            push @line, map {
+                              ref($_) eq 'ARRAY'
+                                ? '(N/A)' #unimplemented
+                                : $_;
+                            }
+                            &{$field}($row);
           } else {
             push @line, $row->$field();
           }
@@ -152,7 +245,13 @@
           #  }
           #}
           if ( ref($field) eq 'CODE' ) {
-            $worksheet->write($r, $c++, &{$field}($row) );
+            foreach my $value ( &{$field}($row) ) {
+              if ( ref($value) eq 'ARRAY' ) { 
+                $worksheet->write($r, $c++, '(N/A)' ); #unimplemented
+              } else {
+                $worksheet->write($r, $c++, $value );
+              }
+            }
           } else {
             $worksheet->write($r, $c++, $row->$field() );
           }
@@ -172,16 +271,36 @@
   } else { # regular HTML
 
     if ( exists($opt{'redirect'}) && scalar(@$rows) == 1 && $total == 1 ) {
-      my( $url, $method ) = @{$opt{'redirect'}};
+      my $redirect = $opt{'redirect'};
+      $redirect = &{$redirect}($rows->[0]) if ref($redirect) eq 'CODE';
+      my( $url, $method ) = @$redirect;
       redirect( $url. $rows->[0]->$method() );
     } else {
       ( my $xlsname = $opt{'name'} ) =~ s/\W//g;
-      $opt{'name'} =~ s/s$// if $total == 1;
+      #$opt{'name'} =~ s/s$// if $total == 1;
+      $opt{'name'} =~ s/((s)e)?s$/$2/ if $total == 1;  #should use Lingua::bs
+                                                       # to "depluralize"
+
+      my @menubar = ();
+      if ( $opt{'menubar'} ) {
+        @menubar = @{ $opt{'menubar'} };
+      } else {
+        @menubar = ( 'Main menu' => $p );
+      }
+
+
   %>
   <%= include( '/elements/header.html', $opt{'title'},
-                 include( '/elements/menubar.html', 'Main menu' => $p )
+                 include( '/elements/menubar.html', @menubar )
              )
   %>
+  <%= defined($opt{'html_init'}) 
+        ? ( ref($opt{'html_init'})
+              ? &{$opt{'html_init'}}()
+              : $opt{'html_init'}
+          )
+        : ''
+  %>
   <% my $pager = include ( '/elements/pager.html',
                              'offset'     => $offset,
                              'num_rows'   => scalar(@$rows),
@@ -190,39 +309,48 @@
                          );
   %>
   <% unless ( $total ) { %>
-    No matching <%= $opt{'name'} %> found.<BR>
+    <% unless ( $opt{'disable_nonefound'} ) { %>
+      No matching <%= $opt{'name'} %> found.<BR>
+    <% } %>
   <% } else { %>
   
     <TABLE>
       <TR>
-        <TD>
-          <%= $total %> total <%= $opt{'name'} %><BR>
+        <TD VALIGN="bottom">
+          <%= $total %> total <%= $opt{'name'} %>
+          <%= defined($opt{'html_posttotal'}) 
+                ? ( ref($opt{'html_posttotal'})
+                      ? &{$opt{'html_posttotal'}}()
+                      : $opt{'html_posttotal'}
+                  )
+                : ''
+          %>
+          <BR>
           <% if ( $opt{'count_addl'} ) { %>
             <% my $n=0; foreach my $count ( @{$opt{'count_addl'}} ) { %>
               <%= sprintf( $count, $count_arrayref->[++$n] ) %><BR>
             <% } %>
           <% } %>
         </TD>
-        <TD ALIGN="right">
-          <% $cgi->param('_type', "$xlsname.xls" ); %>
-          Download full results<BR>
-          as <A HREF="<%= $cgi->self_url %>">Excel spreadsheet</A><BR>
-          <% $cgi->param('_type', 'csv'); %>
-          as <A HREF="<%= $cgi->self_url %>">CSV file</A>
-        </TD>
+        <% unless ( $opt{'disable_download'} ) { %>
+          <TD ALIGN="right">
+            <% $cgi->param('_type', "$xlsname.xls" ); %>
+            Download full results<BR>
+            as <A HREF="<%= $cgi->self_url %>">Excel spreadsheet</A><BR>
+            <% $cgi->param('_type', 'csv'); %>
+            as <A HREF="<%= $cgi->self_url %>">CSV file</A>
+          </TD>
+        <% } %>
       </TR>
       <TR>
         <TD COLSPAN=2>
-  
             <%= $pager %>
-            <STYLE TYPE="text/css">
-            .grid table { border: solid; empty-cells: show }
-            .grid TH { padding-left: 1px; padding-right: 1px; border: 1px solid #dddddd; border-bottom: dashed 1px black; border-right: none }
-            .grid TD { padding-left: 1px; padding-right: 1px; empty-cells: show; border: 1px solid #cccccc; border-bottom: none; border-right: none }
-            </STYLE>
-            <TABLE CLASS="grid" CELLSPACING=0 CELLPADDING=0 BORDER=1 BORDERCOLOR="#000000" STYLE="border: solid 1px black; empty-cells: show">
+
+            <%= include('/elements/table-grid.html') %>
+
               <TR>
-              <% foreach my $header ( @$header ) { %>
+              <% 
+                 foreach my $header ( @$header ) { %>
                    <TH CLASS="grid" BGCOLOR="#cccccc"><%= $header %></TH>
               <% } %>
               </TR>
@@ -238,11 +366,75 @@
               %>
                    <TR>
                    <% if ( $opt{'fields'} ) {
-                        my $links = $opt{'links'} ? [ @{$opt{'links'}} ] : '';
+
+                        my $links  = $opt{'links'} ? [ @{$opt{'links'}} ] : '';
                         my $aligns = $opt{'align'} ? [ @{$opt{'align'}} ] : '';
-                        foreach my $field ( @{$opt{'fields'}} ) {
+                        my $colors = $opt{'color'} ? [ @{$opt{'color'}} ] : [];
+                        my $sizes  = $opt{'size'}  ? [ @{$opt{'size'}}  ] : [];
+                        my $styles = $opt{'style'} ? [ @{$opt{'style'}} ] : [];
+
+                        foreach my $field (
+
+                          map {
+                                if ( ref($_) eq 'ARRAY' ) {
+
+                                  my $tableref = $_;
+
+                                  '<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0'.
+                                  ' STYLE="border:none">'.
+
+                                  join('', map {
+
+                                    my $rowref = $_;
+
+                                    '<tr>'.
+
+                                    join('', map {
+
+                                      my $element = $_;
+
+                                      '<TD STYLE="border:none"'.
+                                      ( $element->{'align'}
+                                          ? ' ALIGN="'. $element->{'align'}. '"'
+                                          : ''
+                                      ). '>'.
+                                      ( $element->{'link'}
+                                          ? '<A HREF="'. $element->{'link'}.'">'
+                                          : ''
+                                      ).
+                                      $element->{'data'}.
+                                      ( $element->{'link'}
+                                          ? '</A>'
+                                          : ''
+                                      ).
+                                      '</td>';
+
+                                    } @$rowref ).
+
+                                    '</tr>';
+                                  } @$tableref ).
+
+                                  '</table>';
+
+                                } else {
+                                  $_;
+                                }
+                              }
+
+                          map {
+                                if ( ref($_) eq 'CODE' ) {
+                                  &{$_}($row);
+                                } else {
+                                  $row->$_();
+                                }
+                              }
+                          @{$opt{'fields'}}
+
+                        ) {
+
                           my $align = $aligns ? shift @$aligns : '';
                           $align = " ALIGN=$align" if $align;
+
                           my $a = '';
                           if ( $links ) {
                             my $link = shift @$links;
@@ -257,20 +449,45 @@
                               $a = qq(<A HREF="$a">);
                             }
                           }
+
+                          my $font = '';
+                          my $color = shift @$colors;
+                          $color = &{$color}($row) if ref($color) eq 'CODE';
+                          my $size = shift @$sizes;
+                          $size = &{$size}($row) if ref($size) eq 'CODE';
+                          if ( $color || $size ) {
+                            $font = '<FONT '.
+                                    ( $color ? "COLOR=#$color "   : '' ).
+                                    ( $size  ? qq(SIZE="$size" )  : '' ).
+                                    '>';
+                          }
+
+                          my($s, $es) = ( '', '' );
+                          my $style = shift @$styles;
+                          $style = &{$style}($row) if ref($style) eq 'CODE';
+                          if ( $style ) {
+                            $s = join( '', map "<$_>", split('', $style) );
+                            $es = join( '', map "</$_>", split('', $style) );
+                          }
+
                        %>
-                       <% if ( ref($field) eq 'CODE' ) { %>
-                         <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"<%= $align %>><%= $a %><%= &{$field}($row) %><%= $a ? '</A>' : '' %></TD>
-                       <% } else { %>
-                         <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"<%= $align %>><%= $a %><%= $row->$field() %><%= $a ? '</A>' : '' %></TD>
-                       <% } %>
+                       <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"<%= $align %>><%= $font %><%= $a %><%= $s %><%= $field %><%= $es %><%= $a ? '</A>' : '' %><%= $font ? '</FONT>' : '' %></TD>
                      <% } %>
                    <% } else { %>
                      <% foreach ( @$row ) { %>
-                          <TD CLASS="grid" BGCOLOR="$bgcolor"><%= $_ %></TD>
+                          <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><%= $_ %></TD>
                      <% } %>
                    <% } %>
                    </TR>
               <% } %>
+
+              <% if ( $opt{'footer'} ) { %>
+                <TR>
+                <% foreach my $footer ( @{ $opt{'footer'} } ) { %>
+                     <TD CLASS="grid" BGCOLOR="#dddddd" STYLE="border-top: dashed 1px black;"><i><%= $footer %></i></TH>
+                <% } %>
+                </TR>
+              <% } %>
             
             </TABLE>
             <%= $pager %>
@@ -280,7 +497,13 @@
       </TABLE>
   
   <% } %>
-  </BODY>
-  </HTML>
+  <%= defined($opt{'html_foot'}) 
+        ? ( ref($opt{'html_foot'})
+              ? &{$opt{'html_foot'}}()
+              : $opt{'html_foot'}
+          )
+        : ''
+  %>
+  <%= include( '/elements/footer.html' ) %>
   <% } %>
 <% } %>