Attachment #2250 for bug #4883

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




        // var actTotal ="";

        if (!(isNotNull(f.budget_code,1))) {
            _alertString += _("- Budget code cannot be blank") + "\n";
        }

        if (!(isNotNull(f.budget_name,1))) {
            _alertString += _("- Budget name cannot be blank") + "\n";
        }

        if (!(isNotNull(f.budget_amount,1))) {
            _alertString += _("- Budget amount cannot be blank") + "\n";
        }

        var budgetId;

            if   (budgetId  > 0)  {  ; //its a mod ...
                // if parent eq curent-budget, fail...
                if ( newBudgetParent  ==  budgetId     ) {
                        _alertString += _("- Budget parent is current budget") + "\n";
                }

                else if (newBudgetParent) {

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




// to check if the data are correctly entered.
function Check(ff) {
    var ok=0;
    var _alertString=_("Form not submitted because of the following problem(s)");
    _alertString +="\n-------------------------------------------------------------------\n\n";
    if (!(isNotNull(ff.contractname,0))){
        ok=1;
        _alertString += _("- Name missing") + "\n";
    }
    var startDate = Date_from_syspref($("#contractstartdate").val());
    var endDate   = Date_from_syspref($("#contractenddate").val());
    if (!parseInt(startDate.getTime())) {
        ok=1;
        _alertString += _("- Start date missing or invalid.") + "\n";
    }
    if (!parseInt(endDate.getTime())) {
        ok=1;
        _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);




    	
    	if(isempty){
    		flag = 1;
			StrAlert += "\t* Field " + arr[0] + _(" is mandatory, at least one of its subfields must be filled") + "\n";
    	}
    	
    }
    
    
    if(StrAlert){
        return _("Can't save this record because the following field aren't filled :") + "\n\n" + StrAlert;
    }
    return false;
}




    }

    if (count_reserv == "0"){
		msg += (_("- Please select an item to place a hold") + "\n");
    }
    if (count_reserv >= "2"){
		msg += (_("- You may only place a hold on one item at a time") + "\n");
    }

    if (alreadyreserved > "0"){
		msg += (_("- This patron had already placed a hold on this item") + "\n" + _("Please cancel the previous hold first") + "\n");
    }

	if (msg == "") return(true);




		var alertString2;

	    if(f.addshelf.value.length ==0){
			_alertString += _("- You must enter a List Name") + "\n";
		}

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

Return to bug 4883

Lines 21-35 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl (-6 / +6 lines)
21	// var actTotal ="";	21	// var actTotal ="";
22		22
23	if (!(isNotNull(f.budget_code,1))) {	23	if (!(isNotNull(f.budget_code,1))) {
24	_alertString += _("- Budget code cannot be blank\n");	24	_alertString += _("- Budget code cannot be blank") + "\n";
25	}	25	}
26		26
27	if (!(isNotNull(f.budget_name,1))) {	27	if (!(isNotNull(f.budget_name,1))) {
28	_alertString += _("- Budget name cannot be blank\n");	28	_alertString += _("- Budget name cannot be blank") + "\n";
29	}	29	}
30		30
31	if (!(isNotNull(f.budget_amount,1))) {	31	if (!(isNotNull(f.budget_amount,1))) {
32	_alertString += _("- Budget amount cannot be blank\n");	32	_alertString += _("- Budget amount cannot be blank") + "\n";
33	}	33	}
34		34
35	var budgetId;	35	var budgetId;
Lines 52-58 Link Here
52	if (budgetId > 0) { ; //its a mod ...	52	if (budgetId > 0) { ; //its a mod ...
53	// if parent eq curent-budget, fail...	53	// if parent eq curent-budget, fail...
54	if ( newBudgetParent == budgetId ) {	54	if ( newBudgetParent == budgetId ) {
55	_alertString += _("- Budget parent is current budget\n");	55	_alertString += _("- Budget parent is current budget") + "\n";
56	}	56	}
57		57
58	else if (newBudgetParent) {	58	else if (newBudgetParent) {
Lines 74-81 Link Here
74	if (_alertString.length==0) {	74	if (_alertString.length==0) {
75	document.Aform.submit();	75	document.Aform.submit();
76	} else {	76	} else {
77	alertString2 = _("Form not submitted because of the following problem(s)\n");	77	alertString2 = _("Form not submitted because of the following problem(s)");
78	alertString2 += "------------------------------------------------------------------------------------\n\n";	78	alertString2 += "\n------------------------------------------------------------------------------------\n\n";
79	alertString2 += _alertString;	79	alertString2 += _alertString;
80	alert(alertString2);	80	alert(alertString2);
81	}	81	}

Lines 15-44 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl (-7 / +7 lines)
15	// to check if the data are correctly entered.	15	// to check if the data are correctly entered.
16	function Check(ff) {	16	function Check(ff) {
17	var ok=0;	17	var ok=0;
18	var _alertString=_("Form not submitted because of the following problem(s)\n");	18	var _alertString=_("Form not submitted because of the following problem(s)");
19	_alertString +="-------------------------------------------------------------------\n\n";	19	_alertString +="\n-------------------------------------------------------------------\n\n";
20	if (!(isNotNull(ff.contractname,0))){	20	if (!(isNotNull(ff.contractname,0))){
21	ok=1;	21	ok=1;
22	_alertString += _("- Name missing\n");	22	_alertString += _("- Name missing") + "\n";
23	}	23	}
24	var startDate = Date_from_syspref($("#contractstartdate").val());	24	var startDate = Date_from_syspref($("#contractstartdate").val());
25	var endDate = Date_from_syspref($("#contractenddate").val());	25	var endDate = Date_from_syspref($("#contractenddate").val());
26	if (!parseInt(startDate.getTime())) {	26	if (!parseInt(startDate.getTime())) {
27	ok=1;	27	ok=1;
28	_alertString += _("- Start date missing or invalid.\n");	28	_alertString += _("- Start date missing or invalid.") + "\n";
29	}	29	}
30	if (!parseInt(endDate.getTime())) {	30	if (!parseInt(endDate.getTime())) {
31	ok=1;	31	ok=1;
32	_alertString += _("- End date missing or invalid.\n");	32	_alertString += _("- End date missing or invalid.") + "\n";
33	}	33	}
34		34
35	if (startDate > endDate) {	35	if (startDate > endDate) {
36	ok=1;	36	ok=1;
37	_alertString += _("Wrong date! start date cannot be after end date.\n");	37	_alertString += _("Wrong date! start date cannot be after end date.") + "\n";
38	}	38	}
39	if (endDate < (new Date)) {	39	if (endDate < (new Date)) {
40	ok=1;	40	ok=1;
41	_alertString += _("End date before today, Invalid end date!\n");	41	_alertString += _("End date before today, Invalid end date!") + "\n";
42	}	42	}
43	if (ok) { // if there is a problem	43	if (ok) { // if there is a problem
44	alert(_alertString);	44	alert(_alertString);

Lines 91-104 function AreMandatoriesNotOk(){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl (-2 / +2 lines)
91		91
92	if(isempty){	92	if(isempty){
93	flag = 1;	93	flag = 1;
94	StrAlert += "\t* Field " + arr[0] + " is mandatory, at least one of its subfields must be filled\n";	94	StrAlert += "\t* Field " + arr[0] + _(" is mandatory, at least one of its subfields must be filled") + "\n";
95	}	95	}
96		96
97	}	97	}
98		98
99		99
100	if(StrAlert){	100	if(StrAlert){
101	return _("Can't save this record because the following field aren't filled :\n\n") + StrAlert;	101	return _("Can't save this record because the following field aren't filled :") + "\n\n" + StrAlert;
102	}	102	}
103	return false;	103	return false;
104	}	104	}

Lines 47-60 function check() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl (-3 / +3 lines)
47	}	47	}
48		48
49	if (count_reserv == "0"){	49	if (count_reserv == "0"){
50	msg += (_("- Please select an item to place a hold\n"));	50	msg += (_("- Please select an item to place a hold") + "\n");
51	}	51	}
52	if (count_reserv >= "2"){	52	if (count_reserv >= "2"){
53	msg += (_("- You may only place a hold on one item at a time\n"));	53	msg += (_("- You may only place a hold on one item at a time") + "\n");
54	}	54	}
55		55
56	if (alreadyreserved > "0"){	56	if (alreadyreserved > "0"){
57	msg += (_("- This patron had already placed a hold on this item\n Please cancel the previous hold first \n"));	57	msg += (_("- This patron had already placed a hold on this item") + "\n" + _("Please cancel the previous hold first") + "\n");
58	}	58	}
59		59
60	if (msg == "") return(true);	60	if (msg == "") return(true);

Lines 96-109 function placeHold () { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl (-4 / +3 lines)
96	var alertString2;	96	var alertString2;
97		97
98	if(f.addshelf.value.length ==0){	98	if(f.addshelf.value.length ==0){
99	_alertString += _("- You must enter a List Name\n");	99	_alertString += _("- You must enter a List Name") + "\n";
100	}	100	}
101		101
102	if (_alertString.length==0) {	102	if (_alertString.length==0) {
103	document.Aform.submit();	103	document.Aform.submit();
104	} else {	104	} else {
105	alertString2 = _("Form not submitted because of the following problem(s)\n");	105	alertString2 = _("Form not submitted because of the following problem(s)");
106	alertString2 += "------------------------------------------------------------------------------------\n\n";	106	alertString2 += "\n------------------------------------------------------------------------------------\n\n";
107	alertString2 += _alertString;	107	alertString2 += _alertString;
108	alert(alertString2);	108	alert(alertString2);
109	}	109	}
110	-