@@ -, +, @@
---
admin/columns_settings.yml | 32 ++++++++++-----
.../prog/en/modules/ill/ill-requests.tt | 47 ++++++++++------------
2 files changed, 43 insertions(+), 36 deletions(-)
--- a/admin/columns_settings.yml
+++ a/admin/columns_settings.yml
@@ -356,21 +356,21 @@ modules:
-
columnname: illrequest_id
-
- columnname: metadata_Author
+ columnname: metadata_author
-
- columnname: metadata_Title
+ columnname: metadata_title
-
- columnname: metadata_Item_part_title
+ columnname: metadata_item_part_title
-
- columnname: metadata_Issue
+ columnname: metadata_issue
-
- columnname: metadata_Volume
+ columnname: metadata_volume
-
- columnname: metadata_Year
+ columnname: metadata_year
-
- columnname: metadata_Item_part_pages
+ columnname: metadata_item_part_pages
-
- columnname: metadata_Type
+ columnname: metadata_type
-
columnname: orderid
-
@@ -378,19 +378,29 @@ modules:
-
columnname: patron_cardnumber
-
- columnname: biblio_id
+ columnname: patron
-
- columnname: borrowernumber
+ columnname: biblio_id
-
columnname: library_branchname
-
columnname: status
-
columnname: placed
+ cannot_be_toggled: 1
+ cannot_be_modified: 1
+ is_hidden: 1
-
- columnname: replied
+ columnname: placed_formatted
-
columnname: updated
+ cannot_be_toggled: 1
+ cannot_be_modified: 1
+ is_hidden: 1
+ -
+ columnname: updated_formatted
+ -
+ columnname: replied
-
columnname: completed
-
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
@@ -520,8 +520,8 @@
Order ID |
Patron ID |
Patron barcode |
- Biblio ID |
Patron |
+ Biblio ID |
Branch |
Status |
|
@@ -529,6 +529,7 @@
Replied |
|
Updated on |
+ Replied |
Completed on |
Access URL |
Cost |
@@ -614,7 +615,7 @@
var sel = $('#illfilter_status option:selected').val();
if (sel && sel.length > 0) {
activeFilters[me] = function() {
- table.column(5).search(sel);
+ table.api().column(15).search(sel);
}
} else {
if (activeFilters.hasOwnProperty(me)) {
@@ -631,7 +632,7 @@
prep: function(tableData, oData) {
var uniques = {};
tableData.forEach(function(row) {
- uniques[row.library.branchname] = 1
+ uniques[row.library_branchname] = 1
});
Object.keys(uniques).sort().forEach(function(unique) {
$('#illfilter_branchname').append(
@@ -646,7 +647,7 @@
var sel = $('#illfilter_branchname option:selected').val();
if (sel && sel.length > 0) {
activeFilters[me] = function() {
- table.column(4).search(sel);
+ table.api().column(14).search(sel);
}
} else {
if (activeFilters.hasOwnProperty(me)) {
@@ -666,7 +667,7 @@
var val = $('#illfilter_barcode').val();
if (val && val.length > 0) {
activeFilters[me] = function() {
- table.column(12).search(val);
+ table.api().column(11).search(val);
}
} else {
if (activeFilters.hasOwnProperty(me)) {
@@ -735,8 +736,7 @@
if ( row.patron_firstname ) {
patronLink = patronLink + row.patron_firstname + ' ';
}
- patronLink = patronLink + row.patron_surname +
- ' [' + row.patron_cardnumber + ' ]';
+ patronLink = patronLink + row.patron_surname + '';
return patronLink;
};
@@ -882,11 +882,11 @@
});
});
- // Display the modal containing request supplier metadata
- $('#ill-request-display-metadata').on('click', function(e) {
- e.preventDefault();
- $('#dataPreview').modal({show:true});
- });
+ // Display the modal containing request supplier metadata
+ $('#ill-request-display-metadata').on('click', function(e) {
+ e.preventDefault();
+ $('#dataPreview').modal({show:true});
+ });
// Get our data from the API and process it prior to passing
// it to datatables
@@ -912,6 +912,7 @@
var colObj = $.extend({}, thisCol);
colObj.name = colName;
colObj.className = colName;
+ colObj.defaultContent = '';
// We may need to process the data going in this
// column, so do it if necessary
@@ -935,6 +936,7 @@
});
// Initialise the datatable
+ table = KohaTable("ill-requests", {})
var illTable = KohaTable("ill-requests", {
'aoColumnDefs': [
{ // Last column shouldn't be sortable or searchable
@@ -942,20 +944,15 @@
'bSortable': false,
'bSearchable': false
},
- { // Hide the two date columns we use just for sorting
- 'aTargets': [ 'placed', 'updated' ],
- 'bVisible': false,
- 'bSearchable': true
- },
{ // When sorting 'placed', we want to use the
// unformatted column
'aTargets': [ 'placed_formatted'],
- 'iDataSort': 7
+ 'iDataSort': 16
},
{ // When sorting 'updated', we want to use the
// unformatted column
'aTargets': [ 'updated_formatted'],
- 'iDataSort': 9
+ 'iDataSort': 18
},
{
'aTargets': [ 'patron_cardnumber' ],
@@ -963,7 +960,7 @@
'bSearchable': true
}
],
- 'aaSorting': [[ 9, 'desc' ]], // Default sort, updated descending
+ 'aaSorting': [[ 18, 'desc' ]], // Default sort, updated descending
'processing': true, // Display a message when manipulating
'sPaginationType': "full_numbers", // Pagination display
'deferRender': true, // Improve performance on big datasets
@@ -994,8 +991,8 @@
var placedEnd = $('#illfilter_dateplaced_end').datepicker('getDate');
var modifiedStart = $('#illfilter_datemodified_start').datepicker('getDate');
var modifiedEnd = $('#illfilter_datemodified_end').datepicker('getDate');
- var rowPlaced = data[6] ? new Date(data[6]) : null;
- var rowModified = data[8] ? new Date(data[8]) : null;
+ var rowPlaced = data[16] ? new Date(data[16]) : null;
+ var rowModified = data[18] ? new Date(data[18]) : null;
var placedPassed = true;
var modifiedPassed = true;
if (placedStart && rowPlaced && rowPlaced < placedStart) {
@@ -1019,7 +1016,7 @@
);
var clearSearch = function() {
- table.search('').columns().search('');
+ table.api().search('').columns().search('');
activeFilters = {};
for (var filter in filterable) {
if (
@@ -1029,7 +1026,7 @@
filterable[filter].clear();
}
}
- table.draw();
+ table.api().draw();
};
// Apply any search filters, or clear any previous
@@ -1042,7 +1039,7 @@
activeFilters[active]();
}
}
- table.draw();
+ table.api().draw();
});
// Clear all filters
--