@@ -, +, @@ - Apply the patch and go to Serials -> Claims and select the vendor responsible for your late issue. - On the "Missing issues" page, confirm that everything looks correct. - All functionality should be the same: Filters, table sorting, CSV export, and claim notification. --- .../prog/en/modules/serials/claims.tt | 396 +++++++++--------- 1 file changed, 206 insertions(+), 190 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt @@ -4,7 +4,7 @@ [% USE Branches %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] - [% IF ( supplierid ) -%] Claims for [% suppliername | html %] [% END %] › Claims › Serials › Koha + [% IF ( supplierid ) -%] Claims for [% suppliername | html %] › [% END %] Claims › Serials › Koha [% INCLUDE 'doc-head-close.inc' %] @@ -44,174 +44,190 @@
-

Claims [% IF ( suppliername ) %] for [% suppliername | html %] [% END %]

+

Claims [% IF ( suppliername ) %] for [% suppliername | html %] [% END %]

- [% IF error_claim %] - [% IF error_claim == 'no_vendor_email' %] -
This vendor has no email defined for late issues.
- [% ELSIF error_claim == 'bad_or_missing_sender' %] -
Bad or missing sender address; check your branch email address or preference KohaAdminEmailAddress.
- [% ELSE %] -
[% error_claim | html %]
- [% END %] - [% END %] - [% IF info_claim %] -
Email has been sent.
- [% END %] - -[% IF letters %][% UNLESS ( missingissues ) %][% IF ( supplierid ) %]
No missing issues found.
[% ELSE %]
Please choose a vendor.
[% END %][% END %][% END %] - - [% IF ( SHOWCONFIRMATION ) %] -
Your notification has been sent.
- [% END %] -[% UNLESS letters %]
No claims notice defined. Please define one.
[% END %] -
-
- - - -
-
- - [% IF ( missingissues ) %] -

Missing issues

-
-
- Filters : - -
    -
  1. - - - - - [% INCLUDE 'date-format.inc' %] - - Clear filter -
  2. -
-
-
+ [% IF error_claim %] + [% IF error_claim == 'no_vendor_email' %] +
This vendor has no email defined for late issues.
+ [% ELSIF error_claim == 'bad_or_missing_sender' %] +
Bad or missing sender address; check your branch email address or preference KohaAdminEmailAddress.
+ [% ELSE %] +
[% error_claim | html %]
+ [% END %] + [% END %] + [% IF info_claim %] +
Email has been sent.
+ [% END %] -
-
- - - - - - - - - - - - - - [% FOR field IN additional_fields_for_subscription %] - + [% IF letters %] + [% UNLESS ( missingissues ) %] + [% IF ( supplierid ) %] +
No missing issues found.
+ [% ELSE %] +
Please choose a vendor.
[% END %] - - - - - - - - - - - - - - - [% FOR field IN additional_fields_for_subscription %] - [% END %] - - - [% FOREACH missingissue IN missingissues %] - - - - - - - - - - - - [% FOR field IN additional_fields_for_subscription %] - [% IF field.authorised_value_category %] - - [% ELSE %] - - [% END %] - [% END %] - - [% END %] -
VendorLibraryTitleISSNIssue numberStatusSinceClaims countClaim date[% field.name | html %]
- [% UNLESS missingissue.cannot_claim %] - - [% END %] - [% missingissue.name | html %] - [% Branches.GetName( missingissue.branchcode ) | html %] - - [% missingissue.title | html %] - [% missingissue.issn | html %][% missingissue.serialseq | html %] - [% IF ( missingissue.status1 ) %]Expected[% END %] - [% IF ( missingissue.status3 ) %]Late[% END %] - [% IF ( missingissue.status4 ) %]Missing[% END %] - [% IF ( missingissue.status41 ) %]Missing (never received)[% END %] - [% IF ( missingissue.status42 ) %]Missing (sold out)[% END %] - [% IF ( missingissue.status43 ) %]Missing (damaged)[% END %] - [% IF ( missingissue.status44 ) %]Missing (lost)[% END %] - [% IF ( missingissue.status7 ) %]Claimed[% END %] - - [% missingissue.planneddate | html %] - [% missingissue.claims_count | html %] - [% missingissue.claimdate | html %] - [% AuthorisedValues.GetByCode( field.authorised_value_category, missingissue.additional_fields.${field.name} ) | html %][% missingissue.additional_fields.${field.name} | html %]
+ [% END %] - [% IF csv_profiles.count %] -
- - - Download selected claims - [% END %] + [% IF ( SHOWCONFIRMATION ) %] +
Your notification has been sent.
+ [% END %] - [% IF letters %] -
- - - - - -
- [% END %] - -
-[% END %] + [% UNLESS letters %] +
+ No claims notice defined. Please define one. +
+ [% END %] + +
+
+ + + +
+
+ + [% IF ( missingissues ) %] +

Missing issues

+
+
+ Filters : +
    +
  1. + + + + + [% INCLUDE 'date-format.inc' %] + + Clear filter +
  2. +
+
+
+ +
+
+ + + + + + + + + + + + + + [% FOR field IN additional_fields_for_subscription %] + + [% END %] + + + + [% FOREACH missingissue IN missingissues %] + + + + + + + + + + + + [% FOR field IN additional_fields_for_subscription %] + [% IF field.authorised_value_category %] + + [% ELSE %] + + [% END %] + [% END %] + + [% END %] + + + + + + + + + + + + + + [% FOR field IN additional_fields_for_subscription %] + + [% END %] + + +
VendorLibraryTitleISSNIssue numberStatusSinceClaims countClaim date[% field.name | html %]
+ [% UNLESS missingissue.cannot_claim %] + + [% END %] + [% missingissue.name | html %] + [% Branches.GetName( missingissue.branchcode ) | html %] + + [% missingissue.title | html %] + [% missingissue.issn | html %][% missingissue.serialseq | html %] + [% IF ( missingissue.status1 ) %]Expected[% END %] + [% IF ( missingissue.status3 ) %]Late[% END %] + [% IF ( missingissue.status4 ) %]Missing[% END %] + [% IF ( missingissue.status41 ) %]Missing (never received)[% END %] + [% IF ( missingissue.status42 ) %]Missing (sold out)[% END %] + [% IF ( missingissue.status43 ) %]Missing (damaged)[% END %] + [% IF ( missingissue.status44 ) %]Missing (lost)[% END %] + [% IF ( missingissue.status7 ) %]Claimed[% END %] + + [% missingissue.planneddate | html %] + [% missingissue.claims_count | html %] + [% missingissue.claimdate | html %] + [% AuthorisedValues.GetByCode( field.authorised_value_category, missingissue.additional_fields.${field.name} ) | html %][% missingissue.additional_fields.${field.name} | html %]
+ + [% IF csv_profiles.count %] +
+ + + Download selected claims +
+ [% END %] + + [% IF letters %] +
+ + + + + +
+ [% END %] +
+
+ [% END %]
@@ -231,10 +247,10 @@ $(document).ready(function() { sTable = $("#claimst").dataTable($.extend(true, {}, dataTablesDefaults, { "sDom": 't', - "aoColumnDefs": [ - { "aTargets": [ 0 ], "bSortable": false, "bSearchable": false }, - { 'sType': "anti-the", 'aTargets' : [ 'anti-the'] } - ], + "aoColumnDefs": [ + { "aTargets": [ 0 ], "bSortable": false, "bSearchable": false }, + { 'sType': "anti-the", 'aTargets' : [ 'anti-the'] } + ], "bPaginate": false })); sTable.fnAddFilters("filter", "200"); @@ -254,20 +270,20 @@ // We need to use "input[name=serialid]:checked" instead of "input:checked". Otherwise, the "check all" box will pass the value of "on" as a serialid, which produces a SQL error. var selected = $("input[name=serialid]:checked"); - if (selected.length == 0) { - alert(_("Please select at least one item to export.")); - return false; - } + if (selected.length == 0) { + alert(_("Please select at least one item to export.")); + return false; + } - // Building the url from currently checked boxes - var url = '/cgi-bin/koha/serials/lateissues-export.pl?supplierid=&op=claims'; - for (var i = 0; i < selected.length; i++) { - url += '&serialid=' + selected[i].value; - } - url += '&csv_profile=' + $("#csv_profile_for_export option:selected").val(); - // And redirecting to the CSV page - location.href = url; - return false; + // Building the url from currently checked boxes + var url = '/cgi-bin/koha/serials/lateissues-export.pl?supplierid=&op=claims'; + for (var i = 0; i < selected.length; i++) { + url += '&serialid=' + selected[i].value; + } + url += '&csv_profile=' + $("#csv_profile_for_export option:selected").val(); + // And redirecting to the CSV page + location.href = url; + return false; }); $("#filterByDate").on("click",function(e){ e.preventDefault(); @@ -284,13 +300,13 @@ $("#filter_claims_form").on("submit",function(){ return false; }); - }); + }); // Checks if the form can be sent (at least one checkbox must be checked) function checkForm() { if ($("input:checked").length == 0) { - alert(_("Please select at least one issue.")); - return false; + alert(_("Please select at least one issue.")); + return false; } } @@ -325,14 +341,14 @@ // For each date in the table $(".planneddate").each(function() { - // We make a JS Date Object, according to the locale - var pdate = Date_from_syspref($(this).text()).getTime(); + // We make a JS Date Object, according to the locale + var pdate = Date_from_syspref($(this).text()).getTime(); - // And checks if the date is between the beginning and ending dates - if (pdate > beginDate && - pdate < endDate) { - // If so, we can show the row - $(this).parent().show(); + // And checks if the date is between the beginning and ending dates + if (pdate > beginDate && + pdate < endDate) { + // If so, we can show the row + $(this).parent().show(); } }); } --