Redo aggregation

[ypp-sc-tools.db-live.git] / yarrg / web / tabsort

diff --git a/yarrg/web/tabsort b/yarrg/web/tabsort
index ad25f86b9ab981d58ed2e740cd91cc9d7d6ba23e..444bfb56b15f6e1b01e6e2ff74a29c1140209bb8 100644 (file)
--- a/yarrg/web/tabsort
+++ b/yarrg/web/tabsort
@@ -39,10 +39,15 @@
 $table => 'ts_table'
 $sortkeys => 'ts_sortkeys'
 $throw => undef
+$tbrow => undef
+$rowclass => undef
 $cols
 </%args>
 
 <%doc>
+       Numeric
+       SortKey
+       MapFn
        NoSort
        DoReverse
 </%doc>
@@ -57,17 +62,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 row= rows.item(rowix);
-    debug('process row '+rowix+' [[ '+row+' ]] id='+row.id)
-    if (!row.id) continue;
+  var finalrows= new Array;
+  var rowix= 0;
 %      if (defined $throw) {
-    if (row.id == '<% $throw %>') continue;
+  for (; rowix < rows.length; rowix++) {
+    var row= rows.item(rowix);
+    if (row.id == '<% $throw %>') break;
+    debug('skip row '+rowix+' [[ '+row+' ]] id='+row.id);
+  }
+  rowix++;
 %      }
-    if (row.tagName != 'TR') continue;
+  for (; rowix < rows.length; rowix++) {
+    var row= rows.item(rowix);
+%      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+' ]]');
@@ -109,7 +141,7 @@ function <% $comparefn %>(a,b) {
 %      }
 }
 
-%      foreach my $reverse (qw(0 1)) {
+%      foreach my $reverse (qw(1 0)) {
 %              my $tcomparefn= "ts_compar${cix}_cmp${reverse}__$table";
 %              if ($reverse) {
 %                      next unless $col->{DoReverse};