Index: _vhisie/TBX/TBoxResItems4A.js =================================================================== diff -u -r757 -r1071 --- _vhisie/TBX/TBoxResItems4A.js (.../TBoxResItems4A.js) (revision 757) +++ _vhisie/TBX/TBoxResItems4A.js (.../TBoxResItems4A.js) (revision 1071) @@ -1,4 +1,4 @@ -// Javascript created by Cach� Server Page /VHISIE/TBX/ResItems.csp on 2010-12-06 14:54:29 +// Javascript created by Cach� Server Page /VHISIE/TBX/ResItems.csp on 2011-04-07 17:16:57 // var cItemLT=0; @@ -25,6 +25,9 @@ Array('CM/Z',550,'30;50;65'), Array('CM/Z',600,'50;65'), Array('CM/Z',650,'50;65'), + Array('CMS2',400,'30;50'), + Array('CMS2',450,'30;50;65'), + Array('CMS2',500,'30;50;65'), Array('CMY',270,'20;30'), Array('CMY',300,'20;30'), Array('CMY',350,'30'), @@ -61,6 +64,9 @@ Array('M/Z',550,'30;50;65'), Array('M/Z',600,'50;65'), Array('M/Z',650,'50;65'), + Array('MS2',400,'30;50'), + Array('MS2',450,'30;50;65'), + Array('MS2',500,'30;50;65'), Array('MY',270,'20;30'), Array('MY',300,'20;30'), Array('MY',350,'30'), @@ -100,6 +106,9 @@ Array('CM/Z',550,'30;50;65'), Array('CM/Z',600,'50;65'), Array('CM/Z',650,'50;65'), + Array('CMS2',400,'30;50'), + Array('CMS2',450,'30;50;65'), + Array('CMS2',500,'30;50;65'), Array('CMY',270,'20;30'), Array('CMY',300,'20;30'), Array('CMY',350,'30'), @@ -136,6 +145,9 @@ Array('M/Z',550,'30;50;65'), Array('M/Z',600,'50;65'), Array('M/Z',650,'50;65'), + Array('MS2',400,'30;50'), + Array('MS2',450,'30;50;65'), + Array('MS2',500,'30;50;65'), Array('MY',270,'20;30'), Array('MY',300,'20;30'), Array('MY',350,'30'), @@ -178,6 +190,8 @@ Array('CM/Z',550,'30;50;65'), Array('CM/Z',600,'50;65'), Array('CM/Z',650,'50;65'), + Array('CMS2',450,'30;50;65'), + Array('CMS2',500,'30;50;65'), Array('CMY',270,'20;30'), Array('CMY',300,'20;30'), Array('CMY',350,'30'), @@ -214,6 +228,8 @@ Array('M/Z',550,'30;50;65'), Array('M/Z',600,'50;65'), Array('M/Z',650,'50;65'), + Array('MS2',450,'30;50;65'), + Array('MS2',500,'30;50;65'), Array('MY',270,'20;30'), Array('MY',300,'20;30'), Array('MY',350,'30'), @@ -242,7 +258,7 @@ arDC_DS['A']=Array('GA', 'WA', 'ZA'); var arDC_LC=Array(); -arDC_LC['A']=Array('CM', 'CM/Z', 'CMY', 'CMY/Z', 'M', 'M/Z', 'MY', 'MY/Z', 'N'); +arDC_LC['A']=Array('CM', 'CM/Z', 'CMS2', 'CMY', 'CMY/Z', 'M', 'M/Z', 'MS2', 'MY', 'MY/Z', 'N'); var arDC_KV=Array(); @@ -252,56 +268,68 @@ var arDS_BX=Array(); arDS_BX['GA_CM']=Array('ER'); arDS_BX['GA_CM/Z']=Array('ER'); +arDS_BX['GA_CMS2']=Array('ER'); arDS_BX['GA_CMY']=Array('ER'); arDS_BX['GA_CMY/Z']=Array('ER'); arDS_BX['GA_M']=Array('ZR'); arDS_BX['GA_M/Z']=Array('ZR'); +arDS_BX['GA_MS2']=Array('ZR'); arDS_BX['GA_MY']=Array('ZR'); arDS_BX['GA_MY/Z']=Array('ZR'); arDS_BX['GA_N']=Array('ZR'); arDS_BX['WA_CM']=Array('ER'); arDS_BX['WA_CM/Z']=Array('ER'); +arDS_BX['WA_CMS2']=Array('ER'); arDS_BX['WA_CMY']=Array('ER'); arDS_BX['WA_CMY/Z']=Array('ER'); arDS_BX['WA_M']=Array('ZR'); arDS_BX['WA_M/Z']=Array('ZR'); +arDS_BX['WA_MS2']=Array('ZR'); arDS_BX['WA_MY']=Array('ZR'); arDS_BX['WA_MY/Z']=Array('ZR'); arDS_BX['WA_N']=Array('ZR'); arDS_BX['ZA_CM']=Array('ER'); arDS_BX['ZA_CM/Z']=Array('ER'); +arDS_BX['ZA_CMS2']=Array('ER'); arDS_BX['ZA_CMY']=Array('ER'); arDS_BX['ZA_CMY/Z']=Array('ER'); arDS_BX['ZA_M']=Array('ZR'); arDS_BX['ZA_M/Z']=Array('ZR'); +arDS_BX['ZA_MS2']=Array('ZR'); arDS_BX['ZA_MY']=Array('ZR'); arDS_BX['ZA_MY/Z']=Array('ZR'); arDS_BX['ZA_N']=Array('ZR'); var arDC_SPZK=Array(); +arDC_SPZK['A_CMS2']=Array('S2', 'B2', 'M'); arDC_SPZK['A_CMY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); arDC_SPZK['A_CMY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['A_MS2']=Array('S2', 'B2', 'M'); arDC_SPZK['A_MY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); arDC_SPZK['A_MY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); var arDCLC_FS=Array(); // DC replaced by "XX", same items for every DC. arDCLC_FS['XX_CM']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_CM/Z']=Array('A'); +arDCLC_FS['XX_CMS2']=Array('A', 'HS'); arDCLC_FS['XX_CMY']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_CMY/Z']=Array('A'); arDCLC_FS['XX_M']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_M/Z']=Array('A'); +arDCLC_FS['XX_MS2']=Array('A', 'HS'); arDCLC_FS['XX_MY']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_MY/Z']=Array('A'); arDCLC_FS['XX_N']=Array('A', 'HS', '1', '2', '3'); var arDCLC_DWV=Array(); // DC replaced by "XX", same items for every DC. arDCLC_DWV['XX_CM']=Array('0', '1', '2', '3', '4'); arDCLC_DWV['XX_CM/Z']=Array('0', '1', '2', '3', '4'); +arDCLC_DWV['XX_CMS2']=Array('0', '4_sp'); arDCLC_DWV['XX_CMY']=Array('0', '1', '2', '3', '4'); arDCLC_DWV['XX_CMY/Z']=Array('0', '1', '2', '3', '4'); arDCLC_DWV['XX_M']=Array('0'); arDCLC_DWV['XX_M/Z']=Array('0'); +arDCLC_DWV['XX_MS2']=Array('0'); arDCLC_DWV['XX_MY']=Array('0'); arDCLC_DWV['XX_MY/Z']=Array('0'); arDCLC_DWV['XX_N']=Array('0'); Index: _vhisie/TBX/Kopie van TBoxResItems4I.js =================================================================== diff -u -r757 -r1071 --- _vhisie/TBX/Kopie van TBoxResItems4I.js (.../Kopie van TBoxResItems4I.js) (revision 757) +++ _vhisie/TBX/Kopie van TBoxResItems4I.js (.../Kopie van TBoxResItems4I.js) (revision 1071) @@ -1,4 +1,4 @@ -// Javascript created by Cach� Server Page /VHISIE/TBX/ResItems.csp on 2010-07-09 17:33:08 +// Javascript created by Cach� Server Page /VHISIE/TBX/ResItems.csp on 2011-02-04 09:35:45 // var cItemLT=0; @@ -61,6 +61,7 @@ Array('DL/Z',550,'30;50;65'), Array('DL/Z',600,'50;65'), Array('DL/Z',650,'50;65'), + Array('DLS2',400,'30;50'), Array('DLS2',450,'30;50;65'), Array('DLS2',500,'30;50;65'), Array('DLY',270,'20;30'), @@ -99,6 +100,7 @@ Array('M/Z',550,'30;50;65'), Array('M/Z',600,'50;65'), Array('M/Z',650,'50;65'), + Array('MS2',400,'30;50'), Array('MS2',450,'30;50;65'), Array('MS2',500,'30;50;65'), Array('MY',270,'30'), @@ -294,6 +296,7 @@ Array('DL/Z',550,'30;50;65'), Array('DL/Z',600,'50;65'), Array('DL/Z',650,'50;65'), + Array('DLS2',400,'30;50'), Array('DLS2',450,'30;50;65'), Array('DLS2',500,'30;50;65'), Array('DLY',270,'20;30'), @@ -332,6 +335,7 @@ Array('M/Z',550,'30;50;65'), Array('M/Z',600,'50;65'), Array('M/Z',650,'50;65'), + Array('MS2',400,'30;50'), Array('MS2',450,'30;50;65'), Array('MS2',500,'30;50;65'), Array('MY',270,'30'), @@ -483,7 +487,7 @@ arDC_LC['I']=Array('CL', 'CL/Z', 'CLY', 'CLY/Z', 'DL', 'DL/Z', 'DLS2', 'DLY', 'DLY/Z', 'M', 'M/Z', 'MS2', 'MY', 'MY/Z', 'N'); var arDC_KV=Array(); -arDC_KV['I']=Array('BRO8', 'DIA8', 'DFZ8', 'GRI8', 'ZV', 'LE.DBR', 'LE.LBR', 'LE.ZW', 'LE.CRV'); +arDC_KV['I']=Array('BRO8', 'DIA8', 'DFZ8', 'GRI8', 'ZV', 'H.ESD', 'H.EIK', 'H.KERS', 'H.NOOT', 'H.NTS', 'H.PAL', 'H.WNGE', 'H.TEAK', 'LE.DBR', 'LE.LBR', 'LE.ZW', 'LE.CRV'); var arDC_BX=Array(); arDC_BX['I']=Array('COV', 'CAP', 'ZR'); @@ -551,31 +555,31 @@ arDS_BX['ZI_N']=Array('ZR'); var arDC_SPZK=Array(); -arDC_SPZK['I_CLY']=Array('SI01', 'SI01.x2'); -arDC_SPZK['I_CLY/Z']=Array('SI01', 'SI01.x2'); -arDC_SPZK['I_DLS2']=Array('SA'); -arDC_SPZK['I_DLY']=Array('SI01', 'SI01.x2'); -arDC_SPZK['I_DLY/Z']=Array('SI01', 'SI01.x2'); +arDC_SPZK['I_CLY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['I_CLY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['I_DLS2']=Array('SA', 'M'); +arDC_SPZK['I_DLY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['I_DLY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); arDC_SPZK['I_MS2']=Array('S2', 'B2', 'M'); -arDC_SPZK['I_MY']=Array('SI01', 'SI01.x2'); -arDC_SPZK['I_MY/Z']=Array('SI01', 'SI01.x2'); +arDC_SPZK['I_MY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['I_MY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); var arDCLC_FS=Array(); // DC replaced by "XX", same items for every DC. -arDCLC_FS['XX_CL']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_CL']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_CL/Z']=Array('A'); -arDCLC_FS['XX_CLY']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_CLY']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_CLY/Z']=Array('A'); -arDCLC_FS['XX_DL']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_DL']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_DL/Z']=Array('A'); arDCLC_FS['XX_DLS2']=Array('A', 'HS'); -arDCLC_FS['XX_DLY']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_DLY']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_DLY/Z']=Array('A'); -arDCLC_FS['XX_M']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_M']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_M/Z']=Array('A'); arDCLC_FS['XX_MS2']=Array('A', 'HS'); -arDCLC_FS['XX_MY']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_MY']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_MY/Z']=Array('A'); -arDCLC_FS['XX_N']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_N']=Array('A', 'HS', '1', '2', '3'); var arDCLC_DWV=Array(); // DC replaced by "XX", same items for every DC. arDCLC_DWV['XX_CL']=Array('0', '1', '2', '3', '4', 'PR'); Index: _vhisie/TBX/TBoxWizKleur.js =================================================================== diff -u -r757 -r1071 --- _vhisie/TBX/TBoxWizKleur.js (.../TBoxWizKleur.js) (revision 757) +++ _vhisie/TBX/TBoxWizKleur.js (.../TBoxWizKleur.js) (revision 1071) @@ -37,7 +37,7 @@ msg=msg + "DS = " + arKlrValue["DS"] + " - " + arKlrValue["DC"]; msg=msg + "\n" +"KLR= " + arKlrValue["KL"] + " - " + arKlrValue["KB"] + " - " + arKlrValue["RK"] + " - " + arKlrValue["KX"] + " - " + arKlrValue["KV"]; // msg=msg + "\n" + "FB = " + arKlrValue["FB"]; - msg=msg + "\n\n\n" + msg=msg + "\n\n\n"; } if (sType.indexOf("DFL")>-1) { msg=msg + "Defaults:"; @@ -106,9 +106,9 @@ if (isUndef(DS) || DS=="") return; var coll = document.getElementsByTagName("DIV"); var DivID; - var blnHideAll = (DC=="I" && GroepVar=="RK") + var blnHideAll = (DC=="I" && GroepVar=="RK"); if (!blnHideAll) { - var Delim=";" + var Delim=";"; var arKLR=DollarGet(arDS_KLR[GroepVar + "_" + DS ]); // example Array("MG", "CR") if (GroepVar=="KV") arKLR=DollarGet(arDC_KV[DC]); var ItemsList=Delim+cArrayToPieces(arKLR, Delim)+Delim; @@ -117,7 +117,7 @@ for (var i=0; i < coll.length; i++) { DivID=DollarGet(coll[i].getAttribute("id")); if (DivID.indexOf("div"+GroepVar+"_")==0) { - if (blnHideAll) ToggleButtonXtd(coll[i],"OFF",arActBtn[GroepVar],"clsLadeKlrHidden","clsLadeKlrHidden","clsLadeKlrHidden") + if (blnHideAll) ToggleButtonXtd(coll[i],"OFF",arActBtn[GroepVar],"clsLadeKlrHidden","clsLadeKlrHidden","clsLadeKlrHidden"); else ToggleButtonXtd(coll[i],"OFF",arActBtn[GroepVar],(ItemsList.indexOf(Delim+DivID.replace("div"+GroepVar+"_","")+Delim) < 0 ? "clsLadeKlrHidden" : "clsLadeKlr"),"clsLadeKlrHiLite","clsOtherKlrActive"); } } @@ -138,7 +138,7 @@ if ( InschfElmnt.ID == "ZV" ) { btnInschfElmntClick() ; return; } - else { InschfElmntShowInfo() + else { InschfElmntShowInfo(); arModified["KLR"]=true; } blnAllowSaveDfl=true; btnSaveDflToggle(); @@ -324,7 +324,7 @@ for (var i=0; i voorlopig niks dus // Update InputData MOptionsUpdateInputData(pdlNietMee,VPK); Index: _vhisie/TBX/TBoxWizIO.js =================================================================== diff -u -r757 -r1071 --- _vhisie/TBX/TBoxWizIO.js (.../TBoxWizIO.js) (revision 757) +++ _vhisie/TBX/TBoxWizIO.js (.../TBoxWizIO.js) (revision 1071) @@ -343,7 +343,7 @@ var FldKey; var sMsg; for (var j=1; j0 ? "&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 ; Index: _vhisie/TBX/Kopie van TBoxResItemsALL.js =================================================================== diff -u -r757 -r1071 --- _vhisie/TBX/Kopie van TBoxResItemsALL.js (.../Kopie van TBoxResItemsALL.js) (revision 757) +++ _vhisie/TBX/Kopie van TBoxResItemsALL.js (.../Kopie van TBoxResItemsALL.js) (revision 1071) @@ -1,4 +1,4 @@ -// Javascript created by Cach� Server Page /VHISIE/TBX/ResItems.csp on 2010-07-09 17:33:09 +// Javascript created by Cach� Server Page /VHISIE/TBX/ResItems.csp on 2011-02-04 09:35:46 // var cItemLT=0; @@ -186,6 +186,7 @@ Array('B/Z',500,'30;50;65'), Array('B/Z',600,'50;65'), Array('B/Z',650,'50;65'), + Array('BS2',400,'30;50'), Array('BS2',450,'30;50;65'), Array('BS2',500,'30;50;65'), Array('BY',270,'30'), @@ -216,6 +217,7 @@ Array('D/Z',500,'30;50;65'), Array('D/Z',600,'50;65'), Array('D/Z',650,'50;65'), + Array('DS2',400,'30;50'), Array('DS2',450,'30;50;65'), Array('DS2',500,'30;50;65'), Array('DY',270,'30'), @@ -246,6 +248,7 @@ Array('M/Z',500,'30;50;65'), Array('M/Z',600,'50;65'), Array('M/Z',650,'50;65'), + Array('MS2',400,'30;50'), Array('MS2',450,'30;50;65'), Array('MS2',500,'30;50;65'), Array('MY',270,'30'), @@ -318,6 +321,7 @@ Array('DL/Z',550,'30;50;65'), Array('DL/Z',600,'50;65'), Array('DL/Z',650,'50;65'), + Array('DLS2',400,'30;50'), Array('DLS2',450,'30;50;65'), Array('DLS2',500,'30;50;65'), Array('DLY',270,'20;30'), @@ -356,6 +360,7 @@ Array('M/Z',550,'30;50;65'), Array('M/Z',600,'50;65'), Array('M/Z',650,'50;65'), + Array('MS2',400,'30;50'), Array('MS2',450,'30;50;65'), Array('MS2',500,'30;50;65'), Array('MY',270,'30'), @@ -397,6 +402,7 @@ Array('B/Z',550,'30;50;65'), Array('B/Z',600,'50;65'), Array('B/Z',650,'50;65'), + Array('BS2',400,'30;50'), Array('BS2',450,'30;50;65'), Array('BS2',500,'30;50;65'), Array('BY',270,'30'), @@ -447,6 +453,7 @@ Array('D/Z',550,'30;50;65'), Array('D/Z',600,'50;65'), Array('D/Z',650,'50;65'), + Array('DS2',400,'30;50'), Array('DS2',450,'30;50;65'), Array('DS2',500,'30;50;65'), Array('DY',270,'30'), @@ -497,6 +504,7 @@ Array('M/Z',550,'30;50;65'), Array('M/Z',600,'50;65'), Array('M/Z',650,'50;65'), + Array('MS2',400,'30;50'), Array('MS2',450,'30;50;65'), Array('MS2',500,'30;50;65'), Array('MY',270,'30'), @@ -541,6 +549,7 @@ Array('B/Z',550,'30;50;65'), Array('B/Z',600,'50;65'), Array('B/Z',650,'50;65'), + Array('BS2',400,'30;50'), Array('BS2',450,'30;50;65'), Array('BS2',500,'30;50;65'), Array('BY',270,'30'), @@ -591,6 +600,7 @@ Array('D/Z',550,'30;50;65'), Array('D/Z',600,'50;65'), Array('D/Z',650,'50;65'), + Array('DS2',400,'30;50'), Array('DS2',450,'30;50;65'), Array('DS2',500,'30;50;65'), Array('DY',270,'30'), @@ -641,6 +651,7 @@ Array('M/Z',550,'30;50;65'), Array('M/Z',600,'50;65'), Array('M/Z',650,'50;65'), + Array('MS2',400,'30;50'), Array('MS2',450,'30;50;65'), Array('MS2',500,'30;50;65'), Array('MY',270,'30'), @@ -787,119 +798,67 @@ arBPM['IS']=Array( Array('B',270,'20;30'), Array('B',300,'20;30'), - Array('B',350,'30'), - Array('B',400,'30;50'), - Array('B',450,'30;50;65'), Array('B',500,'30;50;65'), - Array('B',550,'30;50;65'), Array('B',600,'50;65'), Array('B',650,'50;65'), Array('B/Z',270,'20;30'), Array('B/Z',300,'20;30'), - Array('B/Z',350,'30'), - Array('B/Z',400,'30;50'), - Array('B/Z',450,'30;50;65'), Array('B/Z',500,'30;50;65'), - Array('B/Z',550,'30;50;65'), Array('B/Z',600,'50;65'), Array('B/Z',650,'50;65'), - Array('BS2',450,'30;50;65'), Array('BS2',500,'30;50;65'), Array('BY',270,'30'), Array('BY',300,'30'), - Array('BY',350,'30'), - Array('BY',400,'30;50'), - Array('BY',450,'30;50;65'), Array('BY',500,'30;50;65'), - Array('BY',550,'30;50;65'), Array('BY',600,'50;65'), Array('BY',650,'50;65'), Array('BY/Z',270,'30'), Array('BY/Z',300,'30'), - Array('BY/Z',350,'30'), - Array('BY/Z',400,'30;50'), - Array('BY/Z',450,'30;50;65'), Array('BY/Z',500,'30;50;65'), - Array('BY/Z',550,'30;50;65'), Array('BY/Z',600,'50;65'), Array('BY/Z',650,'50;65'), Array('D',270,'20;30'), Array('D',300,'20;30'), - Array('D',350,'30'), - Array('D',400,'30;50'), - Array('D',450,'30;50;65'), Array('D',500,'30;50;65'), - Array('D',550,'30;50;65'), Array('D',600,'50;65'), Array('D',650,'50;65'), Array('D/Z',270,'20;30'), Array('D/Z',300,'20;30'), - Array('D/Z',350,'30'), - Array('D/Z',400,'30;50'), - Array('D/Z',450,'30;50;65'), Array('D/Z',500,'30;50;65'), - Array('D/Z',550,'30;50;65'), Array('D/Z',600,'50;65'), Array('D/Z',650,'50;65'), - Array('DS2',450,'30;50;65'), Array('DS2',500,'30;50;65'), Array('DY',270,'30'), Array('DY',300,'30'), - Array('DY',350,'30'), - Array('DY',400,'30;50'), - Array('DY',450,'30;50;65'), Array('DY',500,'30;50;65'), - Array('DY',550,'30;50;65'), Array('DY',600,'50;65'), Array('DY',650,'50;65'), Array('DY/Z',270,'30'), Array('DY/Z',300,'30'), - Array('DY/Z',350,'30'), - Array('DY/Z',400,'30;50'), - Array('DY/Z',450,'30;50;65'), Array('DY/Z',500,'30;50;65'), - Array('DY/Z',550,'30;50;65'), Array('DY/Z',600,'50;65'), Array('DY/Z',650,'50;65'), Array('M',270,'20;30'), Array('M',300,'20;30'), - Array('M',350,'30'), - Array('M',400,'30;50'), - Array('M',450,'30;50;65'), Array('M',500,'30;50;65'), - Array('M',550,'30;50;65'), Array('M',600,'50;65'), Array('M',650,'50;65'), Array('M/Z',270,'20;30'), Array('M/Z',300,'20;30'), - Array('M/Z',350,'30'), - Array('M/Z',400,'30;50'), - Array('M/Z',450,'30;50;65'), Array('M/Z',500,'30;50;65'), - Array('M/Z',550,'30;50;65'), Array('M/Z',600,'50;65'), Array('M/Z',650,'50;65'), - Array('MS2',450,'30;50;65'), Array('MS2',500,'30;50;65'), Array('MY',270,'30'), Array('MY',300,'30'), - Array('MY',350,'30'), - Array('MY',400,'30;50'), - Array('MY',450,'30;50;65'), Array('MY',500,'30;50;65'), - Array('MY',550,'30;50;65'), Array('MY',600,'50;65'), Array('MY',650,'50;65'), Array('MY/Z',270,'30'), Array('MY/Z',300,'30'), - Array('MY/Z',350,'30'), - Array('MY/Z',400,'30;50'), - Array('MY/Z',450,'30;50;65'), Array('MY/Z',500,'30;50;65'), - Array('MY/Z',550,'30;50;65'), Array('MY/Z',600,'50;65'), Array('MY/Z',650,'50;65'), - Array('N',400,'30;50'), Array('N',450,'30;50;65'), Array('N',500,'30;50;65'), Array('N',550,'30;50;65') @@ -1037,6 +996,7 @@ Array('DL/Z',550,'30;50;65'), Array('DL/Z',600,'50;65'), Array('DL/Z',650,'50;65'), + Array('DLS2',400,'30;50'), Array('DLS2',450,'30;50;65'), Array('DLS2',500,'30;50;65'), Array('DLY',270,'20;30'), @@ -1075,6 +1035,7 @@ Array('M/Z',550,'30;50;65'), Array('M/Z',600,'50;65'), Array('M/Z',650,'50;65'), + Array('MS2',400,'30;50'), Array('MS2',450,'30;50;65'), Array('MS2',500,'30;50;65'), Array('MY',270,'30'), @@ -1460,7 +1421,7 @@ var arDC_KV=Array(); arDC_KV['B']=Array('FG', 'FZ'); arDC_KV['F']=Array('FG', 'FZ'); -arDC_KV['I']=Array('BRO8', 'DIA8', 'DFZ8', 'GRI8', 'ZV', 'LE.DBR', 'LE.LBR', 'LE.ZW', 'LE.CRV'); +arDC_KV['I']=Array('BRO8', 'DIA8', 'DFZ8', 'GRI8', 'ZV', 'H.ESD', 'H.EIK', 'H.KERS', 'H.NOOT', 'H.NTS', 'H.PAL', 'H.WNGE', 'H.TEAK', 'LE.DBR', 'LE.LBR', 'LE.ZW', 'LE.CRV'); arDC_KV['MA']=Array('FG', 'FZ'); arDC_KV['S']=Array('FG', 'FZ'); @@ -1677,84 +1638,84 @@ arDS_BX['ZI_N']=Array('ZR'); var arDC_SPZK=Array(); -arDC_SPZK['A_CMY']=Array('SI01', 'SI01.x2'); -arDC_SPZK['A_CMY/Z']=Array('SI01', 'SI01.x2'); -arDC_SPZK['A_MY']=Array('SI01', 'SI01.x2'); -arDC_SPZK['A_MY/Z']=Array('SI01', 'SI01.x2'); +arDC_SPZK['A_CMY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['A_CMY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['A_MY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['A_MY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); arDC_SPZK['F_BS2']=Array('S2', 'B2', 'M'); -arDC_SPZK['F_BY']=Array('SI01', 'SI01.x2'); -arDC_SPZK['F_BY/Z']=Array('SI01', 'SI01.x2'); +arDC_SPZK['F_BY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['F_BY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); arDC_SPZK['F_DS2']=Array('S2', 'B2', 'M'); -arDC_SPZK['F_DY']=Array('SI01', 'SI01.x2'); -arDC_SPZK['F_DY/Z']=Array('SI01', 'SI01.x2'); +arDC_SPZK['F_DY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['F_DY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); arDC_SPZK['F_MS2']=Array('S2', 'B2', 'M'); -arDC_SPZK['F_MY']=Array('SI01', 'SI01.x2'); -arDC_SPZK['F_MY/Z']=Array('SI01', 'SI01.x2'); -arDC_SPZK['I_CLY']=Array('SI01', 'SI01.x2'); -arDC_SPZK['I_CLY/Z']=Array('SI01', 'SI01.x2'); -arDC_SPZK['I_DLS2']=Array('SA'); -arDC_SPZK['I_DLY']=Array('SI01', 'SI01.x2'); -arDC_SPZK['I_DLY/Z']=Array('SI01', 'SI01.x2'); +arDC_SPZK['F_MY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['F_MY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['I_CLY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['I_CLY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['I_DLS2']=Array('SA', 'M'); +arDC_SPZK['I_DLY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['I_DLY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); arDC_SPZK['I_MS2']=Array('S2', 'B2', 'M'); -arDC_SPZK['I_MY']=Array('SI01', 'SI01.x2'); -arDC_SPZK['I_MY/Z']=Array('SI01', 'SI01.x2'); -arDC_SPZK['MA_BY']=Array('SI01', 'SI01.x2'); -arDC_SPZK['MA_BY/Z']=Array('SI01', 'SI01.x2'); -arDC_SPZK['MA_DY']=Array('SI01', 'SI01.x2'); -arDC_SPZK['MA_DY/Z']=Array('SI01', 'SI01.x2'); -arDC_SPZK['MA_MY']=Array('SI01', 'SI01.x2'); -arDC_SPZK['MA_MY/Z']=Array('SI01', 'SI01.x2'); +arDC_SPZK['I_MY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['I_MY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['MA_BY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['MA_BY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['MA_DY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['MA_DY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['MA_MY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['MA_MY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); arDC_SPZK['S_BS2']=Array('S2', 'B2', 'M'); -arDC_SPZK['S_BY']=Array('SI01', 'SI01.x2'); -arDC_SPZK['S_BY/Z']=Array('SI01', 'SI01.x2'); +arDC_SPZK['S_BY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['S_BY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); arDC_SPZK['S_DS2']=Array('S2', 'B2', 'M'); -arDC_SPZK['S_DY']=Array('SI01', 'SI01.x2'); -arDC_SPZK['S_DY/Z']=Array('SI01', 'SI01.x2'); +arDC_SPZK['S_DY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['S_DY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); arDC_SPZK['S_MS2']=Array('S2', 'B2', 'M'); -arDC_SPZK['S_MY']=Array('SI01', 'SI01.x2'); -arDC_SPZK['S_MY/Z']=Array('SI01', 'SI01.x2'); +arDC_SPZK['S_MY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['S_MY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); var arDCLC_FS=Array(); // DC replaced by "XX", same items for every DC. -arDCLC_FS['XX_B']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_B']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_B/Z']=Array('A'); arDCLC_FS['XX_BS2']=Array('A', 'HS'); -arDCLC_FS['XX_BY']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_BY']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_BY/Z']=Array('A'); -arDCLC_FS['XX_C']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_C']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_C/Z']=Array('A'); -arDCLC_FS['XX_CL']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_CL']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_CL/Z']=Array('A'); -arDCLC_FS['XX_CLY']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_CLY']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_CLY/Z']=Array('A'); -arDCLC_FS['XX_CM']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_CM']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_CM/Z']=Array('A'); -arDCLC_FS['XX_CMY']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_CMY']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_CMY/Z']=Array('A'); -arDCLC_FS['XX_D']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_D']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_D/Z']=Array('A'); -arDCLC_FS['XX_DL']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_DL']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_DL/Z']=Array('A'); arDCLC_FS['XX_DLS2']=Array('A', 'HS'); -arDCLC_FS['XX_DLY']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_DLY']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_DLY/Z']=Array('A'); arDCLC_FS['XX_DS2']=Array('A', 'HS'); -arDCLC_FS['XX_DY']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_DY']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_DY/Z']=Array('A'); -arDCLC_FS['XX_K']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_K']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_K/Z']=Array('A'); -arDCLC_FS['XX_M']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_M']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_M/Z']=Array('A'); arDCLC_FS['XX_MS2']=Array('A', 'HS'); -arDCLC_FS['XX_MY']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_MY']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_MY/Z']=Array('A'); -arDCLC_FS['XX_N']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_N']=Array('A', 'HS', '1', '2', '3'); var arDCLC_DWV=Array(); // DC replaced by "XX", same items for every DC. -arDCLC_DWV['XX_B']=Array('0', '1', '2', '3', '4'); -arDCLC_DWV['XX_B/Z']=Array('0', '1', '2', '3', '4'); -arDCLC_DWV['XX_BS2']=Array('0', '4_sp'); -arDCLC_DWV['XX_BY']=Array('0', '1', '2', '3', '4'); -arDCLC_DWV['XX_BY/Z']=Array('0', '1', '2', '3', '4'); +arDCLC_DWV['XX_B']=Array('0'); +arDCLC_DWV['XX_B/Z']=Array('0'); +arDCLC_DWV['XX_BS2']=Array('0'); +arDCLC_DWV['XX_BY']=Array('0'); +arDCLC_DWV['XX_BY/Z']=Array('0'); arDCLC_DWV['XX_C']=Array('0', '1', '2', '3', '4'); arDCLC_DWV['XX_C/Z']=Array('0', '1', '2', '3', '4'); arDCLC_DWV['XX_CL']=Array('0', '1', '2', '3', '4', 'PR'); Index: _vhisie/TBX/TBoxSelectVulstuk.js =================================================================== diff -u -r757 -r1071 --- _vhisie/TBX/TBoxSelectVulstuk.js (.../TBoxSelectVulstuk.js) (revision 757) +++ _vhisie/TBX/TBoxSelectVulstuk.js (.../TBoxSelectVulstuk.js) (revision 1071) @@ -1,5 +1,5 @@ // Constants: -var cHyperEventError="HyperEvent Error" +var cHyperEventError="HyperEvent Error"; // General variabels (initial values): var ActiveTaal=""; @@ -109,7 +109,7 @@ function ValidateClick(GroepVar) { if (!GroepVar) return true; - if (isUndef(arValidateClick[GroepVar])) return true + if (isUndef(arValidateClick[GroepVar])) return true; return arValidateClick[GroepVar].Rtn(); } @@ -173,10 +173,9 @@ VSM = idVSM.replace("btnVSMat_",""); KVUpdate = true ; - - - SetVulstukImage(KV) - SetVulstukText(idVSM,idKV) + + SetVulstukImage(KV); + SetVulstukText(idVSM,idKV); } function UpdateKV (KV,VSM) { @@ -213,7 +212,7 @@ var InitVSM = DisplayVSM; var InitKleur = DollarGet(arActBtn["VSKleur"]); - if (InitVSM != "btnVSMat_GL8") arActBtn["VSMat"]="btnVSMat_GL8" + if (InitVSM != "btnVSMat_GL8") arActBtn["VSMat"]="btnVSMat_GL8"; if (InitVSM != "") SimulButtonClick(InitVSM, "VSMat"); if (InitKleur != "") SimulButtonClick(InitKleur, "VSKleur"); Index: _vhisie/TBX/TBoxResItemsALL.js =================================================================== diff -u -r757 -r1071 --- _vhisie/TBX/TBoxResItemsALL.js (.../TBoxResItemsALL.js) (revision 757) +++ _vhisie/TBX/TBoxResItemsALL.js (.../TBoxResItemsALL.js) (revision 1071) @@ -1,4 +1,4 @@ -// Javascript created by Cach� Server Page /VHISIE/TBX/ResItems.csp on 2010-12-06 14:54:30 +// Javascript created by Cach� Server Page /VHISIE/TBX/ResItems.csp on 2011-04-07 17:16:58 // var cItemLT=0; @@ -115,6 +115,9 @@ Array('CM/Z',550,'30;50;65'), Array('CM/Z',600,'50;65'), Array('CM/Z',650,'50;65'), + Array('CMS2',400,'30;50'), + Array('CMS2',450,'30;50;65'), + Array('CMS2',500,'30;50;65'), Array('CMY',270,'20;30'), Array('CMY',300,'20;30'), Array('CMY',350,'30'), @@ -151,6 +154,9 @@ Array('M/Z',550,'30;50;65'), Array('M/Z',600,'50;65'), Array('M/Z',650,'50;65'), + Array('MS2',400,'30;50'), + Array('MS2',450,'30;50;65'), + Array('MS2',500,'30;50;65'), Array('MY',270,'20;30'), Array('MY',300,'20;30'), Array('MY',350,'30'), @@ -189,14 +195,14 @@ Array('BS2',400,'30;50'), Array('BS2',450,'30;50;65'), Array('BS2',500,'30;50;65'), - Array('BY',270,'30'), + Array('BY',270,'20;30'), Array('BY',350,'30'), Array('BY',400,'30;50'), Array('BY',450,'30;50;65'), Array('BY',500,'30;50;65'), Array('BY',600,'50;65'), Array('BY',650,'50;65'), - Array('BY/Z',270,'30'), + Array('BY/Z',270,'20;30'), Array('BY/Z',350,'30'), Array('BY/Z',400,'30;50'), Array('BY/Z',450,'30;50;65'), @@ -220,14 +226,14 @@ Array('DS2',400,'30;50'), Array('DS2',450,'30;50;65'), Array('DS2',500,'30;50;65'), - Array('DY',270,'30'), + Array('DY',270,'20;30'), Array('DY',350,'30'), Array('DY',400,'30;50'), Array('DY',450,'30;50;65'), Array('DY',500,'30;50;65'), Array('DY',600,'50;65'), Array('DY',650,'50;65'), - Array('DY/Z',270,'30'), + Array('DY/Z',270,'20;30'), Array('DY/Z',350,'30'), Array('DY/Z',400,'30;50'), Array('DY/Z',450,'30;50;65'), @@ -251,14 +257,14 @@ Array('MS2',400,'30;50'), Array('MS2',450,'30;50;65'), Array('MS2',500,'30;50;65'), - Array('MY',270,'30'), + Array('MY',270,'20;30'), Array('MY',350,'30'), Array('MY',400,'30;50'), Array('MY',450,'30;50;65'), Array('MY',500,'30;50;65'), Array('MY',600,'50;65'), Array('MY',650,'50;65'), - Array('MY/Z',270,'30'), + Array('MY/Z',270,'20;30'), Array('MY/Z',350,'30'), Array('MY/Z',400,'30;50'), Array('MY/Z',450,'30;50;65'), @@ -363,17 +369,17 @@ Array('MS2',400,'30;50'), Array('MS2',450,'30;50;65'), Array('MS2',500,'30;50;65'), - Array('MY',270,'30'), - Array('MY',300,'30'), + Array('MY',270,'20;30'), + Array('MY',300,'20;30'), Array('MY',350,'30'), Array('MY',400,'30;50'), Array('MY',450,'30;50;65'), Array('MY',500,'30;50;65'), Array('MY',550,'30;50;65'), Array('MY',600,'50;65'), Array('MY',650,'50;65'), - Array('MY/Z',270,'30'), - Array('MY/Z',300,'30'), + Array('MY/Z',270,'20;30'), + Array('MY/Z',300,'20;30'), Array('MY/Z',350,'30'), Array('MY/Z',400,'30;50'), Array('MY/Z',450,'30;50;65'), @@ -405,17 +411,17 @@ Array('BS2',400,'30;50'), Array('BS2',450,'30;50;65'), Array('BS2',500,'30;50;65'), - Array('BY',270,'30'), - Array('BY',300,'30'), + Array('BY',270,'20;30'), + Array('BY',300,'20;30'), Array('BY',350,'30'), Array('BY',400,'30;50'), Array('BY',450,'30;50;65'), Array('BY',500,'30;50;65'), Array('BY',550,'30;50;65'), Array('BY',600,'50;65'), Array('BY',650,'50;65'), - Array('BY/Z',270,'30'), - Array('BY/Z',300,'30'), + Array('BY/Z',270,'20;30'), + Array('BY/Z',300,'20;30'), Array('BY/Z',350,'30'), Array('BY/Z',400,'30;50'), Array('BY/Z',450,'30;50;65'), @@ -456,17 +462,17 @@ Array('DS2',400,'30;50'), Array('DS2',450,'30;50;65'), Array('DS2',500,'30;50;65'), - Array('DY',270,'30'), - Array('DY',300,'30'), + Array('DY',270,'20;30'), + Array('DY',300,'20;30'), Array('DY',350,'30'), Array('DY',400,'30;50'), Array('DY',450,'30;50;65'), Array('DY',500,'30;50;65'), Array('DY',550,'30;50;65'), Array('DY',600,'50;65'), Array('DY',650,'50;65'), - Array('DY/Z',270,'30'), - Array('DY/Z',300,'30'), + Array('DY/Z',270,'20;30'), + Array('DY/Z',300,'20;30'), Array('DY/Z',350,'30'), Array('DY/Z',400,'30;50'), Array('DY/Z',450,'30;50;65'), @@ -507,17 +513,17 @@ Array('MS2',400,'30;50'), Array('MS2',450,'30;50;65'), Array('MS2',500,'30;50;65'), - Array('MY',270,'30'), - Array('MY',300,'30'), + Array('MY',270,'20;30'), + Array('MY',300,'20;30'), Array('MY',350,'30'), Array('MY',400,'30;50'), Array('MY',450,'30;50;65'), Array('MY',500,'30;50;65'), Array('MY',550,'30;50;65'), Array('MY',600,'50;65'), Array('MY',650,'50;65'), - Array('MY/Z',270,'30'), - Array('MY/Z',300,'30'), + Array('MY/Z',270,'20;30'), + Array('MY/Z',300,'20;30'), Array('MY/Z',350,'30'), Array('MY/Z',400,'30;50'), Array('MY/Z',450,'30;50;65'), @@ -552,17 +558,17 @@ Array('BS2',400,'30;50'), Array('BS2',450,'30;50;65'), Array('BS2',500,'30;50;65'), - Array('BY',270,'30'), - Array('BY',300,'30'), + Array('BY',270,'20;30'), + Array('BY',300,'20;30'), Array('BY',350,'30'), Array('BY',400,'30;50'), Array('BY',450,'30;50;65'), Array('BY',500,'30;50;65'), Array('BY',550,'30;50;65'), Array('BY',600,'50;65'), Array('BY',650,'50;65'), - Array('BY/Z',270,'30'), - Array('BY/Z',300,'30'), + Array('BY/Z',270,'20;30'), + Array('BY/Z',300,'20;30'), Array('BY/Z',350,'30'), Array('BY/Z',400,'30;50'), Array('BY/Z',450,'30;50;65'), @@ -603,17 +609,17 @@ Array('DS2',400,'30;50'), Array('DS2',450,'30;50;65'), Array('DS2',500,'30;50;65'), - Array('DY',270,'30'), - Array('DY',300,'30'), + Array('DY',270,'20;30'), + Array('DY',300,'20;30'), Array('DY',350,'30'), Array('DY',400,'30;50'), Array('DY',450,'30;50;65'), Array('DY',500,'30;50;65'), Array('DY',550,'30;50;65'), Array('DY',600,'50;65'), Array('DY',650,'50;65'), - Array('DY/Z',270,'30'), - Array('DY/Z',300,'30'), + Array('DY/Z',270,'20;30'), + Array('DY/Z',300,'20;30'), Array('DY/Z',350,'30'), Array('DY/Z',400,'30;50'), Array('DY/Z',450,'30;50;65'), @@ -654,17 +660,17 @@ Array('MS2',400,'30;50'), Array('MS2',450,'30;50;65'), Array('MS2',500,'30;50;65'), - Array('MY',270,'30'), - Array('MY',300,'30'), + Array('MY',270,'20;30'), + Array('MY',300,'20;30'), Array('MY',350,'30'), Array('MY',400,'30;50'), Array('MY',450,'30;50;65'), Array('MY',500,'30;50;65'), Array('MY',550,'30;50;65'), Array('MY',600,'50;65'), Array('MY',650,'50;65'), - Array('MY/Z',270,'30'), - Array('MY/Z',300,'30'), + Array('MY/Z',270,'20;30'), + Array('MY/Z',300,'20;30'), Array('MY/Z',350,'30'), Array('MY/Z',400,'30;50'), Array('MY/Z',450,'30;50;65'), @@ -772,17 +778,17 @@ Array('M/Z',650,'50;65'), Array('MS2',450,'30;50;65'), Array('MS2',500,'30;50;65'), - Array('MY',270,'30'), - Array('MY',300,'30'), + Array('MY',270,'20;30'), + Array('MY',300,'20;30'), Array('MY',350,'30'), Array('MY',400,'30;50'), Array('MY',450,'30;50;65'), Array('MY',500,'30;50;65'), Array('MY',550,'30;50;65'), Array('MY',600,'50;65'), Array('MY',650,'50;65'), - Array('MY/Z',270,'30'), - Array('MY/Z',300,'30'), + Array('MY/Z',270,'20;30'), + Array('MY/Z',300,'20;30'), Array('MY/Z',350,'30'), Array('MY/Z',400,'30;50'), Array('MY/Z',450,'30;50;65'), @@ -795,7 +801,7 @@ Array('N',500,'30;50;65'), Array('N',550,'30;50;65') ); -arBPM['IS']=Array( +arBPM['IMA']=Array( Array('B',270,'20;30'), Array('B',300,'20;30'), Array('B',350,'30'), @@ -814,19 +820,17 @@ Array('B/Z',550,'30;50;65'), Array('B/Z',600,'50;65'), Array('B/Z',650,'50;65'), - Array('BS2',450,'30;50;65'), - Array('BS2',500,'30;50;65'), - Array('BY',270,'30'), - Array('BY',300,'30'), + Array('BY',270,'20;30'), + Array('BY',300,'20;30'), Array('BY',350,'30'), Array('BY',400,'30;50'), Array('BY',450,'30;50;65'), Array('BY',500,'30;50;65'), Array('BY',550,'30;50;65'), Array('BY',600,'50;65'), Array('BY',650,'50;65'), - Array('BY/Z',270,'30'), - Array('BY/Z',300,'30'), + Array('BY/Z',270,'20;30'), + Array('BY/Z',300,'20;30'), Array('BY/Z',350,'30'), Array('BY/Z',400,'30;50'), Array('BY/Z',450,'30;50;65'), @@ -852,19 +856,17 @@ Array('D/Z',550,'30;50;65'), Array('D/Z',600,'50;65'), Array('D/Z',650,'50;65'), - Array('DS2',450,'30;50;65'), - Array('DS2',500,'30;50;65'), - Array('DY',270,'30'), - Array('DY',300,'30'), + Array('DY',270,'20;30'), + Array('DY',300,'20;30'), Array('DY',350,'30'), Array('DY',400,'30;50'), Array('DY',450,'30;50;65'), Array('DY',500,'30;50;65'), Array('DY',550,'30;50;65'), Array('DY',600,'50;65'), Array('DY',650,'50;65'), - Array('DY/Z',270,'30'), - Array('DY/Z',300,'30'), + Array('DY/Z',270,'20;30'), + Array('DY/Z',300,'20;30'), Array('DY/Z',350,'30'), Array('DY/Z',400,'30;50'), Array('DY/Z',450,'30;50;65'), @@ -890,30 +892,56 @@ Array('M/Z',550,'30;50;65'), Array('M/Z',600,'50;65'), Array('M/Z',650,'50;65'), - Array('MS2',450,'30;50;65'), - Array('MS2',500,'30;50;65'), - Array('MY',270,'30'), - Array('MY',300,'30'), + Array('MY',270,'20;30'), + Array('MY',300,'20;30'), Array('MY',350,'30'), Array('MY',400,'30;50'), Array('MY',450,'30;50;65'), Array('MY',500,'30;50;65'), Array('MY',550,'30;50;65'), Array('MY',600,'50;65'), Array('MY',650,'50;65'), - Array('MY/Z',270,'30'), - Array('MY/Z',300,'30'), + Array('MY/Z',270,'20;30'), + Array('MY/Z',300,'20;30'), Array('MY/Z',350,'30'), Array('MY/Z',400,'30;50'), Array('MY/Z',450,'30;50;65'), Array('MY/Z',500,'30;50;65'), Array('MY/Z',550,'30;50;65'), Array('MY/Z',600,'50;65'), Array('MY/Z',650,'50;65'), + Array('N',400,'30;50'), Array('N',450,'30;50;65'), Array('N',500,'30;50;65'), Array('N',550,'30;50;65') ); +arBPM['IS']=Array( + Array('B',270,'20;30'), + Array('B',650,'50;65'), + Array('B/Z',270,'20;30'), + Array('B/Z',650,'50;65'), + Array('BY',270,'20;30'), + Array('BY',650,'50;65'), + Array('BY/Z',270,'20;30'), + Array('BY/Z',650,'50;65'), + Array('D',270,'20;30'), + Array('D',650,'50;65'), + Array('D/Z',270,'20;30'), + Array('D/Z',650,'50;65'), + Array('DY',270,'20;30'), + Array('DY',650,'50;65'), + Array('DY/Z',270,'20;30'), + Array('DY/Z',650,'50;65'), + Array('M',270,'20;30'), + Array('M',650,'50;65'), + Array('M/Z',270,'20;30'), + Array('M/Z',650,'50;65'), + Array('MY',270,'20;30'), + Array('MY',650,'50;65'), + Array('MY/Z',270,'20;30'), + Array('MY/Z',650,'50;65'), + Array('N',550,'30;50;65') +); arBPM['WA']=Array( Array('CM',270,'20;30'), Array('CM',300,'20;30'), @@ -933,6 +961,9 @@ Array('CM/Z',550,'30;50;65'), Array('CM/Z',600,'50;65'), Array('CM/Z',650,'50;65'), + Array('CMS2',400,'30;50'), + Array('CMS2',450,'30;50;65'), + Array('CMS2',500,'30;50;65'), Array('CMY',270,'20;30'), Array('CMY',300,'20;30'), Array('CMY',350,'30'), @@ -969,6 +1000,9 @@ Array('M/Z',550,'30;50;65'), Array('M/Z',600,'50;65'), Array('M/Z',650,'50;65'), + Array('MS2',400,'30;50'), + Array('MS2',450,'30;50;65'), + Array('MS2',500,'30;50;65'), Array('MY',270,'20;30'), Array('MY',300,'20;30'), Array('MY',350,'30'), @@ -1089,17 +1123,17 @@ Array('MS2',400,'30;50'), Array('MS2',450,'30;50;65'), Array('MS2',500,'30;50;65'), - Array('MY',270,'30'), - Array('MY',300,'30'), + Array('MY',270,'20;30'), + Array('MY',300,'20;30'), Array('MY',350,'30'), Array('MY',400,'30;50'), Array('MY',450,'30;50;65'), Array('MY',500,'30;50;65'), Array('MY',550,'30;50;65'), Array('MY',600,'50;65'), Array('MY',650,'50;65'), - Array('MY/Z',270,'30'), - Array('MY/Z',300,'30'), + Array('MY/Z',270,'20;30'), + Array('MY/Z',300,'20;30'), Array('MY/Z',350,'30'), Array('MY/Z',400,'30;50'), Array('MY/Z',450,'30;50;65'), @@ -1133,17 +1167,17 @@ Array('B/Z',650,'50;65'), Array('BS2',450,'30;50;65'), Array('BS2',500,'30;50;65'), - Array('BY',270,'30'), - Array('BY',300,'30'), + Array('BY',270,'20;30'), + Array('BY',300,'20;30'), Array('BY',350,'30'), Array('BY',400,'30;50'), Array('BY',450,'30;50'), Array('BY',500,'30;50;65'), Array('BY',550,'30;50;65'), Array('BY',600,'50;65'), Array('BY',650,'50;65'), - Array('BY/Z',270,'30'), - Array('BY/Z',300,'30'), + Array('BY/Z',270,'20;30'), + Array('BY/Z',300,'20;30'), Array('BY/Z',350,'30'), Array('BY/Z',400,'30;50'), Array('BY/Z',450,'30;50'), @@ -1183,17 +1217,17 @@ Array('D/Z',650,'50;65'), Array('DS2',450,'30;50;65'), Array('DS2',500,'30;50;65'), - Array('DY',270,'30'), - Array('DY',300,'30'), + Array('DY',270,'20;30'), + Array('DY',300,'20;30'), Array('DY',350,'30'), Array('DY',400,'30;50'), Array('DY',450,'30;50'), Array('DY',500,'30;50;65'), Array('DY',550,'30;50;65'), Array('DY',600,'50;65'), Array('DY',650,'50;65'), - Array('DY/Z',270,'30'), - Array('DY/Z',300,'30'), + Array('DY/Z',270,'20;30'), + Array('DY/Z',300,'20;30'), Array('DY/Z',350,'30'), Array('DY/Z',400,'30;50'), Array('DY/Z',450,'30;50'), @@ -1233,17 +1267,17 @@ Array('M/Z',650,'50;65'), Array('MS2',450,'30;50;65'), Array('MS2',500,'30;50;65'), - Array('MY',270,'30'), - Array('MY',300,'30'), + Array('MY',270,'20;30'), + Array('MY',300,'20;30'), Array('MY',350,'30'), Array('MY',400,'30;50'), Array('MY',450,'30;50'), Array('MY',500,'30;50;65'), Array('MY',550,'30;50;65'), Array('MY',600,'50;65'), Array('MY',650,'50;65'), - Array('MY/Z',270,'30'), - Array('MY/Z',300,'30'), + Array('MY/Z',270,'20;30'), + Array('MY/Z',300,'20;30'), Array('MY/Z',350,'30'), Array('MY/Z',400,'30;50'), Array('MY/Z',450,'30;50'), @@ -1275,6 +1309,8 @@ Array('CM/Z',550,'30;50;65'), Array('CM/Z',600,'50;65'), Array('CM/Z',650,'50;65'), + Array('CMS2',450,'30;50;65'), + Array('CMS2',500,'30;50;65'), Array('CMY',270,'20;30'), Array('CMY',300,'20;30'), Array('CMY',350,'30'), @@ -1311,6 +1347,8 @@ Array('M/Z',550,'30;50;65'), Array('M/Z',600,'50;65'), Array('M/Z',650,'50;65'), + Array('MS2',450,'30;50;65'), + Array('MS2',500,'30;50;65'), Array('MY',270,'20;30'), Array('MY',300,'20;30'), Array('MY',350,'30'), @@ -1429,17 +1467,17 @@ Array('M/Z',650,'50;65'), Array('MS2',450,'30;50;65'), Array('MS2',500,'30;50;65'), - Array('MY',270,'30'), - Array('MY',300,'30'), + Array('MY',270,'20;30'), + Array('MY',300,'20;30'), Array('MY',350,'30'), Array('MY',400,'30;50'), Array('MY',450,'30;50;65'), Array('MY',500,'30;50;65'), Array('MY',550,'30;50;65'), Array('MY',600,'50;65'), Array('MY',650,'50;65'), - Array('MY/Z',270,'30'), - Array('MY/Z',300,'30'), + Array('MY/Z',270,'20;30'), + Array('MY/Z',300,'20;30'), Array('MY/Z',350,'30'), Array('MY/Z',400,'30;50'), Array('MY/Z',450,'30;50;65'), @@ -1458,21 +1496,21 @@ arDC_DS['B']=Array('BA', 'BI'); arDC_DS['F']=Array('AF', 'GF'); arDC_DS['I']=Array('GI', 'II', 'WI', 'ZI'); -arDC_DS['MA']=Array('GMA'); +arDC_DS['MA']=Array('GMA', 'IMA'); arDC_DS['S']=Array('GS', 'IS', 'WS'); var arDC_LC=Array(); -arDC_LC['A']=Array('CM', 'CM/Z', 'CMY', 'CMY/Z', 'M', 'M/Z', 'MY', 'MY/Z', 'N'); +arDC_LC['A']=Array('CM', 'CM/Z', 'CMS2', 'CMY', 'CMY/Z', 'M', 'M/Z', 'MS2', 'MY', 'MY/Z', 'N'); arDC_LC['B']=Array('B', 'B/Z', 'D', 'D/Z', 'M', 'M/Z'); arDC_LC['F']=Array('B', 'B/Z', 'BS2', 'BY', 'BY/Z', 'D', 'D/Z', 'DS2', 'DY', 'DY/Z', 'M', 'M/Z', 'MS2', 'MY', 'MY/Z'); arDC_LC['I']=Array('CL', 'CL/Z', 'CLY', 'CLY/Z', 'DL', 'DL/Z', 'DLS2', 'DLY', 'DLY/Z', 'M', 'M/Z', 'MS2', 'MY', 'MY/Z', 'N'); -arDC_LC['MA']=Array('B', 'B/Z', 'BS2', 'BY', 'BY/Z', 'C', 'C/Z', 'D', 'D/Z', 'DS2', 'DY', 'DY/Z', 'K', 'K/Z', 'M', 'M/Z', 'MS2', 'MY', 'MY/Z', 'N'); +arDC_LC['MA']=Array('B', 'B/Z', 'BY', 'BY/Z', 'D', 'D/Z', 'DY', 'DY/Z', 'M', 'M/Z', 'MY', 'MY/Z', 'N'); arDC_LC['S']=Array('B', 'B/Z', 'BS2', 'BY', 'BY/Z', 'C', 'C/Z', 'D', 'D/Z', 'DS2', 'DY', 'DY/Z', 'K', 'K/Z', 'M', 'M/Z', 'MS2', 'MY', 'MY/Z', 'N'); var arDC_KV=Array(); arDC_KV['B']=Array('FG', 'FZ'); arDC_KV['F']=Array('FG', 'FZ'); -arDC_KV['I']=Array('BRO8', 'DIA8', 'DFZ8', 'GRI8', 'ZV', 'LE.DBR', 'LE.LBR', 'LE.ZW', 'LE.CRV'); +arDC_KV['I']=Array('BRO8', 'DIA8', 'DFZ8', 'GRI8', 'ZV', 'H.ESD', 'H.EIK', 'H.KERS', 'H.NOOT', 'H.NTS', 'H.PAL', 'H.WNGE', 'H.TEAK', 'LE.DBR', 'LE.LBR', 'LE.ZW', 'LE.CRV'); arDC_KV['MA']=Array('FG', 'FZ'); arDC_KV['S']=Array('FG', 'FZ'); @@ -1511,10 +1549,12 @@ arDS_BX['BI_M/Z']=Array('ZR'); arDS_BX['GA_CM']=Array('ER'); arDS_BX['GA_CM/Z']=Array('ER'); +arDS_BX['GA_CMS2']=Array('ER'); arDS_BX['GA_CMY']=Array('ER'); arDS_BX['GA_CMY/Z']=Array('ER'); arDS_BX['GA_M']=Array('ZR'); arDS_BX['GA_M/Z']=Array('ZR'); +arDS_BX['GA_MS2']=Array('ZR'); arDS_BX['GA_MY']=Array('ZR'); arDS_BX['GA_MY/Z']=Array('ZR'); arDS_BX['GA_N']=Array('ZR'); @@ -1603,28 +1643,40 @@ arDS_BX['II_MY']=Array('ZR'); arDS_BX['II_MY/Z']=Array('ZR'); arDS_BX['II_N']=Array('ZR'); +arDS_BX['IMA_B']=Array('ER'); +arDS_BX['IMA_B/Z']=Array('ER'); +arDS_BX['IMA_BY']=Array('ER'); +arDS_BX['IMA_BY/Z']=Array('ER'); +arDS_BX['IMA_D']=Array('DR', 'ER', 'BD', 'BG'); +arDS_BX['IMA_D/Z']=Array('DR', 'ER', 'BD', 'BG'); +arDS_BX['IMA_DY']=Array('DR', 'ER', 'BD', 'BG'); +arDS_BX['IMA_DY/Z']=Array('DR', 'ER', 'BD', 'BG'); +arDS_BX['IMA_M']=Array('ZR'); +arDS_BX['IMA_M/Z']=Array('ZR'); +arDS_BX['IMA_MY']=Array('ZR'); +arDS_BX['IMA_MY/Z']=Array('ZR'); +arDS_BX['IMA_N']=Array('ZR'); arDS_BX['IS_B']=Array('ER'); arDS_BX['IS_B/Z']=Array('ER'); -arDS_BX['IS_BS2']=Array('ER'); arDS_BX['IS_BY']=Array('ER'); arDS_BX['IS_BY/Z']=Array('ER'); arDS_BX['IS_D']=Array('DR', 'ER', 'BD', 'BG'); arDS_BX['IS_D/Z']=Array('DR', 'ER', 'BD', 'BG'); -arDS_BX['IS_DS2']=Array('DR', 'ER', 'BD', 'BG'); arDS_BX['IS_DY']=Array('DR', 'ER', 'BD', 'BG'); arDS_BX['IS_DY/Z']=Array('DR', 'ER', 'BD', 'BG'); arDS_BX['IS_M']=Array('ZR'); arDS_BX['IS_M/Z']=Array('ZR'); -arDS_BX['IS_MS2']=Array('ZR'); arDS_BX['IS_MY']=Array('ZR'); arDS_BX['IS_MY/Z']=Array('ZR'); arDS_BX['IS_N']=Array('ZR'); arDS_BX['WA_CM']=Array('ER'); arDS_BX['WA_CM/Z']=Array('ER'); +arDS_BX['WA_CMS2']=Array('ER'); arDS_BX['WA_CMY']=Array('ER'); arDS_BX['WA_CMY/Z']=Array('ER'); arDS_BX['WA_M']=Array('ZR'); arDS_BX['WA_M/Z']=Array('ZR'); +arDS_BX['WA_MS2']=Array('ZR'); arDS_BX['WA_MY']=Array('ZR'); arDS_BX['WA_MY/Z']=Array('ZR'); arDS_BX['WA_N']=Array('ZR'); @@ -1665,10 +1717,12 @@ arDS_BX['WS_N']=Array('ZR'); arDS_BX['ZA_CM']=Array('ER'); arDS_BX['ZA_CM/Z']=Array('ER'); +arDS_BX['ZA_CMS2']=Array('ER'); arDS_BX['ZA_CMY']=Array('ER'); arDS_BX['ZA_CMY/Z']=Array('ER'); arDS_BX['ZA_M']=Array('ZR'); arDS_BX['ZA_M/Z']=Array('ZR'); +arDS_BX['ZA_MS2']=Array('ZR'); arDS_BX['ZA_MY']=Array('ZR'); arDS_BX['ZA_MY/Z']=Array('ZR'); arDS_BX['ZA_N']=Array('ZR'); @@ -1689,8 +1743,10 @@ arDS_BX['ZI_N']=Array('ZR'); var arDC_SPZK=Array(); +arDC_SPZK['A_CMS2']=Array('S2', 'B2', 'M'); arDC_SPZK['A_CMY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); arDC_SPZK['A_CMY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['A_MS2']=Array('S2', 'B2', 'M'); arDC_SPZK['A_MY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); arDC_SPZK['A_MY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); arDC_SPZK['F_BS2']=Array('S2', 'B2', 'M'); @@ -1704,7 +1760,7 @@ arDC_SPZK['F_MY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); arDC_SPZK['I_CLY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); arDC_SPZK['I_CLY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); -arDC_SPZK['I_DLS2']=Array('SA'); +arDC_SPZK['I_DLS2']=Array('SA', 'M'); arDC_SPZK['I_DLY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); arDC_SPZK['I_DLY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); arDC_SPZK['I_MS2']=Array('S2', 'B2', 'M'); @@ -1740,6 +1796,7 @@ arDCLC_FS['XX_CLY/Z']=Array('A'); arDCLC_FS['XX_CM']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_CM/Z']=Array('A'); +arDCLC_FS['XX_CMS2']=Array('A', 'HS'); arDCLC_FS['XX_CMY']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_CMY/Z']=Array('A'); arDCLC_FS['XX_D']=Array('A', 'HS', '1', '2', '3'); @@ -1775,6 +1832,7 @@ arDCLC_DWV['XX_CLY/Z']=Array('0', '1', '2', '3', '4', 'PR'); arDCLC_DWV['XX_CM']=Array('0', '1', '2', '3', '4'); arDCLC_DWV['XX_CM/Z']=Array('0', '1', '2', '3', '4'); +arDCLC_DWV['XX_CMS2']=Array('0', '4_sp'); arDCLC_DWV['XX_CMY']=Array('0', '1', '2', '3', '4'); arDCLC_DWV['XX_CMY/Z']=Array('0', '1', '2', '3', '4'); arDCLC_DWV['XX_D']=Array('0', '1', '2', '3', '4'); @@ -1806,6 +1864,7 @@ arDS_KLR['RK_GMA']=Array('MG', 'CR'); arDS_KLR['RK_GS']=Array('MG', 'CR'); arDS_KLR['RK_II']=Array('CR'); +arDS_KLR['RK_IMA']=Array('CR'); arDS_KLR['RK_IS']=Array('CR'); arDS_KLR['RK_WA']=Array('SW'); arDS_KLR['RK_WI']=Array('SW'); @@ -1821,6 +1880,7 @@ arDS_KLR['KX_GMA']=Array('MG'); arDS_KLR['KX_GS']=Array('MG'); arDS_KLR['KX_II']=Array('IN'); +arDS_KLR['KX_IMA']=Array('IN'); arDS_KLR['KX_IS']=Array('IN'); arDS_KLR['KX_WA']=Array('SW'); arDS_KLR['KX_WI']=Array('SW'); Index: _vhisie/TBX/Main.csp =================================================================== diff -u -r757 -r1071 --- _vhisie/TBX/Main.csp (.../Main.csp) (revision 757) +++ _vhisie/TBX/Main.csp (.../Main.csp) (revision 1071) @@ -275,9 +275,9 @@ - + - + Klantspecifiek: TEST DE VERBINDING MET ONZE SERVER
Index: _vhisie/TBX/TBoxResItems.js =================================================================== diff -u -r757 -r1071 --- _vhisie/TBX/TBoxResItems.js (.../TBoxResItems.js) (revision 757) +++ _vhisie/TBX/TBoxResItems.js (.../TBoxResItems.js) (revision 1071) @@ -1,4 +1,4 @@ -// Javascript created by Cach� Server Page /VHISIE/TBX/ResItems.csp on 2010-12-06 14:54:28 +// Javascript created by Cach� Server Page /VHISIE/TBX/ResItems.csp on 2011-04-07 17:16:55 // var cItemLT=0; @@ -114,14 +114,14 @@ Array('BS2',400,'30;50'), Array('BS2',450,'30;50;65'), Array('BS2',500,'30;50;65'), - Array('BY',270,'30'), + Array('BY',270,'20;30'), Array('BY',350,'30'), Array('BY',400,'30;50'), Array('BY',450,'30;50;65'), Array('BY',500,'30;50;65'), Array('BY',600,'50;65'), Array('BY',650,'50;65'), - Array('BY/Z',270,'30'), + Array('BY/Z',270,'20;30'), Array('BY/Z',350,'30'), Array('BY/Z',400,'30;50'), Array('BY/Z',450,'30;50;65'), @@ -145,14 +145,14 @@ Array('DS2',400,'30;50'), Array('DS2',450,'30;50;65'), Array('DS2',500,'30;50;65'), - Array('DY',270,'30'), + Array('DY',270,'20;30'), Array('DY',350,'30'), Array('DY',400,'30;50'), Array('DY',450,'30;50;65'), Array('DY',500,'30;50;65'), Array('DY',600,'50;65'), Array('DY',650,'50;65'), - Array('DY/Z',270,'30'), + Array('DY/Z',270,'20;30'), Array('DY/Z',350,'30'), Array('DY/Z',400,'30;50'), Array('DY/Z',450,'30;50;65'), @@ -176,14 +176,14 @@ Array('MS2',400,'30;50'), Array('MS2',450,'30;50;65'), Array('MS2',500,'30;50;65'), - Array('MY',270,'30'), + Array('MY',270,'20;30'), Array('MY',350,'30'), Array('MY',400,'30;50'), Array('MY',450,'30;50;65'), Array('MY',500,'30;50;65'), Array('MY',600,'50;65'), Array('MY',650,'50;65'), - Array('MY/Z',270,'30'), + Array('MY/Z',270,'20;30'), Array('MY/Z',350,'30'), Array('MY/Z',400,'30;50'), Array('MY/Z',450,'30;50;65'), @@ -213,17 +213,17 @@ Array('BS2',400,'30;50'), Array('BS2',450,'30;50;65'), Array('BS2',500,'30;50;65'), - Array('BY',270,'30'), - Array('BY',300,'30'), + Array('BY',270,'20;30'), + Array('BY',300,'20;30'), Array('BY',350,'30'), Array('BY',400,'30;50'), Array('BY',450,'30;50;65'), Array('BY',500,'30;50;65'), Array('BY',550,'30;50;65'), Array('BY',600,'50;65'), Array('BY',650,'50;65'), - Array('BY/Z',270,'30'), - Array('BY/Z',300,'30'), + Array('BY/Z',270,'20;30'), + Array('BY/Z',300,'20;30'), Array('BY/Z',350,'30'), Array('BY/Z',400,'30;50'), Array('BY/Z',450,'30;50;65'), @@ -264,17 +264,17 @@ Array('DS2',400,'30;50'), Array('DS2',450,'30;50;65'), Array('DS2',500,'30;50;65'), - Array('DY',270,'30'), - Array('DY',300,'30'), + Array('DY',270,'20;30'), + Array('DY',300,'20;30'), Array('DY',350,'30'), Array('DY',400,'30;50'), Array('DY',450,'30;50;65'), Array('DY',500,'30;50;65'), Array('DY',550,'30;50;65'), Array('DY',600,'50;65'), Array('DY',650,'50;65'), - Array('DY/Z',270,'30'), - Array('DY/Z',300,'30'), + Array('DY/Z',270,'20;30'), + Array('DY/Z',300,'20;30'), Array('DY/Z',350,'30'), Array('DY/Z',400,'30;50'), Array('DY/Z',450,'30;50;65'), @@ -315,17 +315,17 @@ Array('MS2',400,'30;50'), Array('MS2',450,'30;50;65'), Array('MS2',500,'30;50;65'), - Array('MY',270,'30'), - Array('MY',300,'30'), + Array('MY',270,'20;30'), + Array('MY',300,'20;30'), Array('MY',350,'30'), Array('MY',400,'30;50'), Array('MY',450,'30;50;65'), Array('MY',500,'30;50;65'), Array('MY',550,'30;50;65'), Array('MY',600,'50;65'), Array('MY',650,'50;65'), - Array('MY/Z',270,'30'), - Array('MY/Z',300,'30'), + Array('MY/Z',270,'20;30'), + Array('MY/Z',300,'20;30'), Array('MY/Z',350,'30'), Array('MY/Z',400,'30;50'), Array('MY/Z',450,'30;50;65'), @@ -360,17 +360,17 @@ Array('BS2',400,'30;50'), Array('BS2',450,'30;50;65'), Array('BS2',500,'30;50;65'), - Array('BY',270,'30'), - Array('BY',300,'30'), + Array('BY',270,'20;30'), + Array('BY',300,'20;30'), Array('BY',350,'30'), Array('BY',400,'30;50'), Array('BY',450,'30;50;65'), Array('BY',500,'30;50;65'), Array('BY',550,'30;50;65'), Array('BY',600,'50;65'), Array('BY',650,'50;65'), - Array('BY/Z',270,'30'), - Array('BY/Z',300,'30'), + Array('BY/Z',270,'20;30'), + Array('BY/Z',300,'20;30'), Array('BY/Z',350,'30'), Array('BY/Z',400,'30;50'), Array('BY/Z',450,'30;50;65'), @@ -411,17 +411,17 @@ Array('DS2',400,'30;50'), Array('DS2',450,'30;50;65'), Array('DS2',500,'30;50;65'), - Array('DY',270,'30'), - Array('DY',300,'30'), + Array('DY',270,'20;30'), + Array('DY',300,'20;30'), Array('DY',350,'30'), Array('DY',400,'30;50'), Array('DY',450,'30;50;65'), Array('DY',500,'30;50;65'), Array('DY',550,'30;50;65'), Array('DY',600,'50;65'), Array('DY',650,'50;65'), - Array('DY/Z',270,'30'), - Array('DY/Z',300,'30'), + Array('DY/Z',270,'20;30'), + Array('DY/Z',300,'20;30'), Array('DY/Z',350,'30'), Array('DY/Z',400,'30;50'), Array('DY/Z',450,'30;50;65'), @@ -462,17 +462,17 @@ Array('MS2',400,'30;50'), Array('MS2',450,'30;50;65'), Array('MS2',500,'30;50;65'), - Array('MY',270,'30'), - Array('MY',300,'30'), + Array('MY',270,'20;30'), + Array('MY',300,'20;30'), Array('MY',350,'30'), Array('MY',400,'30;50'), Array('MY',450,'30;50;65'), Array('MY',500,'30;50;65'), Array('MY',550,'30;50;65'), Array('MY',600,'50;65'), Array('MY',650,'50;65'), - Array('MY/Z',270,'30'), - Array('MY/Z',300,'30'), + Array('MY/Z',270,'20;30'), + Array('MY/Z',300,'20;30'), Array('MY/Z',350,'30'), Array('MY/Z',400,'30;50'), Array('MY/Z',450,'30;50;65'), @@ -485,7 +485,7 @@ Array('N',500,'30;50;65'), Array('N',550,'30;50;65') ); -arBPM['IS']=Array( +arBPM['IMA']=Array( Array('B',270,'20;30'), Array('B',300,'20;30'), Array('B',350,'30'), @@ -504,19 +504,17 @@ Array('B/Z',550,'30;50;65'), Array('B/Z',600,'50;65'), Array('B/Z',650,'50;65'), - Array('BS2',450,'30;50;65'), - Array('BS2',500,'30;50;65'), - Array('BY',270,'30'), - Array('BY',300,'30'), + Array('BY',270,'20;30'), + Array('BY',300,'20;30'), Array('BY',350,'30'), Array('BY',400,'30;50'), Array('BY',450,'30;50;65'), Array('BY',500,'30;50;65'), Array('BY',550,'30;50;65'), Array('BY',600,'50;65'), Array('BY',650,'50;65'), - Array('BY/Z',270,'30'), - Array('BY/Z',300,'30'), + Array('BY/Z',270,'20;30'), + Array('BY/Z',300,'20;30'), Array('BY/Z',350,'30'), Array('BY/Z',400,'30;50'), Array('BY/Z',450,'30;50;65'), @@ -542,19 +540,17 @@ Array('D/Z',550,'30;50;65'), Array('D/Z',600,'50;65'), Array('D/Z',650,'50;65'), - Array('DS2',450,'30;50;65'), - Array('DS2',500,'30;50;65'), - Array('DY',270,'30'), - Array('DY',300,'30'), + Array('DY',270,'20;30'), + Array('DY',300,'20;30'), Array('DY',350,'30'), Array('DY',400,'30;50'), Array('DY',450,'30;50;65'), Array('DY',500,'30;50;65'), Array('DY',550,'30;50;65'), Array('DY',600,'50;65'), Array('DY',650,'50;65'), - Array('DY/Z',270,'30'), - Array('DY/Z',300,'30'), + Array('DY/Z',270,'20;30'), + Array('DY/Z',300,'20;30'), Array('DY/Z',350,'30'), Array('DY/Z',400,'30;50'), Array('DY/Z',450,'30;50;65'), @@ -580,30 +576,56 @@ Array('M/Z',550,'30;50;65'), Array('M/Z',600,'50;65'), Array('M/Z',650,'50;65'), - Array('MS2',450,'30;50;65'), - Array('MS2',500,'30;50;65'), - Array('MY',270,'30'), - Array('MY',300,'30'), + Array('MY',270,'20;30'), + Array('MY',300,'20;30'), Array('MY',350,'30'), Array('MY',400,'30;50'), Array('MY',450,'30;50;65'), Array('MY',500,'30;50;65'), Array('MY',550,'30;50;65'), Array('MY',600,'50;65'), Array('MY',650,'50;65'), - Array('MY/Z',270,'30'), - Array('MY/Z',300,'30'), + Array('MY/Z',270,'20;30'), + Array('MY/Z',300,'20;30'), Array('MY/Z',350,'30'), Array('MY/Z',400,'30;50'), Array('MY/Z',450,'30;50;65'), Array('MY/Z',500,'30;50;65'), Array('MY/Z',550,'30;50;65'), Array('MY/Z',600,'50;65'), Array('MY/Z',650,'50;65'), + Array('N',400,'30;50'), Array('N',450,'30;50;65'), Array('N',500,'30;50;65'), Array('N',550,'30;50;65') ); +arBPM['IS']=Array( + Array('B',270,'20;30'), + Array('B',650,'50;65'), + Array('B/Z',270,'20;30'), + Array('B/Z',650,'50;65'), + Array('BY',270,'20;30'), + Array('BY',650,'50;65'), + Array('BY/Z',270,'20;30'), + Array('BY/Z',650,'50;65'), + Array('D',270,'20;30'), + Array('D',650,'50;65'), + Array('D/Z',270,'20;30'), + Array('D/Z',650,'50;65'), + Array('DY',270,'20;30'), + Array('DY',650,'50;65'), + Array('DY/Z',270,'20;30'), + Array('DY/Z',650,'50;65'), + Array('M',270,'20;30'), + Array('M',650,'50;65'), + Array('M/Z',270,'20;30'), + Array('M/Z',650,'50;65'), + Array('MY',270,'20;30'), + Array('MY',650,'50;65'), + Array('MY/Z',270,'20;30'), + Array('MY/Z',650,'50;65'), + Array('N',550,'30;50;65') +); arBPM['WS']=Array( Array('B',270,'20;30'), Array('B',300,'20;30'), @@ -625,17 +647,17 @@ Array('B/Z',650,'50;65'), Array('BS2',450,'30;50;65'), Array('BS2',500,'30;50;65'), - Array('BY',270,'30'), - Array('BY',300,'30'), + Array('BY',270,'20;30'), + Array('BY',300,'20;30'), Array('BY',350,'30'), Array('BY',400,'30;50'), Array('BY',450,'30;50'), Array('BY',500,'30;50;65'), Array('BY',550,'30;50;65'), Array('BY',600,'50;65'), Array('BY',650,'50;65'), - Array('BY/Z',270,'30'), - Array('BY/Z',300,'30'), + Array('BY/Z',270,'20;30'), + Array('BY/Z',300,'20;30'), Array('BY/Z',350,'30'), Array('BY/Z',400,'30;50'), Array('BY/Z',450,'30;50'), @@ -675,17 +697,17 @@ Array('D/Z',650,'50;65'), Array('DS2',450,'30;50;65'), Array('DS2',500,'30;50;65'), - Array('DY',270,'30'), - Array('DY',300,'30'), + Array('DY',270,'20;30'), + Array('DY',300,'20;30'), Array('DY',350,'30'), Array('DY',400,'30;50'), Array('DY',450,'30;50'), Array('DY',500,'30;50;65'), Array('DY',550,'30;50;65'), Array('DY',600,'50;65'), Array('DY',650,'50;65'), - Array('DY/Z',270,'30'), - Array('DY/Z',300,'30'), + Array('DY/Z',270,'20;30'), + Array('DY/Z',300,'20;30'), Array('DY/Z',350,'30'), Array('DY/Z',400,'30;50'), Array('DY/Z',450,'30;50'), @@ -725,17 +747,17 @@ Array('M/Z',650,'50;65'), Array('MS2',450,'30;50;65'), Array('MS2',500,'30;50;65'), - Array('MY',270,'30'), - Array('MY',300,'30'), + Array('MY',270,'20;30'), + Array('MY',300,'20;30'), Array('MY',350,'30'), Array('MY',400,'30;50'), Array('MY',450,'30;50'), Array('MY',500,'30;50;65'), Array('MY',550,'30;50;65'), Array('MY',600,'50;65'), Array('MY',650,'50;65'), - Array('MY/Z',270,'30'), - Array('MY/Z',300,'30'), + Array('MY/Z',270,'20;30'), + Array('MY/Z',300,'20;30'), Array('MY/Z',350,'30'), Array('MY/Z',400,'30;50'), Array('MY/Z',450,'30;50'), @@ -752,13 +774,13 @@ var arDC_DS=Array(); arDC_DS['B']=Array('BA', 'BI'); arDC_DS['F']=Array('AF', 'GF'); -arDC_DS['MA']=Array('GMA'); +arDC_DS['MA']=Array('GMA', 'IMA'); arDC_DS['S']=Array('GS', 'IS', 'WS'); var arDC_LC=Array(); arDC_LC['B']=Array('B', 'B/Z', 'D', 'D/Z', 'M', 'M/Z'); arDC_LC['F']=Array('B', 'B/Z', 'BS2', 'BY', 'BY/Z', 'D', 'D/Z', 'DS2', 'DY', 'DY/Z', 'M', 'M/Z', 'MS2', 'MY', 'MY/Z'); -arDC_LC['MA']=Array('B', 'B/Z', 'BS2', 'BY', 'BY/Z', 'C', 'C/Z', 'D', 'D/Z', 'DS2', 'DY', 'DY/Z', 'K', 'K/Z', 'M', 'M/Z', 'MS2', 'MY', 'MY/Z', 'N'); +arDC_LC['MA']=Array('B', 'B/Z', 'BY', 'BY/Z', 'D', 'D/Z', 'DY', 'DY/Z', 'M', 'M/Z', 'MY', 'MY/Z', 'N'); arDC_LC['S']=Array('B', 'B/Z', 'BS2', 'BY', 'BY/Z', 'C', 'C/Z', 'D', 'D/Z', 'DS2', 'DY', 'DY/Z', 'K', 'K/Z', 'M', 'M/Z', 'MS2', 'MY', 'MY/Z', 'N'); var arDC_KV=Array(); @@ -853,19 +875,29 @@ arDS_BX['GS_MY']=Array('ZR'); arDS_BX['GS_MY/Z']=Array('ZR'); arDS_BX['GS_N']=Array('ZR'); +arDS_BX['IMA_B']=Array('ER'); +arDS_BX['IMA_B/Z']=Array('ER'); +arDS_BX['IMA_BY']=Array('ER'); +arDS_BX['IMA_BY/Z']=Array('ER'); +arDS_BX['IMA_D']=Array('DR', 'ER', 'BD', 'BG'); +arDS_BX['IMA_D/Z']=Array('DR', 'ER', 'BD', 'BG'); +arDS_BX['IMA_DY']=Array('DR', 'ER', 'BD', 'BG'); +arDS_BX['IMA_DY/Z']=Array('DR', 'ER', 'BD', 'BG'); +arDS_BX['IMA_M']=Array('ZR'); +arDS_BX['IMA_M/Z']=Array('ZR'); +arDS_BX['IMA_MY']=Array('ZR'); +arDS_BX['IMA_MY/Z']=Array('ZR'); +arDS_BX['IMA_N']=Array('ZR'); arDS_BX['IS_B']=Array('ER'); arDS_BX['IS_B/Z']=Array('ER'); -arDS_BX['IS_BS2']=Array('ER'); arDS_BX['IS_BY']=Array('ER'); arDS_BX['IS_BY/Z']=Array('ER'); arDS_BX['IS_D']=Array('DR', 'ER', 'BD', 'BG'); arDS_BX['IS_D/Z']=Array('DR', 'ER', 'BD', 'BG'); -arDS_BX['IS_DS2']=Array('DR', 'ER', 'BD', 'BG'); arDS_BX['IS_DY']=Array('DR', 'ER', 'BD', 'BG'); arDS_BX['IS_DY/Z']=Array('DR', 'ER', 'BD', 'BG'); arDS_BX['IS_M']=Array('ZR'); arDS_BX['IS_M/Z']=Array('ZR'); -arDS_BX['IS_MS2']=Array('ZR'); arDS_BX['IS_MY']=Array('ZR'); arDS_BX['IS_MY/Z']=Array('ZR'); arDS_BX['IS_N']=Array('ZR'); @@ -967,6 +999,7 @@ arDS_KLR['RK_GF']=Array('MG', 'CR'); arDS_KLR['RK_GMA']=Array('MG', 'CR'); arDS_KLR['RK_GS']=Array('MG', 'CR'); +arDS_KLR['RK_IMA']=Array('CR'); arDS_KLR['RK_IS']=Array('CR'); arDS_KLR['RK_WS']=Array('WI', 'CR'); arDS_KLR['KX_AF']=Array('AL'); @@ -975,5 +1008,6 @@ arDS_KLR['KX_GF']=Array('MG'); arDS_KLR['KX_GMA']=Array('MG'); arDS_KLR['KX_GS']=Array('MG'); +arDS_KLR['KX_IMA']=Array('IN'); arDS_KLR['KX_IS']=Array('IN'); arDS_KLR['KX_WS']=Array('WI'); Index: _vhisie/TBX/TBoxWizPData.js =================================================================== diff -u -r757 -r1071 --- _vhisie/TBX/TBoxWizPData.js (.../TBoxWizPData.js) (revision 757) +++ _vhisie/TBX/TBoxWizPData.js (.../TBoxWizPData.js) (revision 1071) @@ -62,7 +62,7 @@ return false; } // Optioneel: waarschuwing - var MatchEMail = /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/ + var MatchEMail = /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/ ; if ((arCheckPData["EMail"]==3) && (tmpPData["EMail"]!="") && (! MatchEMail.test(tmpPData["EMail"]))) { msg="'" + GetObjAttribValue("txtKL_EMail","lbl","EMail adres") + "' " + jsVTL("jsDMogelijkFout") + ". " + jsVTL("jsDTochDoorgaan"); // "is mogelijk niet correct ingevuld. Wil je toch doorgaan?"; if (! confirm (msg)) { @@ -143,7 +143,7 @@ function CheckPDataModified (oldPData,newPData) { function PDataDiffer (sKey) { - return (oldPData[sKey] != newPData[sKey]) + return (oldPData[sKey] != newPData[sKey]); } if (PDataDiffer("tmpKFType")) return true; if (PDataDiffer("Naam")) return true; @@ -184,7 +184,7 @@ function DataToKlrDFL () { // Input data overrules the Default values var pdlNietMee=DollarGet(arPData["NietMee"]); - for (var i=0; i-1 ? 1 : 0) } + for (var i=0; i-1 ? 1 : 0); } if (arMData.length>0 && !isUndef(arMData[0])) { arKlrValue['DFL_VPK']=DollarGet(arMData[0]["VPK"]); } } @@ -223,7 +223,7 @@ } } } - if (blnHEIN) { arCheckPData["LeverTijd"]=(KlantFormType=="OFF" ? 0 : 3) } + if (blnHEIN) { arCheckPData["LeverTijd"]=(KlantFormType=="OFF" ? 0 : 3); } } function initFormType () { @@ -245,6 +245,6 @@ function initPData () { initFormType(); - initCheckPData() + initCheckPData(); } Index: _vhisie/TBX/VH_LibIO.js =================================================================== diff -u -r757 -r1071 --- _vhisie/TBX/VH_LibIO.js (.../VH_LibIO.js) (revision 757) +++ _vhisie/TBX/VH_LibIO.js (.../VH_LibIO.js) (revision 1071) @@ -107,7 +107,7 @@ function ClearListOpts (objList) { if (!objList) return; - ClearCollection (objList.options) + ClearCollection (objList.options); } function ClearCollection (oColl) { @@ -155,7 +155,7 @@ ItemsList=Delim+ItemsList+Delim; if (!oCombo.objCopy) oCombo.objCopy=oCombo.cloneNode(true); // Execute first time only. if (!oCombo.objCopy) { alert("Node oCombo.objCopy not found!"); return; } - ClearComboOpts(oCombo) + ClearComboOpts(oCombo); for (var i=0;i<=oCombo.objCopy.options.length-1;i++) { oOpt=oCombo.objCopy.options[i]; blnDisabled = (!blnAll) && (ItemsList.indexOf(Delim+oOpt.value+Delim) < 0); Index: _vhisie/TBX/TBoxWizard.js =================================================================== diff -u -r757 -r1071 --- _vhisie/TBX/TBoxWizard.js (.../TBoxWizard.js) (revision 757) +++ _vhisie/TBX/TBoxWizard.js (.../TBoxWizard.js) (revision 1071) @@ -1,5 +1,5 @@ // Constants: -var cHyperEventError="HyperEvent Error" +var cHyperEventError="HyperEvent Error"; // General variabels (initial values): var ActiveTaal=""; @@ -32,7 +32,7 @@ var InitHWizT; var InitHDivStap; -var InitHDivMT +var InitHDivMT; var winWait=Object; var winTBXHelp=Object; @@ -46,11 +46,11 @@ } function GetParentPos() { - if (isIE()) return {x:window.screenLeft, y:window.screenTop} + if (isIE()) return {x:window.screenLeft, y:window.screenTop} ; else return {x:window.screenX, y:window.screenY} ; } function GetParentDim() { - if (isIE()) return {w:document.body.offsetWidth, h:document.body.offsetHeight} + if (isIE()) return {w:document.body.offsetWidth, h:document.body.offsetHeight} ; else return {w:window.outerWidth, h:window.outerHeight} ; } function GetScreenDim() { @@ -59,11 +59,11 @@ function PosCenterWindow(DlgDim) { var ParPos=GetParentPos(); var ParDim=GetParentDim(); - return {x:parseInt(ParPos.x + (ParDim.w - DlgDim.w)/2), y:parseInt(ParPos.y + (ParDim.h - DlgDim.h)/2)} + return {x:parseInt(ParPos.x + (ParDim.w - DlgDim.w)/2), y:parseInt(ParPos.y + (ParDim.h - DlgDim.h)/2)} ; } function PosCenterScreen(DlgDim) { var ScrnDim=GetScreenDim(); - return {x:parseInt((ScrnDim.w - DlgDim.w)/2), y:parseInt((ScrnDim.h - DlgDim.h)/2)} + return {x:parseInt((ScrnDim.w - DlgDim.w)/2), y:parseInt((ScrnDim.h - DlgDim.h)/2)} ; } function GetFeatures() { @@ -81,7 +81,7 @@ case "M_INFO" : DlgDim= DlgDim || {w:450, h:600}; ScrnDim=GetScreenDim(); - DlgPos={x:ScrnDim.w-DlgDim.w-30, y:25} // align right-top // y:ScrnDim.h-DlgDim.h-25-20 --> bottom + DlgPos={x:ScrnDim.w-DlgDim.w-30, y:25} ; // align right-top // y:ScrnDim.h-DlgDim.h-25-20 --> bottom sFeat=GetFeatures2(); break; case "WAIT" : @@ -257,7 +257,7 @@ function ValidateClick(GroepVar) { if (!GroepVar) return true; - if (isUndef(arValidateClick[GroepVar])) return true + if (isUndef(arValidateClick[GroepVar])) return true; return arValidateClick[GroepVar].Rtn(); } @@ -362,7 +362,7 @@ if (ActBtn=="btnStap1") { var blnValid=ValidatePData(); if (blnValid) UpdatePDataModified(true); - return blnValid + return blnValid; } // Else return true; @@ -390,7 +390,7 @@ function init () { var DefaultTaal = "N"; var DefaultButton = "btnStap1"; - if (OrdID && OrdID.length) DefaultButton = "btnStap2" + if (OrdID && OrdID.length) DefaultButton = "btnStap2"; if (TestHTMLWiz()) DefaultButton = "btnStap3"; // temp: for development var sURL = document.location.href; @@ -424,7 +424,7 @@ } var InitButton = GetParamValue (sURL, "Button", DefaultButton); - if (InitButton != "btnStap1") arActBtn["STAP"]="btnStap1" + if (InitButton != "btnStap1") arActBtn["STAP"]="btnStap1"; if (InitButton != "") SimulButtonClick(InitButton, "STAP"); blnDocInited=true; Index: _vhisie/TBX/TBoxWizMatenCtrls.js =================================================================== diff -u -r757 -r1071 --- _vhisie/TBX/TBoxWizMatenCtrls.js (.../TBoxWizMatenCtrls.js) (revision 757) +++ _vhisie/TBX/TBoxWizMatenCtrls.js (.../TBoxWizMatenCtrls.js) (revision 1071) @@ -25,7 +25,7 @@ */ } function KLASFromLCode (LT) { - if (LT=="") return "" + if (LT=="") return ""; if (LT=="DS") return "SP"; // Spoelbak if (LT.indexOf("DS2") > -1) return "SP2"; // Spoelbak type 2 if (LT.indexOf("BS2") > -1) return "SP2"; // Spoelbak type 2 @@ -66,7 +66,7 @@ // return ""; } function RugHFromLCode (LT) { - if (LT=="") return "" + if (LT=="") return ""; if (LT.indexOf("N") > -1) return "N"; if (LT.indexOf("CM")> -1) return "CM"; // Intivo CM : pseudo-code voor RugH if (LT.indexOf("CL") > -1) return "CL"; // Intivo CL : pseudo-code voor RugH @@ -96,7 +96,7 @@ } function GetBGRPListFromRugH (RH,BL) { if (BL != "B") return "X"; // geen binnenlade - if (RH=="" || RH=="*") return "H;Z;G;M" + if (RH=="" || RH=="*") return "H;Z;G;M"; if (RH=="CM") return "R;RG;RM"; // antaro CM/Z : front reling if (RH=="C" || RH=="D" || RH=="CL") return (DC=="I" ? "R;RG;RM;V" : "H"); // intivo DL/Z heeft geen greep if (RH=="M" || RH=="B" || RH=="K") return "Z;G;M"; // behalve voor intivo @@ -128,24 +128,24 @@ */ } function DKInfoTransform (DK) { - if (DK=="" || isUndef(DK)) return "" - if (DK==25) return "E" - if (DK > 0) return "V" + if (DK=="" || isUndef(DK)) return ""; + if (DK==25) return "E"; + if (DK > 0) return "V"; return ""; } function WDInfoTransform (WD) { - if (WD==CodeBinMaat) return "|←→|" // "|<-->|" - return WD + if (WD==CodeBinMaat) return "|←→|"; // "|<-->|" + return WD; } function BXInfoTransform (BX) { return (isUndef(arXBS[BX]) ? BX : arXBS[BX]); } function FBInfoTransform (FB,Taal) { Taal = Taal || ActiveTaal; - if (FB=="" || isUndef(FB)) return "" - if (FB=="NM") return "-" - if (FB=="Z") return "" - if (FB=="S" && Taal=="F") return "Vis" + if (FB=="" || isUndef(FB)) return ""; + if (FB=="NM") return "-"; + if (FB=="Z") return ""; + if (FB=="S" && Taal=="F") return "Vis"; return FB; } @@ -294,7 +294,7 @@ // iDC="A"; } else { - iDC="" + iDC=""; } ImgLT=iDC + LC+(BS !="" ? "_"+BS : ""); ImgLT="TBoxWiz_" + ImgLT + ".jpg"; @@ -317,7 +317,7 @@ { SetFieldsMatenSPZK("SA"); SetlnkSPZKVisible(false); } else { SetFieldsMatenSPZK(""); - SetlnkSPZKVisible(true) } + SetlnkSPZKVisible(true); } if (Klas=="SP2" || Klas=="SY") { SetSPZKrowVisible ("",true); SetOPVLrowVisible ("",false); @@ -436,15 +436,15 @@ } function CheckDraagKracht (DK,LD,BM) { if (BM=="T") { - if (LD <= 0) return "" - else if (LD<350) return (DK != 20 ? 20 : "") - else if (LD<450) return (DK != 30 ? 30 : "") - else if (true) return (DK != 50 ? 50 : "") + if (LD <= 0) return ""; + else if (LD<350) return (DK != 20 ? 20 : ""); + else if (LD<450) return (DK != 30 ? 30 : ""); + else if (true) return (DK != 50 ? 50 : ""); } else { if (DK==20) return 30; } - return "" + return ""; } // ------------------------------------------------------------- @@ -508,11 +508,11 @@ if (isUndef(LT)) LT=GetValCbo(LTFieldName); var BSList=GetBSListFromLCode(LT,DS); if (BSList=="") alert ("Error. No boxside values to choose from."); - else if (BSList=="*") SetBoxsideValue("") + else if (BSList=="*") SetBoxsideValue(""); else { var NewVal=GetDefaultFromData("BX",BSList); if (NewVal=="") NewVal=cPiecesToArray(BSList, ";")[0]; // Select first from BSList. - SetBoxsideValue(NewVal) + SetBoxsideValue(NewVal); } } function GetBSListFromLCode (LT,DS) { @@ -578,10 +578,10 @@ if (isUndef(LT)) LT=GetValCbo(LTFieldName); var BGRPList=GetBGRPListFromLCode(LT); if (BGRPList=="") alert ("Error. No 'BinnenGreep' values to choose from."); - else if (BGRPList=="*") SetBinnenGreepValue("") + else if (BGRPList=="*") SetBinnenGreepValue(""); else { // Select first from BGRPList. var NewVal=cPiecesToArray(BGRPList, ";")[0]; - SetBinnenGreepValue(NewVal) + SetBinnenGreepValue(NewVal); } } function GetBGRPListFromLCode (LT) { @@ -702,7 +702,7 @@ value="I"; } else { // standaard design : - value=(blnBlumotion ? "I" : "Z") + value=(blnBlumotion ? "I" : "Z"); } } if (!isUndef(value)) SetValTxt("txtBlumotion",BlumotionValueToJS(value)); Index: _vhisie/TBX/Kopie van TBoxResItems4A.js =================================================================== diff -u -r757 -r1071 --- _vhisie/TBX/Kopie van TBoxResItems4A.js (.../Kopie van TBoxResItems4A.js) (revision 757) +++ _vhisie/TBX/Kopie van TBoxResItems4A.js (.../Kopie van TBoxResItems4A.js) (revision 1071) @@ -1,4 +1,4 @@ -// Javascript created by Cach� Server Page /VHISIE/TBX/ResItems.csp on 2010-07-09 17:33:08 +// Javascript created by Cach� Server Page /VHISIE/TBX/ResItems.csp on 2011-02-04 09:35:46 // var cItemLT=0; @@ -279,21 +279,21 @@ arDS_BX['ZA_N']=Array('ZR'); var arDC_SPZK=Array(); -arDC_SPZK['A_CMY']=Array('SI01', 'SI01.x2'); -arDC_SPZK['A_CMY/Z']=Array('SI01', 'SI01.x2'); -arDC_SPZK['A_MY']=Array('SI01', 'SI01.x2'); -arDC_SPZK['A_MY/Z']=Array('SI01', 'SI01.x2'); +arDC_SPZK['A_CMY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['A_CMY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['A_MY']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); +arDC_SPZK['A_MY/Z']=Array('SI01', 'SI03', 'SI01.x2', 'SI03.x2'); var arDCLC_FS=Array(); // DC replaced by "XX", same items for every DC. -arDCLC_FS['XX_CM']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_CM']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_CM/Z']=Array('A'); -arDCLC_FS['XX_CMY']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_CMY']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_CMY/Z']=Array('A'); -arDCLC_FS['XX_M']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_M']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_M/Z']=Array('A'); -arDCLC_FS['XX_MY']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_MY']=Array('A', 'HS', '1', '2', '3'); arDCLC_FS['XX_MY/Z']=Array('A'); -arDCLC_FS['XX_N']=Array('A', 'HS', '1', '2'); +arDCLC_FS['XX_N']=Array('A', 'HS', '1', '2', '3'); var arDCLC_DWV=Array(); // DC replaced by "XX", same items for every DC. arDCLC_DWV['XX_CM']=Array('0', '1', '2', '3', '4');