oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some improvements to Tax.pm sorting, but it is still borked.

Browse source
This commit is contained in:
Kaleb Murphy 2008-07-17 04:19:05 +00:00
parent e1feea8f83
commit 70a63233b1
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/WebGUI/Shop/Tax.pm
View file

@ -452,22 +452,26 @@ sub www_getTaxesAsJson {
my ($db, $form) = $session->quick(qw(db form)); my ($db, $form) = $session->quick(qw(db form));
my $startIndex = $form->get('startIndex') || 0; my $startIndex = $form->get('startIndex') || 0;
my $numberOfResults = $form->get('results') || 25; my $numberOfResults = $form->get('results') || 25;
my $sortKey = $form->get('sortKey') || 'country'; my %goodKeys = qw/country 1 state 1 city 1 code 1 'tax rate' 1/;
my $sortDir = $form->get('sortDir') || 'desc'; my $sortKey = $form->get('sortKey');
$self->session->errorHandler->warn("$sortKey");
$sortKey = $goodKeys{$sortKey} == 1 ? $sortKey : 'country';
my $sortDir = $form->get('sortDir');
$self->session->errorHandler->warn("$sortDir");
$sortDir = lc($sortDir) eq 'desc' ? 'desc' : 'asc';
$self->session->errorHandler->warn("$sortKey,$sortDir");
my @placeholders = (); my @placeholders = ();
my $sql = 'select SQL_CALC_FOUND_ROWS * from tax'; my $sql = 'select SQL_CALC_FOUND_ROWS * from tax';
my $keywords = $form->get("keywords"); my $keywords = $form->get("keywords");
if ($keywords ne "") { if ($keywords ne "") {
$db->buildSearchQuery(\$sql, \@placeholders, $keywords, [qw{country state city code}]) $db->buildSearchQuery(\$sql, \@placeholders, $keywords, [qw{country state city code}])
} }
push(@placeholders, $sortKey, $sortDir, $startIndex, $numberOfResults); push(@placeholders, $startIndex, $numberOfResults);
$sql .= ' order by ? ? limit ?,?'; $sql .= sprintf (" order by %s limit ?,?","$sortKey $sortDir");
#$self->session->errorHandler->warn("$sql $sortKey $sortDir $startIndex $numberOfResults");
my %results = (); my %results = ();
my @records = (); my @records = ();
my $sth = $db->read($sql, \@placeholders); my $sth = $db->read($sql, \@placeholders);
while (my $record = $sth->hashRef) { while (my $record = $sth->hashRef) {
#$self->session->errorHandler->warn($$record{country});
push(@records,$record); push(@records,$record);
} }
$results{'recordsReturned'} = $sth->rows()+0; $results{'recordsReturned'} = $sth->rows()+0;
@ -688,7 +692,8 @@ EODSURL
initialRequest : ';startIndex=0;results=25', initialRequest : ';startIndex=0;results=25',
generateRequest : buildQueryString, generateRequest : buildQueryString,
paginationEventHandler : handlePagination, paginationEventHandler : handlePagination,
//paginator : myPaginator sortedBy : {key:"country", dir:'asc'},
//paginator : myPaginator
paginator : new YAHOO.widget.Paginator({rowsPerPage:25}) paginator : new YAHOO.widget.Paginator({rowsPerPage:25})
}; };
STOP STOP
@ -717,7 +722,6 @@ EOCHJS
myTable.sortColumn = function(oColumn) { myTable.sortColumn = function(oColumn) {
// Default ascending // Default ascending
var sDir = "asc"; var sDir = "asc";
// If already sorted, sort in opposite direction // If already sorted, sort in opposite direction
if(oColumn.key === this.get("sortedBy").key) { if(oColumn.key === this.get("sortedBy").key) {
sDir = (this.get("sortedBy").dir === YAHOO.widget.DataTable.CLASS_ASC) ? sDir = (this.get("sortedBy").dir === YAHOO.widget.DataTable.CLASS_ASC) ?