Attachment #54057 for bug #16754

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




    $.datepicker.setDefaults($.datepicker.regional['']);
});

/*  jQuery Validator plugin custom method
    This allows you to check that a given date falls after another.
    It is required that a message be defined.

   Syntax:
       $("#form_id").validate({
        rules: {
            input_name_of_later_date_field: {
                is_date_after: "#input_id_of_earlier_date_field"
            },
        },
        messages: {
            input_name_of_later_date_field: {
                is_date_after: _("Validation error to be shown, i.e. End date must come after start date")
            }
        }
    });
*/

jQuery.validator.addMethod("is_date_after",
function(value, element, params) {
    var from = Date_from_syspref( $(params).val() );
    var to = Date_from_syspref(value);
    return to > from;
});

$(document).ready(function(){

$.datepicker.setDefaults({




[% END %]
<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
<script type="text/javascript">
// #################################################################################
// Javascript
// #################################################################################
    function CheckDuplicateForm(f){
            var ok=1;
            var _alertString="";
            var alertString="";
            if(!(isNotNull(f.budget_period_startdate,1))){
              _alertString += "\n- " + _("Start date missing");
            }
            if (!(isNotNull(f.budget_period_enddate,1))){
              _alertString += "\n- " + _("End date missing");
            }
            if( f.budget_period_startdate > f.budget_period_enddate ) {
              _alertString += "\n- " + _("Start date must be before end date");
            }
            if (!(isNotNull(f.budget_period_description,1))){
              _alertString += "\n- " + _("Budget description missing");
            }

            if(_alertString.length==0){
              f.submit();
            } else {
              alertString += _("Form not submitted because of the following problem(s)");
              alertString += "\n-----------------------------------------\n";
              alertString += _alertString;
              alert(alertString);
            }
    }
    function Check(f) {
            var ok=1;
            var _alertString="";
            var alertString2;

            if (!(isNotNull(f.budget_period_startdate,1))) {
                    _alertString += "\n- " + _("Start date missing");
            }

            if (!(isNotNull(f.budget_period_enddate,1))) {
                    _alertString += "\n- " + _("End date missing");
            }

            if ( f.budget_period_startdate >   f.budget_period_enddate )  {
                    _alertString += "\n- " + _("Start date must be before end date");
            }

            if (!(isNotNull(f.budget_period_description,1))) {
                    _alertString += "\n- " + _("Description missing");
            }

            if (!(isNum(f.budget_period_total))) {
                    _alertString += "\n- " + _("Amount must be a valid number, or empty");
            }

/*
			checkBudgetTotal(f) {
			}
*/

            if (_alertString.length==0) {
                    f.submit();
            } else {
                    alertString2  = _("Form not submitted because of the following problem(s)");
                    alertString2 += "\n------------------------------------------------------------------------------------\n";
                    alertString2 += _alertString;
                    alert(alertString2);
            }
    }

    $(document).ready(function() {
        var tabs = $('#budgetsTabs').tabs();
        [% IF ( tab ) %]

            "sPaginationType": "full_numbers"
          }));
        [% END %]
        $("#add_modify_budget").validate({
            rules: {
                budget_period_startdate: "required",
                budget_period_enddate: {
                    required: true,
                    is_date_after: "#from"
                },
                budget_period_description: "required",
                budget_period_total: {
                    number: true
                }
            },
            messages: {
                budget_period_enddate: {
                    is_date_after: _("Budget end date must be after budget start date")
                }
            }
        });
    });
</script>


<div id="yui-main">
<div class="yui-b">

[% UNLESS close_form OR closed OR duplicate_form %]
  [% INCLUDE 'budgets-admin-toolbar.inc' %]
[% END %]

[% IF ( duplicate_form ) %]
<h3>Duplicate budget</h3>
<form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" id="add_modify_budget" name="f" method="post">
    <fieldset class="rows">
    <input type="hidden" name="op" value="duplicate_budget" />
    <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />

    <li>
    <label class="required" for="from">Start date: </label>
    <input type="text" size="10" id="from" name="budget_period_startdate" value="[% budget_period_startdate | $KohaDates %]" class="datepickerfrom" />
            <span class="required">Required</span>
                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
    </li>
    <li>

    <label class="required" for="to">End date: </label>
    <input type="text" size="10" id="to" name="budget_period_enddate" value="[% budget_period_enddate | $KohaDates %]" class="datepickerto" />
            <span class="required">Required</span>
                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
    </li>

    <li>
    <label class="required" for="budget_period_description">Description</label>
    <input type="text" id="budget_period_description" name="budget_period_description" value="[% budgetperiod.budget_period_description %]" />
        <span class="required">Required</span>
    </li>

    <li>

    </fieldset>

    <fieldset class="action">
        <input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]">Cancel</a>
    </fieldset>

</form>

    [% ELSE %]
        <h3>Add budget</h3>
	[% END %]
<form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" id="add_modify_budget" name="f" method="post">
    <fieldset class="rows">
    <!-- ################################################################################# -->
    <!-- display information about the budget period that must be added or modified -->

    <li>
    <label class="required" for="from">Start date: </label>
    <input type="text" size="10" id="from" name="budget_period_startdate" value="[% budget_period_startdate | $KohaDates %]" class="datepickerfrom" />
            <span class="required">Required</span>
                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
    </li>
    <li>

    <label class="required" for="to">End date: </label>
    <input type="text" size="10" id="to" name="budget_period_enddate" value="[% budget_period_enddate | $KohaDates %]" class="datepickerto" />
            <span class="required">Required</span>
                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
    </li>

    <li>

        <label class="required" for="budget_period_description">Description: </label>
        <input type="text" id="budget_period_description" name="budget_period_description"
        size="48" maxlength="80" value="[% budget_period_description %]" />
            <span class="required">Required</span>
    </li>

    <li>

    <fieldset class="action">
        <!-- "save changes" button -->
        <!-- ###################################### -->
        <input type="submit" value="Save" />
        <!--             <input type="submit" value="Save Changes"  />  -->
        [% IF ( budget_period_id ) %]
            <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]" class="cancel">Cancel</a>
        [% ELSE %]




<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
<script type="text/javascript">
//<![CDATA[
$(document).ready(function(){
    $("#add_modify_contract").validate({
        rules: {
            contractstartdate: "required",
            contractname: "required",
            contractenddate: {
                required: true,
                is_date_after: "#from"
            }
        },
        messages: {
            contractenddate: {
                is_date_after: _("Contract end date must be after contract start date")
            }
        }
    });
});
        _alertString += _("- End date missing or invalid.") + "\n";
    }
    
    if (startDate > endDate) {
        ok=1;
        _alertString += _("Wrong date! start date cannot be after end date.") + "\n";
    }
    if (endDate < (new Date)) {
        ok=1;
        _alertString += _("End date before today, Invalid end date!") + "\n";
    }
    if (ok) { // if there is a problem
        alert(_alertString);
    return false;
}
// if all is good
    ff.submit();
}
//]]>
</script>
</head>

[% END %]

                [% IF ( add_form ) %]
                    <form name="Aform" action="/cgi-bin/koha/admin/aqcontract.pl" id="add_modify_contract" method="post">
                        <input type="hidden" name="op" value="add_validate" />
                        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
                        <input type="hidden" name="checked" value="0" />

                        <fieldset class="rows">
                            <ol>
                                [% IF ( contractnumber ) %]
                                        <li><span class="label">Contract id:</span>[% contractnumber %]
                                            <input type="hidden" name="contractnumber" value="[% contractnumber %]" />
                                            <input type="hidden" name="is_a_modif" value="1" />
                                        </li>
                                [% END %]
                                <li><label for="contractname" class="required">Name:</label> &nbsp;
                                        <input type="text" name="contractname" id="contractname" size="40" maxlength="80" value="[% contractname %]" />
                                        <span class="required">Required</span>
                                </li>
                                <li><label for="contractdescription">Description: </label> &nbsp;
                                        <input type="text" name="contractdescription" id="contractdescription" size="40" maxlength="80" value="[% contractdescription %]" />
                                </li>
                                <li><label for="from" class="required">Start date:</label> &nbsp;
                                        <input type="text" name="contractstartdate" id="from" value="[% contractstartdate | $KohaDates %]" maxlength="10" size="10" class="datepickerfrom" />
                                        <span class="required">Required</span>
				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
                                </li>
                                <li><label for="to" class="required">End date:</label> &nbsp;
                                        <input type="text" name="contractenddate" id="to" value="[% contractenddate | $KohaDates %]" maxlength="10"  size="10" class="datepickerto" />
                                        <span class="required">Required</span>
				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
                                </li>
                            </ol>
                        </fieldset>
                        <fieldset class="action">
                            <input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]&amp;contractnumber=[% contractnumber %]">Cancel</a>
                        </fieldset>
                    </form>
            [% END %]




[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Administration &rsaquo; Budgets &rsaquo; Funds &rsaquo; Planning for [% budget_period_description %] by [% authcat %]</title>
[% INCLUDE 'doc-head-close.inc' %]
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
<script type="text/javascript">
//<![CDATA[
    jQuery.validator.addClassRules("plan_entry", {
        number: true // require that input be a number in fields with the class 'plan_entry'
    });
            var alertString2;
            var arr = document.getElementsByName('est_total')

            for ( var i=0, len=arr.length; i<len; ++i ){
                    var tot = arr[i].innerHTML;

                    if (tot == 'NaN') {
                        _alertString += "\n- " + _("One or more cell values is non-numeric");
                    }
            }

            if (_alertString.length==0) {

                var op  = document.createElement('input');
                op.setAttribute("type","hidden");
                op.setAttribute("name","op");
                op.setAttribute("value","save");   //ohh the pain...

                document.Aform.appendChild(op);
                document.Aform.submit()

            } else {
                    alertString2  = _("Form not submitted because of the following problem(s)");
                    alertString2 += "\n------------------------------------------------------------------------------------\n";
                    alertString2 += _alertString;
                    alert(alertString2);
            }
    }
    $(document).ready(function() {
        $("#selections input").on("change",function(e){
            var num = $(this).attr("id");

                }
            }
        });
        $(".plan_entry").on("change",function(){
            calcTotalRow( this );
        });
        $("#Aform").validate();
        $(".auto_fill_row").on("click",function(){
            var budget_id = $(this).data("budget-id");
            autoFillRow( budget_id );
        });
    });
//]]>
</script>
<style type="text/css">td.locked { background-image: url('[% interface %]/[% theme %]/img/locked.png'); padding-left : 20px; background-repeat: no-repeat; background-position: 5px 5px; } a.control { font-size:85%;text-decoration:none; } .plan_entry { text-align: right;  width:90%; } </style>
</head>
<body id="admin_aqplan" class="admin">
[% INCLUDE 'header.inc' %]

                    [% line.estimated_amount %]&nbsp;
                    <input type="hidden" style="text-align: right;"  name="[% line.cell_name %]" value="[% line.estimated_amount %]"   />
                [% ELSE %]
                    <input type="text" size="6" name="[% line.cell_name %]"  value="[% line.estimated_amount %]"  id="budget_[% line.budget_id %][% line.colnum %]" class="plan_entry plan_entry_[% line.budget_id %]" />
                [% END %]

                </td></tr>


        <td>
             [% UNLESS ( budget_line.budget_lock ) %]
                    <input type="button" class="auto_fill_row" data-budget-id="[% budget_line.budget_id %]" value="Auto-fill row"/>
            [% ELSE %]
             <div style="color:red;">not owned</div>
            [% END %]

    [% IF ( budget_period_locked ) %]
        <!-- <input STYLE="background: gray;"   type="submit" value="Save" disabled="disabled"/> -->
    [% ELSE %]
        <fieldset class="action"><input type="submit" value="Save"/></fieldset>
    [% END %]


- 

Return to bug 16754

Lines 76-81 jQuery(function($){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc (+26 lines)
76	$.datepicker.setDefaults($.datepicker.regional['']);	76	$.datepicker.setDefaults($.datepicker.regional['']);
77	});	77	});
78		78
		79	/* jQuery Validator plugin custom method
		80	This allows you to check that a given date falls after another.
		81	It is required that a message be defined.
		82
		83	Syntax:
		84	$("#form_id").validate({
		85	rules: {
		86	input_name_of_later_date_field: {
		87	is_date_after: "#input_id_of_earlier_date_field"
		88	},
		89	},
		90	messages: {
		91	input_name_of_later_date_field: {
		92	is_date_after: _("Validation error to be shown, i.e. End date must come after start date")
		93	}
		94	}
		95	});
		96	*/
		97
		98	jQuery.validator.addMethod("is_date_after",
		99	function(value, element, params) {
		100	var from = Date_from_syspref( $(params).val() );
		101	var to = Date_from_syspref(value);
		102	return to > from;
		103	});
		104
79	$(document).ready(function(){	105	$(document).ready(function(){
80		106
81	$.datepicker.setDefaults({	107	$.datepicker.setDefaults({

Lines 37-111 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt (-79 / +33 lines)
37	[% END %]	37	[% END %]
38	<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>	38	<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
39	<script type="text/javascript">	39	<script type="text/javascript">
40	// #################################################################################
41	// Javascript
42	// #################################################################################
43	function CheckDuplicateForm(f){
44	var ok=1;
45	var _alertString="";
46	var alertString="";
47	if(!(isNotNull(f.budget_period_startdate,1))){
48	_alertString += "\n- " + _("Start date missing");
49	}
50	if (!(isNotNull(f.budget_period_enddate,1))){
51	_alertString += "\n- " + _("End date missing");
52	}
53	if( f.budget_period_startdate > f.budget_period_enddate ) {
54	_alertString += "\n- " + _("Start date must be before end date");
55	}
56	if (!(isNotNull(f.budget_period_description,1))){
57	_alertString += "\n- " + _("Budget description missing");
58	}
59
60	if(_alertString.length==0){
61	f.submit();
62	} else {
63	alertString += _("Form not submitted because of the following problem(s)");
64	alertString += "\n-----------------------------------------\n";
65	alertString += _alertString;
66	alert(alertString);
67	}
68	}
69	function Check(f) {
70	var ok=1;
71	var _alertString="";
72	var alertString2;
73
74	if (!(isNotNull(f.budget_period_startdate,1))) {
75	_alertString += "\n- " + _("Start date missing");
76	}
77
78	if (!(isNotNull(f.budget_period_enddate,1))) {
79	_alertString += "\n- " + _("End date missing");
80	}
81
82	if ( f.budget_period_startdate > f.budget_period_enddate ) {
83	_alertString += "\n- " + _("Start date must be before end date");
84	}
85
86	if (!(isNotNull(f.budget_period_description,1))) {
87	_alertString += "\n- " + _("Description missing");
88	}
89
90	if (!(isNum(f.budget_period_total))) {
91	_alertString += "\n- " + _("Amount must be a valid number, or empty");
92	}
93
94	/*
95	checkBudgetTotal(f) {
96	}
97	*/
98
99	if (_alertString.length==0) {
100	f.submit();
101	} else {
102	alertString2 = _("Form not submitted because of the following problem(s)");
103	alertString2 += "\n------------------------------------------------------------------------------------\n";
104	alertString2 += _alertString;
105	alert(alertString2);
106	}
107	}
108
109	$(document).ready(function() {	40	$(document).ready(function() {
110	var tabs = $('#budgetsTabs').tabs();	41	var tabs = $('#budgetsTabs').tabs();
111	[% IF ( tab ) %]	42	[% IF ( tab ) %]
Lines 171-176 Link Here
171	"sPaginationType": "full_numbers"	102	"sPaginationType": "full_numbers"
172	}));	103	}));
173	[% END %]	104	[% END %]
		105	$("#add_modify_budget").validate({
		106	rules: {
		107	budget_period_startdate: "required",
		108	budget_period_enddate: {
		109	required: true,
		110	is_date_after: "#from"
		111	},
		112	budget_period_description: "required",
		113	budget_period_total: {
		114	number: true
		115	}
		116	},
		117	messages: {
		118	budget_period_enddate: {
		119	is_date_after: _("Budget end date must be after budget start date")
		120	}
		121	}
		122	});
174	});	123	});
175	</script>	124	</script>
176		125
Lines 252-264 Link Here
252	<div id="yui-main">	201	<div id="yui-main">
253	<div class="yui-b">	202	<div class="yui-b">
254		203
255	[% UNLESS close_form OR closed%]	204	[% UNLESS close_form OR closed OR duplicate_form %]
256	[% INCLUDE 'budgets-admin-toolbar.inc' %]	205	[% INCLUDE 'budgets-admin-toolbar.inc' %]
257	[% END %]	206	[% END %]
258		207
259	[% IF ( duplicate_form ) %]	208	[% IF ( duplicate_form ) %]
260	<h3>Duplicate budget</h3>	209	<h3>Duplicate budget</h3>
261	<form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post">	210	<form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" id="add_modify_budget" name="f" method="post">
262	<fieldset class="rows">	211	<fieldset class="rows">
263	<input type="hidden" name="op" value="duplicate_budget" />	212	<input type="hidden" name="op" value="duplicate_budget" />
264	<input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />	213	<input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
Lines 268-285 Link Here
268	<li>	217	<li>
269	<label class="required" for="from">Start date: </label>	218	<label class="required" for="from">Start date: </label>
270	<input type="text" size="10" id="from" name="budget_period_startdate" value="[% budget_period_startdate \| $KohaDates %]" class="datepickerfrom" />	219	<input type="text" size="10" id="from" name="budget_period_startdate" value="[% budget_period_startdate \| $KohaDates %]" class="datepickerfrom" />
271	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>	220	<span class="required">Required</span>
		221	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
272	</li>	222	</li>
273	<li>	223	<li>
274		224
275	<label class="required" for="to">End date: </label>	225	<label class="required" for="to">End date: </label>
276	<input type="text" size="10" id="to" name="budget_period_enddate" value="[% budget_period_enddate \| $KohaDates %]" class="datepickerto" />	226	<input type="text" size="10" id="to" name="budget_period_enddate" value="[% budget_period_enddate \| $KohaDates %]" class="datepickerto" />
277	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>	227	<span class="required">Required</span>
		228	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
278	</li>	229	</li>
279		230
280	<li>	231	<li>
281	<label class="required" for="budget_period_description">Description</label>	232	<label class="required" for="budget_period_description">Description</label>
282	<input type="text" id="budget_period_description" name="budget_period_description" value="[% budgetperiod.budget_period_description %]" />	233	<input type="text" id="budget_period_description" name="budget_period_description" value="[% budgetperiod.budget_period_description %]" />
		234	<span class="required">Required</span>
283	</li>	235	</li>
284		236
285	<li>	237	<li>
Lines 308-314 Link Here
308	</fieldset>	260	</fieldset>
309		261
310	<fieldset class="action">	262	<fieldset class="action">
311	<input type="button" value="Save Changes" onclick="CheckDuplicateForm(this.form)" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]">Cancel</a>	263	<input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]">Cancel</a>
312	</fieldset>	264	</fieldset>
313		265
314	</form>	266	</form>
Lines 323-329 Link Here
323	[% ELSE %]	275	[% ELSE %]
324	<h3>Add budget</h3>	276	<h3>Add budget</h3>
325	[% END %]	277	[% END %]
326	<form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post">	278	<form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" id="add_modify_budget" name="f" method="post">
327	<fieldset class="rows">	279	<fieldset class="rows">
328	<!-- ################################################################################# -->	280	<!-- ################################################################################# -->
329	<!-- display information about the budget period that must be added or modified -->	281	<!-- display information about the budget period that must be added or modified -->
Lines 334-346 Link Here
334	<li>	286	<li>
335	<label class="required" for="from">Start date: </label>	287	<label class="required" for="from">Start date: </label>
336	<input type="text" size="10" id="from" name="budget_period_startdate" value="[% budget_period_startdate \| $KohaDates %]" class="datepickerfrom" />	288	<input type="text" size="10" id="from" name="budget_period_startdate" value="[% budget_period_startdate \| $KohaDates %]" class="datepickerfrom" />
337	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>	289	<span class="required">Required</span>
		290	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
338	</li>	291	</li>
339	<li>	292	<li>
340		293
341	<label class="required" for="to">End date: </label>	294	<label class="required" for="to">End date: </label>
342	<input type="text" size="10" id="to" name="budget_period_enddate" value="[% budget_period_enddate \| $KohaDates %]" class="datepickerto" />	295	<input type="text" size="10" id="to" name="budget_period_enddate" value="[% budget_period_enddate \| $KohaDates %]" class="datepickerto" />
343	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>	296	<span class="required">Required</span>
		297	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
344	</li>	298	</li>
345		299
346	<li>	300	<li>
Lines 349-354 Link Here
349	<label class="required" for="budget_period_description">Description: </label>	303	<label class="required" for="budget_period_description">Description: </label>
350	<input type="text" id="budget_period_description" name="budget_period_description"	304	<input type="text" id="budget_period_description" name="budget_period_description"
351	size="48" maxlength="80" value="[% budget_period_description %]" />	305	size="48" maxlength="80" value="[% budget_period_description %]" />
		306	<span class="required">Required</span>
352	</li>	307	</li>
353		308
354	<li>	309	<li>
Lines 378-385 Link Here
378	<fieldset class="action">	333	<fieldset class="action">
379	<!-- "save changes" button -->	334	<!-- "save changes" button -->
380	<!-- ###################################### -->	335	<!-- ###################################### -->
381	<input type="button" value="Save" onclick="Check(this.form)" />	336	<input type="submit" value="Save" />
382	<!-- <input type="submit" value="Save Changes" /> -->
383	[% IF ( budget_period_id ) %]	337	[% IF ( budget_period_id ) %]
384	<a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]" class="cancel">Cancel</a>	338	<a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]" class="cancel">Cancel</a>
385	[% ELSE %]	339	[% ELSE %]

Lines 14-54 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt (-41 / +26 lines)
14	<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>	14	<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
15	<script type="text/javascript">	15	<script type="text/javascript">
16	//<![CDATA[	16	//<![CDATA[
17	// to check if the data are correctly entered.	17	$(document).ready(function(){
18	function Check(ff) {	18	$("#add_modify_contract").validate({
19	var ok=0;	19	rules: {
20	var _alertString=_("Form not submitted because of the following problem(s)");	20	contractstartdate: "required",
21	_alertString +="\n-------------------------------------------------------------------\n\n";	21	contractname: "required",
22	if (!(isNotNull(ff.contractname,0))){	22	contractenddate: {
23	ok=1;	23	required: true,
24	_alertString += _("- Name missing") + "\n";	24	is_date_after: "#from"
25	}	25	}
26	var startDate = Date_from_syspref($("#from").val());	26	},
27	var endDate = Date_from_syspref($("#to").val());	27	messages: {
28	if (!parseInt(startDate.getTime())) {	28	contractenddate: {
29	ok=1;	29	is_date_after: _("Contract end date must be after contract start date")
30	_alertString += _("- Start date missing or invalid.") + "\n";	30	}
31	}	31	}
32	if (!parseInt(endDate.getTime())) {	32	});
33	ok=1;	33	});
34	_alertString += _("- End date missing or invalid.") + "\n";
35	}
36
37	if (startDate > endDate) {
38	ok=1;
39	_alertString += _("Wrong date! start date cannot be after end date.") + "\n";
40	}
41	if (endDate < (new Date)) {
42	ok=1;
43	_alertString += _("End date before today, Invalid end date!") + "\n";
44	}
45	if (ok) { // if there is a problem
46	alert(_alertString);
47	return false;
48	}
49	// if all is good
50	ff.submit();
51	}
52	//]]>	34	//]]>
53	</script>	35	</script>
54	</head>	36	</head>
Lines 97-103 function Check(ff) { Link Here
97	[% END %]	79	[% END %]
98		80
99	[% IF ( add_form ) %]	81	[% IF ( add_form ) %]
100	<form name="Aform" action="[% script_name %]" method="post">	82	<form name="Aform" action="/cgi-bin/koha/admin/aqcontract.pl" id="add_modify_contract" method="post">
101	<input type="hidden" name="op" value="add_validate" />	83	<input type="hidden" name="op" value="add_validate" />
102	<input type="hidden" name="booksellerid" value="[% booksellerid %]" />	84	<input type="hidden" name="booksellerid" value="[% booksellerid %]" />
103	<input type="hidden" name="checked" value="0" />	85	<input type="hidden" name="checked" value="0" />
Lines 109-137 function Check(ff) { Link Here
109	<fieldset class="rows">	91	<fieldset class="rows">
110	<ol>	92	<ol>
111	[% IF ( contractnumber ) %]	93	[% IF ( contractnumber ) %]
112	<li><span class="label">Contract id </span>[% contractnumber %]	94	<li><span class="label">Contract id:</span>[% contractnumber %]
113	<input type="hidden" name="contractnumber" value="[% contractnumber %]" />	95	<input type="hidden" name="contractnumber" value="[% contractnumber %]" />
114	<input type="hidden" name="is_a_modif" value="1" />	96	<input type="hidden" name="is_a_modif" value="1" />
115	</li>	97	</li>
116	[% END %]	98	[% END %]
117	<li><label for="contractname" class="required">Name: *</label>	99	<li><label for="contractname" class="required">Name:</label>
118	<input type="text" name="contractname" id="contractname" size="40" maxlength="80" value="[% contractname %]" />	100	<input type="text" name="contractname" id="contractname" size="40" maxlength="80" value="[% contractname %]" />
		101	<span class="required">Required</span>
119	</li>	102	</li>
120	<li><label for="contractdescription">Description: </label>	103	<li><label for="contractdescription">Description: </label>
121	<input type="text" name="contractdescription" id="contractdescription" size="40" maxlength="80" value="[% contractdescription %]" />	104	<input type="text" name="contractdescription" id="contractdescription" size="40" maxlength="80" value="[% contractdescription %]" />
122	</li>	105	</li>
123	<li><label for="from" class="required">Start date: *</label>	106	<li><label for="from" class="required">Start date:</label>
124	<input type="text" name="contractstartdate" id="from" value="[% contractstartdate \| $KohaDates %]" maxlength="10" size="10" class="datepickerfrom" />	107	<input type="text" name="contractstartdate" id="from" value="[% contractstartdate \| $KohaDates %]" maxlength="10" size="10" class="datepickerfrom" />
		108	<span class="required">Required</span>
125	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>	109	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
126	</li>	110	</li>
127	<li><label for="to" class="required">End date: *</label>	111	<li><label for="to" class="required">End date:</label>
128	<input type="text" name="contractenddate" id="to" value="[% contractenddate \| $KohaDates %]" maxlength="10" size="10" class="datepickerto" />	112	<input type="text" name="contractenddate" id="to" value="[% contractenddate \| $KohaDates %]" maxlength="10" size="10" class="datepickerto" />
		113	<span class="required">Required</span>
129	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>	114	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
130	</li>	115	</li>
131	</ol>	116	</ol>
132	</fieldset>	117	</fieldset>
133	<fieldset class="action">	118	<fieldset class="action">
134	<input type="button" value="Save" onclick="Check(this.form);" /> <a class="cancel" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]&contractnumber=[% contractnumber %]">Cancel</a>	119	<input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]&contractnumber=[% contractnumber %]">Cancel</a>
135	</fieldset>	120	</fieldset>
136	</form>	121	</form>
137	[% END %]	122	[% END %]

Lines 2-42 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt (-37 / +15 lines)
2	[% INCLUDE 'doc-head-open.inc' %]	2	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Koha &rsaquo; Administration &rsaquo; Budgets &rsaquo; Funds &rsaquo; Planning for [% budget_period_description %] by [% authcat %]</title>	3	<title>Koha &rsaquo; Administration &rsaquo; Budgets &rsaquo; Funds &rsaquo; Planning for [% budget_period_description %] by [% authcat %]</title>
4	[% INCLUDE 'doc-head-close.inc' %]	4	[% INCLUDE 'doc-head-close.inc' %]
5	<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
6	<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>	5	<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
7	<script type="text/javascript">	6	<script type="text/javascript">
8	//<![CDATA[	7	//<![CDATA[
9	function Check(f) {	8	jQuery.validator.addClassRules("plan_entry", {
10	var ok=1;	9	number: true // require that input be a number in fields with the class 'plan_entry'
11	var _alertString="";	10	});
12	var alertString2;
13	var arr = document.getElementsByName('est_total')
14
15	for ( var i=0, len=arr.length; i<len; ++i ){
16	var tot = arr[i].innerHTML;
17
18	if (tot == 'NaN') {
19	_alertString += "\n- " + _("One or more cell values is non-numeric");
20	}
21	}
22
23	if (_alertString.length==0) {
24
25	var op = document.createElement('input');
26	op.setAttribute("type","hidden");
27	op.setAttribute("name","op");
28	op.setAttribute("value","save"); //ohh the pain...
29
30	document.Aform.appendChild(op);
31	document.Aform.submit()
32
33	} else {
34	alertString2 = _("Form not submitted because of the following problem(s)");
35	alertString2 += "\n------------------------------------------------------------------------------------\n";
36	alertString2 += _alertString;
37	alert(alertString2);
38	}
39	}
40	$(document).ready(function() {	11	$(document).ready(function() {
41	$("#selections input").on("change",function(e){	12	$("#selections input").on("change",function(e){
42	var num = $(this).attr("id");	13	var num = $(this).attr("id");
Lines 54-63 Link Here
54	}	25	}
55	}	26	}
56	});	27	});
		28	$(".plan_entry").on("change",function(){
		29	calcTotalRow( this );
		30	});
		31	$("#Aform").validate();
		32	$(".auto_fill_row").on("click",function(){
		33	var budget_id = $(this).data("budget-id");
		34	autoFillRow( budget_id );
		35	});
57	});	36	});
58	//]]>	37	//]]>
59	</script>	38	</script>
60	<style type="text/css">td.locked { background-image: url('[% interface %]/[% theme %]/img/locked.png'); padding-left : 20px; background-repeat: no-repeat; background-position: 5px 5px; } a.control { font-size:85%;text-decoration:none; }</style>	39	<style type="text/css">td.locked { background-image: url('[% interface %]/[% theme %]/img/locked.png'); padding-left : 20px; background-repeat: no-repeat; background-position: 5px 5px; } a.control { font-size:85%;text-decoration:none; } .plan_entry { text-align: right; width:90%; } </style>
61	</head>	40	</head>
62	<body id="admin_aqplan" class="admin">	41	<body id="admin_aqplan" class="admin">
63	[% INCLUDE 'header.inc' %]	42	[% INCLUDE 'header.inc' %]
Lines 150-156 Link Here
150	[% line.estimated_amount %]	129	[% line.estimated_amount %]
151	<input type="hidden" style="text-align: right;" name="[% line.cell_name %]" value="[% line.estimated_amount %]" />	130	<input type="hidden" style="text-align: right;" name="[% line.cell_name %]" value="[% line.estimated_amount %]" />
152	[% ELSE %]	131	[% ELSE %]
153	<input type="text" style="text-align: right; width:90%; " size="6" name="[% line.cell_name %]" value="[% line.estimated_amount %]" id="budget_[% line.budget_id %][% line.colnum %]" class="plan_entry_[% line.budget_id %]" onchange="calcTotalRow(this);" />	132	<input type="text" size="6" name="[% line.cell_name %]" value="[% line.estimated_amount %]" id="budget_[% line.budget_id %][% line.colnum %]" class="plan_entry plan_entry_[% line.budget_id %]" />
154	[% END %]	133	[% END %]
155		134
156	</td></tr>	135	</td></tr>
Lines 188-194 Link Here
188		167
189	<td>	168	<td>
190	[% UNLESS ( budget_line.budget_lock ) %]	169	[% UNLESS ( budget_line.budget_lock ) %]
191	<input type="button" onclick="autoFillRow('[% budget_line.budget_id %]')" value="Auto-fill row"/>	170	<input type="button" class="auto_fill_row" data-budget-id="[% budget_line.budget_id %]" value="Auto-fill row"/>
192	[% ELSE %]	171	[% ELSE %]
193	<div style="color:red;">not owned</div>	172	<div style="color:red;">not owned</div>
194	[% END %]	173	[% END %]
Lines 202-208 Link Here
202	[% IF ( budget_period_locked ) %]	181	[% IF ( budget_period_locked ) %]
203	<!-- <input STYLE="background: gray;" type="submit" value="Save" disabled="disabled"/> -->	182	<!-- <input STYLE="background: gray;" type="submit" value="Save" disabled="disabled"/> -->
204	[% ELSE %]	183	[% ELSE %]
205	<fieldset class="action"><input type="button" onclick="Check(this.form)" value="Save"/></fieldset>	184	<fieldset class="action"><input type="submit" value="Save"/></fieldset>
206	[% END %]	185	[% END %]
207		186
208		187
209	-