Lines 63-70
Link Here
|
63 |
</select> |
63 |
</select> |
64 |
</li> |
64 |
</li> |
65 |
<li> |
65 |
<li> |
66 |
<label for="illfilter_barcode">Cardnumber:</label> |
66 |
<label for="illfilter_patron">Patron:</label> |
67 |
<input type="text" name="illfilter_barcode" id="illfilter_barcode" /> |
67 |
<input type="text" name="illfilter_patron" id="illfilter_patron" /> |
68 |
</li> |
68 |
</li> |
69 |
</ol> |
69 |
</ol> |
70 |
<fieldset class="action"> |
70 |
<fieldset class="action"> |
Lines 518-525
Link Here
|
518 |
<th scope="col">Pages</th> |
518 |
<th scope="col">Pages</th> |
519 |
<th scope="col">Type</th> |
519 |
<th scope="col">Type</th> |
520 |
<th scope="col">Order ID</th> |
520 |
<th scope="col">Order ID</th> |
521 |
<th scope="col">Patron ID</th> |
|
|
522 |
<th scope="col" class="patron_cardnumber">Patron barcode</th> |
523 |
<th scope="col">Patron</th> |
521 |
<th scope="col">Patron</th> |
524 |
<th scope="col">Biblio ID</th> |
522 |
<th scope="col">Biblio ID</th> |
525 |
<th scope="col">Branch</th> |
523 |
<th scope="col">Branch</th> |
Lines 615-621
Link Here
|
615 |
var sel = $('#illfilter_status option:selected').val(); |
613 |
var sel = $('#illfilter_status option:selected').val(); |
616 |
if (sel && sel.length > 0) { |
614 |
if (sel && sel.length > 0) { |
617 |
activeFilters[me] = function() { |
615 |
activeFilters[me] = function() { |
618 |
table.api().column(15).search(sel); |
616 |
table.api().column(13).search(sel); |
619 |
} |
617 |
} |
620 |
} else { |
618 |
} else { |
621 |
if (activeFilters.hasOwnProperty(me)) { |
619 |
if (activeFilters.hasOwnProperty(me)) { |
Lines 647-653
Link Here
|
647 |
var sel = $('#illfilter_branchname option:selected').val(); |
645 |
var sel = $('#illfilter_branchname option:selected').val(); |
648 |
if (sel && sel.length > 0) { |
646 |
if (sel && sel.length > 0) { |
649 |
activeFilters[me] = function() { |
647 |
activeFilters[me] = function() { |
650 |
table.api().column(14).search(sel); |
648 |
table.api().column(12).search(sel); |
651 |
} |
649 |
} |
652 |
} else { |
650 |
} else { |
653 |
if (activeFilters.hasOwnProperty(me)) { |
651 |
if (activeFilters.hasOwnProperty(me)) { |
Lines 660-673
Link Here
|
660 |
$('#illfilter_branchname').val(''); |
658 |
$('#illfilter_branchname').val(''); |
661 |
} |
659 |
} |
662 |
}, |
660 |
}, |
663 |
barcode: { |
661 |
patron: { |
664 |
listener: function() { |
662 |
listener: function() { |
665 |
var me = 'barcode'; |
663 |
var me = 'patron'; |
666 |
$('#illfilter_barcode').change(function() { |
664 |
$('#illfilter_patron').change(function() { |
667 |
var val = $('#illfilter_barcode').val(); |
665 |
var val = $('#illfilter_patron').val(); |
668 |
if (val && val.length > 0) { |
666 |
if (val && val.length > 0) { |
669 |
activeFilters[me] = function() { |
667 |
activeFilters[me] = function() { |
670 |
table.api().column(11).search(val); |
668 |
table.api().column(10).search(val); |
671 |
} |
669 |
} |
672 |
} else { |
670 |
} else { |
673 |
if (activeFilters.hasOwnProperty(me)) { |
671 |
if (activeFilters.hasOwnProperty(me)) { |
Lines 677-683
Link Here
|
677 |
}); |
675 |
}); |
678 |
}, |
676 |
}, |
679 |
clear: function() { |
677 |
clear: function() { |
680 |
$('#illfilter_barcode').val(''); |
678 |
$('#illfilter_patron').val(''); |
681 |
} |
679 |
} |
682 |
}, |
680 |
}, |
683 |
dateModified: { |
681 |
dateModified: { |
Lines 736-742
Link Here
|
736 |
if ( row.patron_firstname ) { |
734 |
if ( row.patron_firstname ) { |
737 |
patronLink = patronLink + row.patron_firstname + ' '; |
735 |
patronLink = patronLink + row.patron_firstname + ' '; |
738 |
} |
736 |
} |
739 |
patronLink = patronLink + row.patron_surname + '</a>'; |
737 |
patronLink = patronLink + row.patron_surname + |
|
|
738 |
' (' + row.patron_cardnumber + ')' + '</a>'; |
740 |
return patronLink; |
739 |
return patronLink; |
741 |
}; |
740 |
}; |
742 |
|
741 |
|
Lines 841-849
Link Here
|
841 |
updated: { |
840 |
updated: { |
842 |
name: _("Updated on"), |
841 |
name: _("Updated on"), |
843 |
}, |
842 |
}, |
844 |
patron_cardnumber: { |
|
|
845 |
name: _("Cardnumber") |
846 |
}, |
847 |
patron: { |
843 |
patron: { |
848 |
skipSanitize: true, |
844 |
skipSanitize: true, |
849 |
func: createPatronLink |
845 |
func: createPatronLink |
Lines 976-995
Link Here
|
976 |
{ // When sorting 'placed', we want to use the |
972 |
{ // When sorting 'placed', we want to use the |
977 |
// unformatted column |
973 |
// unformatted column |
978 |
'aTargets': [ 'placed_formatted'], |
974 |
'aTargets': [ 'placed_formatted'], |
979 |
'iDataSort': 16 |
975 |
'iDataSort': 14 |
980 |
}, |
976 |
}, |
981 |
{ // When sorting 'updated', we want to use the |
977 |
{ // When sorting 'updated', we want to use the |
982 |
// unformatted column |
978 |
// unformatted column |
983 |
'aTargets': [ 'updated_formatted'], |
979 |
'aTargets': [ 'updated_formatted'], |
984 |
'iDataSort': 18 |
980 |
'iDataSort': 16 |
985 |
}, |
|
|
986 |
{ |
987 |
'aTargets': [ 'patron_cardnumber' ], |
988 |
'bVisible': false, |
989 |
'bSearchable': true |
990 |
} |
981 |
} |
991 |
], |
982 |
], |
992 |
'aaSorting': [[ 18, 'desc' ]], // Default sort, updated descending |
983 |
'aaSorting': [[ 16, 'desc' ]], // Default sort, updated descending |
993 |
'processing': true, // Display a message when manipulating |
984 |
'processing': true, // Display a message when manipulating |
994 |
'sPaginationType': "full_numbers", // Pagination display |
985 |
'sPaginationType': "full_numbers", // Pagination display |
995 |
'deferRender': true, // Improve performance on big datasets |
986 |
'deferRender': true, // Improve performance on big datasets |
Lines 1020-1027
Link Here
|
1020 |
var placedEnd = $('#illfilter_dateplaced_end').datepicker('getDate'); |
1011 |
var placedEnd = $('#illfilter_dateplaced_end').datepicker('getDate'); |
1021 |
var modifiedStart = $('#illfilter_datemodified_start').datepicker('getDate'); |
1012 |
var modifiedStart = $('#illfilter_datemodified_start').datepicker('getDate'); |
1022 |
var modifiedEnd = $('#illfilter_datemodified_end').datepicker('getDate'); |
1013 |
var modifiedEnd = $('#illfilter_datemodified_end').datepicker('getDate'); |
1023 |
var rowPlaced = data[16] ? new Date(data[16]) : null; |
1014 |
var rowPlaced = data[14] ? new Date(data[14]) : null; |
1024 |
var rowModified = data[18] ? new Date(data[18]) : null; |
1015 |
var rowModified = data[16] ? new Date(data[16]) : null; |
1025 |
var placedPassed = true; |
1016 |
var placedPassed = true; |
1026 |
var modifiedPassed = true; |
1017 |
var modifiedPassed = true; |
1027 |
if (placedStart && rowPlaced && rowPlaced < placedStart) { |
1018 |
if (placedStart && rowPlaced && rowPlaced < placedStart) { |
1028 |
- |
|
|