Attachment #150719 for bug #22440

View | Details | Raw Unified | Return to bug 22440
Collapse All | Expand All




use DateTime;

use C4::Letters;
use Mojo::Util qw(deprecated);

use Koha::Cache::Memory::Lite;
use Koha::Database;

=cut

sub illrequestattributes {
    deprecated 'illrequestattributes is DEPRECATED in favor of extended_attributes';
    my ( $self ) = @_;
    return Koha::Illrequestattributes->_new_from_dbic(
        scalar $self->_result->illrequestattributes

    return Koha::Library->_new_from_dbic( scalar $self->_result->library );
}

=head3 extended_attributes

    my $extended_attributes = $request->extended_attributes;

Returns the linked I<Koha::Illrequestattributes> resultset object.

=cut

sub extended_attributes {
    my ( $self ) = @_;

    my $rs = $self->_result->extended_attributes;
    # We call search to use the filters in Koha::Illrequestattributes->search
    return Koha::Illrequestattributes->_new_from_dbic($rs)->search;
}

=head3 status_alias





=head2 Class Methods

=cut

=head3 search

my $attributes = Koha::Illrequestattributes->search( $params );

=cut

sub search {
    my ( $self, $params, $attributes ) = @_;

    unless ( exists $attributes->{order_by} ) { $attributes->{order_by} = ['me.type', 'value'] }

    return $self->SUPER::search( $params, $attributes );
}

=head3 type

=cut

Lines 342-348 __PACKAGE__->has_many( Link Here

(-)a/Koha/Schema/Result/Illrequest.pm (-1 / +1 lines)
342	);	342	);
343		343
344	__PACKAGE__->has_many(	344	__PACKAGE__->has_many(
345	"ill_extended_attributes",	345	"extended_attributes",
346	"Koha::Schema::Result::Illrequestattribute",	346	"Koha::Schema::Result::Illrequestattribute",
347	{ "foreign.illrequest_id" => "self.illrequest_id" },	347	{ "foreign.illrequest_id" => "self.illrequest_id" },
348	{ cascade_copy => 0, cascade_delete => 0 },	348	{ cascade_copy => 0, cascade_delete => 0 },




      ill-requests:
        columns:
            -
              columnname: ill_request_id
            -
              columnname: metadata_author
            -

              columnname: library_branchname
            -
              columnname: status
            -
              columnname: placed
              cannot_be_toggled: 1
              cannot_be_modified: 1
              is_hidden: 1
            -
              columnname: placed_formatted
            -
              columnname: updated
              cannot_be_toggled: 1
              cannot_be_modified: 1
              is_hidden: 1
            -
              columnname: updated_formatted
            -
              columnname: replied
            -
              columnname: completed
              cannot_be_toggled: 1
              cannot_be_modified: 1
              is_hidden: 1
            -
              columnname: completed_formatted
            -

Lines 108-114 properties: Link Here

(-)a/api/v1/swagger/definitions/ill_request.yaml (-1 / +1 lines)
108	- integer	108	- integer
109	- "null"	109	- "null"
110	description: The linked comment objects count (x-koha-embed)	110	description: The linked comment objects count (x-koha-embed)
111	ill_extended_attributes:	111	extended_attributes:
112	type:	112	type:
113	- array	113	- array
114	- "null"	114	- "null"

Lines 27-33 Link Here

(-)a/api/v1/swagger/paths/illrequests.yaml (-1 / +1 lines)
27	- biblio	27	- biblio
28	- comments	28	- comments
29	- comments+count	29	- comments+count
30	- ill_extended_attributes	30	- extended_attributes
31	- library	31	- library
32	- id_prefix	32	- id_prefix
33	- patron	33	- patron




<!-- ill-list-table-strings.inc -->
<script>
    var ill_borrower_details = _("View patron details");
    var ill_biblio_details = _("View bibliographic record");
    var ill_statuses = {
        new: _("New request"),
        req: _("Requested"),
        genreq: _("Requested from partners"),
        rev: _("Reverted"),
        que: _("Queued request"),
        canc: _("Cancellation requested"),
        comp: _("Completed"),
        del: _("Delete request")
    };
    var ill_manage = _("Manage request");
    var ill_manage_select_backend_first = _("Select a backend first");
    var ill_all_statuses = _("All statuses");
        updated: _("Updated on")
    };
</script>
<!-- / ill-list-table-strings.inc -->




[% IF prefilters.length > 0 %]
<table id="ill-requests" data-prefilters="[% prefilters | html %]">
[% ELSE %]
<table id="ill-requests">
[% END %]
    <thead>
        <tr id="ill_requests_header">
            <th scope="col">Request ID</th>
            <th scope="col" data-datatype="related-object" data-related="extended_attributes" data-related-key="type" data-related-value="author"         data-related-search-on="value">Author</th>
            <th scope="col" data-datatype="related-object" data-related="extended_attributes" data-related-key="type" data-related-value="title"         data-related-search-on="value">Title</th>
            <th scope="col" data-datatype="related-object" data-related="extended_attributes" data-related-key="type" data-related-value="article_title" data-related-search-on="value">Article title</th>
            <th scope="col" data-datatype="related-object" data-related="extended_attributes" data-related-key="type" data-related-value="issue"         data-related-search-on="value">Issue</th>
            <th scope="col" data-datatype="related-object" data-related="extended_attributes" data-related-key="type" data-related-value="volume"        data-related-search-on="value">Volume</th>
            <th scope="col" data-datatype="related-object" data-related="extended_attributes" data-related-key="type" data-related-value="year"          data-related-search-on="value">Year</th>
            <th scope="col" data-datatype="related-object" data-related="extended_attributes" data-related-key="type" data-related-value="pages"         data-related-search-on="value">Pages</th>
            <th scope="col" data-datatype="related-object" data-related="extended_attributes" data-related-key="type" data-related-value="type"          data-related-search-on="value">Request type</th>
            <th scope="col">Order ID</th>
            <th scope="col">Patron</th>
            <th scope="col">Bibliographic record ID</th>
            <th scope="col">Library</th>
            <th scope="col">Status</th>
            <th scope="col" class="placed">&nbsp;</th>
            <th scope="col" class="placed_formatted">Placed on</th>
            <th scope="col" class="updated">&nbsp;</th>
            <th scope="col" class="updated_formatted">Updated on</th>
            <th scope="col">Replied</th>
            <th scope="col" class="completed">&nbsp;</th>
            <th scope="col" class="completed_formatted">Completed on</th>
            <th scope="col">Access URL</th>
            <th scope="col">Cost</th>

    </thead>
    <tbody id="illview-body">
    </tbody>
</table>




                return ''; // empty string for no biblio
            }

            var title = '';

            if ( config && config.biblio_id_only ) {
                title = escape_str(biblio.biblio_id);
                title += __("No title");
            }
            else {
                title = '<span class="biblio-title">';
                if (biblio.title != null && biblio.title != '') {
                    title += escape_str(biblio.title);
                } else {
                    title += __("No title");
                }
                title += '</span>';

                // add subtitle
                if (biblio.subtitle != null && biblio.subtitle != '') {
                    title += ' <span class="biblio-subtitle">' + escape_str(biblio.subtitle) + '</span>';
                }
            }

            // set title as link

                }
            }

            if ( !config || !config.biblio_id_only ) {
                // add medium
                if (biblio.medium != null && biblio.medium != '') {
                    title += ' <span class="biblio-medium">' + escape_str(biblio.medium) + '</span>';

            // add part numbers/names
            let part_numbers = (typeof biblio.part_number === 'string') ? biblio.part_number.split("|") : [];
            let part_names = (typeof biblio.part_name === 'string') ? biblio.part_name.split("|") : [];
            let i = 0;
            while (part_numbers[i] || part_names[i]) {
                if (part_numbers[i]) {
                    title += ' <span class="part-number">' + escape_str(part_numbers[i]) + '</span>';
                }

                // add part numbers/names
                let part_numbers = (typeof biblio.part_number === 'string') ? biblio.part_number.split("|") : [];
                let part_names = (typeof biblio.part_name === 'string') ? biblio.part_name.split("|") : [];
                let i = 0;
                while (part_numbers[i] || part_names[i]) {
                    if (part_numbers[i]) {
                        title += ' <span class="part-number">' + escape_str(part_numbers[i]) + '</span>';
                    }
                    if (part_names[i]) {
                        title += ' <span class="part-name">' + escape_str(part_names[i]) + '</span>';
                    }
                    i++;
                }
                i++;
            }

            return title;

Lines 68-77 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt (-49 / +64 lines)
68	<label for="illfilter_keyword">Keyword:</label>	68	<label for="illfilter_keyword">Keyword:</label>
69	<input type="text" name="illfilter_keyword" id="illfilter_keyword" />	69	<input type="text" name="illfilter_keyword" id="illfilter_keyword" />
70	</li>	70	</li>
		71	<li>
		72	<label for="illfilter_backend">Backend:</label>
		73	<select name="illfilter_backend" id="illfilter_backend">
		74	<option value="">All backends</option>
		75	</select>
		76	</li>
71	<li>	77	<li>
72	<label for="illfilter_status">Status:</label>	78	<label for="illfilter_status">Status:</label>
73	<select name="illfilter_status" id="illfilter_status">	79	<select name="illfilter_status" id="illfilter_status">
74	<option value=""></option>
75	</select>	80	</select>
76	</li>	81	</li>
77	<li>	82	<li>
Lines 93-99 Link Here
93	<li>	98	<li>
94	<label for="illfilter_branchname">Library:</label>	99	<label for="illfilter_branchname">Library:</label>
95	<select name="illfilter_branchname" id="illfilter_branchname">	100	<select name="illfilter_branchname" id="illfilter_branchname">
96	<option value=""></option>	101	<option value="">All libraries</option>
		102	[% PROCESS options_for_libraries libraries => Branches.all( selected => userbranch, only_from_group => 1 ) %]
97	</select>	103	</select>
98	</li>	104	</li>
99	<li>	105	<li>
Lines 150-156 Link Here
150	[% IF !whole.stage \|\| whole.stage == 'form' %]	156	[% IF !whole.stage \|\| whole.stage == 'form' %]
151	<h1 id="ill-issue-title">Issue requested item to [% INCLUDE 'patron-title.inc' patron = request.patron %]</h1>	157	<h1 id="ill-issue-title">Issue requested item to [% INCLUDE 'patron-title.inc' patron = request.patron %]</h1>
152	[% IF !request.biblio_id \|\| request.biblio_id.length == 0 %]	158	[% IF !request.biblio_id \|\| request.biblio_id.length == 0 %]
153	<div class="alert">This item cannot be checked out out as there is no bibliographic record associated with it</div>	159	<div class="alert">This item cannot be issued as it has no biblio record associated with it</div>
154	[% END %]	160	[% END %]
155	[% IF whole.value.errors.itemcount %]	161	[% IF whole.value.errors.itemcount %]
156	<div class="alert">The bibliographic record for this request has multiple items, it should only have one. Please fix this then try again.</div>	162	<div class="alert">The bibliographic record for this request has multiple items, it should only have one. Please fix this then try again.</div>
Lines 599-613 Link Here
599	<span class="fa fa-eye"></span>	605	<span class="fa fa-eye"></span>
600	Display supplier metadata	606	Display supplier metadata
601	</a>	607	</a>
602	[% IF Koha.Preference('IllLog') %]	608	<a title="ILL request log" id="ill-request-display-log" class="btn btn-default pull-right" href="#">
603	<a title="ILL request log" id="ill-request-display-log" class="btn btn-default pull-right" href="#">	609	<span class="fa fa-calendar"></span>
604	<span class="fa fa-calendar"></span>	610	ILL request log
605	ILL request log	611	</a>
606	</a>
607	[% END %]
608	</div>	612	</div>
609	<div class="page-section">	613	<div class="ill-view-panel panel panel-default">
610	<h3>Request details</h3>	614	<div class="panel-heading">
		615	<h3>Request details</h3>
		616	</div>
		617	<div class="panel-body">
611	<h4>Details from library</h4>	618	<h4>Details from library</h4>
612	<div class="rows">	619	<div class="rows">
613	<ol>	620	<ol>
Lines 618-624 Link Here
618	<li class="borrowernumber">	625	<li class="borrowernumber">
619	<span class="label borrowernumber">Patron:</span>	626	<span class="label borrowernumber">Patron:</span>
620	[% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %]	627	[% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %]
621	<a href="[% borrowerlink \| url %]" title="View patron details">	628	<a href="[% borrowerlink \| url %]" title="View borrower details">
622	[% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" \| html %]	629	[% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" \| html %]
623	</a>	630	</a>
624	</li>	631	</li>
Lines 664-670 Link Here
664	[% IF request.price_paid %][% request.price_paid \| $Price %][% ELSE %]<span>N/A</span>[% END %]	671	[% IF request.price_paid %][% request.price_paid \| $Price %][% ELSE %]<span>N/A</span>[% END %]
665	</li>	672	</li>
666	<li class="req_id">	673	<li class="req_id">
667	<span class="label req_id">Request ID:</span>	674	<span class="label req_id">Request number:</span>
668	[% request.id_prefix _ request.illrequest_id \| html %]	675	[% request.id_prefix _ request.illrequest_id \| html %]
669	</li>	676	</li>
670	<li class="notesstaff">	677	<li class="notesstaff">
Lines 672-678 Link Here
672	<p>[% request.notesstaff \| html %]</p>	679	<p>[% request.notesstaff \| html %]</p>
673	</li>	680	</li>
674	<li class="notesopac">	681	<li class="notesopac">
675	<span class="label notes_opac">OPAC notes:</span>	682	<span class="label notes_opac">Notes:</span>
676	<p>[% request.notesopac \| html %]</p>	683	<p>[% request.notesopac \| html %]</p>
677	</li>	684	</li>
678	</ol>	685	</ol>
Lines 688-693 Link Here
688	[% END %]	695	[% END %]
689	</ol>	696	</ol>
690	</div>	697	</div>
		698	</div>
691	</div>	699	</div>
692		700
693	<div id="dataPreview" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true">	701	<div id="dataPreview" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true">
Lines 738-777 Link Here
738	</div>	746	</div>
739	</div>	747	</div>
740		748
741	<div class="page-section">	749	<div class="ill-view-panel panel panel-default">
742	<h3>[% request.illcomments.count \| html %] comments</h3>	750	<div class="panel-heading">
743	[% IF request.illcomments.count && request.illcomments.count > 0 %]	751	<h3>[% request.illcomments.count \| html %] comments</h3>
744	[% FOREACH comment IN request.illcomments %]	752	</div>
745	<div class="rows comment_[% comment.patron.categorycode \| html %]">	753	<div class="panel-body">
746	<h5>Comment by:	754	[% IF request.illcomments.count && request.illcomments.count > 0 %]
747	<a href="[% borrowerlink \| url %]" title="View patron details">	755	[% FOREACH comment IN request.illcomments %]
748	[% comment.patron.firstname _ " " _ comment.patron.surname _ " [" _ comment.patron.cardnumber _ "]" \| html %]</a>	756	<div class="rows comment_[% comment.patron.categorycode \| html %]">
749	[% comment.timestamp \| $KohaDates with_hours => 1 %]</h5>	757	<h5>Comment by:
750	<p>[% comment.comment \| html %]</p>	758	<a href="[% borrowerlink \| url %]" title="View borrower details">
751	</div>	759	[% comment.patron.firstname _ " " _ comment.patron.surname _ " [" _ comment.patron.cardnumber _ "]" \| html %]</a>
		760	[% comment.timestamp \| $KohaDates with_hours => 1 %]</h5>
		761	<p>[% comment.comment \| html %]</p>
		762	</div>
		763	[% END %]
752	[% END %]	764	[% END %]
753	[% END %]	765	<div class="rows">
754	<div class="rows">	766	<h3><a id="toggle_addcomment" href="#">Add comment</a></h3>
755	<h3><a id="toggle_addcomment" href="#">Add comment</a></h3>	767	<div id="addcomment" class="content_hidden">
756	<div id="addcomment" class="content_hidden">	768	<form class="validated" method="post" action="/cgi-bin/koha/ill/ill-requests.pl">
757	<form class="validated" method="post" action="/cgi-bin/koha/ill/ill-requests.pl">	769	<input type="hidden" value="save_comment" name="method">
758	<input type="hidden" value="save_comment" name="method">	770	<input type="hidden" value="[% csrf_token \| html %]" name="csrf_token">
759	<input type="hidden" value="[% csrf_token \| html %]" name="csrf_token">	771	<input type="hidden" value="[% request.illrequest_id \| html %]" name="illrequest_id">
760	<input type="hidden" value="[% request.illrequest_id \| html %]" name="illrequest_id">	772	<fieldset class="rows">
761	<fieldset class="rows">	773	<ol>
762	<ol>	774	<li>
763	<li>	775	<label class="required" for="comment">Comment: </label>
764	<label class="required" for="comment">Comment: </label>	776	<textarea class="required" required="required" cols="80" rows="10" id="comment" name="comment"></textarea>
765	<textarea class="required" required="required" cols="80" rows="10" id="comment" name="comment"></textarea>	777	<span class="required">Required</span>
766	<span class="required">Required</span>	778	</li>
767	</li>	779	</ol>
768	</ol>	780	</fieldset>
769	</fieldset>	781	<fieldset class="action">
770	<fieldset class="action">	782	<input type="submit" class="btn btn-primary" value="Submit" />
771	<input type="submit" class="btn btn-primary" value="Submit" />	783	</fieldset>
772	</fieldset>	784	</form>
773	</form>	785	</div>
774	</div>	786	</div>
775	</div>	787	</div>
776	</div>	788	</div>
777		789
Lines 780-791 Link Here
780	<h1>View ILL requests</h1>	792	<h1>View ILL requests</h1>
781	<div id="results" class="page-section">	793	<div id="results" class="page-section">
782	<h2>Details for all requests</h2>	794	<h2>Details for all requests</h2>
783	[% INCLUDE 'ill-list-table.inc' %]	795	[% INCLUDE 'ill-list-table.inc' %]
784	</div> <!-- /#results -->	796	</div> <!-- /#results -->
785	[% ELSIF query_type == 'availability' %]	797	[% ELSIF query_type == 'availability' %]
786	<!-- availability -->	798	<!-- availability -->
787	<h1>Availability</h1>	799	<h1>Availability</h1>
788	<div id="results" class="page-section">	800	<div id="results">
789	<h3>Displaying availability results</h3>	801	<h3>Displaying availability results</h3>
790	<form method="POST" action="/cgi-bin/koha/ill/ill-requests.pl">	802	<form method="POST" action="/cgi-bin/koha/ill/ill-requests.pl">
791	[% FOREACH key IN whole.keys %]	803	[% FOREACH key IN whole.keys %]
Lines 830-835 Link Here
830		842
831	[% MACRO jsinclude BLOCK %]	843	[% MACRO jsinclude BLOCK %]
832	[% INCLUDE 'datatables.inc' %]	844	[% INCLUDE 'datatables.inc' %]
		845	[% INCLUDE 'js-biblio-format.inc' %]
		846	[% INCLUDE 'js-patron-format.inc' %]
833	[% INCLUDE 'columns_settings.inc' %]	847	[% INCLUDE 'columns_settings.inc' %]
834	[% INCLUDE 'calendar.inc' %]	848	[% INCLUDE 'calendar.inc' %]
835	[% INCLUDE 'select2.inc' %]	849	[% INCLUDE 'select2.inc' %]
Lines 871-876 Link Here
871	[% IF query_type == 'generic_confirm' && Koha.Preference('ILLCheckAvailability') %]	885	[% IF query_type == 'generic_confirm' && Koha.Preference('ILLCheckAvailability') %]
872	[% Asset.js("js/ill-availability-partner.js") \| $raw %]	886	[% Asset.js("js/ill-availability-partner.js") \| $raw %]
873	[% END %]	887	[% END %]
		888
874	[% END %]	889	[% END %]
875		890
876	[% TRY %]	891	[% TRY %]

Lines 56-61 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt (+2 lines)
56	[% Asset.js("js/members-menu.js") \| $raw %]	56	[% Asset.js("js/members-menu.js") \| $raw %]
57	[% INCLUDE 'datatables.inc' %]	57	[% INCLUDE 'datatables.inc' %]
58	[% INCLUDE 'columns_settings.inc' %]	58	[% INCLUDE 'columns_settings.inc' %]
		59	[% INCLUDE 'js-biblio-format.inc' %]
		60	[% INCLUDE 'js-patron-format.inc' %]
59	[% INCLUDE 'calendar.inc' %]	61	[% INCLUDE 'calendar.inc' %]
60	<script>	62	<script>
61	var prefilters = '[% prefilters \| html %]';	63	var prefilters = '[% prefilters \| html %]';




                        // escape SQL LIKE special characters %
                        value = value.replace(/(\%|\\)/g, "\\$1");
                    }
                    
                    let built_value;
                    if ( col.datatype !== undefined ) {
                        if ( col.datatype == 'date' ) {
                            let rfc3339 = $date_to_rfc3339(value);
                            if ( rfc3339 != 'Invalid Date' ) {
                                built_value = rfc3339;
                            }
                        }
                        else if (col.datatype == 'related-object') {
                            let query_term = value;

                            if (criteria != 'exact') {
                                query_term = { like: (['contains', 'ends_with'].indexOf(criteria) !== -1 ? '%' : '') + value + (['contains', 'starts_with'].indexOf(criteria) !== -1 ? '%' : '') };
                            }

                            part = {
                                [col.related + '.' + col.relatedKey]: col.relatedValue,
                                [col.related + '.' + col.relatedSearchOn]: query_term
                            };
                        } else {
                            console.log("datatype %s not supported yet".format(col.datatype));
                        }
                    }

                    if (col.datatype != 'related-object') {
                        let value_part;
                        if ( criteria === 'exact' ) {
                            value_part = built_value ? [value, built_value] : value
                        } else {
                            let like = {like: (['contains', 'ends_with'].indexOf(criteria) !== -1?'%':'') + value + (['contains', 'starts_with'].indexOf(criteria) !== -1?'%':'')};
                            value_part = built_value ? [like, built_value] : like;
                        }

                        part[!attr.includes('.')?'me.'+attr:attr] = value_part;
                    }

                    parts.push(part);
                }
                return parts;




$(document).ready(function() {

    // Illview Datatable setup

    var table;

    // Filters that are active
    var activeFilters = {};

    // Get any prefilters
    var prefilters = $('table#ill-requests').data('prefilters');

    // Fields we need to expand (flatten)
    var expand = [
        'metadata',
        'patron',
        'library'
    ];

    // Expanded fields
    // This is auto populated
    var expanded = {};

    // Filterable columns
    var filterable = {
        status: {
            prep: function(tableData, oData) {
                var uniques = {};
                tableData.forEach(function(row) {
                    var resolvedName;
                    if (row.status_alias) {
                        resolvedName = row.status_alias.lib;
                    } else {
                        resolvedName = getStatusName(
                            row.capabilities[row.status].name,
                            row
                        );
                    }
                    uniques[resolvedName] = 1
                });
                Object.keys(uniques).sort().forEach(function(unique) {
                    $('#illfilter_status').append(
                        '<option value="' + unique  +
                        '">' + unique +  '</option>'
                    );
                });
            },
            listener: function() {
                var me = 'status';
                $('#illfilter_status').change(function() {
                    var sel = $('#illfilter_status option:selected').val();
                    if (sel && sel.length > 0) {
                        activeFilters[me] = function() {
                            table.api().column(13).search(sel);
                        }
                    } else {
                        if (activeFilters.hasOwnProperty(me)) {
                            delete activeFilters[me];
                        }
                    }
                });
            },
            clear: function() {
                $('#illfilter_status').val('');
            }
        },
        pickupBranch: {
            prep: function(tableData, oData) {
                var uniques = {};
                tableData.forEach(function(row) {
                    uniques[row.library_branchname] = 1
                });
                Object.keys(uniques).sort().forEach(function(unique) {
                    $('#illfilter_branchname').append(
                        '<option value="' + unique  +
                        '">' + unique +  '</option>'
                    );
                });
            },
            listener: function() {
                var me = 'pickupBranch';
                $('#illfilter_branchname').change(function() {
                    var sel = $('#illfilter_branchname option:selected').val();
                    if (sel && sel.length > 0) {
                        activeFilters[me] = function() {
                            table.api().column(12).search(sel);
                        }
                    } else {
                        if (activeFilters.hasOwnProperty(me)) {
                            delete activeFilters[me];
                        }
                    }
                });
            },
            clear: function() {
                $('#illfilter_branchname').val('');
            }
        },
        patron: {
            listener: function() {
                var me = 'patron';
                $('#illfilter_patron').change(function() {
                    var val = $('#illfilter_patron').val();
                    if (val && val.length > 0) {
                        activeFilters[me] = function() {
                            table.api().column(10).search(val);
                        }
                    } else {
                        if (activeFilters.hasOwnProperty(me)) {
                            delete activeFilters[me];
                        }
                    }
                });
            },
            clear: function() {
                $('#illfilter_patron').val('');
            }
        },
        keyword: {
            listener: function () {
                var me = 'keyword';
                $('#illfilter_keyword').change(function () {
                    var val = $('#illfilter_keyword').val();
                    if (val && val.length > 0) {
                        activeFilters[me] = function () {
                            table.api().search(val);
                        }
                    } else {
                        if (activeFilters.hasOwnProperty(me)) {
                            delete activeFilters[me];
                        }
                    }
                });
            },
            clear: function () {
                $('#illfilter_keyword').val('');
            }
        },
        dateModified: {
            clear: function() {
                $('#illfilter_datemodified_start, #illfilter_datemodified_end').val('');
            }
        },
        datePlaced: {
            clear: function() {
                $('#illfilter_dateplaced_start, #illfilter_dateplaced_end').val('');
            }
        }
    }; //END Filterable columns

    // Expand any fields we're expanding
    var expandExpand = function(row) {
        expand.forEach(function(thisExpand) {
            if (row.hasOwnProperty(thisExpand)) {
                if (!expanded.hasOwnProperty(thisExpand)) {
                    expanded[thisExpand] = [];
                }
                var expandObj = row[thisExpand];
                Object.keys(expandObj).forEach(
                    function(thisExpandCol) {
                        var expColName = thisExpand + '_' + thisExpandCol.replace(/\s/g,'_');
                        // Keep a list of fields that have been expanded
                        // so we can create toggle links for them
                        if (expanded[thisExpand].indexOf(expColName) == -1) {
                            expanded[thisExpand].push(expColName);
                        }
                        expandObj[expColName] =
                            expandObj[thisExpandCol];
                        delete expandObj[thisExpandCol];
                    }
                );
                $.extend(true, row, expandObj);
                delete row[thisExpand];
            }
        });
    };
    //END Expand

    // Strip the expand prefix if it exists, we do this for display
    var stripPrefix = function(value) {
        expand.forEach(function(thisExpand) {
            var regex = new RegExp(thisExpand + '_', 'g');
            value = value.replace(regex, '');
        });
        return value;
    };

    // Our 'render' function for borrowerlink
    var createPatronLink = function(data, type, row) {
        var patronLink = '<a title="' + ill_borrower_details + '" ' +
            'href="/cgi-bin/koha/members/moremember.pl?' +
            'borrowernumber='+row.borrowernumber+'">';
        if ( row.patron_firstname ) {
            patronLink = patronLink + row.patron_firstname + ' ';
        }
        patronLink = patronLink + row.patron_surname +
            ' (' + row.patron_cardnumber + ')' + '</a>';
        return patronLink;
    };

    // Our 'render' function for biblio_id
    var createBiblioLink = function(data, type, row) {
        return (row.biblio_id) ?
            '<a title="' + ill_biblio_details + '" ' +
            'href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=' +
            row.biblio_id + '">' +
            row.biblio_id +
            '</a>' : '';
    };

    // Our 'render' function for title
    var createTitle = function(data, type, row) {
        return (
            row.hasOwnProperty('metadata_container_title') &&
            row.metadata_container_title
        ) ? row.metadata_container_title : row.metadata_title;
    };

    // Render function for request ID
    var createRequestId = function(data, type, row) {
        return row.id_prefix + row.illrequest_id;
    };

    // Render function for type
    var createType = function(data, type, row) {
        if (!row.hasOwnProperty('metadata_Type') || !row.metadata_Type) {
            if (row.hasOwnProperty('medium') && row.medium) {
                row.metadata_Type = row.medium;
            } else {
                row.metadata_Type = null;
            }
        }
        return row.metadata_Type;
    };

    // Render function for request status
    var createStatus = function(data, type, row, meta) {
        if (row.status_alias) {
            return row.status_alias.lib
                ? row.status_alias.lib
                : row.status_alias.authorised_value;
        } else {
            var status_name = row.capabilities[row.status].name;
            return getStatusName(status_name, row);
        }
    };

    var getStatusName = function(origName, row) {
        switch( origName ) {
            case "New request":
                return ill_statuses.new;
            case "Requested":
                return ill_statuses.req;
            case "Requested from partners":
                var statStr = ill_statuses.genreq;
                if (
                    row.hasOwnProperty('requested_partners') &&
                    row.requested_partners &&
                    row.requested_partners.length > 0
                ) {
                    statStr += ' (' + row.requested_partners + ')';
                }
                return statStr;
            case "Request reverted":
                return ill_statuses.rev;
            case "Queued request":
                return ill_statuses.que;
            case "Cancellation requested":
                return ill_statuses.canc;
            case "Completed":
                return ill_statuses.comp;
            case "Delete request":
                return ill_statuses.del;
            default:
                return origName;
        }
    };

    // Render function for creating a row's action link
    var createActionLink = function(data, type, row) {
        return '<a class="btn btn-default btn-sm" ' +
            'href="/cgi-bin/koha/ill/ill-requests.pl?' +
            'method=illview&amp;illrequest_id=' +
            row.illrequest_id +
            '">' + ill_manage + '</a>';
    };

    // Columns that require special treatment
    var specialCols = {
        action: {
            func: createActionLink,
            skipSanitize: true
        },
        illrequest_id: {
            func: createRequestId
        },
        status: {
            func: createStatus
        },
        biblio_id: {
            name: ill_columns.biblio_id,
            func: createBiblioLink,
            skipSanitize: true
        },
        metadata_title: {
            func: createTitle
        },
        metadata_Type: {
            func: createType
        },
        updated: {
            name: ill_columns.updated
        },
        patron: {
            skipSanitize: true,
            func: createPatronLink
        }
    };

    // Display the modal containing request supplier metadata
    $('#ill-request-display-log').on('click', function(e) {
        e.preventDefault();

        $('#dataPreview').modal({show:true});
    });

    function display_extended_attribute(row, type) {
        var arr = $.grep(row.extended_attributes, ( x => x.type === type ));
        if (arr.length > 0) {
            return escape_str(arr[0].value);
        return function(d, type, row, meta) {
            for(var r = 0; r < renderArray.length; r++) {
                var toCall = renderArray[r].hasOwnProperty('display') ?
                    renderArray[r].display :
                    renderArray[r];
                d = toCall(d, type, row, meta);
            }
            return d;
        }

        return '';
    }

    // At the moment, the only prefilter possible is borrowernumber
    // see ill/ill-requests.pl and members/ill-requests.pl
    let additional_prefilters = [];
    if(prefilters){
            let prefilters_array = prefilters.split("&");
            prefilters_array.forEach((prefilter) => {
                let prefilter_split = prefilter.split("=");
                additional_prefilters.push( {
                     "key": prefilter_split[0],
                     "value": prefilter_split[1]
                } );

    ) {
        var ajax = $.ajax(
            '/api/v1/illrequests?embed=metadata,patron,capabilities,library,status_alias,comments,requested_partners'
            + filterParam
        ).done(function() {
            var data = JSON.parse(ajax.responseText);
            // Make a copy, we'll be removing columns next and need
            // to be able to refer to data that has been removed
            var dataCopy = $.extend(true, [], data);
            // Expand columns that need it and create an array
            // of all column names
            $.each(dataCopy, function(k, row) {
                expandExpand(row);
            });
    }

    let additional_filters = {
        "me.backend": function(){
            let backend = $("#illfilter_backend").val();
            if (!backend) return "";
            return { "=": backend  }
        },
        "me.branchcode": function(){
            let branchcode = $("#illfilter_branchname").val();
            if (!branchcode) return "";
            return { "=": branchcode }
        },
        "me.borrowernumber": function(){
            let borrowernumber_pre_filter = additional_prefilters.find(e => e.key === 'borrowernumber');
            if ( additional_prefilters.length == 0 || typeof borrowernumber_pre_filter === undefined) return "";
            return { "=": borrowernumber_pre_filter["value"] }
        },
        "-or": function(){
            let patron = $("#illfilter_patron").val();
            let status = $("#illfilter_status").val();
            let filters = [];
            let patron_sub_or = [];
            let status_sub_or = [];
            let subquery_and = [];

            if (!patron && !status) return "";

            if(patron){
                const patron_search_fields = "me.borrowernumber,patron.cardnumber,patron.firstname,patron.surname";
                patron_search_fields.split(',').forEach(function(attr){
                    let operator = "=";
                    let patron_data = patron;
                    if ( attr != "me.borrowernumber" && attr != "patron.cardnumber") {
                        operator = "like";
                        patron_data = "%" + patron + "%";
                    }
                    patron_sub_or.push({
                        [attr]:{[operator]: patron_data }
                    });
                });
                subquery_and.push(patron_sub_or);
            }

            if(status){
                const status_search_fields = "me.status,me.status_av";
                status_search_fields.split(',').forEach(function(attr){
                    status_sub_or.push({
                        [attr]:{"=": status }
                    });
                });
                subquery_and.push(status_sub_or);
            }

            filters.push({"-and": subquery_and});

            return filters;
        },
        "me.placed": function(){
            if ( additional_prefilters.length != 0 && !additional_prefilters.find(e => e.key === 'placed')) return "";
            let placed_start = $('#illfilter_dateplaced_start').get(0)._flatpickr.selectedDates[0];
            let placed_end = $('#illfilter_dateplaced_end').get(0)._flatpickr.selectedDates[0];
            if (!placed_start && !placed_end) return "";
            return {
                ...(placed_start && {">=": placed_start}),
                ...(placed_end && {"<=": placed_end})
            }
        },
        "me.updated": function(){
            if ( additional_prefilters.length != 0 && !additional_prefilters.find(e => e.key === 'updated')) return "";
            let updated_start = $('#illfilter_datemodified_start').get(0)._flatpickr.selectedDates[0];
            let updated_end = $('#illfilter_datemodified_end').get(0)._flatpickr.selectedDates[0];
            if (!updated_start && !updated_end) return "";
            // set selected datetime hours and minutes to the end of the day
            // to grab any request updated during that day
            let updated_end_value = new Date(updated_end);
            updated_end_value.setHours(updated_end_value.getHours()+23);
            updated_end_value.setMinutes(updated_end_value.getMinutes()+59);
            return {
                ...(updated_start && {">=": updated_start}),
                ...(updated_end && {"<=": updated_end_value})
            }
        },
        "-and": function(){
            let keyword = $("#illfilter_keyword").val();
            if (!keyword) return "";

            let filters = [];
            let subquery_and = [];

            const search_fields = "me.illrequest_id,me.borrowernumber,me.biblio_id,me.due_date,me.branchcode,library.name,me.status,me.status_alias,me.placed,me.replied,me.updated,me.completed,me.medium,me.accessurl,me.cost,me.price_paid,me.notesopac,me.notesstaff,me.orderid,me.backend,patron.firstname,patron.surname";
            let sub_or = [];
            search_fields.split(',').forEach(function(attr){
                sub_or.push({
                        [attr]:{"like":"%" + keyword + "%"}
                });
                colData.push(colObj);
            });
            subquery_and.push(sub_or);
            filters.push({"-and": subquery_and});

            const extended_attributes = "title,type,author,article_title,pages,issue,volume,year";
            let extended_sub_or = [];
            subquery_and = [];
            extended_sub_or.push({
                "extended_attributes.type": extended_attributes.split(','),
                "extended_attributes.value":{"like":"%" + keyword + "%"}
            });
            subquery_and.push(extended_sub_or);

            filters.push({"-and": subquery_and});
            return filters;
        }
    };
                        'aTargets': [ 'actions' ],
                        'bSortable': false,
                        'bSearchable': false
                    },
                    { // When sorting 'placed', we want to use the
                        // unformatted column
                        'aTargets': [ 'placed_formatted'],
                        'iDataSort': 14
                    },
                    { // When sorting 'updated', we want to use the
                        // unformatted column
                        'aTargets': [ 'updated_formatted'],
                        'iDataSort': 16
                    },
                    { // When sorting 'completed', we want to use the
                        // unformatted column
                        'aTargets': [ 'completed_formatted'],
                        'iDataSort': 19
                    }
                ],
                'aaSorting': [[ 16, 'desc' ]], // Default sort, updated descending
                'processing': true, // Display a message when manipulating
                'sPaginationType': "full_numbers", // Pagination display
                'deferRender': true, // Improve performance on big datasets
                'data': dataCopy,
                "dom": '<"top pager"<"table_entries"ilp><"table_controls"B>>tr<"bottom pager"ip>',
                'columns': colData,
                'originalData': data, // Enable render functions to access
                                        // our original data
                'initComplete': function() {

                    // Prepare any filter elements that need it
                    for (var el in filterable) {
                        if (filterable.hasOwnProperty(el)) {
                            if (filterable[el].hasOwnProperty('prep')) {
                                filterable[el].prep(dataCopy, data);
                            }
                            if (filterable[el].hasOwnProperty('listener')) {
                                filterable[el].listener();
                            }
                        }
                    }

    var ill_requests_table = $("#ill-requests").kohaTable({
        "ajax": {
            "url": '/api/v1/ill_requests'
        },
        "embed": [
            '+strings',
            'biblio',
            'comments+count',
            'extended_attributes',
            'library',
            'id_prefix',
            'patron'
        ],
        "stateSave": true, // remember state on page reload
        "columns": [
            {
                "data": "ill_request_id",
                "searchable": true,
                "orderable": true,
                "render": function( data, type, row, meta ) {
                    return '<a href="/cgi-bin/koha/ill/ill-requests.pl?' +
                            'method=illview&amp;illrequest_id=' +
                            encodeURIComponent(data) +
                            '">' + escape_str(row.id_prefix) + escape_str(data) + '</a>';
                }
            },
            {
                "data": "", // author
                "orderable": false,
                "render": function(data, type, row, meta) {
                    return display_extended_attribute(row, 'author');
                }
            },
            {
                "data": "", // title
                "orderable": false,
                "render": function(data, type, row, meta) {
                    return display_extended_attribute(row, 'title');
                }
            },
            {
                "data": "", // article_title
                "orderable": false,
                "render": function(data, type, row, meta) {
                    return display_extended_attribute(row, 'article_title');
                }
            },
            {
                "data": "", // issue
                "orderable": false,
                "render": function(data, type, row, meta) {
                    return display_extended_attribute(row, 'issue');
                }
            },
            {
                "data": "", // volume
                "orderable": false,
                "render": function(data, type, row, meta) {
                    return display_extended_attribute(row, 'volume');
                }
            },
            {
                "data": "",  // year
                "orderable": false,
                "render": function(data, type, row, meta) {
                    return display_extended_attribute(row, 'year');
                }
            },
            {
                "data": "", // pages
                "orderable": false,
                "render": function(data, type, row, meta) {
                    return display_extended_attribute(row, 'pages');
                }
            },
            {
                "data": "", // type
                "orderable": false,
                "render": function(data, type, row, meta) {
                    return display_extended_attribute(row, 'type');
                }
            },
            {
                "data": "ill_backend_request_id",
                "orderable": true,
                "render": function(data, type, row, meta) {
                    return escape_str(data);
                }
            },
            {
                "data": "patron.firstname:patron.surname:patron.cardnumber",
                "render": function(data, type, row, meta) {
                    return (row.patron) ? $patron_to_html( row.patron, { display_cardnumber: true, url: true } ) : ''; }                    },
            {
                "data": "biblio_id",
                "orderable": true,
                "render": function(data, type, row, meta) {
                    if ( data === null ) {
                        return "";
                    }
                    return $biblio_to_html(row.biblio, { biblio_id_only: 1, link: 1 });
                    placedPassed = false
                };
                if (placedEnd && rowPlaced && rowPlaced > placedEnd) {
                    placedPassed = false;
                }
            },
            {
                "data": "library.name",
                "orderable": true,
                "render": function(data, type, row, meta) {
                    return escape_str(data);
                }
            },
            {
                "data": "status",
                "orderable": true,
                "render": function(data, type, row, meta) {
                    let status_label = row._strings.status_av ?
                        row._strings.status_av.str ?
                            row._strings.status_av.str :
                            row._strings.status_av.code :
                        row._strings.status.str
                    return escape_str(status_label);
                }
            },
            {
                "data": "requested_date",
                "orderable": true,
                "render": function(data, type, row, meta) {
                    return $date(data);
                }
            },
            {
                "data": "timestamp",
                "orderable": true,
                "render": function(data, type, row, meta) {
                    return $date(data);
                }
            },
            {
                "data": "replied_date",
                "orderable": true,
                "render": function(data, type, row, meta) {
                    return $date(data);
                }
            },
            {
                "data": "completed_date",
                "orderable": true,
                "render": function(data, type, row, meta) {
                    return $date(data);
                }
            },
            {
                "data": "access_url",
                "orderable": true,
                "render": function(data, type, row, meta) {
                    return escape_str(data);
                }
            },
            {
                "data": "cost",
                "orderable": true,
                "render": function(data, type, row, meta) {
                    return escape_str(data);
                }
            },
            {
                "data": "paid_price",
                "orderable": true,
                "render": function(data, type, row, meta) {
                    return escape_str(data);
                }
            },
            {
                "data": "comments_count",
                "orderable": true,
                "searchable": false,
                "render": function(data, type, row, meta) {
                    return escape_str(data);
                }
            },
            {
                "data": "opac_notes",
                "orderable": true,
                "render": function(data, type, row, meta) {
                    return escape_str(data);
                }
            },
            {
                "data": "staff_notes",
                "orderable": true,
                "render": function(data, type, row, meta) {
                    return escape_str(data);
                }
            },
            {
                "data": "ill_backend_id",
                "orderable": true,
                "render": function(data, type, row, meta) {
                    return escape_str(data);
                }
            },
            {
                "data": "ill_request_id",
                "orderable": false,
                "searchable": false,
                "render": function( data, type, row, meta ) {
                    return '<a class="btn btn-default btn-sm" ' +
                            'href="/cgi-bin/koha/ill/ill-requests.pl?' +
                            'method=illview&amp;illrequest_id=' +
                            encodeURIComponent(data) +
                            '">' + ill_manage + '</a>';
                }
            }
        ]
    }, table_settings, null, additional_filters);

    $("#illfilter_form").on('submit', filter);

    function redrawTable() {
        let table_dt = ill_requests_table.DataTable();
        table_dt.draw();
    }

    function filter() {
        redrawTable();
        return false;
    }

    function clearSearch() {
        let filters = [
            "illfilter_backend",
            "illfilter_branchname",
            "illfilter_patron",
            "illfilter_keyword",
        ];
        filters.forEach((filter) => {
            $("#"+filter).val("");
        });
    } //END if window.location.search.length == 0

        //Clear flatpickr date filters
        $('#illfilter_form > fieldset > ol > li:nth-child(4) > span > a').click();
        $('#illfilter_form > fieldset > ol > li:nth-child(5) > span > a').click();
        $('#illfilter_form > fieldset > ol > li:nth-child(6) > span > a').click();
        $('#illfilter_form > fieldset > ol > li:nth-child(7) > span > a').click();

        disableStatusFilter();

        redrawTable();
    }

    function populateStatusFilter(backend) {
        $.ajax({
            type: "GET",
            url: "/api/v1/ill_backends/"+backend+"/statuses",
            success: function(statuses){
                $('#illfilter_status').append(
                    '<option value="">'+ill_all_statuses+'</option>'
                );
                statuses.sort((a, b) => a.str.localeCompare(b.str)).forEach(function(status) {
                    $('#illfilter_status').append(
                        '<option value="' + status.code  +
                        '">' + status.str +  '</option>'
                    );
                });
            }
        });
    }
    };

    function populateBackendFilter() {
        $.ajax({
            type: "GET",
            url: "/api/v1/ill_backends",
            success: function(backends){
                backends.sort((a, b) => a.ill_backend_id.localeCompare(b.ill_backend_id)).forEach(function(backend) {
                    $('#illfilter_backend').append(
                        '<option value="' + backend.ill_backend_id  +
                        '">' + backend.ill_backend_id +  '</option>'
                    );
                });
            }
        });
    }

    function disableStatusFilter() {
        $('#illfilter_status').children().remove();
        $("#illfilter_status").attr('title', ill_manage_select_backend_first);
        $('#illfilter_status').prop("disabled", true);
    }

    function enableStatusFilter() {
        $('#illfilter_status').children().remove();
        $("#illfilter_status").attr('title', '');
        $('#illfilter_status').prop("disabled", false);
    }

    $('#illfilter_backend').change(function() {
        var selected_backend = $('#illfilter_backend option:selected').val();
        if (selected_backend && selected_backend.length > 0) {
            populateStatusFilter(selected_backend);
            enableStatusFilter();
        } else {
            disableStatusFilter();
        }
        table.api().draw();
    });

    disableStatusFilter();
    populateBackendFilter();

    // Clear all filters
    $('#clear_search').click(function() {
        clearSearch();
- 

Return to bug 22440

Lines 24-29 use Try::Tiny qw( catch try ); Link Here

(-)a/Koha/Illrequest.pm (-6 / +8 lines)
24	use DateTime;	24	use DateTime;
25		25
26	use C4::Letters;	26	use C4::Letters;
		27	use Mojo::Util qw(deprecated);
27		28
28	use Koha::Cache::Memory::Lite;	29	use Koha::Cache::Memory::Lite;
29	use Koha::Database;	30	use Koha::Database;
Lines 177-182 sub statusalias { Link Here
177	=cut	178	=cut
178		179
179	sub illrequestattributes {	180	sub illrequestattributes {
		181	deprecated 'illrequestattributes is DEPRECATED in favor of extended_attributes';
180	my ( $self ) = @_;	182	my ( $self ) = @_;
181	return Koha::Illrequestattributes->_new_from_dbic(	183	return Koha::Illrequestattributes->_new_from_dbic(
182	scalar $self->_result->illrequestattributes	184	scalar $self->_result->illrequestattributes
Lines 247-266 sub library { Link Here
247	return Koha::Library->_new_from_dbic( scalar $self->_result->library );	249	return Koha::Library->_new_from_dbic( scalar $self->_result->library );
248	}	250	}
249		251
250	=head3 ill_extended_attributes	252	=head3 extended_attributes
251		253
252	my $ill_extended_attributes = $request->ill_extended_attributes;	254	my $extended_attributes = $request->extended_attributes;
253		255
254	Returns the linked I<Koha::Illrequestattributes> resultset object.	256	Returns the linked I<Koha::Illrequestattributes> resultset object.
255		257
256	=cut	258	=cut
257		259
258	sub ill_extended_attributes {	260	sub extended_attributes {
259	my ( $self ) = @_;	261	my ( $self ) = @_;
260		262
261	return Koha::Illrequestattributes->_new_from_dbic(	263	my $rs = $self->_result->extended_attributes;
262	scalar $self->_result->ill_extended_attributes	264	# We call search to use the filters in Koha::Illrequestattributes->search
263	);	265	return Koha::Illrequestattributes->_new_from_dbic($rs)->search;
264	}	266	}
265		267
266	=head3 status_alias	268	=head3 status_alias

Lines 824-830 modules: Link Here

(-)a/admin/columns_settings.yml (-16 / +1 lines)
824	ill-requests:	824	ill-requests:
825	columns:	825	columns:
826	-	826	-
827	columnname: illrequest_id	827	columnname: ill_request_id
828	-	828	-
829	columnname: metadata_author	829	columnname: metadata_author
830	-	830	-
Lines 851-877 modules: Link Here
851	columnname: library_branchname	851	columnname: library_branchname
852	-	852	-
853	columnname: status	853	columnname: status
854	-
855	columnname: placed
856	cannot_be_toggled: 1
857	cannot_be_modified: 1
858	is_hidden: 1
859	-	854	-
860	columnname: placed_formatted	855	columnname: placed_formatted
861	-
862	columnname: updated
863	cannot_be_toggled: 1
864	cannot_be_modified: 1
865	is_hidden: 1
866	-	856	-
867	columnname: updated_formatted	857	columnname: updated_formatted
868	-	858	-
869	columnname: replied	859	columnname: replied
870	-
871	columnname: completed
872	cannot_be_toggled: 1
873	cannot_be_modified: 1
874	is_hidden: 1
875	-	860	-
876	columnname: completed_formatted	861	columnname: completed_formatted
877	-	862	-

Lines 560-568 function _dt_default_ajax (params){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/datatables.js (-3 / +37 lines)
560	// escape SQL LIKE special characters %	560	// escape SQL LIKE special characters %
561	value = value.replace(/(\%\|\\)/g, "\\$1");	561	value = value.replace(/(\%\|\\)/g, "\\$1");
562	}	562	}
563	part[!attr.includes('.')?'me.'+attr:attr] = criteria === 'exact'	563
564	? value	564	let built_value;
565	: {like: (['contains', 'ends_with'].indexOf(criteria) !== -1?'%':'') + value + (['contains', 'starts_with'].indexOf(criteria) !== -1?'%':'')};	565	if ( col.datatype !== undefined ) {
		566	if ( col.datatype == 'date' ) {
		567	let rfc3339 = $date_to_rfc3339(value);
		568	if ( rfc3339 != 'Invalid Date' ) {
		569	built_value = rfc3339;
		570	}
		571	}
		572	else if (col.datatype == 'related-object') {
		573	let query_term = value;
		574
		575	if (criteria != 'exact') {
		576	query_term = { like: (['contains', 'ends_with'].indexOf(criteria) !== -1 ? '%' : '') + value + (['contains', 'starts_with'].indexOf(criteria) !== -1 ? '%' : '') };
		577	}
		578
		579	part = {
		580	[col.related + '.' + col.relatedKey]: col.relatedValue,
		581	[col.related + '.' + col.relatedSearchOn]: query_term
		582	};
		583	} else {
		584	console.log("datatype %s not supported yet".format(col.datatype));
		585	}
		586	}
		587
		588	if (col.datatype != 'related-object') {
		589	let value_part;
		590	if ( criteria === 'exact' ) {
		591	value_part = built_value ? [value, built_value] : value
		592	} else {
		593	let like = {like: (['contains', 'ends_with'].indexOf(criteria) !== -1?'%':'') + value + (['contains', 'starts_with'].indexOf(criteria) !== -1?'%':'')};
		594	value_part = built_value ? [like, built_value] : like;
		595	}
		596
		597	part[!attr.includes('.')?'me.'+attr:attr] = value_part;
		598	}
		599
566	parts.push(part);	600	parts.push(part);
567	}	601	}
568	return parts;	602	return parts;

Lines 32-37 Koha::Illrequestattributes - Koha Illrequestattributes Object class Link Here

(-)a/Koha/Illrequestattributes.pm (+16 lines)
32		32
33	=head2 Class Methods	33	=head2 Class Methods
34		34
		35	=cut
		36
		37	=head3 search
		38
		39	my $attributes = Koha::Illrequestattributes->search( $params );
		40
		41	=cut
		42
		43	sub search {
		44	my ( $self, $params, $attributes ) = @_;
		45
		46	unless ( exists $attributes->{order_by} ) { $attributes->{order_by} = ['me.type', 'value'] }
		47
		48	return $self->SUPER::search( $params, $attributes );
		49	}
		50
35	=head3 type	51	=head3 type
36		52
37	=cut	53	=cut

Lines 1-21 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table-strings.inc (-16 / +2 lines)
1	<!-- ill-list-table-strings.inc -->	1	<!-- ill-list-table-strings.inc -->
2	<script>	2	<script>
3	var ill_borrower_details = _("View patron details");
4	var ill_biblio_details = _("View bibliographic record");
5	var ill_statuses = {
6	new: _("New request"),
7	req: _("Requested"),
8	genreq: _("Requested from partners"),
9	rev: _("Reverted"),
10	que: _("Queued request"),
11	canc: _("Cancellation requested"),
12	comp: _("Completed"),
13	del: _("Delete request")
14	};
15	var ill_manage = _("Manage request");	3	var ill_manage = _("Manage request");
16	var ill_columns = {	4	var ill_manage_select_backend_first = _("Select a backend first");
17	biblio_id: _("Bibliographic record ID"),	5	var ill_all_statuses = _("All statuses");
18	updated: _("Updated on")
19	};
20	</script>	6	</script>
21	<!-- / ill-list-table-strings.inc -->	7	<!-- / ill-list-table-strings.inc -->

Lines 1-30 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc (-17 / +10 lines)
1	[% IF prefilters.length > 0 %]
2	<table id="ill-requests" data-prefilters="[% prefilters \| html %]">
3	[% ELSE %]
4	<table id="ill-requests">	1	<table id="ill-requests">
5	[% END %]
6	<thead>	2	<thead>
7	<tr id="illview-header">	3	<tr id="ill_requests_header">
8	<th scope="col">Request ID</th>	4	<th scope="col">Request ID</th>
9	<th scope="col">Author</th>	5	<th scope="col" data-datatype="related-object" data-related="extended_attributes" data-related-key="type" data-related-value="author" data-related-search-on="value">Author</th>
10	<th scope="col">Title</th>	6	<th scope="col" data-datatype="related-object" data-related="extended_attributes" data-related-key="type" data-related-value="title" data-related-search-on="value">Title</th>
11	<th scope="col">Article title</th>	7	<th scope="col" data-datatype="related-object" data-related="extended_attributes" data-related-key="type" data-related-value="article_title" data-related-search-on="value">Article title</th>
12	<th scope="col">Issue</th>	8	<th scope="col" data-datatype="related-object" data-related="extended_attributes" data-related-key="type" data-related-value="issue" data-related-search-on="value">Issue</th>
13	<th scope="col">Volume</th>	9	<th scope="col" data-datatype="related-object" data-related="extended_attributes" data-related-key="type" data-related-value="volume" data-related-search-on="value">Volume</th>
14	<th scope="col">Year</th>	10	<th scope="col" data-datatype="related-object" data-related="extended_attributes" data-related-key="type" data-related-value="year" data-related-search-on="value">Year</th>
15	<th scope="col">Pages</th>	11	<th scope="col" data-datatype="related-object" data-related="extended_attributes" data-related-key="type" data-related-value="pages" data-related-search-on="value">Pages</th>
16	<th scope="col">Request type</th>	12	<th scope="col" data-datatype="related-object" data-related="extended_attributes" data-related-key="type" data-related-value="type" data-related-search-on="value">Request type</th>
17	<th scope="col">Order ID</th>	13	<th scope="col">Order ID</th>
18	<th scope="col">Patron</th>	14	<th scope="col">Patron</th>
19	<th scope="col">Bibliographic record ID</th>	15	<th scope="col">Bibliographic record ID</th>
20	<th scope="col">Library</th>	16	<th scope="col">Library</th>
21	<th scope="col">Status</th>	17	<th scope="col">Status</th>
22	<th scope="col" class="placed"> </th>
23	<th scope="col" class="placed_formatted">Placed on</th>	18	<th scope="col" class="placed_formatted">Placed on</th>
24	<th scope="col" class="updated"> </th>
25	<th scope="col" class="updated_formatted">Updated on</th>	19	<th scope="col" class="updated_formatted">Updated on</th>
26	<th scope="col">Replied</th>	20	<th scope="col">Replied</th>
27	<th scope="col" class="completed"> </th>
28	<th scope="col" class="completed_formatted">Completed on</th>	21	<th scope="col" class="completed_formatted">Completed on</th>
29	<th scope="col">Access URL</th>	22	<th scope="col">Access URL</th>
30	<th scope="col">Cost</th>	23	<th scope="col">Cost</th>
Lines 38-41 Link Here
38	</thead>	31	</thead>
39	<tbody id="illview-body">	32	<tbody id="illview-body">
40	</tbody>	33	</tbody>
41	</table>	34	</table>

Lines 13-29 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/js-biblio-format.inc (-24 / +33 lines)
13	return ''; // empty string for no biblio	13	return ''; // empty string for no biblio
14	}	14	}
15		15
16	var title = '<span class="biblio-title">';	16	var title = '';
17	if (biblio.title != null && biblio.title != '') {	17
18	title += escape_str(biblio.title);	18	if ( config && config.biblio_id_only ) {
19	} else {	19	title = escape_str(biblio.biblio_id);
20	title += __("No title");
21	}	20	}
22	title += '</span>';	21	else {
		22	title = '<span class="biblio-title">';
		23	if (biblio.title != null && biblio.title != '') {
		24	title += escape_str(biblio.title);
		25	} else {
		26	title += __("No title");
		27	}
		28	title += '</span>';
23		29
24	// add subtitle	30	// add subtitle
25	if (biblio.subtitle != null && biblio.subtitle != '') {	31	if (biblio.subtitle != null && biblio.subtitle != '') {
26	title += ' <span class="biblio-subtitle">' + escape_str(biblio.subtitle) + '</span>';	32	title += ' <span class="biblio-subtitle">' + escape_str(biblio.subtitle) + '</span>';
		33	}
27	}	34	}
28		35
29	// set title as link	36	// set title as link
Lines 39-61 Link Here
39	}	46	}
40	}	47	}
41		48
42	// add medium	49	if ( !config \|\| !config.biblio_id_only ) {
43	if (biblio.medium != null && biblio.medium != '') {	50	// add medium
44	title += ' <span class="biblio-medium">' + escape_str(biblio.medium) + '</span>';	51	if (biblio.medium != null && biblio.medium != '') {
45	}	52	title += ' <span class="biblio-medium">' + escape_str(biblio.medium) + '</span>';
46
47	// add part numbers/names
48	let part_numbers = (typeof biblio.part_number === 'string') ? biblio.part_number.split("\|") : [];
49	let part_names = (typeof biblio.part_name === 'string') ? biblio.part_name.split("\|") : [];
50	let i = 0;
51	while (part_numbers[i] \|\| part_names[i]) {
52	if (part_numbers[i]) {
53	title += ' <span class="part-number">' + escape_str(part_numbers[i]) + '</span>';
54	}	53	}
55	if (part_names[i]) {	54
56	title += ' <span class="part-name">' + escape_str(part_names[i]) + '</span>';	55	// add part numbers/names
		56	let part_numbers = (typeof biblio.part_number === 'string') ? biblio.part_number.split("\|") : [];
		57	let part_names = (typeof biblio.part_name === 'string') ? biblio.part_name.split("\|") : [];
		58	let i = 0;
		59	while (part_numbers[i] \|\| part_names[i]) {
		60	if (part_numbers[i]) {
		61	title += ' <span class="part-number">' + escape_str(part_numbers[i]) + '</span>';
		62	}
		63	if (part_names[i]) {
		64	title += ' <span class="part-name">' + escape_str(part_names[i]) + '</span>';
		65	}
		66	i++;
57	}	67	}
58	i++;
59	}	68	}
60		69
61	return title;	70	return title;