Index: Prod/GADef/emKadBeslag.cls.xml =================================================================== diff -u -r55030 -r55247 --- Prod/GADef/emKadBeslag.cls.xml (.../emKadBeslag.cls.xml) (revision 55030) +++ Prod/GADef/emKadBeslag.cls.xml (.../emKadBeslag.cls.xml) (revision 55247) @@ -367,7 +367,7 @@ #define CalcOpdekY ##class(Prod.GADef.emKadBeslag).GetOpdekFromPos(Pos, %this.Beslag.ConstructAfm.GetAt("OFFSOPDEKY"), %this.WandDikte) #define CalcVoegY ##class(Prod.GADef.emKadBeslag).GetVoegFromPos(Pos, %this.Beslag.ConstructAfm.GetAt("OFFSOPDEKY")) - New Key,emBeslagPos,Pos,BType,param1,param2,KadVertaler,VertaalKey,TekstAlignering,OpdekY + New Key,emBeslagPos,Pos,BType,param1,param2,KadVertaler,VertaalKey,TekstAlignering,OpdekY,OpmerkingHKXS Set KadVertaler=##class(Prod.GADef.KadVertaler).%New(Taal) Do BEGINTAG^XMLWRITE(DevObj,"BESLAG",KadVertaler.VertaalXmlLabelAttribute("Beslag")) @@ -403,6 +403,7 @@ } } Set:($L(VertaalKey)) param2=KadVertaler.VertaalXmlLabelAttribute(VertaalKey) + Set OpmerkingHKXS = "" Do TAGWRITE^XMLWRITE(DevObj,"BESLAGTYPE",BeslagKey, param1, param2) Do TAGWRITE^XMLWRITE(DevObj,"BESLAGREF",%this.Beslag.ItemID,$S(Opties["O":$$PARAMFILL^XMLWRITE("OMS",$$ConvertToHTML^vhRtn1(%this.Beslag.OmsGet(Taal))_$$xmwBeslagCodesSD(BType)_$$xmwBeslagBoringen(BType)),1:"")) Do TAGWRITE^XMLWRITE(DevObj,"WANDDIKTE",%this.WandDikte,"UNIT=""mm""",KadVertaler.VertaalXmlLabelAttribute("Wanddikte")) @@ -420,6 +421,7 @@ .. ; Opdek Bovenkant Aventos HK-XS .. Set OpdekY = ##class(Prod.GADef.emKadBeslag).GetOpdekFromPos(Pos, %this.Beslag.ConstructAfm.GetAt("OFFSOPDEKY") + ..GeefExtraOffsetAventosHKXS(), 0) .. Do TAGWRITE^XMLWRITE(DevObj,"OPDEKY",OpdekY,"UNIT=""mm""",KadVertaler.VertaalXmlLabelAttribute("lblBeslag_Opdek")) + .. Set OpmerkingHKXS = "(D+K)="_..GeefPositieParameter(..#ppAventosHKXSOffsetDK)_$$$If(..GeefPositieParameter(..#ppAventosHKXSOndiepeCorpus)>0," | ondiepe corpus(!)","") . Else If (BType?1(1"HZ",1"HL",1"HKT")) Do .. ; Opdek Bovenkant Aventos HS, HL en HK-TOP .. Do TAGWRITE^XMLWRITE(DevObj,"OPDEKY",$$$CalcOpdekY,"UNIT=""mm""",KadVertaler.VertaalXmlLabelAttribute("lblBeslag_Opdek")) @@ -437,6 +439,10 @@ Do xmwTussenMaten(DevObj,GADefProd,BeslagKey) + If $$$HasLength(OpmerkingHKXS) { + Do TAGWRITE^XMLWRITE(DevObj,"OPMERKING",OpmerkingHKXS,$$PARAMFILL^XMLWRITE("label",("HK-XS"))) + } + Do:($L(%this.Opmerking)) TAGWRITE^XMLWRITE(DevObj,"OPMERKING",%this.Opmerking,KadVertaler.VertaalXmlLabelAttribute("Opmerking_CAPS")) Do ENDTAG^XMLWRITE(DevObj,"BESLAG") Quit