WebSVN – CoffeeCatalog – Diff – /trunk/site/roasters.pl

 my $pageTitle = "CC Roasters";
 my $prefscookie = "CCRoastersPrefs";
 our $DBTABLE = 'roasters';
 my %COLUMNS = (
-	roaster   =>  [qw(Roaster     5    text     static)],
+	roaster   =>  [qw(Roaster           5    text     static)],
-	url       =>  [qw(URL        10    text     default)],
+	url       =>  [qw(URL              10    text     default)],
-	location  =>  [qw(Location   15    text     default)],
+	location  =>  [qw(Location         15    text     default)],
+	note      =>  [qw(Notes            20    text)],
-	note      =>  [qw(Notes      20    text)]
+	date_added => [qw(Date&nbsp;Added  25    date)]
 );
 my $stylesheet = "style.css";
+my $homeURL = '/';
-my $homeURL = '/';
+my @pagelimitoptions = (5, 10, 25, "All");
 # If we need to modify line item values, create a subroutine named "modify_$columnname"
   # Make the URL an actual link
   my $lineItem = shift;
   return $h->a ({ href=>$lineItem->{'url'}, -target=>"_blank" }, $lineItem->{'url'});
+}
+my $addNewButton = $h->div ({ style=>"float:right;" }, $h->input ({ type=>"button", value=>"Add New", style=>"margin:0;", onClick=>"window.location.href='manage_roaster.pl'" }));
 # Ideally, nothing below this comment needs to change
 #-------------------------------------------------------------------------------
 our %NAME              = map  { $_ => $COLUMNS{$_}->[0] } keys %COLUMNS;
 our %colOrderHash      = map  { $_ => $COLUMNS{$_}->[1] } keys %COLUMNS;
 our %colFilterTypeHash = map  { $_ => $COLUMNS{$_}->[2] } keys %COLUMNS;
-our @staticFields      = grep { $COLUMNS{$_}->[3] eq 'static' } keys %COLUMNS;
+our @staticFields      = sort byfield grep { $COLUMNS{$_}->[3] eq 'static' } keys %COLUMNS;
+our @defaultFields     = grep { defined $COLUMNS{$_}->[3] } keys %COLUMNS;
+#our @defaultFields     = grep { $COLUMNS{$_}->[3] eq 'default' or inArray ($_, \@staticFields) } keys %COLUMNS;
 our @defaultFields     = grep { defined $COLUMNS{$_}->[3] } keys %COLUMNS;
-#our @defaultFields     = grep { $COLUMNS{$_}->[3] eq 'default' or inArray ($_, \@staticFields) } keys %COLUMNS;
+our @allFields = sort byfield keys %NAME;
 our @displayFields = ();
 if (exists $FORM{autoload})	{			# If the FORM was submitted (i.e. the page is being redisplayed),
 							                    #  	build the data for the cookie that remembers the page setup
 	my $disFields = join ":", @displayFields;
 	my $fils = join ":", map { "$_=$FILTER->{$_}" } keys %{$FILTER};
-	$QUERY_STRING = $disFields.'&'.$fils.'&'.$FORM{autoload};
+	$QUERY_STRING = $disFields.'&'.$fils.'&'.$FORM{sortby}.'&'.$FORM{autoload};
+}
 if (!(exists $FORM{autoload}))	{			# No FORM was submitted...
-	if (my $prefs = cookie($prefscookie))	{ # Check for cookies from previous visits.
+	if (my $prefs = cookie ($prefscookie) and !defined param ("ignoreCookie"))	{ # Check for cookies from previous visits.
-		my ($disF, $filts, $al) = split /&/,$prefs;
+		my ($disF, $filts, $sb, $al) = split /&/,$prefs;
 		@displayFields = split /:/,$disF;
 		foreach $pair (split /:/, $filts)	{
+			my ($key, $value) = split /=/, $pair;
-			my ($key, $value) = split /=/, $pair;
+			$FORM{"filter-$key"} = $value;
-			$FORM{"filter-$key"} = $value;
+			$FILTER->{$key} = $value;
 			$FILTER->{$key} = $value;
 my @whereClause = map { filter ($_, $FILTER->{$_}) } grep { defined $FILTER->{$_} } @displayFields;
 							#  Given the fields to display and the where conditions,
 							#	  "getData" will return a reference to an array of
+							#	  hash references of the results.
+my ($data, $datacount) = getData (\@displayFields, \@whereClause, $DBTABLE, $FORM{sortby}, $curpage, $pagelimit);
+my @ProductList = @{ $data };
-							#	  hash references of the results.
-my @ProductList = @{ getData (\@displayFields, \@whereClause, $DBTABLE) };
+#my @ProductList = @{ getData (\@displayFields, \@whereClause, $DBTABLE, $FORM{sortby}, $curpage, $pagelimit) };
 my $x = scalar @ProductList; # How many results were returned?
 # Set some cookie stuff...
 #------------------
 # Toggle the autoload fields within the table elements
 our ($onClick, $onChange);   # (also used in scanFunctions)
-my ($radiobutton, $refreshbutton);
+my ($radiobutton, $refreshbutton, $sortby);
 if ($FORM{autoload}) {
 	$onClick = "onClick='submit();'";
 	$onChange = "onChange='submit();'";
   $radiobutton = $h->div ({ class=>'autoload' },
     ["Autoload Changes: ",
     $h->input ({ type=>radio, name=>'autoload', class=>'accent', value=>1, onClick=>'submit();', checked=>[] }), "On ",
+    $h->input ({ type=>radio, name=>'autoload', class=>'accent', value=>0, onClick=>'submit();' }), "Off ",
-    $h->input ({ type=>radio, name=>'autoload', class=>'accent', value=>0, onClick=>'submit();' }), "Off ",
+    ]);
-    ]);
+  $sortby = $h->select ({name=>sortby, onChange=>'submit();' }, [ map { $FORM{sortby} eq $_ ? $h->option ({ value=>$_, selected=>[] }, $NAME{$_}) : $h->option ({ value=>$_ }, $NAME{$_}) } @displayFields ]);
 } else {
   $onClick = "";
 	$onChange = "";
   $radiobutton = $h->div ({ class=>'autoload' },
     ["Autoload Changes: ",
     $h->input ({ type=>radio, name=>'autoload', class=>'accent', value=>1, onClick=>'submit();' }), "On ",
     $h->input ({ type=>radio, name=>'autoload', class=>'accent', value=>0, onClick=>'submit();', checked=>[] }), "Off ",
+    ]);
-    ]);
+  $refreshbutton = $h->input ({ type=>"button", value=>"Apply Changes", onClick=>"submit(); return false;" });
+  $sortby = $h->select ({name=>sortby }, [ map { $FORM{sortby} eq $_ ? $h->option ({ value=>$_, selected=>[] }, $NAME{$_}) : $h->option ({ value=>$_ }, $NAME{$_}) } @displayFields ]);
+}
   $refreshbutton = $h->input ({ type=>"button", value=>"Apply Changes", onClick=>"submit(); return false;" });
 my $c = 1;
 my @hiddencheckboxes;
 my @hiddenrows;
 foreach $field (sort { $NAME{$a} cmp $NAME{$b}; } @hideFields) {
   if ($FORM{autoload}) {
-    push @hiddencheckboxes, $h->div ({ class=>'rTableCell quarters', nowrap=>[], onClick=>"Req.$field.click();" }, [ $h->input ({ type=>'checkbox', class=>'accent', name=>$field, value=>'true', onClick=>"event.stopPropagation(); submit();" }), $NAME{$field} ]);
+    push @hiddencheckboxes, $h->div ({ class=>'rTableCell quarters nowrap', onClick=>"Req.$field.click();" }, [ $h->input ({ type=>'checkbox', class=>'accent', name=>$field, value=>'true', onClick=>"event.stopPropagation(); submit();" }), $NAME{$field} ]);
   } else {
-    push @hiddencheckboxes, $h->div ({ class=>'rTableCell quarters', nowrap=>[], onClick=>"Req.$field.checked=!Req.$field.checked;" }, [ $h->input ({ type=>'checkbox', class=>'accent', name=>$field, value=>'true', onClick=>"event.stopPropagation();" }), $NAME{$field} ]);
+    push @hiddencheckboxes, $h->div ({ class=>'rTableCell quarters nowrap', onClick=>"Req.$field.checked=!Req.$field.checked;" }, [ $h->input ({ type=>'checkbox', class=>'accent', name=>$field, value=>'true', onClick=>"event.stopPropagation();" }), $NAME{$field} ]);
+  }
-  if (! $c % 4) {
+  if ($c++ % 4 == 0) {
     push @hiddenrows, $h->div ({ class=>'rTableRow' }, [ @hiddencheckboxes ]);
     @hiddencheckboxes = [];
-    $c++;
+  }
+}
-push @hiddenrows, $h->div ({ class=>'rTableRow' }, [ @hiddencheckboxes ]) unless ! $c % 4;
+push @hiddenrows, $h->div ({ class=>'rTableRow' }, [ @hiddencheckboxes ]) unless --$c % 4 == 0;
 if (scalar @hideFields) {
 print $h->open ('div', { class=>'rTable' });
 my @tmptitlerow;
 foreach $f (@displayFields)	{  # Print the Column headings
   if (inArray ($f, \@staticFields)) {
+    push @tmptitlerow, $h->div ({ class=>'rTableHead' }, [ $h->input ({ type=>"hidden", name=>$f, value=>"true" }), $NAME{$f}, $addNewButton ]);
-    push @tmptitlerow, $h->div ({ class=>'rTableHead' }, [ $h->input ({ type=>"hidden", name=>$f, value=>"true" }), $NAME{$f} ]);
+    $addNewButton = "";
   } else {
     if ($FORM{autoload}) {
       push @tmptitlerow, $h->div ({ class=>'rTableHead', onClick=>"Req.$f.click();" }, [ $h->input ({ type=>"checkbox", class=>"accent", name=>$f, value=>"true", checked=>[], onClick=>'event.stopPropagation(); submit();' }), $NAME{$f} ]);
     } else {
 print $h->close ('div');
+# close things out................................................
+my $pages = $pagelimit eq "All" ? 1 : int( $datacount / $pagelimit + 0.99 );
 if ($curpage > $pages) { $curpage = $pages; }
 # close things out................................................
 print $h->br; # print $h->br;
 print $h->div ({ class=>"sp0" }, [
     $h->div ({ class=>"spLeft" }, [
       $h->div ({ class=>"footer" }, [
+        "To bookmark, save, or send this exact view, use the ",
+        $h->a ({ href=>'', onClick=>"window.document.Req.method = 'GET'; Req.submit(); return false;" }, "[Full URL]"),
+        $h->br,
-        "To bookmark, save, or send this exact view, use the ",
+        "If this page is displaying oddly, ",
-        $h->a ({ href=>'', onClick=>"window.document.Req.method = 'GET'; Req.submit(); return false;" }, "[Full URL]"),
+        $h->a ({ href=>url ()."?ignoreCookie=1" }, "[Reset Your View]"),
         $h->br,
         "This page was displayed on $now",
         $h->br,
         "Please direct questions, problems, and concerns to noone\@gmail.com"
+      ])
-      ])
+    ]),
+    $h->div ({ class=>"spRight" }, [
+      $h->h5 ([
+               "$x of $datacount Record". ($x == 1 ? "" : "s") ." Displayed", $h->br,
+               "Sorted by ", $sortby, $h->br,
+               "Displaying ", $h->select ({ name=>"limit", onChange=>"page.value = 1; submit();" }, [ map { $pagelimit == $_ ? $h->option ({ selected=>[] }, $_) : $h->option ($_) } @pagelimitoptions ]),
-    ]),
+               ( $pages > 1 ? " Per Page: ". ( join " ", map { $_ == $curpage ? "<B>$_</b>" : $h->a ({ onClick=>qq{Req.page.value=$_; Req.submit();} }, "[$_]") } (1 .. $pages) ) : "" ), $h->br,
-    $h->div ({ class=>"spRight" }, [
+               $h->input ({ type=>"hidden", name=>"page", value=>$curpage })
-      $h->h5 ("$x Record". ($x == 1 ? "" : "s") ." Displayed")
+      ])
     ]),

Subversion Repositories CoffeeCatalog

(root)/trunk/site/roasters.pl – Rev 7 → 9