From 102dc8a40a66c15818805e2080f055394b61c680 Mon Sep 17 00:00:00 2001
From: jirislav <mail@jkozlovsky.cz>
Date: Tue, 14 Apr 2015 11:34:53 +0200
Subject: [PATCH] Bug 13931 - Added date of birth to member's search results
 table (intranet/cgi-bin/koha/members/member.pl)

---
 .../intranet-tmpl/prog/en/modules/members/member.tt     |   15 +++++++++------
 .../prog/en/modules/members/tables/members_results.tt   |    3 +++
 members/member.pl                                       |    1 +
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
index 7ecf271..03a1eff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
@@ -1,11 +1,9 @@
 [% USE Koha %]
-[% USE ColumnsSettings %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Patrons [% IF ( searching ) %]&rsaquo; Search results[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'datatables.inc' %]
-[% INCLUDE 'columns_settings.inc' %]
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function() {
@@ -132,8 +130,7 @@ $(document).ready(function() {
     });
 
     // Apply DataTables on the results table
-    var columns_settings = [% ColumnsSettings.GetColumns( 'members', 'member', 'memberresultst', 'json' ) %];
-    dtMemberResults = KohaTable("#memberresultst", {
+    dtMemberResults = $("#memberresultst").dataTable($.extend(true, {}, dataTablesDefaults, {
         'bServerSide': true,
         'sAjaxSource': "/cgi-bin/koha/svc/members/search",
         'fnServerData': function(sSource, aoData, fnCallback) {
@@ -162,6 +159,9 @@ $(document).ready(function() {
                 'name': 'name_sorton',
                 'value': 'borrowers.surname borrowers.firstname'
             },{
+		'name': 'dateofbirth',
+		'value': 'borrowers.dateofbirth'
+            },{
                 'name': 'category_sorton',
                 'value': 'categories.description',
             },{
@@ -193,6 +193,7 @@ $(document).ready(function() {
             [% END %]
             { 'mDataProp': 'dt_cardnumber' },
             { 'mDataProp': 'dt_name' },
+            { 'mDataProp': 'dt_dateofbirth' },
             { 'mDataProp': 'dt_category' },
             { 'mDataProp': 'dt_branch' },
             { 'mDataProp': 'dt_dateexpiry' },
@@ -218,7 +219,7 @@ $(document).ready(function() {
         'sPaginationType': 'full_numbers',
         "iDisplayLength": [% PatronsPerPage %],
         "bProcessing": true,
-    }, columns_settings);
+    }));
     update_searched();
 });
 
@@ -339,7 +340,8 @@ function filterByFirstLetterSurname(letter) {
                       <a href="javascript:void(0)" onclick="$('.selection').prop('checked', false)">Clear all</a>
                       |
                       <span>
-                          <label for="add_to_patron_list">Add selected patrons to:</label>
+                          Add selected patrons
+                          <label for="add_to_patron_list">to:</label>
                           <select id="add_to_patron_list" name="add_to_patron_list">
                               <option value=""></option>
                               [% IF patron_lists %]
@@ -369,6 +371,7 @@ function filterByFirstLetterSurname(letter) {
                 [% END %]
                   <th>Card</th>
                   <th>Name</th>
+		  <th>Date of birth</th>
                   <th>Category</th>
                   <th>Library</th>
                   <th>Expires on</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt
index 00b02af..dce364c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt
@@ -1,4 +1,5 @@
 [% USE AuthorisedValues %]
+[% USE KohaDates %]
 {
     "sEcho": [% sEcho %],
     "iTotalRecords": [% iTotalRecords %],
@@ -14,6 +15,8 @@
                     "[% data.cardnumber %]",
                 "dt_name":
                     "<span style='white-space:nowrap'><a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber %]'>[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames invert_name = 1%]</a><br />[% IF ( data.streetnumber ) %][% data.streetnumber %] [% END %][% IF ( data.streettype ) %][% AuthorisedValues.GetByCode( 'ROADTYPE', data.streettype ) %] [% END %][% data.address %][% IF ( data.address2 ) %]<br />[% data.address2 %][% END %][% IF ( data.city || data.state || data.zipcode || data.country) %]<br />[% END %][% IF ( data.city ) %][% data.city %][% IF ( data.state ) %],[% END %][% END %][% IF ( data.state ) %] [% data.state %][% END %] [% IF ( data.zipcode ) %] [% data.zipcode %][% END %][% IF ( data.country ) %], [% data.country %][% END %][% IF data.email %]<br/>Email&#58; <a href='mailto&#58;[% data.email %]'>[% data.email %]</a>[% END %]</span>",
+		"dt_dateofbirth":
+		    "[% data.dateofbirth | $KohaDates %]",
                 "dt_category":
                     "[% data.category_description |html %] ([% data.category_type |html %])",
                 "dt_branch":
diff --git a/members/member.pl b/members/member.pl
index 191ff44..ba84008 100755
--- a/members/member.pl
+++ b/members/member.pl
@@ -117,6 +117,7 @@ $template->param(
     categories          => \@categories,
     branchcode          => $patron->{branchcode},
     categorycode        => $patron->{categorycode},
+    dateofbirth		=> $patron->{dateofbirth},
     searchtype          => $input->param('searchtype') || 'start_with',
     searchfieldstype    => $searchfieldstype,
     PatronsPerPage      => C4::Context->preference("PatronsPerPage") || 20,
-- 
1.7.10.4