From 1153c051711de2fea9b76be9a726d57e8d037580 Mon Sep 17 00:00:00 2001 From: Rob Garrison Date: Thu, 8 Sep 2011 11:28:10 -0500 Subject: [PATCH] addRows method & destroy pager --- README.markdown | 8 + addons/pager/jquery.tablesorter.pager.js | 56 ++++--- addons/pager/jquery.tablesorter.pager.min.js | 2 +- changelog.txt | 9 ++ docs/css/jq.css | 2 +- docs/example-add-rows.html | 140 ++++++++++++++++++ docs/example-ajax.html | 2 +- docs/example-apply-widget.html | 2 +- docs/example-child-rows.html | 2 +- docs/example-empty-table.html | 9 +- docs/example-option-digits.html | 2 +- docs/example-option-render-header.html | 5 + docs/example-option-sort-append.html | 6 +- docs/example-option-text-extraction.html | 6 +- ...xample-options-headers-digits-strings.html | 1 + docs/example-options-headers-locked.html | 3 +- docs/example-options-headers-order.html | 5 + docs/example-pager.html | 58 +++++++- docs/example-parsers-class-name.html | 5 + docs/example-parsers.html | 5 + docs/example-ui-theme.html | 4 + docs/example-update-cell.html | 7 +- docs/index.html | 20 ++- js/jquery.tablesorter.js | 23 ++- js/jquery.tablesorter.min.js | 4 +- 25 files changed, 345 insertions(+), 41 deletions(-) create mode 100644 docs/example-add-rows.html diff --git a/README.markdown b/README.markdown index 265b8376..48ba0a2f 100644 --- a/README.markdown +++ b/README.markdown @@ -28,6 +28,14 @@ Included all original [document pages](http://mottie.github.com/tablesorter/docs View the [complete listing here](http://mottie.github.com/tablesorter/changelog.txt). +#### Version 2.0.16 (2011-09-08) + +* Added notes to demo pages to indicate if the original (version 2.0.5, at [tablesorter.com](http://tablesorter.com/docs/)) does have that option or method. +* Added "addRows" method that allows adding table rows. + * This method differs from the "update" method in that it only adds rows to the cache. + * Use this new method to add rows to a table with the pager plugin applied. Using the "update" method on a table with the pager plugin will remove all hidden rows from the cache. +* Added a "destroy.pager" method to remove the pager from the table - pager demo updated. + #### Version 2.0.15 (2011-08-23) * Fixed a problem that caused a javascript error when a table header cell doesn't have a class name. diff --git a/addons/pager/jquery.tablesorter.pager.js b/addons/pager/jquery.tablesorter.pager.js index 1dffec02..9e0a2965 100644 --- a/addons/pager/jquery.tablesorter.pager.js +++ b/addons/pager/jquery.tablesorter.pager.js @@ -1,12 +1,29 @@ /* * tablesorter pager plugin - * updated 7/27/2011 + * updated 9/8/2011 */ (function($) { $.extend({tablesorterPager: new function() { - var updatePageDisplay = function(table,c) { + // hide arrows at extremes + var pagerArrows = function(c) { + if (c.updateArrows) { + c.container.removeClass(c.cssDisabled); + $(c.cssFirst + ',' + c.cssPrev + ',' + c.cssNext + ',' + c.cssLast, c.container).removeClass(c.cssDisabled); + if (c.page === 0) { + $(c.cssFirst + ',' + c.cssPrev, c.container).addClass(c.cssDisabled); + } else if (c.page === c.totalPages - 1) { + $(c.cssNext + ',' + c.cssLast, c.container).addClass(c.cssDisabled); + } + // if the total # of pages is less than the selected number of visible rows, then hide the pager + if (c.totalRows < c.size) { + c.container.addClass(c.cssDisabled); + } + } + }, + + updatePageDisplay = function(table,c) { c.startRow = c.size * (c.page) + 1; c.endRow = Math.min(c.totalRows, c.size * (c.page+1)); var out = $(c.cssPageDisplay, c.container), @@ -25,6 +42,7 @@ } else { out.html(s); } + pagerArrows(c); $(table).trigger('pagerComplete', c); }, @@ -71,29 +89,11 @@ updatePageDisplay(table,c); }, - // hide arrows at extremes - pagerArrows = function(c) { - if (c.updateArrows) { - c.container.removeClass(c.cssDisabled); - $(c.cssFirst + ',' + c.cssPrev + ',' + c.cssNext + ',' + c.cssLast, c.container).removeClass(c.cssDisabled); - if (c.page === 0) { - $(c.cssFirst + ',' + c.cssPrev, c.container).addClass(c.cssDisabled); - } else if (c.page === c.totalPages - 1) { - $(c.cssNext + ',' + c.cssLast, c.container).addClass(c.cssDisabled); - } - // if the total # of pages is less than the selected number of visible rows, then hide the pager - if (c.totalRows < c.size) { - c.container.addClass(c.cssDisabled); - } - } - }, - moveToPage = function(table) { var c = table.config; if (c.page < 0 || c.page > (c.totalPages-1)) { c.page = 0; } - pagerArrows(c); renderTable(table,c.rowsCopy); }, @@ -134,6 +134,18 @@ c.page = 0; } moveToPage(table); + }, + + destroyPager = function(table){ + var c = table.config; + c.size = c.totalRows; + c.totalPages = 1; + renderTable(table,c.rowsCopy); + // hide pager + c.container.hide(); + c.appender = null; + $(table).unbind('destroy.pager'); + }; this.appender = function(table,rows) { @@ -195,6 +207,10 @@ return false; }); + $(this).bind('destroy.pager', function(){ + destroyPager(table); + }); + }); }; diff --git a/addons/pager/jquery.tablesorter.pager.min.js b/addons/pager/jquery.tablesorter.pager.min.js index 37b89f89..2a53e158 100644 --- a/addons/pager/jquery.tablesorter.pager.min.js +++ b/addons/pager/jquery.tablesorter.pager.min.js @@ -1,2 +1,2 @@ /* tablesorter pager plugin */ -(function(d){d.extend({tablesorterPager:new function(){var o=function(a,b){b.startRow=b.size*b.page+1;b.endRow=Math.min(b.totalRows,b.size*(b.page+1));var c=d(b.cssPageDisplay,b.container),e=b.output.replace(/\{(page|totalPages|startRow|endRow|totalRows)\}/gi,function(a){return{"{page}":b.page+1,"{totalPages}":b.totalPages,"{startRow}":b.startRow,"{endRow}":b.endRow,"{totalRows}":b.totalRows}[a]});c[0].tagName==="INPUT"?c.val(e):c.html(e);d(a).trigger("pagerComplete",b)},k=function(a){var b=a.config, a=d(a);if(!b.pagerPositionSet&&b.positionFixed)a.offset&&b.container.css({top:a.offset().top+a.height()+"px",position:"absolute"}),b.pagerPositionSet=!0},m=function(a,b){var c,e,h,i,g=a.config,f=b.length;c=g.page*g.size;var j=c+g.size;d(a).trigger("pagerChange",g);if(j>b.length)j=b.length;i=d(a.tBodies[0]);for(d.tablesorter.clearTableBody(a);c=g.totalPages&&l(a);o(a,g)},n=function(a){a.updateArrows&& (a.container.removeClass(a.cssDisabled),d(a.cssFirst+","+a.cssPrev+","+a.cssNext+","+a.cssLast,a.container).removeClass(a.cssDisabled),a.page===0?d(a.cssFirst+","+a.cssPrev,a.container).addClass(a.cssDisabled):a.page===a.totalPages-1&&d(a.cssNext+","+a.cssLast,a.container).addClass(a.cssDisabled),a.totalRowsb.totalPages-1)b.page=0;n(b);m(a,b.rowsCopy)},l=function(a){var b=a.config;b.page=b.totalPages-1; f(a)};this.appender=function(a,b){var c=a.config;c.rowsCopy=b;c.totalRows=b.length;c.totalPages=Math.ceil(c.totalRows/c.size);m(a,b)};this.defaults={size:10,offset:0,page:0,totalRows:0,totalPages:0,container:null,cssNext:".next",cssPrev:".prev",cssFirst:".first",cssLast:".last",cssPageDisplay:".pagedisplay",cssPageSize:".pagesize",cssDisabled:"disabled",output:"{page}/{totalPages}",updateArrows:!1,positionFixed:!0,appender:this.appender};this.construct=function(a){return this.each(function(){var b= d.extend(this.config,d.tablesorterPager.defaults,a),c=this,e=b.container;d(this).trigger("appendCache");b.size=parseInt(d(".pagesize",e).val(),10);n(b);d(b.cssFirst,e).click(function(){c.config.page=0;f(c);return!1});d(b.cssNext,e).click(function(){var a=c.config;a.page++;if(a.page>=a.totalPages-1)a.page=a.totalPages-1;f(c);return!1});d(b.cssPrev,e).click(function(){var a=c.config;a.page--;if(a.page<=0)a.page=0;f(c);return!1});d(b.cssLast,e).click(function(){l(c);return!1});d(b.cssPageSize,e).change(function(){var a= parseInt(d(this).val(),10),b=c.config;b.size=a;b.totalPages=Math.ceil(b.totalRows/b.size);b.pagerPositionSet=!1;f(c);k(c);return!1})})}}});d.fn.extend({tablesorterPager:d.tablesorterPager.construct})})(jQuery); \ No newline at end of file +(function(d){d.extend({tablesorterPager:new function(){var k=function(a){a.updateArrows&&(a.container.removeClass(a.cssDisabled),d(a.cssFirst+","+a.cssPrev+","+a.cssNext+","+a.cssLast,a.container).removeClass(a.cssDisabled),a.page===0?d(a.cssFirst+","+a.cssPrev,a.container).addClass(a.cssDisabled):a.page===a.totalPages-1&&d(a.cssNext+","+a.cssLast,a.container).addClass(a.cssDisabled),a.totalRowsb.length)h=b.length;j=d(a.tBodies[0]);for(d.tablesorter.clearTableBody(a);c=g.totalPages&&m(a);n(a,g)},f=function(a){var b=a.config;if(b.page<0||b.page>b.totalPages-1)b.page=0;h(a,b.rowsCopy)},m=function(a){var b=a.config;b.page=b.totalPages-1;f(a)};this.appender= function(a,b){var c=a.config;c.rowsCopy=b;c.totalRows=b.length;c.totalPages=Math.ceil(c.totalRows/c.size);h(a,b)};this.defaults={size:10,offset:0,page:0,totalRows:0,totalPages:0,container:null,cssNext:".next",cssPrev:".prev",cssFirst:".first",cssLast:".last",cssPageDisplay:".pagedisplay",cssPageSize:".pagesize",cssDisabled:"disabled",output:"{page}/{totalPages}",updateArrows:!1,positionFixed:!0,appender:this.appender};this.construct=function(a){return this.each(function(){var b=d.extend(this.config, d.tablesorterPager.defaults,a),c=this,e=b.container;d(this).trigger("appendCache");b.size=parseInt(d(".pagesize",e).val(),10);k(b);d(b.cssFirst,e).click(function(){c.config.page=0;f(c);return!1});d(b.cssNext,e).click(function(){var a=c.config;a.page++;if(a.page>=a.totalPages-1)a.page=a.totalPages-1;f(c);return!1});d(b.cssPrev,e).click(function(){var a=c.config;a.page--;if(a.page<=0)a.page=0;f(c);return!1});d(b.cssLast,e).click(function(){m(c);return!1});d(b.cssPageSize,e).change(function(){var a= parseInt(d(this).val(),10),b=c.config;b.size=a;b.totalPages=Math.ceil(b.totalRows/b.size);b.pagerPositionSet=!1;f(c);l(c);return!1});d(this).bind("destroy.pager",function(){var a=c.config;a.size=a.totalRows;a.totalPages=1;h(c,a.rowsCopy);a.container.hide();a.appender=null;d(c).unbind("destroy.pager")})})}}});d.fn.extend({tablesorterPager:d.tablesorterPager.construct})})(jQuery); diff --git a/changelog.txt b/changelog.txt index 37c3cf90..167e0ebf 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,14 @@ TableSorter Change Log +Version 2.0.16 (2011-09-08) +============================ + +* Added notes to demo pages to indicate if the original (version 2.0.5, at [tablesorter.com](http://tablesorter.com/docs/)) does have that option or method. +* Added "addRows" method that allows adding table rows. + * This method differs from the "update" method in that it only adds rows to the cache. + * Use this new method to add rows to a table with the pager plugin applied. Using the "update" method on a table with the pager plugin will remove all hidden rows from the cache. +* Added a "destroy.pager" method to remove the pager from the table - pager demo updated. + Version 2.0.15 (2011-08-23) ============================ diff --git a/docs/css/jq.css b/docs/css/jq.css index df0d12f6..1f692b3a 100644 --- a/docs/css/jq.css +++ b/docs/css/jq.css @@ -24,7 +24,7 @@ pre.normal{background-color:transparent;border:none;border-left-width:0;overflow hr{height:1px;} code{font-size:108%;font-style:normal;padding:0;} ul{color:#333;list-style:square;} -#banner{margin:20px;padding-bottom:10px;text-align:left;} +#banner{margin:20px 20px 5px 20px;padding:0;text-align:left;} #banner *{color:#232121;font-family:Georgia, Palatino, Times New Roman;font-size:30px;font-style:normal;font-weight:400;margin:0;padding:0;} #banner h1{display:block;float:left;} #banner h1 em{color:#6cf;} diff --git a/docs/example-add-rows.html b/docs/example-add-rows.html new file mode 100644 index 00000000..b3660fe0 --- /dev/null +++ b/docs/example-add-rows.html @@ -0,0 +1,140 @@ + + + + + jQuery plugin: Tablesorter 2.0 - Adding a table row + + + + + + + + + + + + + + + + + + + + + + +
+ +

+ NOTE! +

    +
  • Click on the [ Add Rows ] button to add two new rows.
  • +
  • The "addRows" method was added in version 2.0.16, and is not part of the original plugin.
  • +
  • This example could have used the "update" method to add rows, but to remove rows only the "update" method works.
  • +
  • This method is better used for the pager plugin when not all of the rows are displayed.
  • +
+

+ +

Demo

+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
First NameLast NameAgeTotalDiscountDate
PeterParker28$9.9920%Jul 6, 2006 8:14 AM
JohnHood33$19.9925%Dec 10, 2002 5:14 AM
ClarkKent18$15.8944%Jan 12, 2003 11:14 AM
BruceAlmighty45$153.1944%Jan 18, 2001 9:12 AM
BruceEvans22$13.1911%Jan 18, 2007 9:12 AM
+ +

Javascript

+
+

+	
+

HTML

+
+

+	
+ + + +
+ + + diff --git a/docs/example-ajax.html b/docs/example-ajax.html index d482f7a2..b718ac68 100644 --- a/docs/example-ajax.html +++ b/docs/example-ajax.html @@ -125,7 +125,7 @@ diff --git a/docs/example-apply-widget.html b/docs/example-apply-widget.html index fa352923..9b42eb79 100644 --- a/docs/example-apply-widget.html +++ b/docs/example-apply-widget.html @@ -46,7 +46,7 @@

- NOTE! Click on [ Apply Widget Id ], then sort the table a few times... then click on [ Apply Widgets ] and sort again. + NOTE! Click on [ Apply Widget Id ], then sort the table a few times... then click on [ Apply Widgets ] and sort again (these methods are part of the original plugin).

Demo

diff --git a/docs/example-child-rows.html b/docs/example-child-rows.html index a2879fe4..effbd2ff 100644 --- a/docs/example-child-rows.html +++ b/docs/example-child-rows.html @@ -62,7 +62,7 @@

NOTE! Click the link in the Order # column to reveal the hidden child row cells - (original demo). + (original demo). This option is available in the original plugin.

Demo

diff --git a/docs/example-empty-table.html b/docs/example-empty-table.html index 5aa2b52c..6cf2f74c 100644 --- a/docs/example-empty-table.html +++ b/docs/example-empty-table.html @@ -33,8 +33,8 @@ // append new html to table body $("table tbody").append(html); - // let the plugin know that we made a update, then - // set sorting column and direction, this will sort on the first and third column + // let the plugin know that we made a update, then the plugin will + // automatically sort the table based on the header settings $("table").trigger("update"); return false; @@ -52,6 +52,11 @@
+ +

+ NOTE! The presorting of an empty table and automatic sorting of appended data was added in version 2.0.14 (not part of the original plugin). +

+

Demo

diff --git a/docs/example-option-digits.html b/docs/example-option-digits.html index 42748001..4aded56e 100644 --- a/docs/example-option-digits.html +++ b/docs/example-option-digits.html @@ -32,7 +32,7 @@

- NOTE! Click on any column header to sort that column. Note the new alphanumeric sort working in the first column. + NOTE! Click on any column header to sort that column. The alphanumeric sort working in the first column was added in version 2.0.6 (not part of the original plugin).

Demo

diff --git a/docs/example-option-render-header.html b/docs/example-option-render-header.html index 12b98f35..48ac8e05 100644 --- a/docs/example-option-render-header.html +++ b/docs/example-option-render-header.html @@ -52,6 +52,11 @@
+ +

+ NOTE! The span wrapping the header text and the index variable for the function was added in version 2.0.9 (it is not part of the original plugin, but the "onRenderHeader" option was available). +

+

Demo

diff --git a/docs/example-option-sort-append.html b/docs/example-option-sort-append.html index 1dfbbf5d..92e11e3c 100644 --- a/docs/example-option-sort-append.html +++ b/docs/example-option-sort-append.html @@ -40,7 +40,11 @@

- NOTE! Click to sort any column header to see the the first column sort is appended to the selected sort order. + NOTE! +

    +
  • Click to sort any column header to see the the first column sort is appended to the selected sort order.
  • +
  • This option is part of the original plugin
  • +

Demo

diff --git a/docs/example-option-text-extraction.html b/docs/example-option-text-extraction.html index 80a31484..db1b34f3 100644 --- a/docs/example-option-text-extraction.html +++ b/docs/example-option-text-extraction.html @@ -56,7 +56,11 @@

- NOTE! The "First Name" column is sorting by the contents of the <strong> tag (in red). + NOTE! +

    +
  • The textExtraction function setting for each column was added in version 2.0.12 (not part of the original plugin).
  • +
  • The "First Name" column is sorting by the contents of the <strong> tag (in red).
  • +

Demo

diff --git a/docs/example-options-headers-digits-strings.html b/docs/example-options-headers-digits-strings.html index c8825f48..3ff0d7d2 100644 --- a/docs/example-options-headers-digits-strings.html +++ b/docs/example-options-headers-digits-strings.html @@ -45,6 +45,7 @@

NOTE!

    +
  • This functionality is new as of version 2.0.10 (not part of the original plugin).
  • When a column is sorted numerically ( sorter:"digit" ) any text in that column will, by default, be given a zero value. Sort the last column (#9) to see the problem with this method.
  • Set the headers option "string" value to "max+" to treat any text in that column as a value greater than the max positive value.
  • Set the headers option "string" value to "max-" to treat any text in that column as a value greater than the max negative value.
  • diff --git a/docs/example-options-headers-locked.html b/docs/example-options-headers-locked.html index 57be9868..e12579a2 100644 --- a/docs/example-options-headers-locked.html +++ b/docs/example-options-headers-locked.html @@ -43,7 +43,8 @@

    - TIP! Sort the first and third columns to see how the sort is locked. Override this by using the multisort key (shift) while clicking on the header. + TIP! Sort the first and third columns to see how the sort is locked. Override this by using the multisort key (shift) while clicking on the header.
    + NOTE! This option was part of the original plugin, but it was broken.

    diff --git a/docs/example-options-headers-order.html b/docs/example-options-headers-order.html index 46a60ccd..497733e7 100644 --- a/docs/example-options-headers-order.html +++ b/docs/example-options-headers-order.html @@ -42,6 +42,11 @@ Back to documentation
    + +

    + NOTE! The functionality to add a "sortInitialOrder" inside of the "headers" option was added in version 2.0.8 (not part of the original plugin). +

    +

    Demo

diff --git a/docs/example-pager.html b/docs/example-pager.html index 4a7fddd9..3a8da77d 100644 --- a/docs/example-pager.html +++ b/docs/example-pager.html @@ -61,6 +61,24 @@ .find('li:first').remove(); }); + // Add two new rows using the "addRows" method + // the "update" method doesn't work here because not all + // rows are present in the table when the pager is applied + $('button:contains(Add)').click(function(){ + // add two rows + var row = '' + + '', + $row = $(row); + $('table') + .find('tbody').append($row) + .trigger('addRows', [$row]); + }); + + // Destroy pager + $('button:contains(Destroy)').click(function(){ + $('table').trigger('destroy.pager'); + }); + }); @@ -72,6 +90,11 @@
+ +

+ NOTE! Updated pager functions and added output string formatting (e.g. "1 to 10 (1022)") to version 2.0.9 (it is not part of the original plugin). +

+

Triggered Events

  • Pager events will appear here.
  • @@ -80,8 +103,9 @@

Demo

-
+ +

@@ -93,7 +117,7 @@ - +
@@ -320,7 +344,35 @@
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
StudentXXMathematicsmale33395473
StudentYYMathematicsfemale83898483
100 90
student23Mathematicsmale8277079
student24Languagesfemale100911382
student25Mathematicsmale22968253
student26Languagesfemale37295659
student27Mathematicsmale86826923
student28Languagesfemale4425431
student29Mathematicsmale77472238
student30Languagesfemale19352310
student31Mathematicsmale90271750
student32Languagesfemale60753338
student33Mathematicsmale4313715
student34Languagesfemale77978144
student35Mathematicsmale5815195
student36Languagesfemale70617094
student37Mathematicsmale6036184
student38Languagesfemale6339011
student39Mathematicsmale50463238
student40Languagesfemale5175253
student41Mathematicsmale43342878
student42Languagesfemale11896095
student43Mathematicsmale48921888
student44Languagesfemale8225973
student45Mathematicsmale91733739
student46Languagesfemale481210
student47Mathematicsmale8910611
student48Languagesfemale90322118
student49Mathematicsmale42494972
student50Languagesfemale56376754
student51Mathematicsmale48315563
student52Languagesfemale38917174
student53Mathematicsmale26385100
student54Languagesfemale75811623
student55Mathematicsmale65521553
student56Languagesfemale23527994
student57Mathematicsmale80226112
student58Languagesfemale5357979
student59Mathematicsmale96323517
student60Languagesfemale16766527
student61Mathematicsmale20572223
student62Languagesfemale19838778
student63Mathematicsmale258330
student64Languagesfemale021993
student65Mathematicsmale20861396
student66Languagesfemale28358757
student67Mathematicsmale36502910
student68Languagesfemale6090966
student69Mathematicsmale34614398
student70Languagesfemale13379183
student71Mathematicsmale47805782
student72Languagesfemale69433737
student73Mathematicsmale54609421
student74Languagesfemale71143446
student75Mathematicsmale89963117
student76Languagesfemale28482994
student77Mathematicsmale100652024
student78Languagesfemale11969033
student79Mathematicsmale53559339
student80Languagesfemale11008444
student81Mathematicsmale63789643
student82Languagesfemale41698235
student83Mathematicsmale9498139
student84Languagesfemale94729177
student85Mathematicsmale71324525
student86Languagesfemale9896437
student87Mathematicsmale8917367
student88Languagesfemale43416879
student89Mathematicsmale7382237
student90Languagesfemale94839337
student91Mathematicsmale8284261
student92Languagesfemale46413069
student93Mathematicsmale47198583
student94Languagesfemale39146462
student95Mathematicsmale71314628
student96Languagesfemale90944540
student97Mathematicsmale468925
student98Languagesfemale41434799
student99Mathematicsmale71908973
student100Languagesfemale31641856
student101Mathematicsmale52136999
student102Languagesfemale86398318
student103Mathematicsmale23659880
student104Languagesfemale781005766
student105Mathematicsmale69214397
student106Languagesfemale2727838
student107Mathematicsmale86964634
student108Languagesfemale13846664
student109Mathematicsmale35959881
student110Languagesfemale30286254
student111Mathematicsmale60313585
student112Languagesfemale19811969
student113Mathematicsmale6659854
student114Languagesfemale38804016
student115Mathematicsmale5849697
student116Languagesfemale59976954
student117Mathematicsmale0347949
student118Languagesfemale1871285
student119Mathematicsmale9387759
student120Languagesfemale42232690
student121Mathematicsmale17396689
student122Languagesfemale26759018
student123Mathematicsmale34237780
student124Languagesfemale5267742
student125Mathematicsmale5628581
student126Languagesfemale51356744
student127Mathematicsmale64644434
student128Languagesfemale67917982
student129Mathematicsmale4261579
student130Languagesfemale7210369
student131Mathematicsmale9477511
student132Languagesfemale27958548
student133Mathematicsmale92114061
student134Languagesfemale4185660
student135Mathematicsmale8422652
student136Languagesfemale7604721
student137Mathematicsmale51813090
student138Languagesfemale5861673
student139Mathematicsmale48383731
student140Languagesfemale33265660
student141Mathematicsmale84842975
student142Languagesfemale7235654
student143Mathematicsmale31427082
student144Languagesfemale94875035
student145Mathematicsmale91528026
student146Languagesfemale78657979
student147Mathematicsmale50905971
student148Languagesfemale15686633
student149Mathematicsmale17363413
student150Languagesfemale30956973
student151Mathematicsmale20534958
student152Languagesfemale19896060
student153Mathematicsmale5282203
student154Languagesfemale66985366
student155Mathematicsmale5852258
student156Languagesfemale3443688
student157Mathematicsmale4309114
student158Languagesfemale34186731
student159Mathematicsmale79733452
student160Languagesfemale15613727
student161Mathematicsmale74771545
student162Languagesfemale52621958
student163Mathematicsmale77602795
student164Languagesfemale9619357
student165Mathematicsmale51637519
student166Languagesfemale32447299
student167Mathematicsmale82845763
student168Languagesfemale53128567
student169Mathematicsmale4916846
student170Languagesfemale39341665
student171Mathematicsmale10068884
student172Languagesfemale14256352
student173Mathematicsmale74261560
student174Languagesfemale1158892
student175Mathematicsmale6247231
student176Languagesfemale65263242
student177Mathematicsmale83786924
student178Languagesfemale14100743
student179Mathematicsmale2835897
student180Languagesfemale1483962
student181Mathematicsmale1442469
student182Languagesfemale6452722
student183Mathematicsmale15262785
student184Languagesfemale9149407
student185Mathematicsmale87894287
student186Languagesfemale75766188
student187Mathematicsmale11486630
student188Languagesfemale7379272
student189Mathematicsmale98365815
student190Languagesfemale8028656
student191Mathematicsmale3633974
student192Languagesfemale5923390
student193Mathematicsmale9461933
student194Languagesfemale82497242
student195Mathematicsmale8059830
student196Languagesfemale89179027
student197Mathematicsmale4622667
student198Languagesfemale65757377
student199Mathematicsmale77975413
student200Languagesfemale78195796
student201Mathematicsmale92211180
student202Languagesfemale45499340
student203Mathematicsmale74258753
student204Languagesfemale1571234
student205Mathematicsmale82979573
student206Languagesfemale82605898
student207Mathematicsmale266411100
student208Languagesfemale6496045
student209Mathematicsmale96819663
student210Languagesfemale2439069
student211Mathematicsmale8664710
student212Languagesfemale764507
student213Mathematicsmale59122677
student214Languagesfemale21259382
student215Mathematicsmale22186451
student216Languagesfemale92419828
student217Mathematicsmale32481417
student218Languagesfemale62368556
student219Mathematicsmale33379087
student220Languagesfemale24436084
student221Mathematicsmale6593751
student222Languagesfemale9197576
student223Mathematicsmale86293227
student224Languagesfemale63596891
student225Mathematicsmale57739568
student226Languagesfemale38545987
student227Mathematicsmale53627264
student228Languagesfemale62847273
student229Mathematicsmale1308358
student230Languagesfemale35658087
student231Mathematicsmale76202850
student232Languagesfemale9176633
student233Mathematicsmale9229961
student234Languagesfemale47699839
student235Mathematicsmale21443882
student236Languagesfemale19865178
student237Mathematicsmale28454936
student238Languagesfemale78194981
student239Mathematicsmale72694720
student240Languagesfemale17436656
student241Mathematicsmale901944
student242Languagesfemale618251
student243Mathematicsmale1377213
student244Languagesfemale8005854
student245Mathematicsmale8331859
student246Languagesfemale90992912
student247Mathematicsmale89238159
student248Languagesfemale7226283
student249Mathematicsmale28105047
student250Languagesfemale8914894
student251Mathematicsmale15233769
student252Languagesfemale27821036
student253Mathematicsmale49456423
student254Languagesfemale79756374
student255Mathematicsmale2566475
student256Languagesfemale36262958
student257Mathematicsmale17226673
student258Languagesfemale70919745
student259Mathematicsmale34307830
student260Languagesfemale77578677
student261Mathematicsmale1259687
student262Languagesfemale11609771
student263Mathematicsmale12303558
student264Languagesfemale46152340
student265Mathematicsmale4481926
student266Languagesfemale15683215
student267Mathematicsmale5585098
student268Languagesfemale42303224
student269Mathematicsmale781009957
student270Languagesfemale55338725
student271Mathematicsmale25972993
student272Languagesfemale39351843
student273Mathematicsmale35179958
student274Languagesfemale86522724
student275Mathematicsmale97387376
student276Languagesfemale206198
student277Mathematicsmale9336947
student278Languagesfemale423152
student279Mathematicsmale6118962
student280Languagesfemale99898794
student281Mathematicsmale4895900
student282Languagesfemale60473130
student283Mathematicsmale64241076
student284Languagesfemale9937468
student285Mathematicsmale0986869
student286Languagesfemale66824959
student287Mathematicsmale86143717
student288Languagesfemale27489327
student289Mathematicsmale8489668
student290Languagesfemale9902057
student291Mathematicsmale50967242
student292Languagesfemale9822792
student293Mathematicsmale1994287
student294Languagesfemale9897922
student295Mathematicsmale75307764
student296Languagesfemale5198553
student297Mathematicsmale25958672
student298Languagesfemale20753735
student299Mathematicsmale4924111
student300Languagesfemale2832891
student301Mathematicsmale4163425
student302Languagesfemale29167790
student303Mathematicsmale89415182
student304Languagesfemale40912434
student305Mathematicsmale7474978
student306Languagesfemale6375562
student307Mathematicsmale30733490
student308Languagesfemale82919593
student309Mathematicsmale6247382
student310Languagesfemale39101257
student311Mathematicsmale89642067
student312Languagesfemale56369241
student313Mathematicsmale99809974
student314Languagesfemale31796493
student315Mathematicsmale5327055
student316Languagesfemale35152960
student317Mathematicsmale31476960
student318Languagesfemale88281366
student319Mathematicsmale65121640
student320Languagesfemale28171940
student321Mathematicsmale241004470
student322Languagesfemale20598352
student323Mathematicsmale17608291
student324Languagesfemale95994337
student325Mathematicsmale30189931
student326Languagesfemale3478386
student327Mathematicsmale9863435
student328Languagesfemale54239846
student329Mathematicsmale97934518
student330Languagesfemale2774077
student331Mathematicsmale9704137
student332Languagesfemale52377620
student333Mathematicsmale74186819
student334Languagesfemale77100339
student335Mathematicsmale38537718
student336Languagesfemale18132610
student337Mathematicsmale90478770
student338Languagesfemale38493674
student339Mathematicsmale100641372
student340Languagesfemale74254152
student341Mathematicsmale37131613
student342Languagesfemale24341583
student343Mathematicsmale2056728
student344Languagesfemale4522572
student345Mathematicsmale19117535
student346Languagesfemale6583115
student347Mathematicsmale16663611
student348Languagesfemale1239540
student349Mathematicsmale752742
student350Languagesfemale88926055
student351Mathematicsmale92709145
student352Languagesfemale74765944
student353Mathematicsmale63696094
student354Languagesfemale3685548
student355Mathematicsmale39962148
student356Languagesfemale4134275
student357Mathematicsmale6434733
student358Languagesfemale95146355
student359Mathematicsmale701001382
student360Languagesfemale522410021
student361Mathematicsmale040869
student362Languagesfemale024932
student363Mathematicsmale23108694
student364Languagesfemale1538649
student365Mathematicsmale7623310
student366Languagesfemale35357894
student367Mathematicsmale294243100
student368Languagesfemale668510
student369Mathematicsmale74155683
student370Languagesfemale7543908
student371Mathematicsmale4060470
student372Languagesfemale62421749
student373Mathematicsmale31464454
student374Languagesfemale30344787
student375Mathematicsmale9694152
student376Languagesfemale85432992
student377Mathematicsmale7904025
student378Languagesfemale36407285
student379Mathematicsmale5368882
student380Languagesfemale87783879
student381Mathematicsmale89978338
student382Languagesfemale21194910
student383Mathematicsmale47126850
student384Languagesfemale37124995
student385Mathematicsmale8408851
student386Languagesfemale89612748
student387Mathematicsmale10478761
student388Languagesfemale1692656
student389Mathematicsmale57331347
student390Languagesfemale90357775
student391Mathematicsmale31474753
student392Languagesfemale942412
student393Mathematicsmale6119817
student394Languagesfemale457577
student395Mathematicsmale6729212
student396Languagesfemale516456
student397Mathematicsmale93147714
student398Languagesfemale1893427
student399Mathematicsmale93775791
student400Languagesfemale67778032
student401Mathematicsmale5889417
student402Languagesfemale3056053
student403Mathematicsmale28253259
student404Languagesfemale62348164
student405Mathematicsmale29842623
student406Languagesfemale7086377
student407Mathematicsmale8654799
student408Languagesfemale9381089
student409Mathematicsmale84214658
student410Languagesfemale21841849
student411Mathematicsmale2796340
student412Languagesfemale9301991
student413Mathematicsmale31928743
student414Languagesfemale53259843
student415Mathematicsmale36758089
student416Languagesfemale37681254
student417Mathematicsmale25891253
student418Languagesfemale922846
student419Mathematicsmale11286058
student420Languagesfemale1373517
student421Mathematicsmale67303885
student422Languagesfemale68793441
student423Mathematicsmale72459341
student424Languagesfemale56464538
student425Mathematicsmale8621840
student426Languagesfemale99854119
student427Mathematicsmale7135389
student428Languagesfemale22911216
student429Mathematicsmale1532693
student430Languagesfemale35463474
student431Mathematicsmale33839720
student432Languagesfemale9920326
student433Mathematicsmale48428318
student434Languagesfemale4442530
student435Mathematicsmale78486045
student436Languagesfemale4757890
student437Mathematicsmale881210053
student438Languagesfemale4805160
student439Mathematicsmale70898516
student440Languagesfemale71943433
student441Mathematicsmale68137218
student442Languagesfemale7539721
student443Mathematicsmale65366087
student444Languagesfemale43212434
student445Mathematicsmale85776528
student446Languagesfemale61907891
student447Mathematicsmale9207812
student448Languagesfemale33306290
student449Mathematicsmale8616745
student450Languagesfemale100862423
student451Mathematicsmale1425645
student452Languagesfemale86399888
student453Mathematicsmale72687719
student454Languagesfemale94523100
student455Mathematicsmale34678979
student456Languagesfemale9204745
student457Mathematicsmale64582698
student458Languagesfemale439359100
student459Mathematicsmale82359781
student460Languagesfemale183524100
student461Mathematicsmale79804351
student462Languagesfemale56101767
student463Mathematicsmale36441485
student464Languagesfemale2640692
student465Mathematicsmale59934378
student466Languagesfemale7884883
student467Mathematicsmale41378060
student468Languagesfemale44279777
student469Mathematicsmale29196482
student470Languagesfemale50962746
student471Mathematicsmale49155145
student472Languagesfemale38353178
student473Mathematicsmale1802365
student474Languagesfemale91172376
student475Mathematicsmale57393563
student476Languagesfemale33736214
student477Mathematicsmale96168840
student478Languagesfemale30631613
student479Mathematicsmale74393787
student480Languagesfemale26369479
student481Mathematicsmale19586512
student482Languagesfemale73362248
student483Mathematicsmale7894757
student484Languagesfemale5951935
student485Mathematicsmale677110085
student486Languagesfemale33301546
student487Mathematicsmale12191637
student488Languagesfemale80982914
student489Mathematicsmale70511431
student490Languagesfemale95381592
student491Mathematicsmale60317412
student492Languagesfemale62569068
student493Mathematicsmale63112991
student494Languagesfemale4112520
student495Mathematicsmale6053144
student496Languagesfemale1135528
student497Mathematicsmale11964237
student498Languagesfemale16727974
student499Mathematicsmale9212266
student500Languagesfemale34226434
student501Mathematicsmale50938661
student502Languagesfemale50224044
student503Mathematicsmale383917
student504Languagesfemale98169355
student505Mathematicsmale86893628
student506Languagesfemale16531350
student507Mathematicsmale5757338
student508Languagesfemale34796977
student509Mathematicsmale241659
student510Languagesfemale606299100
student511Mathematicsmale65525295
student512Languagesfemale5873941
student513Mathematicsmale39752876
student514Languagesfemale4666478
student515Mathematicsmale5160998
student516Languagesfemale17201297
student517Mathematicsmale72179673
student518Languagesfemale92216227
student519Mathematicsmale5042433
student520Languagesfemale5237157
student521Mathematicsmale58403554
student522Languagesfemale9385753
student523Mathematicsmale79201818
student524Languagesfemale149427
student525Mathematicsmale95412998
student526Languagesfemale3459921
student527Mathematicsmale39664129
student528Languagesfemale328125
student529Mathematicsmale33443785
student530Languagesfemale69255979
student531Mathematicsmale13504952
student532Languagesfemale54834531
student533Mathematicsmale15249751
student534Languagesfemale7516963
student535Mathematicsmale9183856
student536Languagesfemale50137480
student537Mathematicsmale54757410
student538Languagesfemale76397046
student539Mathematicsmale84723940
student540Languagesfemale10047214
student541Mathematicsmale426111
student542Languagesfemale57716561
student543Mathematicsmale7854134
student544Languagesfemale14763647
student545Mathematicsmale15196396
student546Languagesfemale27823356
student547Mathematicsmale70239690
student548Languagesfemale612278
student549Mathematicsmale22376436
student550Languagesfemale75969440
student551Mathematicsmale4382921
student552Languagesfemale7968718
student553Mathematicsmale65765244
student554Languagesfemale41627354
student555Mathematicsmale25982140
student556Languagesfemale17709682
student557Mathematicsmale43912743
student558Languagesfemale33372433
student559Mathematicsmale87871031
student560Languagesfemale48409774
student561Mathematicsmale63759155
student562Languagesfemale66825995
student563Mathematicsmale21955838
student564Languagesfemale9299745
student565Mathematicsmale5979420
student566Languagesfemale64952412
student567Mathematicsmale70463674
student568Languagesfemale16259149
student569Mathematicsmale73332488
student570Languagesfemale9619527
student571Mathematicsmale18127646
student572Languagesfemale61714963
student573Mathematicsmale46328517
student574Languagesfemale42421137
student575Mathematicsmale49764120
student576Languagesfemale22278012
student577Mathematicsmale76341866
student578Languagesfemale96772917
student579Mathematicsmale62516772
student580Languagesfemale96672254
student581Mathematicsmale77112388
student582Languagesfemale6282433
student583Mathematicsmale392312100
student584Languagesfemale10212071
student585Mathematicsmale11277100
student586Languagesfemale40349778
student587Mathematicsmale2518319
student588Languagesfemale18763025
student589Mathematicsmale24574681
student590Languagesfemale2103194
student591Mathematicsmale91847513
student592Languagesfemale79449710
student593Mathematicsmale42606730
student594Languagesfemale61577535
student595Mathematicsmale42468171
student596Languagesfemale92637574
student597Mathematicsmale86374051
student598Languagesfemale5210473
student599Mathematicsmale100281476
student600Languagesfemale31762043
student601Mathematicsmale402766
student602Languagesfemale587921
student603Mathematicsmale754691
student604Languagesfemale2830153
student605Mathematicsmale38939892
student606Languagesfemale43968991
student607Mathematicsmale43491483
student608Languagesfemale50617298
student609Mathematicsmale4499983
student610Languagesfemale5367382
student611Mathematicsmale40849954
student612Languagesfemale29966569
student613Mathematicsmale1276599
student614Languagesfemale4783494
student615Mathematicsmale3727224
student616Languagesfemale94394924
student617Mathematicsmale0752141
student618Languagesfemale5936418
student619Mathematicsmale2266133
student620Languagesfemale4387448
student621Mathematicsmale100155152
student622Languagesfemale63719917
student623Mathematicsmale143444100
student624Languagesfemale2385727
student625Mathematicsmale23143240
student626Languagesfemale34497254
student627Mathematicsmale21168126
student628Languagesfemale54693434
student629Mathematicsmale72116331
student630Languagesfemale8798947
student631Mathematicsmale43525358
student632Languagesfemale5014420
student633Mathematicsmale89836787
student634Languagesfemale079916
student635Mathematicsmale59178458
student636Languagesfemale94953660
student637Mathematicsmale39426346
student638Languagesfemale019610
student639Mathematicsmale50164171
student640Languagesfemale8604613
student641Mathematicsmale45855936
student642Languagesfemale8335057
student643Mathematicsmale8306014
student644Languagesfemale76807338
student645Mathematicsmale2614582
student646Languagesfemale9316422
student647Mathematicsmale85947616
student648Languagesfemale57453216
student649Mathematicsmale16169013
student650Languagesfemale4331887
student651Mathematicsmale16243244
student652Languagesfemale5998334
student653Mathematicsmale73184783
student654Languagesfemale992510093
student655Mathematicsmale0739784
student656Languagesfemale0289475
student657Mathematicsmale65905863
student658Languagesfemale84358641
student659Mathematicsmale4539599
student660Languagesfemale32103162
student661Mathematicsmale61285461
student662Languagesfemale70961454
student663Mathematicsmale6392298
student664Languagesfemale41104623
student665Mathematicsmale81918021
student666Languagesfemale79716568
student667Mathematicsmale47691890
student668Languagesfemale2616700
student669Mathematicsmale66109335
student670Languagesfemale66682713
student671Mathematicsmale86792645
student672Languagesfemale50532574
student673Mathematicsmale9753914
student674Languagesfemale28796942
student675Mathematicsmale607259
student676Languagesfemale53213943
student677Mathematicsmale37654591
student678Languagesfemale76806027
student679Mathematicsmale85273455
student680Languagesfemale66114117
student681Mathematicsmale27618982
student682Languagesfemale402613
student683Mathematicsmale2516695
student684Languagesfemale63448563
student685Mathematicsmale97957883
student686Languagesfemale5121387
student687Mathematicsmale63928723
student688Languagesfemale22965959
student689Mathematicsmale33801523
student690Languagesfemale34751924
student691Mathematicsmale36684854
student692Languagesfemale32362012
student693Mathematicsmale68917450
student694Languagesfemale87919637
student695Mathematicsmale239144
student696Languagesfemale9462977
student697Mathematicsmale1474575
student698Languagesfemale73921990
student699Mathematicsmale8207978
student700Languagesfemale763510039
student701Mathematicsmale27518949
student702Languagesfemale0647237
student703Mathematicsmale93469487
student704Languagesfemale6922172
student705Mathematicsmale1752113
student706Languagesfemale1325219
student707Mathematicsmale75617273
student708Languagesfemale8437736
student709Mathematicsmale81194514
student710Languagesfemale62173927
student711Mathematicsmale8869681
student712Languagesfemale53825929
student713Mathematicsmale83347134
student714Languagesfemale9552614
student715Mathematicsmale6715313
student716Languagesfemale8297825
student717Mathematicsmale65503146
student718Languagesfemale27462537
student719Mathematicsmale98423544
student720Languagesfemale9014444
student721Mathematicsmale3168293
student722Languagesfemale3434370
student723Mathematicsmale59771421
student724Languagesfemale16535759
student725Mathematicsmale7914416
student726Languagesfemale108199
student727Mathematicsmale89487916
student728Languagesfemale8872387
student729Mathematicsmale17539584
student730Languagesfemale65523961
student731Mathematicsmale44309672
student732Languagesfemale70793233
student733Mathematicsmale30474611
student734Languagesfemale761001649
student735Mathematicsmale39369089
student736Languagesfemale1941929
student737Mathematicsmale23737887
student738Languagesfemale87714464
student739Mathematicsmale22198220
student740Languagesfemale94526739
student741Mathematicsmale14175187
student742Languagesfemale5663983
student743Mathematicsmale99924698
student744Languagesfemale19768388
student745Mathematicsmale15776881
student746Languagesfemale48814838
student747Mathematicsmale2913861
student748Languagesfemale7163030
student749Mathematicsmale19683053
student750Languagesfemale91182762
student751Mathematicsmale73333836
student752Languagesfemale99387550
student753Mathematicsmale55713490
student754Languagesfemale52409883
student755Mathematicsmale1463611
student756Languagesfemale1319496
student757Mathematicsmale49665592
student758Languagesfemale0198082
student759Mathematicsmale2635873
student760Languagesfemale8287639
student761Mathematicsmale52118357
student762Languagesfemale83688425
student763Mathematicsmale1725670
student764Languagesfemale1758084
student765Mathematicsmale7564785
student766Languagesfemale76329339
student767Mathematicsmale20758465
student768Languagesfemale25471289
student769Mathematicsmale86947945
student770Languagesfemale65815535
student771Mathematicsmale62414143
student772Languagesfemale1446243
student773Mathematicsmale17557278
student774Languagesfemale9546356
student775Mathematicsmale7205648
student776Languagesfemale30881956
student777Mathematicsmale42448856
student778Languagesfemale42695663
student779Mathematicsmale7857783
student780Languagesfemale15862498
student781Mathematicsmale4684369
student782Languagesfemale67981552
student783Mathematicsmale33326357
student784Languagesfemale35951653
student785Mathematicsmale78545482
student786Languagesfemale8185914
student787Mathematicsmale42412314
student788Languagesfemale591008636
student789Mathematicsmale1926012
student790Languagesfemale10034570
student791Mathematicsmale381217
student792Languagesfemale3155193
student793Mathematicsmale11339877
student794Languagesfemale461786
student795Mathematicsmale5786727
student796Languagesfemale5746236
student797Mathematicsmale57676661
student798Languagesfemale93888725
student799Mathematicsmale59966441
student800Languagesfemale6276923
student801Mathematicsmale35833255
student802Languagesfemale42581583
student803Mathematicsmale41904012
student804Languagesfemale8143837
student805Mathematicsmale87773320
student806Languagesfemale53873037
student807Mathematicsmale13358516
student808Languagesfemale20829034
student809Mathematicsmale5821614
student810Languagesfemale14282356
student811Mathematicsmale4997368
student812Languagesfemale31461163
student813Mathematicsmale7497643
student814Languagesfemale42839575
student815Mathematicsmale2654529
student816Languagesfemale79596988
student817Mathematicsmale68182684
student818Languagesfemale39139915
student819Mathematicsmale2248716
student820Languagesfemale12538811
student821Mathematicsmale33908029
student822Languagesfemale3795486
student823Mathematicsmale9178851
student824Languagesfemale31586731
student825Mathematicsmale22305098
student826Languagesfemale55585610
student827Mathematicsmale56765753
student828Languagesfemale1129881
student829Mathematicsmale67926671
student830Languagesfemale30614449
student831Mathematicsmale0414461
student832Languagesfemale72524585
student833Mathematicsmale60991294
student834Languagesfemale83587542
student835Mathematicsmale9505377
student836Languagesfemale33287062
student837Mathematicsmale3982755
student838Languagesfemale411004547
student839Mathematicsmale81692729
student840Languagesfemale9012649
student841Mathematicsmale45382034
student842Languagesfemale325311
student843Mathematicsmale55778649
student844Languagesfemale61609176
student845Mathematicsmale8085749
student846Languagesfemale63897371
student847Mathematicsmale79159742
student848Languagesfemale99187343
student849Mathematicsmale30523856
student850Languagesfemale65866734
student851Mathematicsmale7343655
student852Languagesfemale42435173
student853Mathematicsmale870980
student854Languagesfemale29411245
student855Mathematicsmale5739090
student856Languagesfemale80529654
student857Mathematicsmale43838246
student858Languagesfemale7917131
student859Mathematicsmale6813707
student860Languagesfemale51441552
student861Mathematicsmale9170178
student862Languagesfemale4116578
student863Mathematicsmale20635585
student864Languagesfemale5938726
student865Mathematicsmale4894432
student866Languagesfemale26679839
student867Mathematicsmale48793866
student868Languagesfemale1632153
student869Mathematicsmale13205085
student870Languagesfemale4922039
student871Mathematicsmale8262353
student872Languagesfemale6607464
student873Mathematicsmale66483914
student874Languagesfemale43833100
student875Mathematicsmale214990
student876Languagesfemale79807180
student877Mathematicsmale84252688
student878Languagesfemale38466660
student879Mathematicsmale35279851
student880Languagesfemale5759267
student881Mathematicsmale7687788
student882Languagesfemale2140817
student883Mathematicsmale5046866
student884Languagesfemale83863092
student885Mathematicsmale63466694
student886Languagesfemale7671262
student887Mathematicsmale7418686
student888Languagesfemale65774488
student889Mathematicsmale67326119
student890Languagesfemale85968541
student891Mathematicsmale1487705
student892Languagesfemale81284528
student893Mathematicsmale9191883
student894Languagesfemale407024
student895Mathematicsmale18195189
student896Languagesfemale70352512
student897Mathematicsmale7290741
student898Languagesfemale8417186
student899Mathematicsmale1423886
student900Languagesfemale7837601
student901Mathematicsmale66953168
student902Languagesfemale23608065
student903Mathematicsmale76896396
student904Languagesfemale3469070
student905Mathematicsmale65449679
student906Languagesfemale6877865
student907Mathematicsmale86619943
student908Languagesfemale88953213
student909Mathematicsmale531005982
student910Languagesfemale3579535
student911Mathematicsmale230177
student912Languagesfemale9687263
student913Mathematicsmale23923996
student914Languagesfemale9497658
student915Mathematicsmale49312971
student916Languagesfemale21577957
student917Mathematicsmale03510089
student918Languagesfemale64827552
student919Mathematicsmale16666968
student920Languagesfemale92951127
student921Mathematicsmale16888590
student922Languagesfemale56152698
student923Mathematicsmale78274017
student924Languagesfemale95104432
student925Mathematicsmale99855218
student926Languagesfemale73317149
student927Mathematicsmale21791063
student928Languagesfemale92718012
student929Mathematicsmale23293388
student930Languagesfemale4189884
student931Mathematicsmale97177921
student932Languagesfemale72409392
student933Mathematicsmale7558326
student934Languagesfemale15982728
student935Mathematicsmale7688806
student936Languagesfemale84234292
student937Mathematicsmale71568671
student938Languagesfemale7395822
student939Mathematicsmale1555460
student940Languagesfemale2031308
student941Mathematicsmale97544181
student942Languagesfemale83418664
student943Mathematicsmale7195327
student944Languagesfemale0273091
student945Mathematicsmale99751722
student946Languagesfemale92531090
student947Mathematicsmale4449432
student948Languagesfemale0974879
student949Mathematicsmale97557974
student950Languagesfemale6598932
student951Mathematicsmale56733881
student952Languagesfemale84946150
student953Mathematicsmale4820770
student954Languagesfemale39981420
student955Mathematicsmale4152465
student956Languagesfemale78229231
student957Mathematicsmale28382654
student958Languagesfemale49613554
student959Mathematicsmale81152817
student960Languagesfemale5480582
student961Mathematicsmale7523537
student962Languagesfemale5565120
student963Mathematicsmale86427036
student964Languagesfemale54455480
student965Mathematicsmale38186992
student966Languagesfemale33894683
student967Mathematicsmale4395576
student968Languagesfemale13261286
student969Mathematicsmale94228559
student970Languagesfemale9358610
student971Mathematicsmale35728536
student972Languagesfemale37519693
student973Mathematicsmale71107959
student974Languagesfemale71317393
student975Mathematicsmale80268697
student976Languagesfemale69216769
student977Mathematicsmale38861039
student978Languagesfemale48903981
student979Mathematicsmale9083342
student980Languagesfemale1919184
student981Mathematicsmale98255046
student982Languagesfemale38882116
student983Mathematicsmale71481843
student984Languagesfemale79851816
student985Mathematicsmale51669068
student986Languagesfemale100956591
student987Mathematicsmale6742424
student988Languagesfemale93809435
student989Mathematicsmale65785794
student990Languagesfemale27922191
student991Mathematicsmale77152676
student992Languagesfemale28845167
student993Mathematicsmale3786250
student994Languagesfemale59772074
student995Mathematicsmale6266875
student996Languagesfemale88703343
student997Mathematicsmale73334253
student998Languagesfemale6410231
student999Mathematicsmale91931635
student1000Languagesfemale30689540
student1001Mathematicsmale2524832
student1002Languagesfemale50775381
student1003Mathematicsmale67441065
student1004Languagesfemale29533486
student1005Mathematicsmale77692275
student1006Languagesfemale48829540
student1007Mathematicsmale30712963
student1008Languagesfemale4531471
student1009Mathematicsmale81122044
student1010Languagesfemale17668242
student1011Mathematicsmale15113218
student1012Languagesfemale27345919
student1013Mathematicsmale18672514
student1014Languagesfemale24645224
student1015Mathematicsmale36874846
student1016Languagesfemale3317068
student1017Mathematicsmale4826380
student1018Languagesfemale53638557
student1019Mathematicsmale5873024
student1020Languagesfemale8590810
student1021Mathematicsmale69285276
student1022Languagesfemale7522752
Student23Mathematicsmale8277079
Student24Languagesfemale100911382
Student25Mathematicsmale22968253
Student26Languagesfemale37295659
Student27Mathematicsmale86826923
Student28Languagesfemale4425431
Student29Mathematicsmale77472238
Student30Languagesfemale19352310
Student31Mathematicsmale90271750
Student32Languagesfemale60753338
Student33Mathematicsmale4313715
Student34Languagesfemale77978144
Student35Mathematicsmale5815195
Student36Languagesfemale70617094
Student37Mathematicsmale6036184
Student38Languagesfemale6339011
Student39Mathematicsmale50463238
Student40Languagesfemale5175253
Student41Mathematicsmale43342878
Student42Languagesfemale11896095
Student43Mathematicsmale48921888
Student44Languagesfemale8225973
Student45Mathematicsmale91733739
Student46Languagesfemale481210
Student47Mathematicsmale8910611
Student48Languagesfemale90322118
Student49Mathematicsmale42494972
Student50Languagesfemale56376754

Javascript

diff --git a/docs/example-parsers-class-name.html b/docs/example-parsers-class-name.html index 7e7cc100..7f826fb6 100644 --- a/docs/example-parsers-class-name.html +++ b/docs/example-parsers-class-name.html @@ -29,6 +29,11 @@ Back to documentation
+ +

+ NOTE! This functionality was added in version 2.0.11 (it is not part of the original plugin). +

+

Demo

diff --git a/docs/example-parsers.html b/docs/example-parsers.html index f0ddfe6a..30dc6636 100644 --- a/docs/example-parsers.html +++ b/docs/example-parsers.html @@ -56,6 +56,11 @@ $(function() {
+ +

+ NOTE! Assigning the parser using a class name was added in version 2.0.11 (it is not part of the original plugin). +

+

Demo

diff --git a/docs/example-ui-theme.html b/docs/example-ui-theme.html index a01b77e3..e8b4e31b 100644 --- a/docs/example-ui-theme.html +++ b/docs/example-ui-theme.html @@ -83,6 +83,10 @@
+

+ NOTE! This widget can be applied to the original plugin. +

+

Demo

diff --git a/docs/example-update-cell.html b/docs/example-update-cell.html index f54bae7b..af081a15 100644 --- a/docs/example-update-cell.html +++ b/docs/example-update-cell.html @@ -50,7 +50,12 @@

- NOTE! Click on any value in the Total column to change it to a random amount. + NOTE! +

    +
  • Click on any value in the Total column to change it to a random amount.
  • +
  • This option is part of the original plugin.
  • +
  • Automatic resorting after "updateCell" is triggered was added in version 2.0.14.
  • +

Demo

diff --git a/docs/index.html b/docs/index.html index d7ee27fb..22a573f9 100644 --- a/docs/index.html +++ b/docs/index.html @@ -36,7 +36,7 @@

Author: Christian Bach
- Version: 2.0.15 (changelog)
+ Version: 2.0.16 (forked from version 2.0.5, changelog)
Licence: Dual licensed under MIT or GPL licenses. @@ -300,7 +300,7 @@

  • Applying widgets
  • Applying the zebra stripe widget
  • Applying the jQuery UI theme widget New! v2.0.9
  • -
  • Disable or set the column parser using class names New! v2.0.11
  • +
  • Disable or set the column parser using class names New! v2.0.11
  • Disable sort using headers options
  • Lock sort order using header options
  • Set initial sort order using header options
  • @@ -317,6 +317,7 @@
  • Triggers sortEnd and sortStart (Displaying sorting progress)
  • Initializing tablesorter on a empty table
  • Appending table data with ajax
  • +
  • Advanced: Adding a table row New! v2.0.16
  • Update the table after cell content has changed
  • Dealing with markup inside cells (textExtraction function)
  • Modify how the header is rendered to allow for custom styling
  • @@ -785,6 +786,21 @@ $(function(){ + + + + + + ").css("width", $(this).width()))});$(table).prepend(colgroup)}}function updateHeaderSortCount(table,sortList){var i,s,o,c=table.config,l=sortList.length;for(i=0;ib?1:-1}catch(er){return 0}} function sortTextDesc(a,b){if($.data(tbl[0],"tablesorter").sortLocaleCompare)return b.localeCompare(a);return-sortText(a,b)}function getTextValue(a,mx,d){if(a==="")return(d||0)*Number.MAX_VALUE;if(mx){var i,l=a.length,n=mx+d;for(i=0;i0)$this.trigger("sorton",[config.sortList]);applyWidget(this)})};this.addParser=function(parser){var i,l=parsers.length,a=true;for(i=0;i").each(function(index){this.column=header_index[this.parentNode.rowIndex+"-"+this.cellIndex];this.order=formatSortingOrder(checkHeaderOrder(table,index));this.count=this.order;if(checkHeaderMetadata(this)||checkHeaderOptions(table,index)||$(this).is(".sorter-false"))this.sortDisabled=true;this.lockedOrder=false;lock=checkHeaderLocked(table,index);if(typeof lock!=="undefined"&&lock!==false)this.order=this.lockedOrder=formatSortingOrder(lock);if(!this.sortDisabled){$th=$(this).addClass(table.config.cssHeader); if(table.config.onRenderHeader)table.config.onRenderHeader.apply($th,[index])}table.config.headerList[index]=this});if(table.config.debug){benchmark("Built headers:",time);log($tableHeaders)}return $tableHeaders}function checkCellColSpan(table,rows,row){var i,cell,arr=[],r=table.tHead.rows,c=r[row].cells;for(i=0;i1)arr=arr.concat(checkCellColSpan(table,rows,row++));else if(table.tHead.length===1||cell.rowSpan>1||!r[row+1])arr.push(cell)}return arr}function isValueInArray(v, a){var i,l=a.length;for(i=0;i");$("tr:first td",table.tBodies[0]).each(function(){colgroup.append($("").css("width", $(this).width()))});$(table).prepend(colgroup)}}function updateHeaderSortCount(table,sortList){var i,s,o,c=table.config,l=sortList.length;for(i=0;ib?1:-1}catch(er){return 0}} function sortTextDesc(a,b){if($.data(tbl[0],"tablesorter").sortLocaleCompare)return b.localeCompare(a);return-sortText(a,b)}function getTextValue(a,mx,d){if(a==="")return(d||0)*Number.MAX_VALUE;if(mx){var i,l=a.length,n=mx+d;for(i=0;i0)$this.trigger("sorton",[config.sortList]);applyWidget(this)})};this.addParser=function(parser){var i,l=parsers.length,a=true;for(i=0;i
    addRowsUse this method to add table rows. New! in v2.0.16 +
    + It does not work the same as "update" in that it only adds rows, it does not remove them.
    + Also, use this method to add table rows while using the pager plugin. If the "update" method is used, only the visible table rows continue to exist. +
    // Add multiple rows to the table
    +  var $row = $('<tr><td>Inigo</td><td>Montoya</td><td>34</td><td>$19.99</td><td>15%</td><td>Sep 25, 1987 12:00PM</td></tr>');
    +  $('table')
    +    .find('tbody').append($row)
    +    .trigger('addRows', [$row]);
    +
    Example
    sorton Use this method to sort an initialized table in the desired order. diff --git a/js/jquery.tablesorter.js b/js/jquery.tablesorter.js index d7cc84d1..e7602274 100644 --- a/js/jquery.tablesorter.js +++ b/js/jquery.tablesorter.js @@ -1,6 +1,6 @@ /* * TableSorter 2.0 - Client-side table sorting with ease! -* Version 2.0.15 +* Version 2.0.16 * @requires jQuery v1.2.3 * * Copyright (c) 2007 Christian Bach @@ -630,7 +630,7 @@ this.order = this.count++ % 2; // always sort on the locked order. if(typeof(this.lockedOrder) !== "undefined" && this.lockedOrder !== false) { this.order = this.lockedOrder; } - // user only whants to sort on one column + // user only wants to sort on one column if (!e[config.sortMultiSortKey]) { // flush the sort list config.sortList = []; @@ -711,6 +711,25 @@ cache.normalized[pos[0]][pos[1]] = config.parsers[pos[1]].format(getElementText(config, cell, pos[1]), cell); $this.trigger("sorton", [config.sortList]); }) + .bind("addRows", function(e, row) { + var i, config = this.config, rows = row.filter('tr').length, + dat = [], l = row[0].cells.length; + // add each row + for (i = 0; i < rows; i++) { + // add each cell + for (j = 0; j < l; j++) { + dat[j] = config.parsers[j].format(getElementText(config, row[i].cells[j], j), row[i].cells[j]); + } + // add the row index to the end + dat.push(cache.row.length); + // update cache + cache.row.push([row[i]]); + cache.normalized.push(dat); + dat = []; + } + // resort using current settings + $this.trigger("sorton", [config.sortList]); + }) .bind("sorton", function(e, list) { $(this).trigger("sortStart", tbl[0]); config.sortList = list; diff --git a/js/jquery.tablesorter.min.js b/js/jquery.tablesorter.min.js index 79e270fb..7d6b1707 100644 --- a/js/jquery.tablesorter.min.js +++ b/js/jquery.tablesorter.min.js @@ -1,7 +1,7 @@ /* * TableSorter 2.0 - Client-side table sorting with ease! -* Version 2.0.15 Minified using Google Closure Compiler (white space only) +* Version 2.0.16 Minified using Google Closure Compiler (white space only) * Copyright (c) 2007 Christian Bach */ -(function($){$.extend({tablesorter:new function(){var parsers=[],widgets=[],tbl;this.defaults={cssHeader:"header",cssAsc:"headerSortUp",cssDesc:"headerSortDown",cssChildRow:"expand-child",sortInitialOrder:"asc",sortMultiSortKey:"shiftKey",sortForce:null,sortAppend:null,sortLocaleCompare:false,textExtraction:"simple",parsers:{},widgets:[],widgetZebra:{css:["even","odd"]},headers:{},widthFixed:false,cancelSelection:true,sortList:[],headerList:[],dateFormat:"us",onRenderHeader:null,selectorHeaders:"thead th", tableClass:"tablesorter",debug:false};function log(s){if(typeof console!=="undefined"&&typeof console.debug!=="undefined")console.log(s);else alert(s)}function benchmark(s,d){log(s+","+((new Date).getTime()-d.getTime())+"ms")}this.benchmark=benchmark;function getElementText(config,node,cellIndex){var text="",te=config.textExtraction;if(!node)return"";if(!config.supportsTextContent)config.supportsTextContent=node.textContent||false;if(te==="simple")if(config.supportsTextContent)text=node.textContent; else if(node.childNodes[0]&&node.childNodes[0].hasChildNodes())text=node.childNodes[0].innerHTML;else text=node.innerHTML;else if(typeof te==="function")text=te(node);else if(typeof te==="object"&&te.hasOwnProperty(cellIndex))text=te[cellIndex](node);else text=$(node).text();return text}function getParserById(name){var i,l=parsers.length;for(i=0;i").each(function(index){this.column=header_index[this.parentNode.rowIndex+"-"+this.cellIndex];this.order=formatSortingOrder(checkHeaderOrder(table,index));this.count=this.order;if(checkHeaderMetadata(this)||checkHeaderOptions(table,index)||$(this).is(".sorter-false"))this.sortDisabled=true;this.lockedOrder=false;lock=checkHeaderLocked(table,index);if(typeof lock!=="undefined"&&lock!==false)this.order=this.lockedOrder=formatSortingOrder(lock);if(!this.sortDisabled){$th=$(this).addClass(table.config.cssHeader); if(table.config.onRenderHeader)table.config.onRenderHeader.apply($th,[index])}table.config.headerList[index]=this});if(table.config.debug){benchmark("Built headers:",time);log($tableHeaders)}return $tableHeaders}function checkCellColSpan(table,rows,row){var i,cell,arr=[],r=table.tHead.rows,c=r[row].cells;for(i=0;i1)arr=arr.concat(checkCellColSpan(table,rows,row++));else if(table.tHead.length===1||cell.rowSpan>1||!r[row+1])arr.push(cell)}return arr}function isValueInArray(v, a){var i,l=a.length;for(i=0;i");$("tr:first td",table.tBodies[0]).each(function(){colgroup.append($("