X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=yarrg%2Fweb%2Ftabsort;h=45d5e69e3763f56cbd2a1e1b888ad26261094116;hp=e690ac8df740d2535ecc56425452e79ab4463305;hb=3ce667a2d3fd7c36f60da86bb59071264790e375;hpb=608bc9e07b5c8a961325fd1b8d5b92f65418b949

diff --git a/yarrg/web/tabsort b/yarrg/web/tabsort
index e690ac8..45d5e69 100644
--- a/yarrg/web/tabsort
+++ b/yarrg/web/tabsort
@@ -38,17 +38,25 @@
 <%args>
 $table => 'ts_table'
 $sortkeys => 'ts_sortkeys'
+$throw => undef
+$tbrow => undef
+$rowclass => undef
 $cols
 </%args>
 
 <%doc>
+	Numeric
+	SortKey
+	MapFn
 	NoSort
 	DoReverse
 </%doc>
 
 <&| script &>
 
-%	my $sortfn= "ts_sort__$table";
+% print $m->content();
+
+%	my $sortfn= "ts_s_$table";
 function <% $sortfn %>(compar) {
   debug('sorting compar='+compar);
   var table= document.getElementById('<% $table %>');
@@ -56,14 +64,44 @@ function <% $sortfn %>(compar) {
   var tbody= firstrow.parentNode
   var rows= tbody.childNodes
   var newrows= new Array;
-  for (var rowix=0; rowix < rows.length; rowix++) {
+  var finalrows= new Array;
+  var rowix= 0;
+%	if (defined $throw) {
+  for (; rowix < rows.length; rowix++) {
+    var row= rows.item(rowix);
+    if (row.id == '<% $throw %>') break;
+    debug('skip row '+rowix+' [[ '+row+' ]] id='+row.id);
+  }
+  rowix++;
+%	}
+  for (; rowix < rows.length; rowix++) {
     var row= rows.item(rowix);
-    debug('process row '+rowix+' [[ '+row+' ]] id='+row.id)
-    if (!row.id) continue;
-    if (row.tagName != 'TR') continue;
+%	if (defined $tbrow) {
+    if (row.id == '<% $tbrow %>') break;
+%	}
+    if (!row.id) { debug('noid row '+rowix+' [[ '+row+' ]]'); continue; }
+    if (row.tagName != 'TR') {
+      debug('no-tr row '+rowix+' tagName='+row.tagName+' [[ '+row+' ]]');
+      continue;
+    }
+    debug('process row '+rowix+' [[ '+row+' ]] id='+row.id);
     newrows.push(row);
   }
+  for (; rowix < rows.length; rowix++) {
+    var row= rows.item(rowix);
+    finalrows.push(row);
+    debug('final row '+rowix+' [[ '+row+' ]]');
+  }
   newrows.sort(compar);
+%	if (defined $rowclass) {
+  for (var rowix=0; rowix < newrows.length; rowix++) {
+    var row= newrows[rowix];
+    var classname= '<% $rowclass %>'+(rowix % 2);
+    debug('fix row '+rowix+' class '+classname);
+    row.className= classname;
+  }
+%	}
+  newrows= newrows.concat(finalrows);
   for (var rowix=0; rowix < newrows.length; rowix++) {
     var row= newrows[rowix];
     debug('add row '+rowix+' [[ '+row+' ]]');
@@ -77,34 +115,40 @@ function <% $sortfn %>(compar) {
 %	my $thhtml= '';
 %	next if $col->{NoSort};
 
-%	my $mapfn= "ts_compar${cix}_map__$table";
-function <% $mapfn %>(rowelement) {
-  var rowid = rowelement.id;
+%	my $mapfn= "ts_${cix}m_$table";
+function <% $mapfn %>(re) {
+  var rowid = re.id;
 %	if ($col->{SortKey}) {
   return <% $col->{SortKey} %>;
 %	} else {
-  return <% $sortkeys %>[<% $cix %>][rowid];
+%		my $sk= "$sortkeys"."[$cix][rowid]";
+%		if ($col->{MapFn}) {
+  return <% $col->{MapFn} %>(<% $sk %>);
+%		} else {
+  return <% $sk %>;
+%		}
 %	}
 }
 
-%	my $comparefn= "ts_compar${cix}_cmp0__$table";
+%	my $comparefn= "ts_${cix}c0_$table";
 function <% $comparefn %>(a,b) {
-  var a_key = <% $mapfn %>(a);
-  var b_key = <% $mapfn %>(b);
+  var ak = <% $mapfn %>(a);
+  var bk = <% $mapfn %>(b);
 %	if ($col->{Numeric}) {
-  return a_key - b_key
+  return ak - bk
 %	} else {
-  if (a_key < b_key) return -1;
-  if (a_key > b_key) return +1;
+  if (ak < bk) return -1;
+  if (ak > bk) return +1;
   return 0;
 %	}
 }
 
-%	foreach my $reverse (qw(0 1)) {
-%		my $tcomparefn= "ts_compar${cix}_cmp${reverse}__$table";
+%	foreach my $reverse (qw(1 0)) {
+%		my $tcomparefn= "ts_${cix}c${reverse}_$table";
 %		if ($reverse) {
 %			next unless $col->{DoReverse};
 function <% $tcomparefn %>(a,b) { return -<% $comparefn %>(a,b); }
+
 %		}
 %		$thhtml .= "<a href=\"javascript:$sortfn($tcomparefn)\">".
 %				($reverse ? '&or;' : '&and;'). '</a>';
@@ -116,8 +160,8 @@ function <% $tcomparefn %>(a,b) { return -<% $comparefn %>(a,b); }
 
 function ts_onload__<% $table %>() {
   var ts_add_heads= <% to_json_protecttags(\%add_heads) %>;
-  var table= document.getElementById('<% $table %>');
-  var firstth= table.getElementsByTagName('th').item(0);
+  var ctr= document.getElementById('<% defined($throw) ? $throw : $table %>');
+  var firstth= ctr.getElementsByTagName('th').item(0);
   var thlist= firstth.parentNode.getElementsByTagName('th');
   debug('thlist='+thlist);
   debug('thlist.item(2)=' + thlist.item(2));
@@ -127,4 +171,6 @@ function ts_onload__<% $table %>() {
     thlist.item(cix).innerHTML += ah;
   }
 }
+
+register_onload(ts_onload__<% $table %>);
 </&>