Attachment #125501 for bug #28983

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





                        <li>
                            <label for="from">Start date:</label>
                            <input name="date_start" id="from" size="10" class="flatpickrfrom" value="[% club.date_start | $KohaDates %]">
                        </li>

                        <li>
                            <label for="to">End date:</label>
                            <input name="date_end" id="to" size="10" class="flatpickrto" value="[% club.date_end | $KohaDates %]" >
                        </li>

                        <li>




                                </li>
                                <li>
                                    <label for="illfilter_dateplaced_start">Date placed between:</label>
                                    <input type="text" name="illfilter_dateplaced_start" id="illfilter_dateplaced_start" />
                                </li>
                                <li>
                                    <label for="illfilter_dateplaced_end">and:</label>
                                    <input type="text" name="illfilter_dateplaced_end" id="illfilter_dateplaced_end" />
                                </li>
                                <li>
                                    <label for="illfilter_datemodified_start">Updated between:</label>
                                    <input type="text" name="illfilter_datemodified_start" id="illfilter_datemodified_start" />
                                </li>
                                <li>
                                    <label for="illfilter_datemodified_end">and:</label>
                                    <input type="text" name="illfilter_datemodified_end" id="illfilter_datemodified_end" />
                                </li>
                                <li>
                                    <label for="illfilter_branchname">Library:</label>





<fieldset class="rows">
<ol>
    <li>
        <label for="from">Added on or after date: </label>
        <input type="text" size="10" id="from" name="datefrom" class="flatpickrfrom" value="" />
        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
    </li>
    <li>
        <label for="to">Added on or before date: </label>
        <input type="text" size="10" id="to" name="dateto" class="flatpickrto" value="" />
        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
    </li>
</ol>
</fieldset>

<fieldset class="action"><input type="submit" value="Search" class="submit" /> <a class="cancel close" href="#">Cancel</a></fieldset>




                    <ol>
                        <li>
                            <label for="trange_f">From: </label>
                            <input type="text" size="10" id="from" class="flatpickrfrom" name="trange_f" value="[% trange_f | html %]"/>
                            <label class="inline" for="trange_t">To: </label>
                            <input type="text" size="10" id="to" class="flatpickrto" name="trange_t" value="[% trange_t | html %]" />
                            <span class="hint">[% INCLUDE 'date-format.inc' %]</span>
                        </li>
                    </ol>

                }
            ]
        }, [], 1);

        $(document).ready(function() {
            // http://jqueryui.com/demos/datepicker/#date-range
            var dates = $( "#from, #to" ).datepicker({
                changeMonth: true,
                numberOfMonths: 1,
                onSelect: function( selectedDate ) {
                    var option = this.id == "from" ? "minDate" : "maxDate",
                        instance = $( this ).data( "datepicker" );
                        date = $.datepicker.parseDate(
                            instance.settings.dateFormat ||
                            $.datepicker._defaults.dateFormat,
                            selectedDate, instance.settings );
                    dates.not( this ).datepicker( "option", option, date );
                }
            });
        });
    </script>
[% END %]





                                            <label for="suggesteddate">[% tp('purchase suggestion created by', 'Created by:') | html %]</label>
                                        </th>
                                        <td>
                                            <input type="text" id="suggesteddate" name="suggesteddate" class="flatpickr" size="10" maxlength="10" value="[% suggesteddate | $KohaDates %]"/> [% INCLUDE 'date-format.inc' %]
                                        </td>
                                        <td id="tdsuggestedby">
                                            <input type="hidden" id="suggestedby" name="suggestedby" value="[% suggestedby | html %]"/>

                                            <label for="accepteddate">Accepted on:</label>
                                        </th>
                                        <td>
                                            <input type="text" id="accepteddate" name="accepteddate" class="flatpickr" size="10" maxlength="10" value="[% accepteddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]
                                        </td>
                                        <td>
                                            <input type="hidden" id="acceptedby" name="acceptedby" value="[% acceptedby | html %]"/>

                        </li>
                        <li>
                            <label for="managedon">Managed on:</label>
                            <input type="text" id="managedon" name="manageddate" class="flatpickr" size="10" maxlength="10" value="[% manageddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]
                        </li>
                        <li>
                            <label for="managedby_name">by:</label>

Lines 230-240 tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt (-2 / +2 lines)
230	</li>	230	</li>
231	<li>	231	<li>
232	<label for="from">Date: from </label>	232	<label for="from">Date: from </label>
233	<input type="text" size="10" id="from" name="from" value="[% filter_date_approved_from \| html %]" class="datepickerfrom" />	233	<input type="text" size="10" id="from" name="from" value="[% filter_date_approved_from \| html %]" class="flatpickrfrom" />
234	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>	234	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
235		235
236	<label for="to">...to </label>	236	<label for="to">...to </label>
237	<input type="text" size="10" id="to" name="to" value="[% filter_date_approved_to \| html %]" class="datepickerto" />	237	<input type="text" size="10" id="to" name="to" value="[% filter_date_approved_to \| html %]" class="flatpickrto" />
238	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>	238	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
239	</li>	239	</li>
240	</ol>	240	</ol>




        $('#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');


            // 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 rowPlaced = data[14] ? new Date(data[14]) : null;
                var rowModified = data[16] ? new Date(data[16]) : null;
                var placedPassed = true;
- 

Return to bug 28983

Lines 73-84 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt (-2 / +2 lines)
73		73
74	<li>	74	<li>
75	<label for="from">Start date:</label>	75	<label for="from">Start date:</label>
76	<input name="date_start" id="from" size="10" readonly="readonly" class="datepickerfrom" value="[% club.date_start \| $KohaDates %]">	76	<input name="date_start" id="from" size="10" class="flatpickrfrom" value="[% club.date_start \| $KohaDates %]">
77	</li>	77	</li>
78		78
79	<li>	79	<li>
80	<label for="to">End date:</label>	80	<label for="to">End date:</label>
81	<input name="date_end" id="to" size="10" readonly="readonly" class="datepickerto" value="[% club.date_end \| $KohaDates %]" >	81	<input name="date_end" id="to" size="10" class="flatpickrto" value="[% club.date_end \| $KohaDates %]" >
82	</li>	82	</li>
83		83
84	<li>	84	<li>

Lines 88-103 to add to Batch [% batch_id \| html %] Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt (-10 / +11 lines)
88		88
89	<fieldset class="rows">	89	<fieldset class="rows">
90	<ol>	90	<ol>
91	<li>	91	<li>
92	<label for="from">Added on or after date: </label>	92	<label for="from">Added on or after date: </label>
93	<input type="text" size="10" id="from" name="datefrom" class="datepickerfrom" value="" />	93	<input type="text" size="10" id="from" name="datefrom" class="flatpickrfrom" value="" />
94	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>	94	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
95	</li>	95	</li>
96	<li>	96	<li>
97	<label for="to">Added on or before date: </label>	97	<label for="to">Added on or before date: </label>
98	<input type="text" size="10" id="to" name="dateto" class="datepickerto" value="" />	98	<input type="text" size="10" id="to" name="dateto" class="flatpickrto" value="" />
99	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>	99	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
100	</li></ol>	100	</li>
		101	</ol>
101	</fieldset>	102	</fieldset>
102		103
103	<fieldset class="action"><input type="submit" value="Search" class="submit" /> <a class="cancel close" href="#">Cancel</a></fieldset>	104	<fieldset class="action"><input type="submit" value="Search" class="submit" /> <a class="cancel close" href="#">Cancel</a></fieldset>

Lines 160-168 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt (-19 / +2 lines)
160	<ol>	160	<ol>
161	<li>	161	<li>
162	<label for="trange_f">From: </label>	162	<label for="trange_f">From: </label>
163	<input type="text" size="10" id="from" class="datepickerfrom" name="trange_f" value="[% trange_f \| html %]"/>	163	<input type="text" size="10" id="from" class="flatpickrfrom" name="trange_f" value="[% trange_f \| html %]"/>
164	<label class="inline" for="trange_t">To: </label>	164	<label class="inline" for="trange_t">To: </label>
165	<input type="text" size="10" id="to" class="datepickerto" name="trange_t" value="[% trange_t \| html %]" />	165	<input type="text" size="10" id="to" class="flatpickrto" name="trange_t" value="[% trange_t \| html %]" />
166	<span class="hint">[% INCLUDE 'date-format.inc' %]</span>	166	<span class="hint">[% INCLUDE 'date-format.inc' %]</span>
167	</li>	167	</li>
168	</ol>	168	</ol>
Lines 471-493 Link Here
471	}	471	}
472	]	472	]
473	}, [], 1);	473	}, [], 1);
474
475	$(document).ready(function() {
476	// http://jqueryui.com/demos/datepicker/#date-range
477	var dates = $( "#from, #to" ).datepicker({
478	changeMonth: true,
479	numberOfMonths: 1,
480	onSelect: function( selectedDate ) {
481	var option = this.id == "from" ? "minDate" : "maxDate",
482	instance = $( this ).data( "datepicker" );
483	date = $.datepicker.parseDate(
484	instance.settings.dateFormat \|\|
485	$.datepicker._defaults.dateFormat,
486	selectedDate, instance.settings );
487	dates.not( this ).datepicker( "option", option, date );
488	}
489	});
490	});
491	</script>	474	</script>
492	[% END %]	475	[% END %]
493		476

Lines 500-506 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-3 / +3 lines)
500	<label for="suggesteddate">[% tp('purchase suggestion created by', 'Created by:') \| html %]</label>	500	<label for="suggesteddate">[% tp('purchase suggestion created by', 'Created by:') \| html %]</label>
501	</th>	501	</th>
502	<td>	502	<td>
503	<input type="text" id="suggesteddate" name="suggesteddate" class="datepicker" size="10" maxlength="10" value="[% suggesteddate \| $KohaDates %]"/>[% INCLUDE 'date-format.inc' %]	503	<input type="text" id="suggesteddate" name="suggesteddate" class="flatpickr" size="10" maxlength="10" value="[% suggesteddate \| $KohaDates %]"/> [% INCLUDE 'date-format.inc' %]
504	</td>	504	</td>
505	<td id="tdsuggestedby">	505	<td id="tdsuggestedby">
506	<input type="hidden" id="suggestedby" name="suggestedby" value="[% suggestedby \| html %]"/>	506	<input type="hidden" id="suggestedby" name="suggestedby" value="[% suggestedby \| html %]"/>
Lines 517-523 Link Here
517	<label for="accepteddate">Accepted on:</label>	517	<label for="accepteddate">Accepted on:</label>
518	</th>	518	</th>
519	<td>	519	<td>
520	<input type="text" id="accepteddate" name="accepteddate" class="datepicker" size="10" maxlength="10" value="[% accepteddate \| $KohaDates %]" />[% INCLUDE 'date-format.inc' %]	520	<input type="text" id="accepteddate" name="accepteddate" class="flatpickr" size="10" maxlength="10" value="[% accepteddate \| $KohaDates %]" />[% INCLUDE 'date-format.inc' %]
521	</td>	521	</td>
522	<td>	522	<td>
523	<input type="hidden" id="acceptedby" name="acceptedby" value="[% acceptedby \| html %]"/>	523	<input type="hidden" id="acceptedby" name="acceptedby" value="[% acceptedby \| html %]"/>
Lines 547-553 Link Here
547	</li>	547	</li>
548	<li>	548	<li>
549	<label for="managedon">Managed on:</label>	549	<label for="managedon">Managed on:</label>
550	<input type="text" id="managedon" name="manageddate" class="datepicker" size="10" maxlength="10" value="[% manageddate \| $KohaDates %]" />[% INCLUDE 'date-format.inc' %]	550	<input type="text" id="managedon" name="manageddate" class="flatpickr" size="10" maxlength="10" value="[% manageddate \| $KohaDates %]" />[% INCLUDE 'date-format.inc' %]
551	</li>	551	</li>
552	<li>	552	<li>
553	<label for="managedby_name">by:</label>	553	<label for="managedby_name">by:</label>

Lines 335-340 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js (-5 / +30 lines)
335	$('#addcomment').toggleClass('content_hidden');	335	$('#addcomment').toggleClass('content_hidden');
336	});	336	});
337		337
		338	var illfilter_dateplaced_start = $("#illfilter_dateplaced_start").flatpickr({
		339	onClose: function( selectedDates, dateText, instance) {
		340	validate_date( selectedDates, instance );
		341	illfilter_dateplaced_end.set('minDate', selectedDates[0]);
		342	}
		343	});
		344
		345	var illfilter_dateplaced_end = $("#illfilter_dateplaced_end").flatpickr({
		346	onClose: function( selectedDates, dateText, instance) {
		347	validate_date( selectedDates, instance );
		348	},
		349	});
		350
		351	var illfilter_datemodified_start = $("#illfilter_datemodified_start").flatpickr({
		352	onClose: function( selectedDates, dateText, instance) {
		353	validate_date( selectedDates, instance );
		354	illfilter_datemodified_end.set('minDate', selectedDates[0]);
		355	}
		356	});
		357
		358	var illfilter_datemodified_end = $("#illfilter_datemodified_end").flatpickr({
		359	onClose: function( selectedDates, dateText, instance) {
		360	validate_date( selectedDates, instance );
		361	},
		362	});
		363
338	// Filter partner list	364	// Filter partner list
339	// Record the list of all options	365	// Record the list of all options
340	var ill_partner_options = $('#partners > option');	366	var ill_partner_options = $('#partners > option');
Lines 498-507 $(document).ready(function() { Link Here
498		524
499	// Custom date range filtering	525	// Custom date range filtering
500	$.fn.dataTable.ext.search.push(function(settings, data, dataIndex) {	526	$.fn.dataTable.ext.search.push(function(settings, data, dataIndex) {
501	var placedStart = $('#illfilter_dateplaced_start').datepicker('getDate');	527	var placedStart = illfilter_dateplaced_start.selectedDates[0];
502	var placedEnd = $('#illfilter_dateplaced_end').datepicker('getDate');	528	var placedEnd = illfilter_dateplaced_end.selectedDates[0];
503	var modifiedStart = $('#illfilter_datemodified_start').datepicker('getDate');	529	var modifiedStart = illfilter_datemodified_start.selectedDates[0];
504	var modifiedEnd = $('#illfilter_datemodified_end').datepicker('getDate');	530	var modifiedEnd = illfilter_datemodified_end.selectedDates[0];
505	var rowPlaced = data[14] ? new Date(data[14]) : null;	531	var rowPlaced = data[14] ? new Date(data[14]) : null;
506	var rowModified = data[16] ? new Date(data[16]) : null;	532	var rowModified = data[16] ? new Date(data[16]) : null;
507	var placedPassed = true;	533	var placedPassed = true;
508	-