Index: _vhisie/TBX/TBoxWizMaten.js =================================================================== diff -u -r757 -r1071 --- _vhisie/TBX/TBoxWizMaten.js (.../TBoxWizMaten.js) (revision 757) +++ _vhisie/TBX/TBoxWizMaten.js (.../TBoxWizMaten.js) (revision 1071) @@ -10,7 +10,7 @@ var blnForceFill=false; var blnSyncBtn=false; var blnValidateInput=true; -var blnSyncBoxside=true +var blnSyncBoxside=true; var blnWithDFLs=true; var LTFieldName="cboLadeType"; var LDFieldName="cboDiepte"; @@ -118,8 +118,8 @@ var sInit=cMDRowToDelim(arFlds,0); //var sKlr=cKleurKeuzeToDelim(); var OLProdNr=DollarGet(arFlds["OLP"]); - var sProdNr=(OLProdNr>0 ? "&PRNr="+OLProdNr : "") - var sAnchor=(OLProdNr>0 ? "#PR"+OLProdNr : "") + var sProdNr=(OLProdNr>0 ? "&PRNr="+OLProdNr : ""); + var sAnchor=(OLProdNr>0 ? "#PR"+OLProdNr : ""); var sHRef=(TestHTMLWiz() ? "SelectOLProd.htm" : "SelectOLProd.csp") +"?data="+sInit+"&DynSpace="+DynSCode + sProdNr + sAnchor; // +"&klr="+sKlr var sTarget="winDynSpace"; winDynSpace=window.open(sHRef, sTarget, GetSettings("M_INFO",{w:650, h:600})); @@ -129,10 +129,10 @@ } function UpdateDynSpace (args) { var OLProdNr=args; - var OLPcode=OLProdCodeFromPRNr(OLProdNr) + var OLPcode=OLProdCodeFromPRNr(OLProdNr); SetValTxt("txtOLProduct", OLProdNr); SetValTxt("txtOLProdCode", OLPcode); - SetValChk ("chkOLProduct",(OLPcode=="" ? false :true)) + SetValChk ("chkOLProduct",(OLPcode=="" ? false :true)); } function OLProdCodeFromPRNr (PRNr) { if (!PRNr) return ""; @@ -147,7 +147,7 @@ */ } function btnOLProdWisClick (PRNr) { - UpdateDynSpace ("") + UpdateDynSpace (""); } @@ -352,7 +352,7 @@ if (!arFlds) return; SetValTxt("txtAantal",arFlds["AANT"]); blnSyncBoxside=false; - SetLadeTypeValue(arFlds["LT"]) // SetValCbo(LTFieldName,arFlds["LT"]); // + Set related image. + SetLadeTypeValue(arFlds["LT"]); // SetValCbo(LTFieldName,arFlds["LT"]); // + Set related image. blnSyncBoxside=true; SetStdLadeValue (DollarGet(arFlds["STD"]).length>0); SetValTxt("txtCBreedte",arFlds["CB"]); @@ -758,15 +758,25 @@ // controle op ( diepe ) sifonlade 250mm tmpErrs[i++]=FldKey; tmpErrMsgs[FldKey]="'" + GetObjAttribValue("txtSPZKDisplay","lbl","Sifon") + "' " + GetObjAttribValue("cboDiepte","lbl","Depth of drawer") + " " + arFlds["LD"] + " onmogelijk "; - } + //var msg=jsVTL("jsMErrMsgDiepeSifonMinimumLD"); + //msg=msg.replace(::Sifon, GetObjAttribValue("txtSPZKDisplay","lbl","Sifon")).replace("::LadeDiepte",arFlds["LD"]); + //tmpErrMsgs[FldKey]=msg; + } else if ( (arFlds["BM"]=="T") && (arFlds["LD"] < 300) ) { + // Voor sifonlades met TIP-ON moet de ladediepte minimum 300mm zijn." ; vanwege de TIP-ON met Synchro + var msg=jsVTL("jsMErrMsgLadeDiepteSifonMetTipon"); + tmpErrs[i++]="TO"; + tmpErrMsgs["TO"]=msg; + tmpErrs[i++]="LD"; + tmpErrMsgs["LD"]=msg; + } } // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+- FldKey="WD"; Val=arFlds[FldKey]; if (Val=="0") { tmpErrs[i++]=FldKey; - tmpErrMsgs[FldKey]="Choose \"" + GetObjAttribValue("divCBBinBuit","lbl","Width") + ":" + (ActiveTaal=="D" ? "Innenmass" : "internal") + "\" instead of \""+ GetObjAttribValue("txtWandDikte","lbl","Carcase thickness") + "=0mm\"" // "Kies \"Kastbreedte:Binnenmaat\" i.p.v. wanddikte=0 mm."; + tmpErrMsgs[FldKey]="Choose \"" + GetObjAttribValue("divCBBinBuit","lbl","Width") + ":" + (ActiveTaal=="D" ? "Innenmass" : "internal") + "\" instead of \""+ GetObjAttribValue("txtWandDikte","lbl","Carcase thickness") + "=0mm\""; // "Kies \"Kastbreedte:Binnenmaat\" i.p.v. wanddikte=0 mm."; // tmpErrMsgs[FldKey]="Choose \"" + (ActiveTaal=="D" ? "Schrankbreite:Innenmass" : "Carcase width:internal") + "\" instead of \""+ (ActiveTaal=="D" ? "Seitenstartke" : "Carcase thickness") + "=0mm\"" // "Kies \"Kastbreedte:Binnenmaat\" i.p.v. wanddikte=0 mm."; } else if (!WandDikteOK(Val)) { @@ -913,8 +923,8 @@ function StabilisatorOK(ValSB,ValLD,RugH,TBKlasse) { if (DC=="B") return false; if (ValLD !="" && ValLD < 450) return false; - if (RugH!="" && RugH.substring(0,1)!="C" && RugH!="B" && RugH!="D") return false; - if (TBKlasse.substr(0,2)=="SP") return false; + if (RugH!="" && RugH.substring(0,1)!="C" && RugH!="M" && RugH!="B" && RugH!="D") return false; + if (TBKlasse != "L" && TBKlasse != "B") return false; // if (TBKlasse.substr(0,2)=="SP") return false; // else return true; } @@ -1014,7 +1024,7 @@ //arFlds=tmpMAr[0]; // Update full array : THIS DOESN'T WORK !!! if (1) arFlds["DIV"]=DollarGet(tmpMAr[0]["DIV"]); if (tmpMErrs==cHyperEventError) return cHyperEventError; - if (!tmpMErrs || tmpMErrs=="") return "" + if (!tmpMErrs || tmpMErrs=="") return ""; // if (!tmpMErrs || tmpMErrs=="" || isUndef(tmpMErrs[0])) return "" // return tmpMErrs[0]; //2-dim array return DollarGet(tmpMErrs[0]); //2-dim array @@ -1040,7 +1050,7 @@ return (MaxIndex >= MaxWSLines-1); } function AddLinesDisabled(Index) { - if (isUndef(Index)) Index=CurIndex + if (isUndef(Index)) Index=CurIndex; return (IndexOutOfRange(Index) && MaxWSLinesReached()); } @@ -1171,7 +1181,7 @@ } function MScrollNavTo(ButtonCode,blnForceUpdate) { var NewOffset; - var MaxOffset=(MDOverflow() ? arMData.length-arMTableDefs["LastRowNr"]-1 : arMTableDefs["FirstRowNr"]) + var MaxOffset=(MDOverflow() ? arMData.length-arMTableDefs["LastRowNr"]-1 : arMTableDefs["FirstRowNr"]); switch (ButtonCode) { case "FIRST" : NewOffset=arMTableDefs["FirstRowNr"]; break; case "PREV" : NewOffset=MaxVal(OffsetMRow-1, arMTableDefs["FirstRowNr"]); break; @@ -1300,7 +1310,7 @@ if (CBBinBuit=="Binnenm") { txtWD.className="clsInputWDBin"; txtWD.disabled=true; - txtWD.value=CodeBinMaat + txtWD.value=CodeBinMaat; lblWDU.innerHTML=WDInfoTransform(txtWD.value); // "["+ +"]"; } else { @@ -1339,7 +1349,7 @@ arMTableDefs["LastRowNr"]=(maxMRow || 8); // maxMRow is defined in Wizard.csp, if not then default 8 rows. arMTableDefs["RowCnt"]=arMTableDefs["LastRowNr"]-arMTableDefs["FirstRowNr"]+1; maxMRow=arMTableDefs["RowCnt"]; - OffsetMRow=arMTableDefs["FirstRowNr"] + OffsetMRow=arMTableDefs["FirstRowNr"]; UpdateRowOffset (OffsetMRow); UpdateMScrollNav(); } @@ -1377,7 +1387,7 @@ } function MShowSyncErrMsg () { - var msg="" + var msg=""; for (var i=0; i0) { msg=msg + " - " + jsVTL("jsOpLijn") + " " + (i+1) + "" + "\n"; } // "op lijn " } @@ -1490,7 +1500,8 @@ OPVLLI = ValueAsFloat(OPVLLI) ; OPVLRE = ValueAsFloat(OPVLRE) ; MTIB = ValueAsFloat(MTIB) ; var result = CB - (2*WD) - (OPVLLI+OPVLRE) - MTIB ; - return result } + return result; +} function BreedteInternFromSPZK(SPZK) { var result = 0 ;