Bug 32939: Have a generic APIClient object

[koha-ffzg.git] / koha-tmpl / intranet-tmpl / prog / js / ill-list-table.js

diff --git a/koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js b/koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js
index 2c39ad7..d6e92cc 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js
@@ -335,32 +335,6 @@ $(document).ready(function() {
         $('#addcomment').toggleClass('content_hidden');
     });
 
-    var illfilter_dateplaced_start = $("#illfilter_dateplaced_start").flatpickr({
-        onClose: function( selectedDates, dateText, instance) {
-            validate_date( selectedDates, instance );
-            illfilter_dateplaced_end.set('minDate', selectedDates[0]);
-        }
-    });
-
-    var illfilter_dateplaced_end = $("#illfilter_dateplaced_end").flatpickr({
-        onClose: function( selectedDates, dateText, instance) {
-            validate_date( selectedDates, instance );
-        },
-    });
-
-    var illfilter_datemodified_start = $("#illfilter_datemodified_start").flatpickr({
-        onClose: function( selectedDates, dateText, instance) {
-            validate_date( selectedDates, instance );
-            illfilter_datemodified_end.set('minDate', selectedDates[0]);
-        }
-    });
-
-    var illfilter_datemodified_end = $("#illfilter_datemodified_end").flatpickr({
-        onClose: function( selectedDates, dateText, instance) {
-            validate_date( selectedDates, instance );
-        },
-    });
-
     // Filter partner list
     // Record the list of all options
     var ill_partner_options = $('#partners > option');
@@ -431,7 +405,8 @@ $(document).ready(function() {
             // Assemble an array of column definitions for passing
             // to datatables
             var colData = [];
-            columns_settings.forEach(function(thisCol) {
+            var columns = table_settings['columns'];
+            columns.forEach(function(thisCol) {
                 var colName = thisCol.columnname;
                 // Create the base column object
                 var colObj = $.extend({}, thisCol);
@@ -520,14 +495,14 @@ $(document).ready(function() {
                     }
 
                 }
-            }, columns_settings);
+            }, table_settings);
 
             // Custom date range filtering
             $.fn.dataTable.ext.search.push(function(settings, data, dataIndex) {
-                var placedStart = illfilter_dateplaced_start.selectedDates[0];
-                var placedEnd = illfilter_dateplaced_end.selectedDates[0];
-                var modifiedStart = illfilter_datemodified_start.selectedDates[0];
-                var modifiedEnd = illfilter_datemodified_end.selectedDates[0];
+                var placedStart = $('#illfilter_dateplaced_start').get(0)._flatpickr.selectedDates[0];
+                var placedEnd = $('#illfilter_dateplaced_end').get(0)._flatpickr.selectedDates[0];
+                var modifiedStart = $('#illfilter_datemodified_start').get(0)._flatpickr.selectedDates[0];
+                var modifiedEnd = $('#illfilter_datemodified_end').get(0)._flatpickr.selectedDates[0];
                 var rowPlaced = data[14] ? new Date(data[14]) : null;
                 var rowModified = data[16] ? new Date(data[16]) : null;
                 var placedPassed = true;