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

FSN#38711 2016.3 ongeldig formaat bij flexkenmerken facilitor onwerkbaar

Browse Source 
svn path=/Website/trunk/; revision=32229
This commit is contained in:
Erik Groener
2017-01-05 14:45:46 +00:00
parent 65d1bcbf6e
commit 10e0430631
9 changed files with 113 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
APPL/BES/bes_bedrijfproduct_search_list.asp
View File

@@ -79,9 +79,10 @@ var authparams = user.checkAutorisation("WEB_BESMSU");
{
if (str != "" && !isGoodCurrency(str.replace(',', '.')))
{
FcltMgr.alert(L("lcl_shared_invalid_format"));
field.select();
field.focus();
FcltMgr.alert(L("lcl_shared_invalid_format"),
{ fnafterclose: function() {field.focus();}
}
);
return false;
}
return true;

22
APPL/BES/bes_retour.asp
View File

@@ -75,16 +75,24 @@ user.auth_required_or_abort(this_bes.canRetourBES);
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"));
obj.focus();
return false;
if( val > remaining )
{
FcltMgr.alert(L("lcl_bes_exceed_value_retour"),
{ fnafterclose: function() {obj.focus();}
}
);
return false;
}
return true;
}
FcltMgr.alert(L("lcl_bes_bad_value"));
obj.focus();
return false;
else
{
FcltMgr.alert(L("lcl_bes_bad_value"),
{ fnafterclose: function() {obj.focus();}
}
);
return false;
}
}
function guardMaxLength(evt)

18
APPL/BES/opdr_delivery.js
View File

@@ -22,15 +22,23 @@ function checkInput(evt)
((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"));
obj.focus();
FcltMgr.alert(L("lcl_bes_exceed_value"),
{ fnafterclose: function() {obj.focus();}
}
);
return false;
}
return true;
}
FcltMgr.alert(L("lcl_bes_bad_value"));
obj.focus();
return false;
else
{
FcltMgr.alert(L("lcl_bes_bad_value"),
{ fnafterclose: function() {obj.focus();}
}
);
return false;
}
}
function complete()

3
APPL/CNT/cnt_edit_contract.asp
View File

@@ -164,8 +164,7 @@ else // nieuw contract
if( value.length > klen ) valid = false;
}
if( show && ! valid ) {
FcltMgr.alert(err);
field.focus();
FcltMgr.alert(err, { fnafterclose: function () {field.focus()} });
}
return valid;
}

3
APPL/CNT/cnt_edit_scope.js
View File

@@ -445,8 +445,7 @@ function checkWeight(evt)
retVal = true;
if ( !retVal )
{
FcltMgr.alert(L("lcl_cnt_invalid_kenmerk_value"));
obj.focus();
FcltMgr.alert(L("lcl_cnt_invalid_kenmerk_value"), { fnafterclose: function () {obj.focus()} });
}
return retVal;
}

12
APPL/FIN/fin_edit_factuur.js
View File

@@ -149,8 +149,10 @@ function checkDP(show)
}
if (show && !valid)
{
FcltMgr.alert(err);
$("#finboekm").focus();
FcltMgr.alert(err,
{ fnafterclose: function() {$("#finboekm").focus();}
}
);
}
return valid;
}
@@ -675,8 +677,10 @@ function SumChanged(obj)
if (obj.value == '' || isNaN(sum) ||
!isGoodNumber(obj.value + "", false,false,8,2))
{
FcltMgr.alert(L("lcl_fin_invalidSum"));
obj.focus();
FcltMgr.alert(L("lcl_fin_invalidSum"),
{ fnafterclose: function() {obj.focus();}
}
);
return;
}
obj.value = num2curr(sum);

75
APPL/INS/ins_verbruik.js
View File

@@ -6,44 +6,69 @@
function checkInput(evt)
{
evt = evt || window.event;
var obj = evt.srcElement || evt.target;
var new_val = obj.value;
var sk_kenmerktype = obj.getAttribute("value1");
//var sk_lengte = parseInt(obj.getAttribute("value2"),10);
var sk_nmin = parseInt(obj.getAttribute("value3"),10);
var sk_nmax = parseInt(obj.getAttribute("value4"),10);
var obj_evt = evt.srcElement || evt.target;
var obj = $("#"+ obj_evt.id);
if (sk_kenmerktype == 'N') {
checkInputChk(obj, false);
}
function checkInputChk(obj, submitting)
{
var new_val = obj.val(); //value;
var sk_kenmerktype = obj.attr("value1");
var sk_nmin = parseInt(obj.attr("value3"),10);
var sk_nmax = parseInt(obj.attr("value4"),10);
if (sk_kenmerktype == 'N')
{
if( new_val == "" || new_val >= 0 || (!isNaN(new_val) && isGoodNumber(new_val,true,true,-1,-1) &&
parseInt(new_val,10) >= 0 )) {
i = obj.id.substring(3);
last_value = parseInt(document.getElementById("last_val"+i).value,10);
parseInt(new_val,10) >= 0 ))
{
i = obj.attr("id").substring(3);
last_value = parseInt($("#last_val"+i).val(),10);
if( new_val == "" ) new_val = last_value;
if( new_val < last_value ){
FcltMgr.alert(L("lcl_ins_value_to_low"));
obj.focus();
if( new_val < last_value && !submitting )
{
FcltMgr.alert(L("lcl_ins_value_to_low"),
{ fnafterclose: function() {obj.focus();}
}
);
return false;
}
else if( !isNaN(sk_nmin) && new_val < sk_nmin ){
FcltMgr.alert(L("lcl_ins_value_below_nmin"));
obj.focus();
else if( !isNaN(sk_nmin) && new_val < sk_nmin && !submitting)
{
FcltMgr.alert(L("lcl_ins_value_below_nmin"),
{ fnafterclose: function() {obj.focus();}
}
);
return false;
}
else if( !isNaN(sk_nmax) && new_val > sk_nmax ){
FcltMgr.alert(L("lcl_ins_value_below_nmax"));
obj.focus();
else if( !isNaN(sk_nmax) && new_val > sk_nmax && !submitting)
{
FcltMgr.alert(L("lcl_ins_value_below_nmax"),
{ fnafterclose: function() {obj.focus();}
}
);
return false;
}
return true;
}
FcltMgr.alert(L("lcl_ins_bad_value"));
obj.focus();
return false;
else
{
if (!submitting)
{
FcltMgr.alert(L("lcl_ins_bad_value"),
{ fnafterclose: function() {obj.focus();}
}
);
return false;
}
}
}
else {
else
{
// yet, only numerical kenmerktypes are supported
// FcltMgr.alert(L("lcl_obj_only_num"));
obj.value = "";
obj.val("");
}
}

22
APPL/INS/ins_verbruik_list.inc
View File

@@ -49,7 +49,18 @@ function fnrowData(oRs)
function doSubmit()
{
document.u2.submit();
var valid = true;
$("[id^='cnt']").each(function()
{
var this_input = $(this).attr("id");
valid = checkInputChk($("#"+this_input), true);
if (!valid)
return;
});
if (valid)
{
document.u2.submit();
}
}
</script>
@@ -128,10 +139,11 @@ function verbruik_list(pautfunction, params)
+ " FROM ins_v_aanwezigkenmerkdeel akd "
+ " WHERE akd.ins_deel_key = d.ins_deel_key "
+ " AND akd.ins_kenmerk_key = sk.ins_kenmerk_key) datum "
+ " , (SELECT akd.ins_kenmerkdeel_waarde "
+ " FROM ins_v_aanwezigkenmerkdeel akd "
+ " WHERE akd.ins_deel_key = d.ins_deel_key "
+ " AND akd.ins_kenmerk_key = sk.ins_kenmerk_key) kenmerkwaarde "
+ " , ( COALESCE((SELECT akd.ins_kenmerkdeel_waarde "
+ " FROM ins_v_aanwezigkenmerkdeel akd "
+ " WHERE akd.ins_deel_key = d.ins_deel_key "
+ " AND akd.ins_kenmerk_key = sk.ins_kenmerk_key)"
+ " ,'0')) kenmerkwaarde "
+ " , sk.ins_srtdeel_key "
+ " , d.ins_deel_key "
+ " , sk.ins_kenmerk_key "

6
APPL/INS/load_owkenmerk.asp
View File

@@ -394,8 +394,10 @@ function checkK<%=i%><%=serienr%>(show){
%>
}
if( show && ! valid ) {
FcltMgr.alert(err);
field.focus();
FcltMgr.alert(err,
{ fnafterclose: function() {field.focus();}
}
);
}
parent.u2.action = valid ? 'outlet.asp' : 'javascript:0';
return valid;