Index: csp/tbx/resitems.cls.xml =================================================================== diff -u -r173 -r185 --- csp/tbx/resitems.cls.xml (.../resitems.cls.xml) (revision 173) +++ csp/tbx/resitems.cls.xml (.../resitems.cls.xml) (revision 185) @@ -120,39 +120,35 @@ #define DKExclude(%DK) (%DK?1(1"25",1"80")) ; Standaard design #define DSExclude4S(%DS) (%DS?1(1"-")) - #define LCExclude4S(%LC) (%LC?1(1"DS",1"MS2/Z",1"BS2/Z",1"DS2/Z",1"MB",1"IMB",1"G")) + #define LCExclude4S(%LC) (%LC?1(1"DS",1"MS2/Z",1"BS2/Z",1"DS2/Z",1"MB",1"IMB",1"G",1"MY",1"MY/Z",1"BY",1"BY/Z",1"DY",1"DY/Z")) ; F-design #define DSExclude4F(%DS) (%DS?1(1"OF")) - #define LCExclude4F(%LC) (%LC?1(1"DS",1"MS2/Z",1"BS2/Z",1"DS2/Z",1"MY2",1"BY2",1"DY2",1"MB",1"IMB",1"G")) + #define LCExclude4F(%LC) (%LC?1(1"DS",1"MS2/Z",1"BS2/Z",1"DS2/Z",1"MY2",1"BY2",1"DY2",1"MB",1"IMB",1"G",1"MY",1"MY/Z",1"BY",1"BY/Z",1"DY",1"DY/Z")) ; Intivo #define DSExclude4I(%DS) (%DS?1(1"AI")) - #define LCExclude4I(%LC) (%LC?1(1"B",1"B/Z",1"D",1"D/Z",1"DLS/Z",1"M/ZS",1"B/ZS",1"D/ZS")) + #define LCExclude4I(%LC) (%LC?1(1"B",1"B/Z",1"D",1"D/Z",1"DLS/Z",1"M/ZS",1"B/ZS",1"D/ZS",1"MY",1"MY/Z",1"CLY",1"CLY/Z",1"DLY",1"DLY/Z")) ; Antaro #define DSExclude4A(%DS) (%DS?1(1"-")) - #define LCExclude4A(%LC) (%LC?1(1"MB",1"G",1"B",1"BS2",1"DM",1"DM/Z",1"DS2",1"DMS2",1"DMY2",1"DMY2/Z")) + #define LCExclude4A(%LC) (%LC?1(1"MB",1"G",1"B",1"BS2",1"DM",1"DM/Z",1"DS2",1"DMS2",1"DMY2",1"DMY2/Z",1"MY",1"MY/Z",1"CMY",1"CMY/Z")) ; Mengvorm A-design #define DSExclude4MA(%DS) (%DS?1(1"GMxx",1"IMA")) - #define LCExclude4MA(%LC) (%LC?1(1"DS",1"MS2/Z",1"BS2/Z",1"DS2/Z",1"MB",1"IMB",1"G")) - ; Baliko + #define LCExclude4MA(%LC) (%LC?1(1"DS",1"MS2/Z",1"BS2/Z",1"DS2/Z",1"MB",1"IMB",1"G",1"MY",1"MY/Z",1"BY",1"BY/Z",1"DY",1"DY/Z")) #define DSExclude4B(%DS) (%DS?1(1"-")) #define LCExclude4B(%LC) (%LC?1(1"MB",1"G")) - ;New arLCode,arKenm,arBPM Set TBoxDesign=$G(%TBoxDesign) Set lbTBoxDesign=$$PiecesToList^vhLib(TBoxDesign,";") Do cjsBuildArrayLC(.arLCode) Do cjsBuildArrayKenm(.arKenm) Do cjsBuildArrayBPM(.arKenm,.arLCode,.arBPM) Do cjsWriteJSArray(.arBPM) - ;d WLIP^vhDBG(97,"Test"_$$$ArrayTT2("arBPM(""GS"")",.arBPM)) Quit cjsBuildArrayLC(arLCode) #define lcKLAS $G(tmpAr(LCodeID,$$$KLAS)) #define lcGT $G(tmpAr(LCodeID,$$$GT)) #define lcLT $G(tmpAr(LCodeID,$$$LT)) #define lcZW $G(tmpAr(LCodeID,$$$ZW)) #define lcRH $G(tmpAr(LCodeID,$$$RH)) - ;New tmpAr,LCodeID,KMNaam,KMWaarde &SQL(DECLARE crLC CURSOR FOR SELECT LadeCode,element_key,TBKenm INTO :LCodeID,:KMNaam,:KMWaarde FROM Prod_GAMeta_BT.LadeCode_TBKenm) &SQL(OPEN crLC) For &SQL(FETCH crLC) Quit:(SQLCODE) Set tmpAr(LCodeID,KMNaam)=KMWaarde @@ -162,7 +158,6 @@ . Set arLCode($$$lcKLAS_"-"_$$$lcGT_"-"_$$$lcLT_"-"_$$$lcZW_"-"_$$$lcRH)=LCodeID ; ("TBKlasse","TBGlijderType","TBLadeType","TBZijwand","TBRugHoogte") Quit cjsBuildArrayKenm(arKenm) - ;New Groep,UnID,KMNaam,KMWaarde Set Groep="TBR" Kill arKenm &sql(DECLARE crsDW CURSOR FOR SELECT UnID,Kenmerk->Kenmerk,Waarden INTO :UnID,:KMNaam,:KMWaarde FROM Kenm_Basis.DataDefinitie @@ -180,7 +175,6 @@ #define akDS arKenm(UnID,$$$DS) #define akLD arKenm(UnID,$$$LD) #define akDK arKenm(UnID,$$$DK) - ;New i,UnID,LCodeID Set i="" Set UnID="" For Set UnID=$O(arKenm(UnID)) Quit:(UnID="") Do @@ -193,7 +187,6 @@ Quit cjsWriteJSArray(arBPM) #define NotInList(%l,%i) ($LF(%l,%i)=0) - ;New iDS,iLC,iLD,iDK,pdlDK,blnNext Write "var cItemLT=0;",! Write "var cItemLD=1;",! Write "var cItemDK=2;",! @@ -315,7 +308,6 @@ . . For i=2:1:$LL(lbItems) Write ", "_$$$QuoteJS($LG(lbItems,i)) . . Write ");",! Write ! - // Kleur van Reling/Boxside keuzes per Design Write "var arDS_KLR=Array();",! Set iDS="" @@ -326,8 +318,6 @@ . Write $$$QuoteJS($LG(lbItems,1)) . For i=2:1:$LL(lbItems) Write:$LG(lbItems,i)'="CR" ", "_$$$QuoteJS($LG(lbItems,i)) ; Chroom skippen . Write ");",! - ;Write ! - ;Write "var arDS_KLR_KX=Array();",! Set iDS="" For Set iDS=$O(arDC("I_DS-LC",iDS)) Quit:(iDS="") Do . Set lbItems=$$cjsBuildKXlistForDS(iDS) @@ -396,7 +386,6 @@ cjsBuildBXlistForLC(LC,DS,DC,ZW,RH) Set BX="" Set tmpLB="" - ;Set MatchDS="%;"_DS_";%" Set MatchZW="%;"_ZW_";%" Set MatchRH="%;"_RH_";%" &SQL(DECLARE crsBXLC CURSOR FOR @@ -497,16 +486,7 @@ cjsBuildKVlistForDS(DS,DC) Set KV="" Set tmpLB="" - /* - Set MatchDS="%;"_DS_";%" &SQL(DECLARE crsKVDS CURSOR FOR - SELECT TBVulstukKleur INTO :KV - FROM Prod_GAMeta_BT.TBVulstukKleur_BeperkGUI - WHERE (element_key = 'TBDesign' and ((';' || BeperkGUI || ';') LIKE :MatchDS OR BeperkGUI="*")) - ORDER BY TBVulstukKleur->VolgNr - ) - */ - &SQL(DECLARE crsKVDS CURSOR FOR SELECT ItemCode INTO :KV FROM Prod_GAMeta_BT.TBVulstukKleur WHERE ($ListFind(FilterDC,:DC)>0)