From e6024a6f56b6fd79886979d8868428f94a5dbb4f Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Thu, 29 Aug 2013 14:04:32 +0200
Subject: [PATCH] Bug 10855: Search subscriptions by additional fields on the
 claim page

Test plan:
- create some serials in late.
- go on serials/claims.pl.
- choose a vendor.
- verify that additional fields are displayed in new columns.
- try filters on columns.
- verify there is no regression on this page.
---
 C4/Serials.pm                                      |    8 ++
 .../prog/en/modules/serials/claims.tt              |  100 ++++++++------------
 serials/claims.pl                                  |   10 ++
 3 files changed, 55 insertions(+), 63 deletions(-)

diff --git a/C4/Serials.pm b/C4/Serials.pm
index 46d8fe5..45c61e4 100644
--- a/C4/Serials.pm
+++ b/C4/Serials.pm
@@ -1878,6 +1878,7 @@ name,title,planneddate,serialseq,serial.subscriptionid from tables : subscriptio
 sub GetLateOrMissingIssues {
     my ( $supplierid, $serialid, $order ) = @_;
     my $dbh = C4::Context->dbh;
+
     my $sth;
     my $byserial = '';
     if ($serialid) {
@@ -1933,6 +1934,13 @@ sub GetLateOrMissingIssues {
             $line->{claimdate}   = format_date( $line->{claimdate} );
         }
         $line->{"status".$line->{status}}   = 1;
+
+        my $additional_field_values = Koha::AdditionalField->fetch_all_values({
+            record_id => $line->{subscriptionid},
+            tablename => 'subscription'
+        });
+        %$line = ( %$line, additional_fields => $additional_field_values->{$line->{subscriptionid}} );
+
         push @issuelist, $line;
     }
     return @issuelist;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
index 7528e9a..58df08e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
@@ -1,4 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
+[% USE KohaAuthorisedValues %]
     <title>Koha &rsaquo; Serials &rsaquo; Claims</title>
     [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
@@ -9,15 +10,17 @@
 <script type="text/javascript">
 //<![CDATA[
     [% IF (dateformat == 'metric') %]dt_add_type_uk_date();[% END %]
+    var sTable;
 	 $(document).ready(function() {
         [% UNLESS ( preview ) %]
-         var sTable = $("#claimst").dataTable($.extend(true, {}, dataTablesDefaults, {
+         sTable = $("#claimst").dataTable($.extend(true, {}, dataTablesDefaults, {
             "sDom": 't',
             "aoColumnDefs": [
-                { "aTargets": [ 0,1,-1 ], "bSortable": false, "bSearchable": false }
+                { "aTargets": [ 0,-1 ], "bSortable": false, "bSearchable": false }
             ],
             "bPaginate": false
         }));
+        sTable.fnAddFilters("filter", "200");
         [% END %]
 	    $('#supplierid').change(function() {
     	    $('#claims').submit();
@@ -51,13 +54,6 @@
 		return false;
 	    });	
 
-        $("#titlefilter").keyup( function () {
-            sTable.fnFilter( this.value, 3 ); // 3 is position of title column
-        } );
-
-        $("#branchfilter").keyup(function() {
-            sTable.fnFilter( this.value, 2 ); // 2 is the position of the author column
-	    });
 	 });
 
 	// Checks if the form can be sent (at least one checkbox must be checked)
@@ -68,27 +64,6 @@
 	    }
 	}
 
-	// Filter by status
-	function filterByStatus() {
-	    selectedStatus = $("#statusfilter").val();
-	    if (selectedStatus == "all") {
-		clearFilters();
-	    } else {
-		$("table#claimst tbody tr").hide();
-		$("table#claimst tbody tr:contains(" + selectedStatus + ")").show();
-	    }
-	}
-
-	// Filter by branch
-	function filterByBranch() {
-	    selectedBranch = $("#branchfilter").val();
-	    if (selectedBranch == "all") {
-		clearFilters();
-	    } else {
-		$("table#claimst tbody tr").hide();
-		$("table#claimst tbody tr:contains(" + selectedBranch + ")").show();
-	    }
-	}
 	// Filter by date
 	function filterByDate() {
         var beginDate = Date_from_syspref($("#from").val()).getTime();
@@ -136,6 +111,7 @@
 	// Clears filters : shows everything
 	function clearFilters() {
 	    $("table#claimst tbody tr").show();
+
 	}
 
 	function popup(supplierid,serialid){
@@ -199,44 +175,14 @@
 	
 	<ol>
 	<li>
-	    <label for="statusfilter">Status : </label>
-	    <select id="statusfilter" onchange="filterByStatus();">
-		<option value="all" selected="selected">(All)</option>
-		<option>Expected</option>
-		<option>Arrived</option>
-		<option>Late</option>
-		<option>Missing</option>
-		<option>Claimed</option>
-        <option>Stopped</option>
-	    </select>
-	</li>
-	
-	<li>
-	    <label for="titlefilter">Title : </label>
-        <input id="titlefilter" type="text" />
-    </li>
-    <li>
-	    <label for="branchfilter">Library: </label>
-	    <select id="branchfilter" onchange="filterByBranch();">
-            [% FOREACH branchloo IN branchloop %]
-                [% IF ( branchloo.selected ) %]
-                <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
-                [% ELSE %]
-                <option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
-                [% END %]
-            [% END %]
-        </select>
-	</li>
-	
-	<li>
         <label for="from">From:</label>
         <input type="text" name="begindate" id="from" value="[% begindate %]" size="10" maxlength="10" class="datepickerfrom" />
         <label for="to" style="float:none;">To:</label>
         <input type="text" name="enddate" id="to" value="[% enddate %]" size="10" maxlength="10" class="datepickerto" />
         <span class="hint">[% INCLUDE 'date-format.inc' %]</span>
 	    <input type="button" value="OK" onclick="filterByDate();" />
-        </li>
-	
+    </li>
+
 	<li>
         <input type="reset" value="Clear filters" onclick="clearFilters();" />
 	</li>
@@ -259,8 +205,29 @@
                     <th>Status</th>
                     <th>Since</th>
                     <th>Claim date</th>
-                <th>Begin claim</th>
+                    [% FOR field IN additional_fields_for_subscription %]
+                      <th>[% field.name %]</th>
+                    [% END %]
+                <th></th>
                 </tr></thead>
+                <tfoot>
+                  <tr>
+                    [% IF ( letter ) %]
+                      <td></td>
+                    [% END %]
+                    <td><input type="text" class="filter" data-column_num="1" placeholder="Search vendor" /></td>
+                    <td><input type="text" class="filter" data-column_num="2" placeholder="Search library" /></td>
+                    <td><input type="text" class="filter" data-column_num="3" placeholder="Search title" /></td>
+                    <td><input type="text" class="filter" data-column_num="4" placeholder="Search issue number" /></td>
+                    <td><input type="text" class="filter" data-column_num="5" placeholder="Search status" /></td>
+                    <td></td>
+                    <td><input type="text" class="filter" data-column_num="7" placeholder="Search claim date" /></td>
+                    [% FOR field IN additional_fields_for_subscription %]
+                      <td><input type="text" class="filter" data-column_num="[% loop.count + 7 %]" placeholder="Search [% field.name %]" /></td>
+                    [% END %]
+                    <td></td>
+                  </tr>
+                </tfoot>
                 <tbody>[% FOREACH missingissue IN missingissues %]
                     <tr>
                         [% IF ( letter ) %]
@@ -294,6 +261,13 @@
                         <td>
                         [% missingissue.claimdate %]
                         </td>
+                        [% FOR field IN additional_fields_for_subscription %]
+                          [% IF field.authorised_value_category %]
+                            <td>[% KohaAuthorisedValues.GetByCode( field.authorised_value_category, missingissue.additional_fields.${field.name} ) %]</td>
+                          [% ELSE %]
+                            <td>[% missingissue.additional_fields.${field.name} %]</td>
+                          [% END %]
+                        [% END %]
                         <td>
                             <a href="/cgi-bin/koha/serials/lateissues-excel.pl?supplierid=[% missingissue.supplieri %]&amp;serialid=[% missingissue.serialid %]&amp;op=claims">Export item data</a>
                         </td>
diff --git a/serials/claims.pl b/serials/claims.pl
index 5434b2a..8641c03 100755
--- a/serials/claims.pl
+++ b/serials/claims.pl
@@ -28,6 +28,8 @@ use C4::Bookseller qw( GetBookSeller );
 use C4::Context;
 use C4::Letters;
 use C4::Branch;    # GetBranches GetBranchesLoop
+use C4::Koha qw( GetAuthorisedValues );
+use Koha::AdditionalField;
 
 my $input = CGI->new;
 
@@ -57,6 +59,13 @@ for my $s (@{$supplierlist} ) {
     }
 }
 
+my $additional_fields = Koha::AdditionalField->all( { table => 'subscription', searchable => 1 } );
+for my $field ( @$additional_fields ) {
+    if ( $field->{authorised_value_category} ) {
+        $field->{authorised_value_choices} = GetAuthorisedValues( $field->{authorised_value_category} );
+    }
+}
+
 my $letters = GetLetters('claimissues');
 my @letters;
 foreach (keys %{$letters}){
@@ -98,6 +107,7 @@ $template->param(
         claimletter => $claimletter,
         supplierloop => \@supplierinfo,
         branchloop   => $branchloop,
+        additional_fields_for_subscription => $additional_fields,
         (uc(C4::Context->preference("marcflavour"))) => 1
         );
 output_html_with_http_headers $input, $cookie, $template->output;
-- 
1.7.10.4