admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FSN#39587 Verschillende onBlur en onChange foutafhandelingen vervangen door validateField() die in de submit foor validateForm() gecheckt wordt

Browse Source 
svn path=/Website/trunk/; revision=33600
This commit is contained in:
Koen Reefman
2017-04-26 14:21:01 +00:00
parent 67eff8790f
commit ed5e8d735a
24 changed files with 195 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/ALG/alg_ruimteafdeling.js
View File

@@ -135,7 +135,7 @@ function changeOppervlak(prowIndex)
{
var $thisObj = $("#bezopp"+prowIndex);
var valid = isGoodNumber($thisObj.val(), false,false,8,2);
makeBad($thisObj, valid, L("lcl_alg_bezetting_ongeldig"))
validateField($thisObj, valid, L("lcl_alg_bezetting_ongeldig"))
if (valid)
{
@@ -158,7 +158,7 @@ function changeBezetting(prowIndex)
var valid = isGoodNumber($thisObj.val(), false,false,8,2) &&
parseFloat($thisObj.val().replace(',', '.')) <= 100 &&
parseFloat($thisObj.val().replace(',', '.')) >= 0;
makeBad($thisObj, valid, L("lcl_alg_bezetting_ongeldig"));
validateField($thisObj, valid, L("lcl_alg_bezetting_ongeldig"));
if (valid && !multiRuimte)
{

12
APPL/BES/bes_bedrijfproduct_search_list.asp
View File

@@ -76,15 +76,9 @@ var authparams = user.checkAutorisation("WEB_BESMSU");
function checkInput(str, field)
{
if (str != "" && !isGoodCurrency(str.replace(',', '.')))
{
FcltMgr.alert(L("lcl_shared_invalid_format"),
{ fnafterclose: function() {field.focus();}
}
);
return false;
}
return true;
var valid = str == "" || isGoodCurrency(str.replace(',', '.'));
validateField(field, valid, L("lcl_shared_invalid_format"));
return valid;
}
// Op de OnBlur van inputveld wordt een weging direct opgeslagen

18
APPL/BES/bes_edit_opdr.asp
View File

@@ -110,6 +110,11 @@ var this_bestelopdr = bes.func_enabled_bestelopdracht(opdr_key);
<script type="text/javascript">
function bes_opdrsubmit()
{ //TODO CheckLengte
if (hasBadFields())
{
FcltMgr.alert(L("lcl_shared_validator_invalid"));
return false;
}
document.forms.u2.submit();
return true;
}
@@ -139,6 +144,8 @@ var this_bestelopdr = bes.func_enabled_bestelopdracht(opdr_key);
function recalcPrice(key)
{
var m_count = parseInt(document.u2['cnt' + key].value);
var valid = true;
var error = "";
if (isNaN(m_count)) {
document.u2['cnt'+key].value = document.u2['am' + key].value;
return;
@@ -147,11 +154,12 @@ var this_bestelopdr = bes.func_enabled_bestelopdracht(opdr_key);
// Het aantal moet groter of gelijk blijven aan het aantal geleverd.
// Trouwens alleen als de status 4 is of daarna kunnen er artikelen geleverd zijn.
var m_count_ontv = parseInt(document.u2['cnt'+key].getAttribute("aantalontv"));
if (m_count < m_count_ontv)
{
FcltMgr.alert(L("lcl_bes_aantontv_mess").format(m_count_ontv));
valid = false;
error = L("lcl_bes_aantontv_mess").format(m_count_ontv);
document.u2['cnt'+key].value = m_count_ontv;
document.u2['cnt'+key].focus()
m_count = m_count_ontv;
}
@@ -159,11 +167,13 @@ var this_bestelopdr = bes.func_enabled_bestelopdracht(opdr_key);
var m_count_max = parseInt(document.u2['max' + key].value);
if (m_count > m_count_max)
{
FcltMgr.alert(L("lcl_bes_verhogen_mess"));
valid = false;
error = L("lcl_bes_verhogen_mess");
document.u2['cnt'+key].value = m_count_max;
document.u2['cnt'+key].focus()
m_count = m_count_max;
}
validateField(document.u2['cnt' + key], valid, error);
var price = parseFloat(document.u2['pr'+key].value);
var c_count = m_count * price;
$('#price' + key).text(num2curr(c_count));

23
APPL/BES/bes_retour.asp
View File

@@ -68,30 +68,23 @@ user.auth_required_or_abort(this_bes.canRetourBES);
evt = evt || window.event;
var obj = evt.srcElement || evt.target;
var val = obj.value;
var valid = true;
var error = "";
if( val == "" || val == 0 || (!isNaN(val) && isGoodNumber(val,true,true,-1,-1) &&
parseInt(val,10) >= 0 )) {
var i = obj.id.substring(3);
var remaining = parseInt(document.getElementById('rem'+i).value,10);
if( val == "" ) val = 0;
if( val > remaining )
{
FcltMgr.alert(L("lcl_bes_exceed_value_retour"),
{ fnafterclose: function() {obj.focus();}
}
);
return false;
}
return true;
valid = val <= remaining;
error = L("lcl_bes_exceed_value_retour");
}
else
{
FcltMgr.alert(L("lcl_bes_bad_value"),
{ fnafterclose: function() {obj.focus();}
}
);
return false;
valid = false;
error = L("lcl_bes_bad_value");
}
validateField(obj, valid, error);
return valid;
}
function guardMaxLength(evt)

5
APPL/BES/opdr_delivery.asp
View File

@@ -39,6 +39,11 @@ user.auth_required_or_abort(this_bestelopdr.canDeliver);
function opdr_submit()
{
if (hasBadFields())
{
FcltMgr.alert(L("lcl_shared_validator_invalid"));
return false;
}
document.forms.u2.submit();
return true; // disable button
}

22
APPL/BES/opdr_delivery.js
View File

@@ -15,30 +15,24 @@ function checkInput(evt)
evt = evt || window.event;
var obj = evt.srcElement || evt.target;
var val = obj.value;
var valid = true;
var error = "";
var i = obj.id.substring(3);
var remaining = parseInt(document.getElementById('rem'+i).value,10);
if( val == "" || val == 0 || (!isNaN(val) && isGoodNumber(val,true,false,-1,-1) &&
((remaining > 0 && parseInt(val,10) >= 0) || (remaining < 0 && parseInt(val,10) <= 0)))) {
if( val == "" ) val = 0;
if( (remaining > 0 && val > remaining) || (remaining < 0 && val < remaining) ){
FcltMgr.alert(L("lcl_bes_exceed_value"),
{ fnafterclose: function() {obj.focus();}
}
);
return false;
}
return true;
valid = !((remaining > 0 && val > remaining) || (remaining < 0 && val < remaining))
error = L("lcl_bes_exceed_value")
}
else
{
FcltMgr.alert(L("lcl_bes_bad_value"),
{ fnafterclose: function() {obj.focus();}
}
);
return false;
error = L("lcl_bes_bad_value")
valid = false;
}
validateField(obj, valid, error);
return valid;
}
function complete()

27
APPL/BES/sel_items_tab.js
View File

@@ -761,14 +761,13 @@ function checkAmount(aantal_cell)
var tr = $(aantal_cell).closest("tr")[0];
var amount = parseInt(aantal_cell.value, 10);
var id_key = aantal_cell.id.substring(6);
var valid = true;
var error = "";
if (aantal_cell.value == '') aantal_cell.value = amount = 1;
if (aantal_cell.value == '' || isNaN(amount) ||
!isGoodNumber(aantal_cell.value, true,false,-1,-1) ||
amount > 99999)
{
FcltMgr.alert(L("lcl_bes_invalidAmount"), { fnafterclose: function () { aantal_cell.focus(); } });
valid = !isNaN(amount) && isGoodNumber(aantal_cell.value, true,false,-1,-1) && amount <= 99999;
validateField(aantal_cell, valid, L("lcl_bes_invalidAmount"));
if (!valid)
return;
}
if (!window.is_correctie)
{
@@ -782,14 +781,16 @@ function checkAmount(aantal_cell)
if (window.stock_info.maxbestel > 0 && besteld > voorraad)
{ // Aantal verlagen naar het aantal dat in voorraad is min het aantal dat in andere regels in bestelling is.
new_amount = voorraad - (besteld - amount);
FcltMgr.alert(L("lcl_bes_reduced_to_max").format(voorraad, new_amount));
valid = false;
error = L("lcl_bes_reduced_to_max").format(voorraad, new_amount);
aantal_cell.value = new_amount;
}
var bestelminimum = tr.bes_item_info.bestelminimum;
if (amount < bestelminimum) {
amount = bestelminimum;
FcltMgr.alert(L("lcl_bes_bestelminimum") + bestelminimum);
valid = false;
error = L("lcl_bes_bestelminimum") + bestelminimum;
aantal_cell.value = amount;
}
@@ -800,22 +801,26 @@ function checkAmount(aantal_cell)
// Het kan zijn dat nu het aantal groter is als de voorraad en dat het niet mag.
if (window.stock_info.maxbestel > 0 && amount > voorraad)
amount = amount - veelvoud;
FcltMgr.alert(L("lcl_bes_matchedveelvoud") + veelvoud);
valid = false;
error = L("lcl_bes_matchedveelvoud") + veelvoud;
aantal_cell.value = amount;
}
validateField(aantal_cell, valid, error);
// Als er items geleverd zijn, mag het aantal daar niet onder komen
// Of laten we de leverancier dit dan gewoon afkeuren?
if ((amount < tr.bes_item_info.received && tr.orgAmount >= 0) ||
(amount > tr.bes_item_info.received && tr.orgAmount <= 0))
{
FcltMgr.alert(L("lcl_bes_exceed_delivered"), { fnafterclose: function () { aantal_cell.focus(); } });
validateField(aantal_cell, false, L("lcl_bes_exceed_delivered"));
return;
}
}
tr.amount = amount; // voor het gemak
if ( !show_price)
if (!show_price)
return;
var new_price = amount * tr.bes_item_info.price;

14
APPL/CNT/cnt_edit_contract.asp
View File

@@ -192,17 +192,11 @@ else // nieuw contract of copy
}
%>
<script type="text/javascript">
function checkTextarea(field, show, klen)
function checkTextarea(field, klen)
{
var valid = true;
var value = field.value;
var err = L("lcl_cnt_text_toolong1")+klen+ L("lcl_cnt_text_toolong2");
if( value != '' ) {
if( value.length > klen ) valid = false;
}
if( show && ! valid ) {
FcltMgr.alert(err, { fnafterclose: function () {field.focus()} });
}
var valid = value == "" || value.length <= klen;
validateField(field, valid, L("lcl_cnt_text_toolong1")+klen+ L("lcl_cnt_text_toolong2"));
return valid;
}
</script>
@@ -285,7 +279,7 @@ else // nieuw contract of copy
});
var cntopm_ro = (cnt_info.isAbonnement ? !this_cnt.canVerlengen : cnt_info.isAbonnement); // zelfde voorwaarde als het veld Verlengen.
RWTEXTAREATR("cnt_cntopm", "fldtxt", L("lcl_remark"), cnt_info.opmerking, {html: "onChange='checkTextarea(this, false, 4000)'", readonly: cntopm_ro, suppressEmpty: true});
RWTEXTAREATR("cnt_cntopm", "fldtxt", L("lcl_remark"), cnt_info.opmerking, {html: "onChange='checkTextarea(this, 4000)'", readonly: cntopm_ro, suppressEmpty: true});
BLOCK_END();
BLOCK_START("cntData" , L("lcl_cnt_dates"));

5
APPL/CNT/cnt_edit_scope.js
View File

@@ -443,10 +443,7 @@ function checkWeight(evt)
var retVal = false;
if (( !isNaN(ival) && Math.abs(ival) < 1000000000) || obj.value =="")
retVal = true;
if ( !retVal )
{
FcltMgr.alert(L("lcl_cnt_invalid_kenmerk_value"), { fnafterclose: function () {obj.focus()} });
}
validateField(obj, retVal, L("lcl_cnt_invalid_kenmerk_value"));
return retVal;
}

29
APPL/FIN/fin_edit_factuur.js
View File

@@ -98,12 +98,6 @@ function fin_submit()
// Formulier specifieke checks, met eventuele submit
if (!checkInput())
return false;
// Meer formulier specifieke checks.
if ($(document).has('span.bad').length)
{
FcltMgr.alert(L("lcl_shared_validator_invalid"));
return false;
}
// Standaard checks op verplichte velden, datum formaat, numeriek en float formaat, currency formaat.
if (!validateForm("u2"))
return false;
@@ -126,7 +120,7 @@ function fin_cancel()
function devidePeriodChanged()
{
if (checkDP(false))
if (checkDP())
{
var finboekm = $("#finboekm").val();
finboekm_jaar = finboekm.substr(0,4);
@@ -142,18 +136,17 @@ function devidePeriodChanged()
}
}
function checkDP(alertFocus)
function checkDP()
{
var isValid = true;
var valid = true;
var value = $("#finboekm").val();
var isBad = $("#finboekm").hasClass("bad");
if (value != '')
isValid = checkDividePeriod(value);
valid = checkDividePeriod(value);
makeBad($("#finboekm"), isValid, L("lcl_fin_invalid_kenmerk_format"))
validateField($("#finboekm"), valid, L("lcl_fin_invalid_kenmerk_format"))
return isValid;
return valid;
}
function clearRefDetails()
@@ -468,7 +461,7 @@ function checkDividePeriod(value)
}
}
else valid = false;
return(valid);
return valid;
}
function kenmerkDividePeriodKey(evt)
@@ -675,11 +668,11 @@ function SumChanged(obj)
if (obj.value == '')
obj.value = sum = defaultamount;
var isBad = obj.value == '' || isNaN(sum) ||
!isGoodNumber(obj.value + "", false,false,8,2);
var valid = obj.value != '' && !isNaN(sum) &&
isGoodNumber(obj.value + "", false,false,8,2);
makeBad(obj, !isBad, L("lcl_fin_invalidSum"))
if (isBad)
validateField(obj, valid, L("lcl_fin_invalidSum"))
if (!valid)
return;
obj.value = num2curr(sum);

34
APPL/INS/ins_list.js
View File

@@ -65,6 +65,8 @@ function checkInput(evt)
if (sk_kenmerktype == 'N')
{
var valid = true;
var error = "";
if (new_val == "" ||
new_val >= 0 ||
(!isNaN(new_val) && isGoodNumber(new_val,true,true,-1,-1) && parseInt(new_val,10) >= 0))
@@ -74,32 +76,28 @@ function checkInput(evt)
if (new_val == "") new_val = last_value;
if (new_val < last_value)
{
FcltMgr.alert(L("lcl_obj_value_to_low"));
obj.focus();
inslist.action = 'javascript:0';
return false;
valid = false;
error = L("lcl_obj_value_to_low");
}
else if (!isNaN(sk_nmin) && new_val < sk_nmin)
{
FcltMgr.alert(L("lcl_obj_value_below_nmin"));
obj.focus();
inslist.action = 'javascript:0';
return false;
valid = false;
error = L("lcl_obj_value_below_nmin");
}
else if (!isNaN(sk_nmax) && new_val > sk_nmax)
{
FcltMgr.alert(L("lcl_obj_value_below_nmax"));
obj.focus();
inslist.action = 'javascript:0';
return false;
valid = false;
error = L("lcl_obj_value_below_nmax");
}
inslist.action = 'ins_search_list.asp';
return true;
}
FcltMgr.alert(L("lcl_obj_bad_value"));
obj.focus();
inslist.action = 'javascript:0';
return false;
else
{
valid = false;
error = L("lcl_obj_bad_value");
}
validateField(obj, valid, error);
inslist.action = valid ? 'ins_search_list.asp' : 'javascript:0';
return valid;
}
else
{

38
APPL/INS/ins_verbruik.js
View File

@@ -18,6 +18,8 @@ function checkInputChk(obj, submitting)
var sk_kenmerktype = obj.attr("value1");
var sk_nmin = parseInt(obj.attr("value3"),10);
var sk_nmax = parseInt(obj.attr("value4"),10);
var valid = true;
var error = "";
if (sk_kenmerktype == 'N')
{
@@ -29,41 +31,29 @@ function checkInputChk(obj, submitting)
if( new_val == "" ) new_val = last_value;
if( new_val < last_value && !submitting )
{
FcltMgr.alert(L("lcl_ins_value_to_low"),
{ fnafterclose: function() {obj.focus();}
}
);
return false;
valid = false;
error = L("lcl_ins_value_to_low");
}
else if( !isNaN(sk_nmin) && new_val < sk_nmin && !submitting)
{
FcltMgr.alert(L("lcl_ins_value_below_nmin"),
{ fnafterclose: function() {obj.focus();}
}
);
return false;
valid = false;
error = L("lcl_ins_value_below_nmin");
}
else if( !isNaN(sk_nmax) && new_val > sk_nmax && !submitting)
{
FcltMgr.alert(L("lcl_ins_value_below_nmax"),
{ fnafterclose: function() {obj.focus();}
}
);
return false;
valid = false;
error = L("lcl_ins_value_below_nmax");
}
return true;
}
else
{
if (!submitting)
{
FcltMgr.alert(L("lcl_ins_bad_value"),
{ fnafterclose: function() {obj.focus();}
}
);
return false;
}
if (submitting)
return;
valid = false;
error = L("lcl_ins_bad_value");
}
validateField(obj, valid, error);
return valid;
}
else
{

5
APPL/INS/ins_verbruik_list.inc
View File

@@ -49,6 +49,11 @@ function fnrowData(oRs)
function doSubmit()
{
if (hasBadFields())
{
FcltMgr.alert(L("lcl_shared_validator_invalid"));
return false;
}
var valid = true;
$("[id^='cnt']").each(function()
{

17
APPL/INS/load_owkenmerk.asp
View File

@@ -371,12 +371,12 @@ function checkK<%=i%><%=serienr%>(show){
var valid = true;
var field = parent.u2.k<%=i%>val<%=serienr%>;
var value = field.value;
var err = "<%=L("lcl_mld_invalid_kenmerk_format")%>";
var error = "<%=L("lcl_mld_invalid_kenmerk_format")%>";
if( value != '' ) {
<% if( ktype == 'D' ) { %>
valid = parent.owcheckDate( value );
if( ! valid ) err = "<%=L("lcl_mld_kenmerk_out_range")%>";
if (!valid) error = "<%=L("lcl_mld_kenmerk_out_range")%>";
<% } else if( (ktype == 'C') || (ktype == 'L') || (ktype == 'Q')) { %>
if( value.length > <%=klen%> ) valid = false;
<% } else if( ktype == 'N' ) {
@@ -386,19 +386,14 @@ function checkK<%=i%><%=serienr%>(show){
} else {
s = '/^\\d{1,'+klen+'}[.,]?$/';
} %>
valid = value.match(<%=s%>) && valid;
valid &= value.match(<%=s%>);
<%
if( kmin != null ) { %> if( value < <%=kmin%> ) { valid = false; err = "<%=L("lcl_mld_kenmerk_out_range")%>"; } <% }
if( kmax != null ) { %> if( value > <%=kmax%> ) { valid = false; err = "<%=L("lcl_mld_kenmerk_out_range")%>"; } <% }
if( kmin != null ) { %> if( value < <%=kmin%> ) { valid = false; error = "<%=L("lcl_mld_kenmerk_out_range")%>"; } <% }
if( kmax != null ) { %> if( value > <%=kmax%> ) { valid = false; error = "<%=L("lcl_mld_kenmerk_out_range")%>"; } <% }
}
%>
}
if( show && ! valid ) {
FcltMgr.alert(err,
{ fnafterclose: function() {field.focus();}
}
);
}
validateField(field, valid, error);
parent.u2.action = valid ? 'outlet.asp' : 'javascript:0';
return valid;
}

43
APPL/Localscripts/iface.js
View File

@@ -311,6 +311,12 @@ function validateForm(fName, params)
if (params.relaxed)
clsName = "";
if (hasBadFields())
{
validatorHint.push(L("lcl_shared_validator_invalid"));
anyBad = true;
}
$(".required").filter(jqcheckonly).not(jqchecknot).filter(':visible').each(function (i)
{
switch (this.tagName)
@@ -526,8 +532,9 @@ function validateForm(fName, params)
// 2==>2:00, 10==>0:10, 40==>0:40, 10:00==>10:00 etc.
function sanitizeHours(veld, minvalue)
{
if (!minvalue)
{
var valid = true;
if (!minvalue)
{
var TIME_RE = /^(\d*)([\/\.\,\-\:])?(\d\d?)?$/;
}
else
@@ -577,10 +584,10 @@ function sanitizeHours(veld, minvalue)
else
if (tmtxt != "")
{
FcltMgr.alert(L("lcl_shared_validator_format"));
return false;
valid = false;
}
return true;
validateField(veld, valid, L("lcl_shared_validator_format"));
return valid;
}
// Usage: "Wilt U melding {0} afmelden?".format(12345)
@@ -743,25 +750,23 @@ function isGoodNumber(str, intOnly, posOnly, numLen, numDec)
return patt.test(str);
}
function makeBad(thisObj, valid, errorMsg)
function validateField(thisObj, valid, errorMsg)
{
var hasIconFollower = $(thisObj).next('i.fa').length;
var $afterThisObj = hasIconFollower ? $(thisObj).next('i.fa') : $(thisObj);
var hasSpanFollower = $afterThisObj.next('span.bad').length;
var hasBadClass = $(thisObj).hasClass('bad');
$(thisObj).removeClass('bad');
$afterThisObj.next('span.bad').remove();
if (!valid)
{
if (!hasBadClass)
$(thisObj).addClass('bad');
if (!hasSpanFollower)
$afterThisObj.after('<span class="bad">' + errorMsg + '</span>')
}
else
{
if (hasBadClass)
$(thisObj).removeClass('bad');
if (hasSpanFollower)
$afterThisObj.next('span.bad').remove();
$(thisObj).addClass('bad');
$afterThisObj.after('<span class="bad">' + errorMsg + '</span>')
}
FcltMgr.resized();
}
function hasBadFields()
{
return $(document).has('span.bad').length;
}

40
APPL/MLD/mld_opdr_materiaal.js
View File

@@ -90,16 +90,10 @@ function isGoodCurrency(str, digits)
function checkInput(str, field, typeNC)
{
if (str != "" && ( (typeNC == "C" && !isGoodCurrency(str.replace(',', '.')))
|| (typeNC == "N" && !isGoodNumber(str.replace(',', '.'),false,true,8,2))
))
{
FcltMgr.alert(L("lcl_mld_opdr_invalid_sum"));
field.select();
field.focus();
return false;
}
return true;
var valid = str == "" || (typeNC == "C" && isGoodCurrency(str.replace(',', '.')))
|| (typeNC == "N" && isGoodNumber(str.replace(',', '.'),false,true,8,2));
validateField(field, valid, L("lcl_mld_opdr_invalid_sum"));
return valid;
}
function onChangeAmount(key)
@@ -428,13 +422,12 @@ function QtyChanged(evt)
var defaultamount = 0;
if (obj.value == '')
obj.value = qty = defaultamount;
if (obj.value == '' || isNaN(qty > 0? qty : -qty) ||
!isGoodNumber(obj.value,false,true,8,2))
{
FcltMgr.alert(L("lcl_mld_opdr_invalid_quantity"));
obj.focus();
return;
}
var valid = obj.value != '' && !isNaN(qty > 0? qty : -qty)
&& isGoodNumber(obj.value,false,true,8,2);
validateField(obj, valid, L("lcl_mld_opdr_invalid_quantity"));
if (!valid)
return;
obj.value = qty;
var index = obj.id.substring(3);
@@ -460,13 +453,12 @@ function PrcChanged(evt)
var defaultprice = 0;
if (obj.value == '')
obj.value = sum = defaultprice;
if (obj.value == '' || isNaN(sum > 0? sum : -sum) ||
!isGoodCurrency(obj.value + "", false))
{
FcltMgr.alert(L("lcl_mld_opdr_invalid_sum"));
obj.focus();
return;
}
var valid = obj.value != '' && !isNaN(sum > 0? sum : -sum)
&& isGoodCurrency(obj.value + "", false);
validateField(obj, valid, L("lcl_mld_opdr_invalid_sum"));
if (!valid)
return;
obj.value = num2curr(sum);
var index = obj.id.substring(3);

9
APPL/MLD/opdr_edit_uren.asp
View File

@@ -92,13 +92,9 @@ if (urole != "fe" && canWrite)
// Onchange urenveldje
function updateDag(veld, millisec, remark)
{
var setting_mld_opdr_minuren = (<%=(S("mld_opdr_minuren")?1:0)%> == 1);
var setting_mld_opdr_minuren = (<%=(S("mld_opdr_minuren")?1:0)%> == 1);
if (!sanitizeHours(veld, setting_mld_opdr_minuren))
{
veld.focus();
veld.select();
return false;
}
anyChange = true;
var tr = $(veld).closest("table").closest("tr")[0]; // <table><tr> <td>opdrachtnr</td> <td>omschrijving</td> <td><table><tr><td> <input><i> </i></td></tr></table> <td>...</td> ... <td>Restant</td></tr></table>
var uPlanned = hourToDecimal($("input#fldmldurenplan" ,tr)[0].value) || 0;
@@ -119,9 +115,10 @@ if (urole != "fe" && canWrite)
som += hourToDecimal(this.value);
});
validateField(veld, uOpdrtyp != 7 || rest >= 0, L("lcl_mlduren_max_exceeded"));
if (uOpdrtyp == 7 && rest < 0)
{ // Bij overschrijding van maximaal geregistreerde uren (mld_typeopdr_matchtype=7) dit melden en wijziging niet opslaan.
FcltMgr.alert(L("lcl_mlduren_max_exceeded"));
return false;
}

11
APPL/MSG/msg_edit_message.asp
View File

@@ -136,14 +136,9 @@ function checkInput() {
}
function checkNrChar() {
if (document.getElementById("ta_message").value.length > 4000) {
FcltMgr.alert(L("lcl_mes_to_many_char") + ' (' + document.getElementById("ta_message").value.length + '). ' + L("lcl_mes_less_500"),
{ fnafterclose: function () {
document.getElementById("ta_message").focus();
document.getElementById("ta_message").select()
}
});
}
var msgLength = $("#ta_message").val().length;
var valid = msgLength <= 4000;
validateField($("#ta_message"), valid, L("lcl_mes_to_many_char") + ' (' + msgLength + '). ' + L("lcl_mes_less_500"));
}
jQuery(document).ready(function()

11
APPL/MSG/msg_portal_edit.asp
View File

@@ -115,14 +115,9 @@ function msgCancel () {
debugger;
function checkNrChar() {
if (document.getElementById("ta_message").value.length > 2000) {
FcltMgr.alert(L("lcl_mes_to_many_char") + ' (' + document.getElementById("ta_message").value.length + '). ' + '<%=L("lcl_mes_less_500")%>',
{ fnafterclose: function () {
document.getElementById("ta_message").focus();
document.getElementById("ta_message").select()
}
});
}
var msgLength = $("#ta_message").val().length;
var valid = msgLength <= 2000;
validateField($("#ta_message"), valid, L("lcl_mes_to_many_char") + ' (' + msgLength + '). ' + L("lcl_mes_less_500"));
}
jQuery(document).ready(function() {

42
APPL/PRJ/edit_bezetting.asp
View File

@@ -110,6 +110,11 @@ var authparams = user.checkAutorisation(autfunction);
<script type="text/javascript">
function doSubmit()
{
if (hasBadFields())
{
FcltMgr.alert(L("lcl_shared_validator_invalid"));
return false;
}
if ($("#wp_bez").val() != "")
document.forms.u2.submit();
}
@@ -122,17 +127,9 @@ var authparams = user.checkAutorisation(autfunction);
if (retVal)
{
var ival = parseInt(obj.value,10);
if (!isNaN(ival) && ival >= 0 && ival <= 100)
retVal = true;
else
retVal = false;
}
if (!retVal)
{
FcltMgr.alert(L("lcl_prs_wp_bad_occupation"),
{ fnafterclose: function () { obj.focus(); } });
retVal = !isNaN(ival) && ival >= 0 && ival <= 100;
}
validateField(obj, retVal, L("lcl_prs_wp_bad_occupation"));
return retVal;
}
@@ -153,26 +150,19 @@ var authparams = user.checkAutorisation(autfunction);
{
evt = evt || window.event;
var obj = evt.srcElement || evt.target;
if( obj.value == "" || !isGoodNumber(obj.value,true,true,-1,-1))
{
FcltMgr.alert(L("lcl_estate_wp_bad_seq"),
{ fnafterclose: function () { obj.focus(); } });
return false;
}
return true;
var valid = obj.value != "" && isGoodNumber(obj.value,true,true,-1,-1);
validateField(obj, valid, L("lcl_estate_wp_bad_seq"));
return valid;
}
function checkArea()
{
if ($("#wp_opp").val() != ""
&& !isGoodNumber($("#wp_opp").val(),false,true,-1,-1)
&& parseInt($("#wp_opp").val(),10) > 0
&& parseInt($("#wp_opp").val(),10) < 999999.99)
{
FcltMgr.alert(L("lcl_estate_wp_bad_area"));
return false;
}
return true;
var valid = $("#wp_opp").val() == "" ||
(isGoodNumber($("#wp_opp").val(),false,true,-1,-1) &&
parseInt($("#wp_opp").val(),10) > 0 &&
parseInt($("#wp_opp").val(),10) <= 999999.99);
validateField($("#wp_opp"), valid, L("lcl_estate_wp_bad_area"));
return valid;
}
</script>

15
APPL/PRS/kpn_edit_kpn.asp
View File

@@ -87,16 +87,11 @@ user.auth_required_or_abort(canChange);
evt = evt || window.event;
var obj = evt.srcElement || evt.target;
var limit = obj.value;
if (limit != ""
&& (!isGoodNumber(limit,true,false,8,-1)
|| parseInt(limit, 10) < 0
|| parseInt(limit, 10) > 99999999))
{
FcltMgr.alert(L("lcl_prs_bad_budget"));
window.setTimeout(function(){$("#kpn_limiet").select()}, 0); // Zonder setTimeout functie gaat zetten van focus niet goed.
return false;
}
return true;
var valid = limit == "" || (isGoodNumber(limit,true,false,8,-1)
&& parseInt(limit, 10) >= 0
&& parseInt(limit, 10) <= 99999999)
validateField(obj, valid, L("lcl_prs_bad_budget"));
return valid;
}
function kpn_submit()

15
APPL/PRS/kpn_edit_kpncat.asp
View File

@@ -73,16 +73,11 @@ if (kpndisc_key > -1)
evt = evt || window.event;
var obj = evt.srcElement || evt.target;
var limit = obj.value;
if (limit != ""
&& (!isGoodNumber(limit,true,false,8,-1)
|| parseInt(limit, 10) < 0
|| parseInt(limit, 10) > 99999999))
{
FcltMgr.alert(L("lcl_prs_bad_budget"));
window.setTimeout(function(){$("#kpn_limiet").select()}, 0); // Zonder setTimeout functie gaat zetten van focus niet goed.
return false;
}
return true;
var valid = limit == "" || (isGoodNumber(limit,true,false,8,-1)
&& parseInt(limit, 10) >= 0
&& parseInt(limit, 10) <= 99999999)
validateField(obj, valid, L("lcl_prs_bad_budget"));
return valid;
}
function kpncat_submit()
{

3
APPL/Shared/default.csx
View File

@@ -2088,7 +2088,8 @@ input.fldflexC50.bad {
}
input.bad,
input[type=text].bad {
input[type=text].bad,
textarea.bad {
background-color: #ffb0b0;
}

10
APPL/Shared/kenmerk_js.asp
View File

@@ -79,7 +79,7 @@ function checkKenmerk(field, show, ktype, klen, kdec, kmin, kmax)
{
in_use = true;
var value = field.value;
var err = "<%=L("lcl_mld_invalid_kenmerk_format")%>";
var error = "<%=L("lcl_mld_invalid_kenmerk_format")%>";
if (value != '')
{
@@ -122,7 +122,7 @@ function checkKenmerk(field, show, ktype, klen, kdec, kmin, kmax)
field.value = value;
}
var s = '^\\-?(\\d{1,'+l1+'}[.,]?|\\d{0,'+l1+'}[.,]\\d{1,'+l2+'})$';
valid = value.match(new RegExp(s)) && valid;
valid &= value.match(new RegExp(s));
if (valid) { var t = parseFloat(value.replace(',','.'));}
}
else
@@ -142,12 +142,12 @@ function checkKenmerk(field, show, ktype, klen, kdec, kmin, kmax)
}
if (valid)
{
if ((kmin !== null) && (t < kmin)) { valid = false; err = "<%=L("lcl_mld_kenmerk_out_range")%>"; }
if ((kmax !== null) && (t > kmax)) { valid = false; err = "<%=L("lcl_mld_kenmerk_out_range")%>"; }
if ((kmin !== null) && (t < kmin)) { valid = false; error = "<%=L("lcl_mld_kenmerk_out_range")%>"; }
if ((kmax !== null) && (t > kmax)) { valid = false; error = "<%=L("lcl_mld_kenmerk_out_range")%>"; }
}
}
}
makeBad(field, valid, err);
validateField(field, valid, error);
if (!show && valid && field.className.match(/required\d*S\d*/g) && field.className.match(/required\d*S\d*/g).length > 0)
{ // Er is een required groep aanwezig.
var requiredgroup = field.className.match(/required\d*S\d*/g)[0];