From 157b5a1eb6a530160dc7e6745ff139061cd8302b Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 12 May 2008 07:58:00 -0500 Subject: [PATCH] Adding checks for dateformat preference so that tablesorter script can be passed an extra parameter for proper sorting of metric dates (Bug 2089, dates & table ordering with jquery) Signed-off-by: Joshua Ferraro --- circ/circulation.pl | 3 ++- circ/pendingreserves.pl | 1 + circ/transferstodo.pl | 1 + circ/transferstoreceive.pl | 1 + circ/waitingreserves.pl | 1 + .../intranet-tmpl/prog/en/modules/circ/circulation.tmpl | 7 ++++--- .../prog/en/modules/circ/pendingreserves.tmpl | 3 ++- .../prog/en/modules/circ/transferstodo.tmpl | 9 ++++++--- .../prog/en/modules/circ/transferstoreceive.tmpl | 7 +++++-- .../prog/en/modules/circ/waitingreserves.tmpl | 3 ++- .../prog/en/modules/members/moremember.tmpl | 6 ++++-- .../prog/en/modules/suggestion/acceptorreject.tmpl | 9 ++++++--- .../intranet-tmpl/prog/en/modules/tools/koha-news.tmpl | 3 ++- koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl | 6 ++++-- members/moremember.pl | 1 + opac/opac-topissues.pl | 1 + opac/opac-user.pl | 1 + suggestion/acceptorreject.pl | 1 + tools/koha-news.pl | 1 + 19 files changed, 46 insertions(+), 19 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index 9904e62ee8..0b660de5b5 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -702,7 +702,8 @@ $template->param( picture => 1 ) if $picture; $template->param( SpecifyDueDate => C4::Context->preference("SpecifyDueDate"), - CircAutocompl => C4::Context->preference("CircAutocompl") , + CircAutocompl => C4::Context->preference("CircAutocompl"), + dateformat => C4::Context->preference("dateformat"), DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), ); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl index 0a6fa2fa6d..04230529c8 100755 --- a/circ/pendingreserves.pl +++ b/circ/pendingreserves.pl @@ -259,6 +259,7 @@ $template->param( reserveloop => \@reservedata, "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1, DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), + dateformat => C4::Context->preference("dateformat"), ); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/circ/transferstodo.pl b/circ/transferstodo.pl index 340dc34b59..1837e331ae 100755 --- a/circ/transferstodo.pl +++ b/circ/transferstodo.pl @@ -129,6 +129,7 @@ foreach my $br ( keys %$branches ) { $template->param( branchesloop => \@branchesloop, show_date => format_date(C4::Dates->today('iso')), + dateformat => C4::Context->preference("dateformat"), ); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/circ/transferstoreceive.pl b/circ/transferstoreceive.pl index 0917292a47..f148dd5526 100755 --- a/circ/transferstoreceive.pl +++ b/circ/transferstoreceive.pl @@ -125,6 +125,7 @@ foreach my $br ( keys %$branches ) { $template->param( branchesloop => \@branchesloop, show_date => format_date(C4::Dates->today('iso')), + dateformat => C4::Context->preference("dateformat"), ); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl index 574edca5b2..01b4df0ca1 100755 --- a/circ/waitingreserves.pl +++ b/circ/waitingreserves.pl @@ -159,6 +159,7 @@ foreach my $num (@getreserves) { $template->param( reserveloop => \@reservloop, show_date => format_date(C4::Dates->today('iso')), + dateformat => C4::Context->preference("dateformat"), ); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl index 219166b5dd..0f3dee9461 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl @@ -17,14 +17,15 @@ $.tablesorter.addParser({ $(document).ready(function() { $('#patronlists > ul').tabs(); $.tablesorter.defaults.widgets = ['zebra']; - $("#issuest").tablesorter({ -// sortList: [[0,0]], don't sort by default to preserve 'previous checkouts' header + $("#issuest").tablesorter({ + dateFormat: 'uk', headers: { 1: { sorter: 'articles' },4:{sorter:false},5: { sorter: false },6:{sorter:false}} }); $("#issuest").bind("sortEnd",function() { $("#previous").parents("tr").remove(); // 'previous checkouts' header chokes table sorter }); - $("#holdst").tablesorter({ + $("#holdst").tablesorter({ + dateFormat: 'uk', sortList: [[0,0]], headers: { 1: { sorter: 'articles' }} }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl index 74cba1c567..7fd76b2153 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl @@ -20,7 +20,8 @@ $.tablesorter.addParser({ $(document).ready(function() { $("th a").hide(); $.tablesorter.defaults.widgets = ['zebra']; - $("#holdst").tablesorter({ + $("#holdst").tablesorter({ + dateFormat: 'uk', sortList: [[3,0]], headers: { 0:{sorter:false},1:{sorter:false},3: { sorter: 'articles' },7:{sorter:false}} }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl index 3b25d5ace3..64333b1eeb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl @@ -11,11 +11,14 @@ $.tablesorter.addParser({ type: 'text' }); $(document).ready(function() { + $.tablesorter.defaults.widgets = ['zebra']; - $("#transferst").tablesorter({ + $("#transferst").tablesorter({ + dateFormat: 'uk', sortList: [[1,0]], headers: { 1: { sorter: 'articles' },4:{sorter:false}} }); + }); //]]> @@ -39,7 +42,7 @@ $.tablesorter.addParser({

Holds waiting for:

- +
" style="width:100%;"> @@ -56,7 +59,7 @@ $.tablesorter.addParser({ ">">   ( )
Barcode : -
Date of hold Title ">  
+ 		">,

?subject=Reservation: "> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl index 063e365c7a..0a19f99fb5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl @@ -11,11 +11,14 @@ $.tablesorter.addParser({ type: 'text' }); $(document).ready(function() { + $.tablesorter.defaults.widgets = ['zebra']; - $("#transferst").tablesorter({ + $("#transferst").tablesorter({ + dateFormat: 'uk', sortList: [[1,0]], headers: { 1: { sorter: 'articles' },4:{sorter:false}} }); + }); //]]> @@ -39,7 +42,7 @@ $.tablesorter.addParser({
- +
"> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl index 2b91306831..ee7194cd46 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl @@ -13,7 +13,8 @@ $.tablesorter.addParser({ $(document).ready(function() { $("th a").hide(); $.tablesorter.defaults.widgets = ['zebra']; - $("#holdst").tablesorter({ + $("#holdst").tablesorter({ + dateFormat: 'uk', sortList: [[3,0]], headers: { 1:{sorter:'articles'},3: { sorter: 'articles' },4:{sorter:false}} }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl index c3baf79542..e51cafdce7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl @@ -14,11 +14,13 @@ $.tablesorter.addParser({ }); $(document).ready(function() { $('#finesholdsissues > ul').tabs(); - $("#issuest").tablesorter({ + $("#issuest").tablesorter({ + dateFormat: 'uk', sortList: [[1,0]], headers: { 1: { sorter: 'articles' },4:{sorter:false},5: { sorter: false },6:{sorter:false},7:{sorter:false}} }); - $("#holdst").tablesorter({ + $("#holdst").tablesorter({ + dateFormat: 'uk', sortList: [[0,0]], headers: { 1: { sorter: 'articles' },6: { sorter: false }} }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl index f749034703..df9ab5f441 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl @@ -25,7 +25,8 @@ } }); $.tablesorter.defaults.widgets = ['zebra']; - $("#acceptedt").tablesorter({ + $("#acceptedt").tablesorter({ + dateFormat: 'uk', headers: { 0: { sorter: 'articles' },3:{sorter: false},4:{sorter: false},5:{sorter: false},6:{sorter: false},7:{sorter: false}} }); $("#acceptedt").bind("sortStart",function() { @@ -33,7 +34,8 @@ }).bind("sortEnd",function() { $("#sorting").hide(); }); - $("#pendingt").tablesorter({ + $("#pendingt").tablesorter({ + dateFormat: 'uk', headers: { 0: { sorter: 'articles' },3:{sorter: false},4:{sorter: false},5:{sorter: false},6:{sorter: false},7:{sorter: false}} }); $("#pendingt").bind("sortStart",function() { @@ -41,7 +43,8 @@ }).bind("sortEnd",function() { $("#sorting").hide(); }); - $("#rejectedt").tablesorter({ + $("#rejectedt").tablesorter({ + dateFormat: 'uk', headers: { 0: { sorter: 'articles' },3:{sorter: false},4:{sorter: false},5:{sorter: false},6:{sorter: false},7:{sorter: false}} }); $("#rejectedt").bind("sortStart",function() { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl index 7560f5ced3..3d9af53a8c 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl @@ -5,7 +5,8 @@
Coming from
Date of transfer