Index: WV PM Maatwerk.prj.xml =================================================================== diff -u -r2410 -r2432 --- WV PM Maatwerk.prj.xml (.../WV PM Maatwerk.prj.xml) (revision 2410) +++ WV PM Maatwerk.prj.xml (.../WV PM Maatwerk.prj.xml) (revision 2432) @@ -1,6 +1,6 @@ - + @@ -157,6 +157,28 @@ + + + + + + + + + + + + + + + + + + + + + + Index: BL/PR/GA/TB/tmpDev2.mac.rou =================================================================== diff -u -r2304 -r2432 --- BL/PR/GA/TB/tmpDev2.mac.rou (.../tmpDev2.mac.rou) (revision 2304) +++ BL/PR/GA/TB/tmpDev2.mac.rou (.../tmpDev2.mac.rou) (revision 2432) @@ -124,7 +124,7 @@ Quit Prod bfwBTItemsFromWSLijn - New lbDSCodes,DSCode,KFront,KRug,KBxs + New lbDSCodes,DSCode,KFront,KRug,KBxs,Klas,SPZKpiece1 ;d WLIP^vhDBG(97,"*"_$L(WSLn.ItemRK)_"*"_" - "_WSLn.ItemRK) Set DSCode=$S($L(WSLn.ItemDS):$LG(..BTDep("TBDesign","TBDesignCode",WSLn.ItemDS),1), 1:"") Set KFront=$S($L(WSLn.ItemRK):$LG(..BTDep("TBRelingKleur","TBFrontKleur",WSLn.ItemRK),1), 1:"") @@ -138,6 +138,7 @@ Do ..BTValues.SetAt(DSCode ,"TBDesignCode") Do ..BTValues.SetAt(WSLn.ItemLT ,"LadeCode") Do bfwBTItemsLadeCode(WSLn.ItemLT) + Set Klas=..BTValues.GetAt("TBKlasse") Do ..BTValues.SetAt($S(..BTValues.GetAt("TBLadeType")="B":"Z", 1:WSLn.ItemFB) ,"TBFBevestiging") Do ..BTValues.SetAt(WSLn.ItemCB ,"TBCBreedte") Do ..BTValues.SetAt(WSLn.ItemWD ,"TBWandDikte") @@ -153,37 +154,43 @@ Do ..BTValues.SetAt(KRug ,"TBRugKleur") Do ..BTValues.SetAt(WSLn.ItemBM ,"TBBlumotion") - /* - ; Temporary work-around for GlazenBoxside, until the web-wizard also uses ItemKV (switched off by WimV on 30/03/2009) - If 1 && (WSLn.ItemBX?1(1"BZ",1"BF",1"BC")) Do - . New KVul - . Set KVul=$Case(WSLn.ItemBX, "BZ":"FZ", "BF":"FG", "BC":"FC", :ERROR) - . Do ..BTValues.SetAt("BG" ,"TBBoxSide") - . Do ..BTValues.SetAt(KBxs ,"TBBoxsideKleur") - . Do ..BTValues.SetAt(KVul ,"TBVulstukKleur") - Else Do - . Do ..BTValues.SetAt(WSLn.ItemBX ,"TBBoxSide") - . Do ..BTValues.SetAt(WSLn.ItemKX ,"TBBoxsideKleur") - . Do ..BTValues.SetAt(WSLn.ItemKV ,"TBVulstukKleur") - */ Do ..BTValues.SetAt(WSLn.ItemBX ,"TBBoxSide") Do ..BTValues.SetAt(KBxs ,"TBBoxsideKleur") ; WSLn.ItemKX Do ..BTValues.SetAt(WSLn.ItemKV ,"TBVulstukKleur") Do ..BTValues.SetAt(WSLn.ItemSB ,"TBStabilisator") Do ..BTValues.SetAt("Z" ,"TBStalenRug") - Do ..BTValues.SetAt($P(WSLn.ItemSPZK,";",1) ,"TBSPZijkant") + Set SPZKpiece1=$P(WSLn.ItemSPZK,";",1) + Do ..BTValues.SetAt(SPZKpiece1 ,"TBSPZijkant") - #define SPZkOpMaat(%v) (%v?1(1"M".E,1"SI".E)) - - If $$$SPZkOpMaat($P(WSLn.ItemSPZK,";",1)) Do ; Spoelbak zijkant op maat - . Do ..BTValues.SetAt($P(WSLn.ItemSPZK,";",2) ,"SpoelbakZkLi") - . Do ..BTValues.SetAt($P(WSLn.ItemSPZK,";",3) ,"SpoelbakZkRe") - . Do ..BTValues.SetAt($P(WSLn.ItemSPZK,";",4) ,"SpoelbakZkMi") - . ; SpoelbakBreedte (SPBR) wordt berekend in Prod.BWValuesToProduct() - + If Klas=##class(DOM.PM.enu.TBXKlas).SifonTypeBlum() { + Do ..BTValues.SetAt($P(WSLn.ItemSPZK,";",2) ,"SpoelbakZkLi") + Do ..BTValues.SetAt($P(WSLn.ItemSPZK,";",3) ,"SpoelbakZkRe") + Set AantalUitsparingen=..SpoelbakUitsparingen(WSLn.ItemLT,SPZKpiece1,Klas) + If AantalUitsparingen>1 { + Do ..BTValues.SetAt($P(WSLn.ItemSPZK,";",4) ,"SpoelbakZkMi") + Do ..BTValues.SetAt($P(WSLn.ItemSPZK,";",5) ,"SpoelbakBreedte1") + Do ..BTValues.SetAt($P(WSLn.ItemSPZK,";",6) ,"SpoelbakBreedte2") + } + Else { + Do ..BTValues.SetAt($P(WSLn.ItemSPZK,";",4) ,"SpoelbakBreedte1") + } + } + ElseIf (Klas=##class(DOM.PM.enu.TBXKlas).Spoelbak())||(Klas=##class(DOM.PM.enu.TBXKlas).Sifon()) { + #define SPZkOpMaat(%v) (%v?1(1"M".E,1"SI".E)) + + If $$$SPZkOpMaat(SPZKpiece1) { ; Spoelbak zijkant op maat + Do ..BTValues.SetAt($P(WSLn.ItemSPZK,";",2) ,"SpoelbakZkLi") + Do ..BTValues.SetAt($P(WSLn.ItemSPZK,";",3) ,"SpoelbakZkRe") + Do ..BTValues.SetAt($P(WSLn.ItemSPZK,";",4) ,"SpoelbakZkMi") + ; SpoelbakBreedte (SPBR) wordt berekend in Prod.BWValuesToProduct() + } + } + /* + ; javascript:UpdateSPZK("MM;181;236;200;129;129"); ;d WLIP^vhDBG(97,WSLn.ItemSPZK_" SPZK LI: "_..BTValues.GetAt("SpoelbakZkLi")_" SPZK RE: "_..BTValues.GetAt("SpoelbakZkRe")) - + */ + If ($L(WSLn.ItemVPK)) Do . Do ..BTValues.SetAt(WSLn.ItemVPK ,"Verpakking") . Do:(##class(BL.PR.GA.TandemBox).NietMeeToepassen(WSLn.ItemVPK)="True")||(WSLn.ItemVPK="xxP") bfwUpdateNMItemsBulk ; Do:(WSLn.ItemVPK?1(1"C",1"P",1"Z",1"A",1"Y")) bfwUpdateNMItemsBulk Index: BL/PR/GA/TandemBox.cls.xml =================================================================== diff -u -r1796 -r2432 --- BL/PR/GA/TandemBox.cls.xml (.../TandemBox.cls.xml) (revision 1796) +++ BL/PR/GA/TandemBox.cls.xml (.../TandemBox.cls.xml) (revision 2432) @@ -1072,7 +1072,7 @@ Set:($$$FScond ) tmpLB=tmpLB_$LB("FS", $$$FCase(##class(Prod.GAMeta.BT.TBFrontSteun).TaalAfhOmsClass("",WSLn.ItemFS,actTaal,,,DC)) ) ; ##class(cspBasis.GAProdTBox).WebTextValue("Frontsteun",actTaal,"L")_": "_WSLn.ItemFS) Set:($$$DWVcond ) tmpLB=tmpLB_$LB("DWV", $$$FCase(##class(Prod.GAMeta.BT.TBDwarsVerdeling).TaalAfhOmsClass("",WSLn.ItemDWV,actTaal,,,DC)) ) ; ##class(cspBasis.GAProdTBox).WebTextValue("Dwarsverdeling",actTaal,"L")_": "_WSLn.ItemDWV) Set:($L(WSLn.ItemOPVL)) tmpLB=tmpLB_$LB("OPVL",##class(cspBasis.GAProdTBox).WebTextValue("Opvullijst",actTaal,"L")_": "_WSLn.ItemOPVL) - Set:($$$isBulkVPK ) tmpLB=tmpLB_$LB("VPK",##class(cspBasis.GAProdTBox).WebTextValue("VerpakBulk",actTaal,"L")_" - "_WSLn.ItemVPK) + Set:($$$isBulkVPK ) tmpLB=tmpLB_$LB("VPK",##class(cspBasis.GAProdTBox).WebTextValue("VerpakBulk",actTaal,"L")_" - "_##class(cspBasis.GAProdTBox).WebTextValue("VPK_"_WSLn.ItemVPK_"_kort",actTaal,"L")) Set:($IsObject(ActieTeksten)) tmpLB=tmpLB_$LB("ACTIE",ActieTeksten.GetNext("")) ; Moet uitgebreid worden naar alle acties, te overlopen met een iterator (added by WimV on 21/12/2010) Quit tmpLB Index: BL/Flow/Offerte/ProductGAData.cls.xml =================================================================== diff -u -r2304 -r2432 --- BL/Flow/Offerte/ProductGAData.cls.xml (.../ProductGAData.cls.xml) (revision 2304) +++ BL/Flow/Offerte/ProductGAData.cls.xml (.../ProductGAData.cls.xml) (revision 2432) @@ -347,6 +347,7 @@ Set arKenm("TBDesignCode") =DSCode Set arKenm("LadeCode") =$$$GetKenm("ItemLT") Do gbtBTItemsLadeCode($$$GetKenm("ItemLT")) + Set Klas=$G(arKenm("TBKlasse")) Set arKenm("TBFBevestiging")=$S(($G(arKenm("TBLadeType"))="B"):"Z", 1:$$$GetKenm("ItemFB")) Set arKenm("TBCBreedte") =$$$GetKenm("ItemCB") Set arKenm("TBWandDikte") =$$$GetKenm("ItemWD") @@ -356,32 +357,13 @@ Set arKenm("TBLadeDiepte") =$$$GetKenm("ItemLD") Set arKenm("TBDraagKracht") =$$$GetKenm("ItemDK") Set arKenm("TBBodemKleur") =$$$GetKenm("ItemKB") + Set arKenm("TBRelingKleur") =$$$GetKenm("ItemRK") Set arKenm("TBFrontKleur") =KFront Set arKenm("TBLadeKleur") =$S($$$GetKenm("ItemKL")="BE":"BA", 1:$$$GetKenm("ItemKL")) Set arKenm("TBRugKleur") =KRug Set arKenm("TBBlumotion") =$$$GetKenm("ItemBM") - /* * / - ; Temporary work-around for GlazenBoxside, until the web-wizard also uses ItemKV ( Switched off by WimV on 27/04/2009) - If (DSCode'="I") && ($$$GetKenm("ItemBX")?1(1"BZ",1"BF",1"BC")) Do - . ;New KVul - . Set KVul=$Case($$$GetKenm("ItemBX"), "BZ":"FZ", "BF":"FG", "BC":"FC", :ERROR) - . Set arKenm("TBBoxSide") ="BG" - . Set arKenm("TBBoxsideKleur")=KBxs - . Set arKenm("TBVulstukKleur")=KVul - Else If (DSCode="I") Do - . Set arKenm("TBBoxSide") =$$$GetKenm("ItemBX") - . Set arKenm("TBBoxsideKleur")=KBxs ; $$$GetKenm("ItemKX") - . Set arKenm("TBVulstukKleur")=$$$GetKenm("ItemKV") - Else Do - . Set arKenm("TBBoxSide") =$$$GetKenm("ItemBX") - . Set arKenm("TBBoxsideKleur")=$$$GetKenm("ItemKX") - . ;Set arKenm("TBVulstukKleur")=$$$GetKenm("ItemKV") - - /* */ - - ; ( Switched ON by WimV on 27/04/2009) Set arKenm("TBBoxSide") =$$$GetKenm("ItemBX") Set arKenm("TBBoxsideKleur")=KBxs ; $$$GetKenm("ItemKX") Set arKenm("TBVulstukKleur")=$$$GetKenm("ItemKV") @@ -390,14 +372,31 @@ Set arKenm("TBStalenRug") =$$$GetKenm("ItemSR") Set:(arKenm("TBStalenRug")="") arKenm("TBStalenRug")="Z" Set arKenm("TBSPZijkant") =$P($$$GetKenm("ItemSPZK"),";",1) - - #define SPZkOpMaat(%v) (%v?1(1"M".E,1"SI".E)) - If $$$SPZkOpMaat(arKenm("TBSPZijkant")) Do ; Spoelbak zijkant op maat - . Set arKenm("SpoelbakZkLi")=$P($$$GetKenm("ItemSPZK"),";",2) - . Set arKenm("SpoelbakZkRe")=$P($$$GetKenm("ItemSPZK"),";",3) - . Set arKenm("SpoelbakZkMi")=$P($$$GetKenm("ItemSPZK"),";",4) - . ; SpoelbakBreedte (SPBR) wordt berekend in Prod.BWValuesToProduct() + If Klas=##class(DOM.PM.enu.TBXKlas).SifonTypeBlum() { + Set arKenm("SpoelbakZkLi")=$P($$$GetKenm("ItemSPZK"),";",2) + Set arKenm("SpoelbakZkRe")=$P($$$GetKenm("ItemSPZK"),";",3) + Set AantalUitsparingen=blTBox.SpoelbakUitsparingen(arKenm("LadeCode"),arKenm("TBSPZijkant"),Klas) + If AantalUitsparingen>1 { + Set arKenm("SpoelbakZkMi")=$P($$$GetKenm("ItemSPZK"),";",4) + Set arKenm("SpoelbakBreedte1")=$P($$$GetKenm("ItemSPZK"),";",5) + Set arKenm("SpoelbakBreedte2")=$P($$$GetKenm("ItemSPZK"),";",6) + } + Else { + Set arKenm("SpoelbakBreedte1")=$P($$$GetKenm("ItemSPZK"),";",4) + } + } + ElseIf (Klas=##class(DOM.PM.enu.TBXKlas).Spoelbak())||(Klas=##class(DOM.PM.enu.TBXKlas).Sifon()) { + + #define SPZkOpMaat(%v) (%v?1(1"M".E,1"SI".E)) + + If $$$SPZkOpMaat(arKenm("TBSPZijkant")) { ; Spoelbak zijkant op maat + Set arKenm("SpoelbakZkLi")=$P($$$GetKenm("ItemSPZK"),";",2) + Set arKenm("SpoelbakZkRe")=$P($$$GetKenm("ItemSPZK"),";",3) + Set arKenm("SpoelbakZkMi")=$P($$$GetKenm("ItemSPZK"),";",4) + ; SpoelbakBreedte (SPBR) wordt berekend in Prod.BWValuesToProduct() + } + } If ($L($$$GetKenm("ItemVPK"))) Do . Set arKenm("Verpakking")=$$$GetKenm("ItemVPK") Index: WV GAProduct WWW.prj.xml =================================================================== diff -u -r2400 -r2432 --- WV GAProduct WWW.prj.xml (.../WV GAProduct WWW.prj.xml) (revision 2400) +++ WV GAProduct WWW.prj.xml (.../WV GAProduct WWW.prj.xml) (revision 2432) @@ -1,6 +1,6 @@ - + FishEye: Tag 2432 refers to a dead (removed) revision in file `BL/Prod/GAData/TBXLadeConvert.cls.xml'. FishEye: No comparison available. Pass `N' to diff?