View | Details | Raw Unified | Return to bug 20600
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css (-2 / +4 lines)
Lines 3164-3171 table#ill-requests { Link Here
3164
    width: 100% !important;
3164
    width: 100% !important;
3165
}
3165
}
3166
3166
3167
#illfilter_dateplaced,
3167
#illfilter_dateplaced_start,
3168
#illfilter_datemodified {
3168
#illfilter_datemodified_start,
3169
#illfilter_dateplaced_end,
3170
#illfilter_datemodified_end {
3169
    width: 80%;
3171
    width: 80%;
3170
}
3172
}
3171
3173
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt (-37 / +42 lines)
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
                    console.log(data);
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
459
            }
457
            }
460
        );
458
        );
461
459
Lines 525-536 Link Here
525
                            </select>
523
                            </select>
526
                        </li>
524
                        </li>
527
                        <li>
525
                        <li>
528
                            <label for="illfilter_dateplaced">Date placed:</label>
526
                            <label for="illfilter_dateplaced_start">Date placed between:</label>
529
                            <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">
530
                        </li>
536
                        </li>
531
                        <li>
537
                        <li>
532
                            <label for="illfilter_datemodified">Updated on:</label>
538
                            <label for="illfilter_datemodified_end">and:</label>
533
                            <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">
534
                        </li>
540
                        </li>
535
                        <li>
541
                        <li>
536
                            <label for="illfilter_branchname">Library:</label>
542
                            <label for="illfilter_branchname">Library:</label>
537
- 

Return to bug 20600