Lines 153-195
Link Here
|
153 |
} |
153 |
} |
154 |
}, |
154 |
}, |
155 |
dateModified: { |
155 |
dateModified: { |
156 |
listener: function() { |
|
|
157 |
var me = 'dateModified'; |
158 |
$('#illfilter_datemodified').change(function() { |
159 |
var val = $('#illfilter_datemodified').val(); |
160 |
if (val && val.length > 0) { |
161 |
activeFilters[me] = function() { |
162 |
table.column(10).search(val); |
163 |
} |
164 |
} else { |
165 |
if (activeFilters.hasOwnProperty(me)) { |
166 |
delete activeFilters[me]; |
167 |
} |
168 |
} |
169 |
}); |
170 |
}, |
171 |
clear: function() { |
156 |
clear: function() { |
172 |
$('#illfilter_datemodified').val(''); |
157 |
$('#illfilter_datemodified_start, #illfilter_datemodified_end').val(''); |
173 |
} |
158 |
} |
174 |
}, |
159 |
}, |
175 |
datePlaced: { |
160 |
datePlaced: { |
176 |
listener: function() { |
|
|
177 |
var me = 'datePlaced'; |
178 |
$('#illfilter_dateplaced').change(function() { |
179 |
var val = $('#illfilter_dateplaced').val(); |
180 |
if (val && val.length > 0) { |
181 |
activeFilters[me] = function() { |
182 |
table.column(8).search(val); |
183 |
} |
184 |
} else { |
185 |
if (activeFilters.hasOwnProperty(me)) { |
186 |
delete activeFilters[me]; |
187 |
} |
188 |
} |
189 |
}); |
190 |
}, |
191 |
clear: function() { |
161 |
clear: function() { |
192 |
$('#illfilter_dateplaced').val(''); |
162 |
$('#illfilter_dateplaced_start, #illfilter_dateplaced_end').val(''); |
193 |
} |
163 |
} |
194 |
} |
164 |
} |
195 |
}; |
165 |
}; |
Lines 457-462
Link Here
|
457 |
} |
427 |
} |
458 |
})); |
428 |
})); |
459 |
|
429 |
|
|
|
430 |
// Custom date range filtering |
431 |
$.fn.dataTable.ext.search.push(function(settings, data, dataIndex) { |
432 |
var placedStart = $('#illfilter_dateplaced_start').datepicker('getDate'); |
433 |
var placedEnd = $('#illfilter_dateplaced_end').datepicker('getDate'); |
434 |
var modifiedStart = $('#illfilter_datemodified_start').datepicker('getDate'); |
435 |
var modifiedEnd = $('#illfilter_datemodified_end').datepicker('getDate'); |
436 |
var rowPlaced = data[8] ? new Date(data[8]) : null; |
437 |
var rowModified = data[10] ? new Date(data[10]) : null; |
438 |
var placedPassed = true; |
439 |
var modifiedPassed = true; |
440 |
if (placedStart && rowPlaced && rowPlaced < placedStart) { |
441 |
placedPassed = false |
442 |
}; |
443 |
if (placedEnd && rowPlaced && rowPlaced > placedEnd) { |
444 |
placedPassed = false; |
445 |
} |
446 |
if (modifiedStart && rowModified && rowModified < modifiedStart) { |
447 |
modifiedPassed = false |
448 |
}; |
449 |
if (modifiedEnd && rowModified && rowModified > modifiedEnd) { |
450 |
modifiedPassed = false; |
451 |
} |
452 |
|
453 |
return placedPassed && modifiedPassed; |
454 |
|
455 |
}); |
456 |
|
460 |
} |
457 |
} |
461 |
); |
458 |
); |
462 |
|
459 |
|
Lines 526-537
Link Here
|
526 |
</select> |
523 |
</select> |
527 |
</li> |
524 |
</li> |
528 |
<li> |
525 |
<li> |
529 |
<label for="illfilter_dateplaced">Date placed:</label> |
526 |
<label for="illfilter_dateplaced_start">Date placed between:</label> |
530 |
<input type="text" name="illfilter_dateplaced" id="illfilter_dateplaced" class="datepicker"> |
527 |
<input type="text" name="illfilter_dateplaced_start" id="illfilter_dateplaced_start" class="datepicker"> |
|
|
528 |
</li> |
529 |
<li> |
530 |
<label for="illfilter_dateplaced_end">and:</label> |
531 |
<input type="text" name="illfilter_dateplaced_end" id="illfilter_dateplaced_end" class="datepicker"> |
532 |
</li> |
533 |
<li> |
534 |
<label for="illfilter_datemodified_start">Updated between:</label> |
535 |
<input type="text" name="illfilter_datemodified_start" id="illfilter_datemodified_start" class="datepicker"> |
531 |
</li> |
536 |
</li> |
532 |
<li> |
537 |
<li> |
533 |
<label for="illfilter_datemodified">Updated on:</label> |
538 |
<label for="illfilter_datemodified_end">and:</label> |
534 |
<input type="text" name="illfilter_datemodified" id="illfilter_datemodified" class="datepicker"> |
539 |
<input type="text" name="illfilter_datemodified_end" id="illfilter_datemodified_end" class="datepicker"> |
535 |
</li> |
540 |
</li> |
536 |
<li> |
541 |
<li> |
537 |
<label for="illfilter_branchname">Library:</label> |
542 |
<label for="illfilter_branchname">Library:</label> |
538 |
- |
|
|