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