@@ -, +, @@ - Status - Date placed - Date modified - Pickup branch - Borrower card number --- Koha/REST/V1/Illrequests.pm | 27 +- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 5 + .../prog/en/modules/ill/ill-requests.tt | 329 +++++++++++++++++++-- 3 files changed, 325 insertions(+), 36 deletions(-) --- a/Koha/REST/V1/Illrequests.pm +++ a/Koha/REST/V1/Illrequests.pm @@ -21,6 +21,7 @@ use Mojo::Base 'Mojolicious::Controller'; use Koha::Illrequests; use Koha::Libraries; +use Koha::DateUtils qw( format_sqldatetime ); =head1 NAME @@ -40,6 +41,7 @@ sub list { my $args = $c->req->params->to_hash // {}; my $filter; my $output = []; + my @format_dates = ( 'placed', 'updated' ); # Create a hash where all keys are embedded values # Enables easy checking @@ -54,18 +56,31 @@ sub list { $filter->{$filter_param} = \@values; } - my $requests = Koha::Illrequests->search($filter); + my @req_list = Koha::Illrequests->search($filter)->as_list; if ( scalar (keys %embed) ) { # Need to embed stuff - my @results = map { $_->TO_JSON(\%embed) } $requests->as_list; - return $c->render( status => 200, openapi => \@results ); + @req_list = map { $_->TO_JSON(\%embed) } @req_list; } - else - { - return $c->render( status => 200, openapi => $requests ); + + # Create new "formatted" columns for each date column + # that needs formatting + foreach(@req_list) { + foreach my $field(@format_dates) { + if (defined $_->{$field}) { + $_->{$field . "_formatted"} = format_sqldatetime( + $_->{$field}, + undef, + undef, + 1 + ); + } + } + } + + return $c->render( status => 200, openapi => \@req_list ); } 1; --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -3164,6 +3164,11 @@ table#ill-requests { width: 100% !important; } +#illfilter_dateplaced, +#illfilter_datemodified { + width: 80%; +} + #helper span { display: none; } --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt @@ -9,12 +9,30 @@ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] [% Asset.css("css/datatables.css") %] [% INCLUDE 'datatables.inc' %] +[% INCLUDE 'calendar.inc' %] @@ -298,6 +524,45 @@
+ [% IF query_type == 'illlist' %] +
+
+
+

Filters

+
    +
  1. + + +
  2. +
  3. + + +
  4. +
  5. + + +
  6. +
  7. + + +
  8. +
  9. + + +
  10. +
+
+ + +
+
+
+
+ [% END %]
[% IF !backends_available %] @@ -588,11 +853,15 @@ Author Title - Patron + Patron name + Patron barcode Biblio ID Library Status - Updated on +   + Date placed +   + Updated on Request number --