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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc (-1 / +1 lines)
Lines 72-78 Link Here
72
                <legend>Add manual restriction</legend>
72
                <legend>Add manual restriction</legend>
73
                <ol>
73
                <ol>
74
                    <li><label for="rcomment">Comment:</label> <input type="text" id="rcomment" name="comment" /></li>
74
                    <li><label for="rcomment">Comment:</label> <input type="text" id="rcomment" name="comment" /></li>
75
                    <li><label for="rexpiration">Expiration:</label> <input name="expiration" id="rexpiration" size="10" readonly="readonly" value="" class="datepicker" />
75
                    <li><label for="rexpiration">Expiration:</label> <input name="expiration" id="rexpiration" size="10" value="" class="datepicker" />
76
                        <a href='#' onclick="document.getElementById('expiration').value='';">Clear date</a></li>
76
                        <a href='#' onclick="document.getElementById('expiration').value='';">Clear date</a></li>
77
                </ol>
77
                </ol>
78
            <fieldset class="action"><input type="submit" value="Add restriction" /> <a href="#" class="cancel" id="cancel_manual_restriction">Cancel</a></fieldset>
78
            <fieldset class="action"><input type="submit" value="Add restriction" /> <a href="#" class="cancel" id="cancel_manual_restriction">Cancel</a></fieldset>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc (-2 / +27 lines)
Lines 5-10 var debug = "[% debug %]"; Link Here
5
var dformat  = "[% dateformat %]";
5
var dformat  = "[% dateformat %]";
6
var sentmsg = 0;
6
var sentmsg = 0;
7
if (debug > 1) {alert("dateformat: " + dformat + "\ndebug is on (level " + debug + ")");}
7
if (debug > 1) {alert("dateformat: " + dformat + "\ndebug is on (level " + debug + ")");}
8
var MSG_PLEASE_ENTER_A_VALID_DATE = ("Please enter a valid date.");
9
10
function validate_date (dateText, inst) {
11
    var dateformat = '[% Koha.Preference('dateformat') %]';
12
    if ( dateformat == 'us' ) {
13
        dateformat = 'mm/dd/yy';
14
    } else if ( dateformat == 'metric' ) {
15
        dateformat = 'dd/mm/yy';
16
    } else if (dateformat == 'iso' ) {
17
        dateformat = 'yy-mm-dd';
18
    }
19
    try {
20
        $.datepicker.parseDate(dateformat, dateText);
21
    } catch (e) {
22
        alert(MSG_PLEASE_ENTER_A_VALID_DATE);
23
        $('#'+inst.id).val('');
24
    };
25
}
8
26
9
function Date_from_syspref(dstring) {
27
function Date_from_syspref(dstring) {
10
        var dateX = dstring.split(/[-/]/);
28
        var dateX = dstring.split(/[-/]/);
Lines 86-92 $.datepicker.setDefaults({ Link Here
86
        selectOtherMonths: true
104
        selectOtherMonths: true
87
    });
105
    });
88
106
89
    $( ".datepicker" ).datepicker();
107
    $( ".datepicker" ).datepicker({
108
        onClose: function(dateText, inst) {
109
            validate_date(dateText, inst);
110
        },
111
    });
90
    // http://jqueryui.com/demos/datepicker/#date-range
112
    // http://jqueryui.com/demos/datepicker/#date-range
91
    var dates = $( ".datepickerfrom, .datepickerto" ).datepicker({
113
    var dates = $( ".datepickerfrom, .datepickerto" ).datepicker({
92
        changeMonth: true,
114
        changeMonth: true,
Lines 99-105 $.datepicker.setDefaults({ Link Here
99
                    $.datepicker._defaults.dateFormat,
121
                    $.datepicker._defaults.dateFormat,
100
                    selectedDate, instance.settings );
122
                    selectedDate, instance.settings );
101
            dates.not( this ).datepicker( "option", option, date );
123
            dates.not( this ).datepicker( "option", option, date );
102
        }
124
        },
125
        onClose: function(dateText, inst) {
126
            validate_date(dateText, inst);
127
        },
103
    });
128
    });
104
});
129
});
105
//]]>
130
//]]>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc (-1 / +1 lines)
Lines 5-11 Link Here
5
        <td>[% finetotal %]</td>
5
        <td>[% finetotal %]</td>
6
        <td>[% totalprice %]</td>
6
        <td>[% totalprice %]</td>
7
                <td colspan="3"><div class="date-select">
7
                <td colspan="3"><div class="date-select">
8
            <p><label for="newduedate">Renewal due date:</label> <input type="text" size="12" id="newduedate" name="newduedate" value="[% newduedate %]" readonly="readonly" />
8
            <p><label for="newduedate">Renewal due date:</label> <input type="text" size="12" id="newduedate" name="newduedate" value="[% newduedate %]" />
9
</p>
9
</p>
10
            <p><label for="exemptfine">Forgive fines on return: <input type="checkbox" id="exemptfine" name="exemptfine" value="1" /></label></p></div>
10
            <p><label for="exemptfine">Forgive fines on return: <input type="checkbox" id="exemptfine" name="exemptfine" value="1" /></label></p></div>
11
		</td>
11
		</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js (-1 / +8 lines)
Lines 31-42 $(document).ready(function() { Link Here
31
    });
31
    });
32
32
33
    $("#newduedate").datetimepicker({
33
    $("#newduedate").datetimepicker({
34
        onClose: function(dateText, inst) {
35
            validate_date(dateText, inst);
36
        },
34
        minDate: 1, // require that renewal date is after today
37
        minDate: 1, // require that renewal date is after today
35
        hour: 23,
38
        hour: 23,
36
        minute: 59
39
        minute: 59
37
    });
40
    });
38
    $("#duedatespec").datetimepicker({
41
    $("#duedatespec").datetimepicker({
39
        onClose: function(dateText, inst) { $("#barcode").focus(); },
42
        onClose: function(dateText, inst) {
43
            if ( validate_date(dateText, inst) ) {
44
                $("#barcode").focus();
45
            }
46
        },
40
        hour: 23,
47
        hour: 23,
41
        minute: 59
48
        minute: 59
42
    });
49
    });
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-2 / +2 lines)
Lines 74-83 Link Here
74
        <fieldset class="rows">
74
        <fieldset class="rows">
75
            <ol>
75
            <ol>
76
            <li><label for="shipmentdate">Shipment date:</label>
76
            <li><label for="shipmentdate">Shipment date:</label>
77
                    <input type="text" size="10" id="shipmentdate" name="shipmentdate" value="[% shipmentdate | $KohaDates %]" readonly="readonly" class="datepicker" /></li>
77
                    <input type="text" size="10" id="shipmentdate" name="shipmentdate" value="[% shipmentdate | $KohaDates %]" class="datepicker" /></li>
78
78
79
            <li><label for="billingdate">Billing date:</label>
79
            <li><label for="billingdate">Billing date:</label>
80
                    <input type="text" size="10" id="billingdate" name="billingdate" value="[% billingdate | $KohaDates %]" readonly="readonly" class="datepicker" /></li>
80
                    <input type="text" size="10" id="billingdate" name="billingdate" value="[% billingdate | $KohaDates %]" class="datepicker" /></li>
81
81
82
            <li><label for="shipmentcost">Shipping cost:</label>
82
            <li><label for="shipmentcost">Shipping cost:</label>
83
                    <input type="text" size="10" id="shipmentcost" name="shipmentcost" value="[% shipmentcost %]" /></li>
83
                    <input type="text" size="10" id="shipmentcost" name="shipmentcost" value="[% shipmentcost %]" /></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt (-2 / +2 lines)
Lines 172-181 $(document).ready(function() { Link Here
172
                    </table></li>
172
                    </table></li>
173
                    <li><label for="merge_invoicenumber">Invoice number:</label><span id="merge_invoicenumber"></span></li>
173
                    <li><label for="merge_invoicenumber">Invoice number:</label><span id="merge_invoicenumber"></span></li>
174
                    <li><label for="merge_shipmentdate">Shipment date:</label>
174
                    <li><label for="merge_shipmentdate">Shipment date:</label>
175
                            <input type="text" size="10" id="merge_shipmentdate" name="shipmentdate" value="" readonly="readonly" class="datepicker" /></li>
175
                            <input type="text" size="10" id="merge_shipmentdate" name="shipmentdate" value="" class="datepicker" /></li>
176
176
177
                    <li><label for="merge_billingdate">Billing date:</label>
177
                    <li><label for="merge_billingdate">Billing date:</label>
178
                            <input type="text" size="10" id="merge_billingdate" name="billingdate" value="" readonly="readonly" class="datepicker" /></li>
178
                            <input type="text" size="10" id="merge_billingdate" name="billingdate" value="" class="datepicker" /></li>
179
179
180
                    <li><label for="merge_shipmentcost">Shipment cost:</label>
180
                    <li><label for="merge_shipmentcost">Shipment cost:</label>
181
                            <input type="text" size="10" id="merge_shipmentcost" name="shipmentcost" value="" /></li>
181
                            <input type="text" size="10" id="merge_shipmentcost" name="shipmentcost" value="" /></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-5 / +9 lines)
Lines 55-61 function toggle_onsite_checkout(){ Link Here
55
        [% END %]
55
        [% END %]
56
    } else {
56
    } else {
57
        $("#duedatespec").datetimepicker({
57
        $("#duedatespec").datetimepicker({
58
            onClose: function(dateText, inst) { $("#barcode").focus(); },
58
            onClose: function(dateText, inst) {
59
                if (validate_date(dateText, inst) ) {
60
                    $("#barcode").focus();
61
                }
62
            },
59
            hour: 23,
63
            hour: 23,
60
            minute: 59
64
            minute: 59
61
        });
65
        });
Lines 326-332 $(document).ready(function() { Link Here
326
    [% IF ( DEBT ) %]<input type="hidden" name="debt_confirmed" value="1" />[% END %]
330
    [% IF ( DEBT ) %]<input type="hidden" name="debt_confirmed" value="1" />[% END %]
327
    [% IF ( INVALID_DATE ) %]
331
    [% IF ( INVALID_DATE ) %]
328
    <p>
332
    <p>
329
    <input type="text" size="13" id="duedatespec" name="duedatespec" readonly="readonly" value="[% duedatespec %]" />
333
    <input type="text" size="13" id="duedatespec" name="duedatespec" value="[% duedatespec %]" />
330
    <label for="duedatespec">Due date</label>
334
    <label for="duedatespec">Due date</label>
331
    </p>
335
    </p>
332
    [% ELSE %]
336
    [% ELSE %]
Lines 595-603 No patron matched <span class="ex">[% message %]</span> Link Here
595
            <div class="date-select">
599
            <div class="date-select">
596
                <div class="hint">Specify due date [% INCLUDE 'date-format.inc' %]: </div>
600
                <div class="hint">Specify due date [% INCLUDE 'date-format.inc' %]: </div>
597
                [% IF ( duedatespec ) %]
601
                [% IF ( duedatespec ) %]
598
                    <input type="text" size="13" id="duedatespec" name="duedatespec" value="[% duedatespec %]" readonly="readonly" />
602
                    <input type="text" size="13" id="duedatespec" name="duedatespec" value="[% duedatespec %]" />
599
                [% ELSE %]
603
                [% ELSE %]
600
                    <input type="text" size="13" id="duedatespec" name="duedatespec" value="" readonly="readonly" />
604
                    <input type="text" size="13" id="duedatespec" name="duedatespec" value="" />
601
                [% END %]
605
                [% END %]
602
                <label for="stickyduedate"> Remember for session:</label>
606
                <label for="stickyduedate"> Remember for session:</label>
603
                [% IF ( stickyduedate ) %]
607
                [% IF ( stickyduedate ) %]
Lines 615-621 No patron matched <span class="ex">[% message %]</span> Link Here
615
            [% IF noissues %]
619
            [% IF noissues %]
616
                <div class="onsite-checkout-only">
620
                <div class="onsite-checkout-only">
617
                    <input type="checkbox" id="onsite_checkout" name="onsite_checkout_forced" checked="checked" disabled="disabled" /> <label for="onsite_checkout">On-site checkouts only. Automatic due date: </label>
621
                    <input type="checkbox" id="onsite_checkout" name="onsite_checkout_forced" checked="checked" disabled="disabled" /> <label for="onsite_checkout">On-site checkouts only. Automatic due date: </label>
618
                    <input type="text" name="duedatespec" id="duedatespec" readonly="readonly" />
622
                    <input type="text" name="duedatespec" id="duedatespec" />
619
                    <input type="hidden" name="onsite_checkout" checked="checked" value="1" />
623
                    <input type="hidden" name="onsite_checkout" checked="checked" value="1" />
620
                </div>
624
                </div>
621
            [% ELSE %]
625
            [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt (-2 / +6 lines)
Lines 553-559 $(document).ready(function () { Link Here
553
        minute: 59
553
        minute: 59
554
    });
554
    });
555
    $("#duedatespec").datetimepicker({
555
    $("#duedatespec").datetimepicker({
556
        onClose: function(dateText, inst) { setTimeout(function() { $('#checkout-barcode').trigger('focus'), 1 }); },
556
        onClose: function(dateText, inst) {
557
            if (validate_date(dateText, inst) ) {
558
                setTimeout(function() { $('#checkout-barcode').trigger('focus'), 1 });
559
            }
560
        },
557
        hour: 23,
561
        hour: 23,
558
        minute: 59
562
        minute: 59
559
    });
563
    });
Lines 690-696 $(document).ready(function () { Link Here
690
694
691
                            <div class="date-select">
695
                            <div class="date-select">
692
                                <div class="hint">Specify due date [% INCLUDE 'date-format.inc' %]: </div>
696
                                <div class="hint">Specify due date [% INCLUDE 'date-format.inc' %]: </div>
693
                                <input type="text" size="13" id="duedatespec" name="duedatespec" value="[% duedatespec %]" readonly="readonly" />
697
                                <input type="text" size="13" id="duedatespec" name="duedatespec" value="[% duedatespec %]" />
694
                                <label for="stickyduedate"> Remember for session:</label>
698
                                <label for="stickyduedate"> Remember for session:</label>
695
                                <input type="checkbox" id="stickyduedate" onclick="this.form.barcode.focus();" name="stickyduedate" checked="checked" />
699
                                <input type="checkbox" id="stickyduedate" onclick="this.form.barcode.focus();" name="stickyduedate" checked="checked" />
696
                                <input type="button" class="action" id="cleardate" value="Clear" name="cleardate" onclick="this.checked = false; this.form.duedatespec.value = ''; this.form.stickyduedate.checked = false; this.form.barcode.focus(); return false;" />
700
                                <input type="button" class="action" id="cleardate" value="Clear" name="cleardate" onclick="this.checked = false; this.form.duedatespec.value = ''; this.form.stickyduedate.checked = false; this.form.barcode.focus(); return false;" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +5 lines)
Lines 24-30 $(document).ready(function () { Link Here
24
    [% END %]
24
    [% END %]
25
25
26
    $("#return_date_override").datetimepicker({
26
    $("#return_date_override").datetimepicker({
27
        onClose: function(dateText, inst) { $("#barcode").focus(); },
27
        onClose: function(dateText, inst) {
28
            if (validate_date(dateText, inst) ) {
29
                $("#barcode").focus(); },
30
            }
31
        },
28
        defaultDate: -1,
32
        defaultDate: -1,
29
        hour: 23,
33
        hour: 23,
30
        minute: 59,
34
        minute: 59,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-1 / +1 lines)
Lines 1286-1292 Link Here
1286
                        <legend>Add manual restriction</legend>
1286
                        <legend>Add manual restriction</legend>
1287
                        <ol>
1287
                        <ol>
1288
                            <li><label for="debarred_comment">Comment: </label><input type="text" id="debarred_comment" name="debarred_comment" onchange="$('#add_debarment').val(1);" /></li>
1288
                            <li><label for="debarred_comment">Comment: </label><input type="text" id="debarred_comment" name="debarred_comment" onchange="$('#add_debarment').val(1);" /></li>
1289
                            <li><label for="debarred_expiration">Expiration: </label><input name="debarred_expiration" id="debarred_expiration" size="10" readonly="readonly" value="" class="datepicker" onchange="$('#add_debarment').val(1);" />
1289
                            <li><label for="debarred_expiration">Expiration: </label><input name="debarred_expiration" id="debarred_expiration" size="10" value="" class="datepicker" onchange="$('#add_debarment').val(1);" />
1290
                                    <a href='javascript:void(0)' onclick="$('#debarred_expiration').val('');">Clear date</a></li>
1290
                                    <a href='javascript:void(0)' onclick="$('#debarred_expiration').val('');">Clear date</a></li>
1291
1291
1292
                        </ol>
1292
                        </ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-5 lines)
Lines 79-89 $(document).ready(function() { Link Here
79
	});[% END %]
79
	});[% END %]
80
80
81
    $("#suspend_until").datepicker({ minDate: 1 }); // require that hold suspended until date is after today
81
    $("#suspend_until").datepicker({ minDate: 1 }); // require that hold suspended until date is after today
82
    $("#newduedate").datetimepicker({
83
        minDate: 1, // require that renewal date is after today
84
        hour: 23,
85
        minute: 59
86
    });
87
 });
82
 });
88
function uncheck_sibling(me){
83
function uncheck_sibling(me){
89
nodename=me.getAttribute("name");
84
nodename=me.getAttribute("name");
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-3 / +3 lines)
Lines 388-401 function checkMultiHold() { Link Here
388
	[% IF ( reserve_in_future ) %]
388
	[% IF ( reserve_in_future ) %]
389
	<li>
389
	<li>
390
        <label for="from">Hold starts on date:</label>
390
        <label for="from">Hold starts on date:</label>
391
        <input name="reserve_date" id="from" size="10" readonly="readonly" class="datepickerfrom">
391
        <input name="reserve_date" id="from" size="10" class="datepickerfrom">
392
        <a href="#" id="clear-date-from" class="clear-date">Clear date</a>
392
        <a href="#" id="clear-date-from" class="clear-date">Clear date</a>
393
	</li>
393
	</li>
394
	[% END %]
394
	[% END %]
395
395
396
	<li>
396
	<li>
397
        <label for="to">Hold expires on date:</label>
397
        <label for="to">Hold expires on date:</label>
398
        <input name="expiration_date" id="to" size="10" readonly="readonly" class="datepickerto" />
398
        <input name="expiration_date" id="to" size="10" class="datepickerto" />
399
        <a href="#" id="clear-date-to" class="clear-date">Clear date</a>
399
        <a href="#" id="clear-date-to" class="clear-date">Clear date</a>
400
	</li>
400
	</li>
401
401
Lines 796-802 function checkMultiHold() { Link Here
796
796
797
            [% IF AutoResumeSuspendedHolds %]
797
            [% IF AutoResumeSuspendedHolds %]
798
        <label for="suspend_until_[% reserveloo.reserve_id %]">[% IF ( reserveloo.suspend ) %] on [% ELSE %] until [% END %]</label>
798
        <label for="suspend_until_[% reserveloo.reserve_id %]">[% IF ( reserveloo.suspend ) %] on [% ELSE %] until [% END %]</label>
799
            <input name="suspend_until" id="suspend_until_[% reserveloo.reserve_id %]" size="10" readonly="readonly" value="[% reserveloo.suspend_until | $KohaDates %]" class="datepicker suspend_until_datepicker" />
799
            <input name="suspend_until" id="suspend_until_[% reserveloo.reserve_id %]" size="10" value="[% reserveloo.suspend_until | $KohaDates %]" class="datepicker suspend_until_datepicker" />
800
            <a href='#' onclick="document.getElementById('suspend_until_[% reserveloo.reserve_id %]').value='';">Clear date</a>
800
            <a href='#' onclick="document.getElementById('suspend_until_[% reserveloo.reserve_id %]').value='';">Clear date</a>
801
            [% END %]
801
            [% END %]
802
	[% ELSE %]
802
	[% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt (-4 / +4 lines)
Lines 1-3 Link Here
1
[% USE Koha %]
1
[% USE KohaDates %]
2
[% USE KohaDates %]
2
[% INCLUDE 'doc-head-open.inc'%]
3
[% INCLUDE 'doc-head-open.inc'%]
3
<title>Koha &rsaquo; Tools &rsaquo; Batch patron modification</title>
4
<title>Koha &rsaquo; Tools &rsaquo; Batch patron modification</title>
Lines 315-321 Link Here
315
                                            [% END %]
316
                                            [% END %]
316
                                            </label>
317
                                            </label>
317
                                            [% IF field.mandatory %]
318
                                            [% IF field.mandatory %]
318
                                                <input type="checkbox" title="This field is mandatory" name="disable_input" value="[% field.name %]" readonly="readonly" onclick="return false;" />
319
                                                <input type="checkbox" title="This field is mandatory" name="disable_input" value="[% field.name %]" onclick="return false;" />
319
                                            [% ELSE %]
320
                                            [% ELSE %]
320
                                                <input type="checkbox" title="Check to delete this field" name="disable_input" value="[% field.name %]" />
321
                                                <input type="checkbox" title="Check to delete this field" name="disable_input" value="[% field.name %]" />
321
                                            [% END %]
322
                                            [% END %]
Lines 334-340 Link Here
334
                                                [% END %]
335
                                                [% END %]
335
                                            [% END %]
336
                                            [% END %]
336
                                            [% IF ( field.type == 'date' ) %]
337
                                            [% IF ( field.type == 'date' ) %]
337
                                                <input type="text" name="[% field.name %]" id="[% field.name %]" value="" size="10" maxlength="10" readonly="readonly" class="datepicker" />
338
                                                <input type="text" name="[% field.name %]" id="[% field.name %]" value="" size="10" maxlength="10" class="datepicker" />
338
                                                <a href="#" class="clear-field" onclick="clearDate('[% field.name %]');return false;">Clear</a>
339
                                                <a href="#" class="clear-field" onclick="clearDate('[% field.name %]');return false;">Clear</a>
339
                                            [% END %]
340
                                            [% END %]
340
                                            [% IF field.mandatory %]
341
                                            [% IF field.mandatory %]
Lines 379-382 Link Here
379
                [% INCLUDE 'tools-menu.inc' %]
380
                [% INCLUDE 'tools-menu.inc' %]
380
            </div>
381
            </div>
381
        </div>
382
        </div>
382
[% INCLUDE 'intranet-bottom.inc' %]
383
[% INCLUDE 'intranet-bottom.inc' %]
383
- 

Return to bug 14060