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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt (-6 / +9 lines)
Lines 1-11 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE ColumnsSettings %]
3
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
4
<title>Koha &rsaquo; Patrons [% IF ( searching ) %]&rsaquo; Search results[% END %]</title>
3
<title>Koha &rsaquo; Patrons [% IF ( searching ) %]&rsaquo; Search results[% END %]</title>
5
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
6
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
5
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
7
[% INCLUDE 'datatables.inc' %]
6
[% INCLUDE 'datatables.inc' %]
8
[% INCLUDE 'columns_settings.inc' %]
9
<script type="text/javascript">
7
<script type="text/javascript">
10
//<![CDATA[
8
//<![CDATA[
11
$(document).ready(function() {
9
$(document).ready(function() {
Lines 132-139 $(document).ready(function() { Link Here
132
    });
130
    });
133
131
134
    // Apply DataTables on the results table
132
    // Apply DataTables on the results table
135
    var columns_settings = [% ColumnsSettings.GetColumns( 'members', 'member', 'memberresultst', 'json' ) %];
133
    dtMemberResults = $("#memberresultst").dataTable($.extend(true, {}, dataTablesDefaults, {
136
    dtMemberResults = KohaTable("#memberresultst", {
137
        'bServerSide': true,
134
        'bServerSide': true,
138
        'sAjaxSource': "/cgi-bin/koha/svc/members/search",
135
        'sAjaxSource': "/cgi-bin/koha/svc/members/search",
139
        'fnServerData': function(sSource, aoData, fnCallback) {
136
        'fnServerData': function(sSource, aoData, fnCallback) {
Lines 162-167 $(document).ready(function() { Link Here
162
                'name': 'name_sorton',
159
                'name': 'name_sorton',
163
                'value': 'borrowers.surname borrowers.firstname'
160
                'value': 'borrowers.surname borrowers.firstname'
164
            },{
161
            },{
162
		'name': 'dateofbirth',
163
		'value': 'borrowers.dateofbirth'
164
            },{
165
                'name': 'category_sorton',
165
                'name': 'category_sorton',
166
                'value': 'categories.description',
166
                'value': 'categories.description',
167
            },{
167
            },{
Lines 193-198 $(document).ready(function() { Link Here
193
            [% END %]
193
            [% END %]
194
            { 'mDataProp': 'dt_cardnumber' },
194
            { 'mDataProp': 'dt_cardnumber' },
195
            { 'mDataProp': 'dt_name' },
195
            { 'mDataProp': 'dt_name' },
196
            { 'mDataProp': 'dt_dateofbirth' },
196
            { 'mDataProp': 'dt_category' },
197
            { 'mDataProp': 'dt_category' },
197
            { 'mDataProp': 'dt_branch' },
198
            { 'mDataProp': 'dt_branch' },
198
            { 'mDataProp': 'dt_dateexpiry' },
199
            { 'mDataProp': 'dt_dateexpiry' },
Lines 218-224 $(document).ready(function() { Link Here
218
        'sPaginationType': 'full_numbers',
219
        'sPaginationType': 'full_numbers',
219
        "iDisplayLength": [% PatronsPerPage %],
220
        "iDisplayLength": [% PatronsPerPage %],
220
        "bProcessing": true,
221
        "bProcessing": true,
221
    }, columns_settings);
222
    }));
222
    update_searched();
223
    update_searched();
223
});
224
});
224
225
Lines 339-345 function filterByFirstLetterSurname(letter) { Link Here
339
                      <a href="javascript:void(0)" onclick="$('.selection').prop('checked', false)">Clear all</a>
340
                      <a href="javascript:void(0)" onclick="$('.selection').prop('checked', false)">Clear all</a>
340
                      |
341
                      |
341
                      <span>
342
                      <span>
342
                          <label for="add_to_patron_list">Add selected patrons to:</label>
343
                          Add selected patrons
344
                          <label for="add_to_patron_list">to:</label>
343
                          <select id="add_to_patron_list" name="add_to_patron_list">
345
                          <select id="add_to_patron_list" name="add_to_patron_list">
344
                              <option value=""></option>
346
                              <option value=""></option>
345
                              [% IF patron_lists %]
347
                              [% IF patron_lists %]
Lines 369-374 function filterByFirstLetterSurname(letter) { Link Here
369
                [% END %]
371
                [% END %]
370
                  <th>Card</th>
372
                  <th>Card</th>
371
                  <th>Name</th>
373
                  <th>Name</th>
374
		  <th>Date of birth</th>
372
                  <th>Category</th>
375
                  <th>Category</th>
373
                  <th>Library</th>
376
                  <th>Library</th>
374
                  <th>Expires on</th>
377
                  <th>Expires on</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt (+3 lines)
Lines 1-4 Link Here
1
[% USE AuthorisedValues %]
1
[% USE AuthorisedValues %]
2
[% USE KohaDates %]
2
{
3
{
3
    "sEcho": [% sEcho %],
4
    "sEcho": [% sEcho %],
4
    "iTotalRecords": [% iTotalRecords %],
5
    "iTotalRecords": [% iTotalRecords %],
Lines 14-19 Link Here
14
                    "[% data.cardnumber %]",
15
                    "[% data.cardnumber %]",
15
                "dt_name":
16
                "dt_name":
16
                    "<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>",
17
                    "<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>",
18
		"dt_dateofbirth":
19
		    "[% data.dateofbirth | $KohaDates %]",
17
                "dt_category":
20
                "dt_category":
18
                    "[% data.category_description |html %] ([% data.category_type |html %])",
21
                    "[% data.category_description |html %] ([% data.category_type |html %])",
19
                "dt_branch":
22
                "dt_branch":
(-)a/members/member.pl (-1 / +1 lines)
Lines 117-122 $template->param( Link Here
117
    categories          => \@categories,
117
    categories          => \@categories,
118
    branchcode          => $patron->{branchcode},
118
    branchcode          => $patron->{branchcode},
119
    categorycode        => $patron->{categorycode},
119
    categorycode        => $patron->{categorycode},
120
    dateofbirth		=> $patron->{dateofbirth},
120
    searchtype          => $input->param('searchtype') || 'start_with',
121
    searchtype          => $input->param('searchtype') || 'start_with',
121
    searchfieldstype    => $searchfieldstype,
122
    searchfieldstype    => $searchfieldstype,
122
    PatronsPerPage      => C4::Context->preference("PatronsPerPage") || 20,
123
    PatronsPerPage      => C4::Context->preference("PatronsPerPage") || 20,
123
- 

Return to bug 13931