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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc (-2 / +2 lines)
Lines 10-17 Link Here
10
            <td colspan="3">
10
            <td colspan="3">
11
        [% END %]
11
        [% END %]
12
            <div class="date-select">
12
            <div class="date-select">
13
                <p><label for="newduedate">Renewal due date:</label> <input type="text" size="12" id="newduedate" name="newduedate" value="" /></p>
13
                <p><label for="newduedate">Renewal due date:</label> <input type="text" size="20" id="newduedate" name="newduedate" value="" /></p>
14
                <p id="newonholdduedate"><label for="newonholdduedate">On hold due date:</label> <input type="text" size="12" name="newonholdduedate" value="" /></p>
14
                <p id="newonholdduedate"><label for="newonholdduedate">On hold due date:</label> <input type="text" size="20" name="newonholdduedate" value="" /></p>
15
                <p><label for="exemptfine">Forgive fines on return:</label> <input type="checkbox" id="exemptfine" name="exemptfine" value="1" /></p>
15
                <p><label for="exemptfine">Forgive fines on return:</label> <input type="checkbox" id="exemptfine" name="exemptfine" value="1" /></p>
16
            </div>
16
            </div>
17
		</td>
17
		</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-41 / +9 lines)
Lines 808-818 Link Here
808
                                        <div class="date-select" id="return_date_override_fields">
808
                                        <div class="date-select" id="return_date_override_fields">
809
                                            <div class="hint">Specify return date [% INCLUDE 'date-format.inc' %]: </div>
809
                                            <div class="hint">Specify return date [% INCLUDE 'date-format.inc' %]: </div>
810
810
811
                                            <input type="text" size="13" id="return_date_override" name="return_date_override" value="[% return_date_override | html %]" />
811
                                            <input type="text" size="20" class="pastdate" id="return_date_override" name="return_date_override" value="[% return_date_override | html %]" />
812
812
813
814
815
                                            <button type="button" class="action btn btn-default btn-xs" id="cleardate" name="cleardate">Clear</button>
816
                                            <div class="circ-setting">
813
                                            <div class="circ-setting">
817
                                                [% IF ( return_date_override_remember ) %]
814
                                                [% IF ( return_date_override_remember ) %]
818
                                                    <input type="checkbox" id="return_date_override_remember" name="return_date_override_remember" checked="checked" />
815
                                                    <input type="checkbox" id="return_date_override_remember" name="return_date_override_remember" checked="checked" />
Lines 1041-1084 Link Here
1041
                    "dom": 'B<"clearfix">t',
1038
                    "dom": 'B<"clearfix">t',
1042
                    }, columns_settings);
1039
                    }, columns_settings);
1043
1040
1044
            $("#return_date_override").datetimepicker({
1041
            $("#return_date_override").flatpickr({
1045
                onClose: function(dateText, inst) {
1042
                enableTime: true,
1046
                    if (validate_date(dateText, inst) ) {
1043
                dateFormat: flatpickr_dateformat_string + " " + flatpickr_timeformat_string,
1047
                        $("#barcode").focus();
1044
                maxDate: "today",
1048
                    }
1045
                onClose: function() {
1049
                },
1046
                    $("#barcode").focus();
1050
                defaultDate: -1,
1051
                hour: 23,
1052
                minute: 59,
1053
                maxDate: 0
1054
            }).on("change", function(e, value) {
1055
                if ( ! is_valid_date( $(this).val() ) ) {$(this).val("");}
1056
            });
1057
            $("#return_date_override").on("blur", function() {
1058
                check_valid_return_date();
1059
            });
1060
            $("#checkin-form").submit(function( event ) {
1061
                if ( !check_valid_return_date() ) {
1062
                    event.preventDefault();
1063
                }
1047
                }
1064
            });
1048
            });
1065
1049
1066
            function check_valid_return_date() {
1067
                if ( $("#return_date_override").val() ) {
1068
                    var datetime = DateTime_from_syspref( $("#return_date_override").val() );
1069
                    var now = new Date();
1070
                    if ( !datetime || datetime > now ) {
1071
                        alert("Invalid return date/time!");
1072
                        $("#return_date_override").val("")
1073
                        return false;
1074
                    }
1075
                }
1076
                // Add saved date information to onscreen message, which
1077
                // may or may not be hidden
1078
                $("#saved_return_date").text( $("#return_date_override").val() );
1079
                return true;
1080
            }
1081
1082
            $("#exemptcheck").change(function () {
1050
            $("#exemptcheck").change(function () {
1083
                if (this.checked == true) {
1051
                if (this.checked == true) {
1084
                    $("#barcode").addClass("input-warning");
1052
                    $("#barcode").addClass("input-warning");
Lines 1089-1110 Link Here
1089
                }
1057
                }
1090
                $("#barcode").focus();
1058
                $("#barcode").focus();
1091
            });
1059
            });
1060
1092
            $("#dropboxcheck").change(function () {
1061
            $("#dropboxcheck").change(function () {
1093
                if (this.checked == true) {
1062
                if (this.checked == true) {
1094
                    $("#barcode").addClass("input-warning");
1063
                    $("#barcode").addClass("input-warning");
1095
                    $("#dropboxmode").show();
1064
                    $("#dropboxmode").show();
1096
1065
1097
                    $("#return_date_override_fields :input").prop('disabled', true);
1066
                    $("#return_date_override_fields :input").prop('disabled', true);
1098
                    $("#return_date_override").datetimepicker("disable");
1099
                } else {
1067
                } else {
1100
                    $("#barcode").removeClass("input-warning");
1068
                    $("#barcode").removeClass("input-warning");
1101
                    $("#dropboxmode").hide();
1069
                    $("#dropboxmode").hide();
1102
1070
1103
                    $("#return_date_override_fields :input").prop('disabled', false);
1071
                    $("#return_date_override_fields :input").prop('disabled', false);
1104
                    $("#return_date_override").datetimepicker("enable");
1105
                }
1072
                }
1106
                $("#barcode").focus();
1073
                $("#barcode").focus();
1107
            });
1074
            });
1075
1108
            $("#forgivemanualholdsexpire").change(function () {
1076
            $("#forgivemanualholdsexpire").change(function () {
1109
                if (this.checked == true) {
1077
                if (this.checked == true) {
1110
                    $("#barcode").addClass("input-warning");
1078
                    $("#barcode").addClass("input-warning");
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt (-5 / +5 lines)
Lines 839-850 Link Here
839
        var prefilters = '[% prefilters | $raw %]';
839
        var prefilters = '[% prefilters | $raw %]';
840
        // Set column settings
840
        // Set column settings
841
        var columns_settings = [% TablesSettings.GetColumns( 'illrequests', 'ill-requests', 'ill-requests', 'json' ) %];
841
        var columns_settings = [% TablesSettings.GetColumns( 'illrequests', 'ill-requests', 'ill-requests', 'json' ) %];
842
        $("#ill_checkout_duedate_input").datetimepicker({
842
843
            hour: 23,
843
        $("#ill_checkout_duedate_input").flatpickr({
844
            minute: 59
844
            enableTime: true,
845
        }).on("change", function(e, value) {
845
            dateFormat: flatpickr_dateformat_string + " " + flatpickr_timeformat_string,
846
            if ( ! is_valid_date( $(this).val() ) ) {$(this).val("");}
847
        });
846
        });
847
848
        [% IF services_json.length > 0 %]
848
        [% IF services_json.length > 0 %]
849
        var services = [% services_json | $raw %];
849
        var services = [% services_json | $raw %];
850
        [% ELSE %]
850
        [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js (-12 / +5 lines)
Lines 29-45 $(document).ready(function() { Link Here
29
        radioCheckBox($(this));
29
        radioCheckBox($(this));
30
    });
30
    });
31
31
32
    $("#newduedate, #newonholdduedate input").datetimepicker({
33
        onClose: function(dateText, inst) {
34
            validate_date(dateText, inst);
35
        },
36
        minDate: 1, // require that renewal date is after today
37
        hour: 23,
38
        minute: 59
39
    }).on("change", function(e) {
40
        if ( ! is_valid_date( $(this).val() ) ) {$(this).val("");}
41
    });
42
43
    $("#duedatespec").flatpickr({
32
    $("#duedatespec").flatpickr({
44
        enableTime: true,
33
        enableTime: true,
45
        dateFormat: flatpickr_dateformat_string + " " + flatpickr_timeformat_string,
34
        dateFormat: flatpickr_dateformat_string + " " + flatpickr_timeformat_string,
Lines 48-53 $(document).ready(function() { Link Here
48
        }
37
        }
49
    });
38
    });
50
39
40
    $("#newduedate, #newonholdduedate input").flatpickr({
41
        enableTime: true,
42
        dateFormat: flatpickr_dateformat_string + " " + flatpickr_timeformat_string,
43
    });
44
51
    $(".clear_date").on("click", function(){
45
    $(".clear_date").on("click", function(){
52
        $("#stickyduedate").prop( "checked", false );
46
        $("#stickyduedate").prop( "checked", false );
53
    });
47
    });
54
- 

Return to bug 29459