Index: DOM/PM/Maatwerk/Calc/Kost/OfEvaluator.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PM/Maatwerk/Calc/Kost/OfEvaluator.cls.xml (.../OfEvaluator.cls.xml) (revision 734) +++ DOM/PM/Maatwerk/Calc/Kost/OfEvaluator.cls.xml (.../OfEvaluator.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject,DOM.PM.Maatwerk.Calc.Kost.IEvaluator -62080,58995.359863 +62171,49425.344563 62070,52454.407044 0 @@ -20,9 +20,9 @@ -HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,Context:DOM.PM.Maatwerk.Calc.Kost.KostContext +HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,Context:DOM.PM.Maatwerk.Calc.Kost.KostContext,IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken %Boolean - @@ -38,5 +38,5 @@ ]]> - + Index: DOM/PM/TBXProduct/impl/TBXLadeImpl.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/PM/TBXProduct/impl/TBXLadeImpl.cls.xml (.../TBXLadeImpl.cls.xml) (revision 903) +++ DOM/PM/TBXProduct/impl/TBXLadeImpl.cls.xml (.../TBXLadeImpl.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + TECH.Error 1 DOM.PM.impl.MaatwerkProductImpl,DOM.PM.TBXProduct.TBXLade -62153,43514.313378 +62172,60078.735853 0 @@ -27,12 +27,32 @@ 1 + +%Boolean + + + %Boolean + +%Boolean + + + + +%Boolean + + + %Boolean + +%Integer + + + DOM.PM.TBXProduct.TBXRug Glas is geen boxside element Quit BoxsideKleur ]]> @@ -293,6 +327,10 @@ { Set MatCode = "DIA8" } + ElseIf (BS = "FZ") || (BS = "FG") + { + Set Matcode = BS + } Else { Set MatCode = $LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",..GeefPRNr(),"KV")) @@ -600,5 +638,5 @@ ]]> - + FishEye: Tag 946 refers to a dead (removed) revision in file `vhUnitTest/APPS/PM/Maatwerk/UTKenmv00v01Upgrader.cls.xml'. FishEye: No comparison available. Pass `N' to diff? Index: DOM/OV/impl/DataM/DataMBonlijnFactory.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/OV/impl/DataM/DataMBonlijnFactory.cls.xml (.../DataMBonlijnFactory.cls.xml) (revision 903) +++ DOM/OV/impl/DataM/DataMBonlijnFactory.cls.xml (.../DataMBonlijnFactory.cls.xml) (revision 946) @@ -1,37 +1,37 @@ - + 1 %RegisteredObject -62157,72086.54276 +62168,39134.684713 0 1 -LijnNummer:%Integer,LijnInfo:%String +Bon:DOM.OV.Bon="",LijnNummer:%Integer,LijnInfo:%String DOM.OV.Orderlijn - + Index: vhUnitTest/APPS/Halux/Planning/TestResourceGebruikCalculator.cls.xml =================================================================== diff -u -r915 -r946 --- vhUnitTest/APPS/Halux/Planning/TestResourceGebruikCalculator.cls.xml (.../TestResourceGebruikCalculator.cls.xml) (revision 915) +++ vhUnitTest/APPS/Halux/Planning/TestResourceGebruikCalculator.cls.xml (.../TestResourceGebruikCalculator.cls.xml) (revision 946) @@ -1,11 +1,11 @@ - + do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.Halux.Planning.TestResourceGebruikCalculator") 1 vhUnitTest.TestCase -62144,29147.500355 +62173,29487.727243 0 @@ -40,15 +40,29 @@ 0,"Het resourcegebruik van de ALUFrees is groter dan 0") Do $$$AssertTrue(ResourceGebruik.ALUZaag.Hoeveelheid > 0,"Het resourcegebruik van de ALUZaag is groter dan 0") Do $$$AssertTrue(ResourceGebruik.ALUOperator.Hoeveelheid > 0,"Het resourcegebruik van de ALUOperator is groter dan 0") + + Set Product = ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefProduct(599536) + Set ResourceGebruik = ResourceGebruikCalculator.BepaalResourceGebruikProduct(Product) + Do $$$AssertTrue($IsObject(ResourceGebruik),"Voor een tbx met sifon wordt een tijd berekend") + + Set Product = ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefProduct(595226) + Set ResourceGebruik = ResourceGebruikCalculator.BepaalResourceGebruikProduct(Product) + Do $$$AssertTrue($IsObject(ResourceGebruik),"Voor een tbx met spoelbak wordt een tijd berekend") + + Set Product = ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefProduct(529744) + Set ResourceGebruik = ResourceGebruikCalculator.BepaalResourceGebruikProduct(Product) + Do $$$AssertTrue($IsObject(ResourceGebruik),"Voor een tbx met in te korten glas wordt een tijd berekend") + + Set Product = ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefProduct(505552) + Set ResourceGebruik = ResourceGebruikCalculator.BepaalResourceGebruikProduct(Product) + Do $$$AssertTrue($IsObject(ResourceGebruik),"Voor een tbx met in te korten reling wordt een tijd berekend") ]]> @@ -77,5 +91,5 @@ ]]> - + Index: JBL_ProductKenmerkwijziging_opslaan.prj.xml =================================================================== diff -u -r937 -r946 --- JBL_ProductKenmerkwijziging_opslaan.prj.xml (.../JBL_ProductKenmerkwijziging_opslaan.prj.xml) (revision 937) +++ JBL_ProductKenmerkwijziging_opslaan.prj.xml (.../JBL_ProductKenmerkwijziging_opslaan.prj.xml) (revision 946) @@ -1,12 +1,12 @@ - - + + - + @@ -22,6 +22,7 @@ + @@ -31,5 +32,5 @@ - + Index: zTryout/CSC/PM/Maatwerk/HF/OLMIntegratieTest.cls.xml =================================================================== diff -u --- zTryout/CSC/PM/Maatwerk/HF/OLMIntegratieTest.cls.xml (revision 0) +++ zTryout/CSC/PM/Maatwerk/HF/OLMIntegratieTest.cls.xml (revision 946) @@ -0,0 +1,84 @@ + + + +1 +%RegisteredObject +62171,49318.530832 +0 + + + +Do ##class(zTryout.CSC.PM.Maatwerk.HF.OLMIntegratieTest).Perform() +1 + + + + + +Do ##class(zTryout.CSC.PM.Maatwerk.HF.OLMIntegratieTest).FullPath() +1 + + + + + Index: DOM/PM/OL/Gamma/impl/OrgaluxProductGamma.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/PM/OL/Gamma/impl/OrgaluxProductGamma.cls.xml (.../OrgaluxProductGamma.cls.xml) (revision 903) +++ DOM/PM/OL/Gamma/impl/OrgaluxProductGamma.cls.xml (.../OrgaluxProductGamma.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Maakt gebruik van de bestaande Kenmerken klassen en zoek-mogelijkheden. @@ -11,7 +11,7 @@ DOM.PM.OL,TECH.Error 1 DOM.PM.OL.Gamma.OrgaluxProductGamma -62157,61878.121854 +62161,42432.680025 61944,51413.335308 0 @@ -223,46 +223,35 @@ do ..KenmerkQueryWaarden.Insert(##class(KenmerkQueryParameter).%New("WebSites", ..Context.Website)) Do ..ZoekKenmerkUnIDsViaKQW() - Set Key = $Order(..arKenmerkUnIDs("")) - While (Key '= "") + Set KenmerkUnID = $Order(..arKenmerkUnIDs("")) + While (KenmerkUnID '= "") { - ;Set KenmerkUnID = ..arKenmerkUnIDs(Key) - - Set oKenmerk = ##class(Prod.Kenmerk.Orgalux).%New(Key,..Context.Taal) + Set oKenmerk = ##class(Prod.Kenmerk.Orgalux).%New(KenmerkUnID,..Context.Taal) Set Korttekst = oKenmerk.GetKortTekst() - Set ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI() - /// Punt weghalen uit key, multiple eruit halen - Set KeyNoMultiples = $Piece(Key,".",1) - Set OLProduct = ProductAPI.GeefProduct(KeyNoMultiples) - Set Korttekst = OLProduct.GeefKorttekst() - - /// Korttekst limiteren tot acht tekens - Set KorttekstGelimiteerd = $Extract($Piece(Korttekst,"OL.",2),1,8) - /// KORTTEKST zonder OL. Set Zoekterm = ##class(APPS.Web.OLParticulier.dto.GekendeZoekterm).%New() - Set Zoekterm.Zoekterm = KorttekstGelimiteerd + Set Zoekterm.Zoekterm = Korttekst Set Zoekterm.CanonischeWaarde = Zoekterm.Zoekterm Set Zoekterm.Categorie = ##class(APPS.Web.OLParticulier.enu.ZoektermCategorie).KortTekst() Do Zoektermen.SetAt(Zoekterm,Zoekterm.Zoekterm) /// KORTTEKST met OL. Set Zoekterm = ##class(APPS.Web.OLParticulier.dto.GekendeZoekterm).%New() - Set Zoekterm.Zoekterm = "OL."_KorttekstGelimiteerd + Set Zoekterm.Zoekterm = "OL."_Korttekst Set Zoekterm.CanonischeWaarde = Zoekterm.Zoekterm Set Zoekterm.Categorie = ##class(APPS.Web.OLParticulier.enu.ZoektermCategorie).KortTekst() Do Zoektermen.SetAt(Zoekterm,Zoekterm.Zoekterm) /// KORTTEKST met OL Set Zoekterm = ##class(APPS.Web.OLParticulier.dto.GekendeZoekterm).%New() - Set Zoekterm.Zoekterm = "OL"_KorttekstGelimiteerd + Set Zoekterm.Zoekterm = "OL"_Korttekst Set Zoekterm.CanonischeWaarde = Zoekterm.Zoekterm Set Zoekterm.Categorie = ##class(APPS.Web.OLParticulier.enu.ZoektermCategorie).KortTekst() Do Zoektermen.SetAt(Zoekterm,Zoekterm.Zoekterm) - Set Key = $Order(..arKenmerkUnIDs(Key)) + Set KenmerkUnID = $Order(..arKenmerkUnIDs(KenmerkUnID)) } Set ZoektermenGesorteerd = ##class(%ListOfObjects).%New() @@ -1376,15 +1365,11 @@ 1 %String @@ -1395,11 +1380,7 @@ - + Index: zTryout/JCL/Validation/dtoKind.cls.xml =================================================================== diff -u --- zTryout/JCL/Validation/dtoKind.cls.xml (revision 0) +++ zTryout/JCL/Validation/dtoKind.cls.xml (revision 946) @@ -0,0 +1,22 @@ + + + +1 +%RegisteredObject,%XML.Adaptor +62153,48930.855583 +0 + + +%Integer + + + +%Float + + + +%String + + + + Index: WS/Web/OLParticulier/OrgaluxProductGamma.cls.xml =================================================================== diff -u -r913 -r946 --- WS/Web/OLParticulier/OrgaluxProductGamma.cls.xml (.../OrgaluxProductGamma.cls.xml) (revision 913) +++ WS/Web/OLParticulier/OrgaluxProductGamma.cls.xml (.../OrgaluxProductGamma.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + TECH.Timing 1 WS.WebService -62157,56474.851933 +62171,39738.879495 61944,50000.995185 0 @@ -39,8 +39,6 @@ $$$LogIncomming(WS.Web.OLParticulier.impl.Logger,GetToepassingen) - set x = 1 / 0 - Set OLGamma = ..GetOrgaluxProductGamma(Sessie) set dtoResult = OLGamma.GetToepassingen(.MeubelToepassing,.Zone,1) ; Extra parameter: blnAddItemALLES=1 @@ -157,7 +155,6 @@ ;Do ##class(TimerUtils).Stop() ;Do ##class(TimerUtils).Start("ZoekProductGroepen") - Do WLIP^vhDBG(127,"Zoek : "_Zoekterm) set dtoResult = OLGamma.ZoekProductGroepen(.ProductCriteria,.Zoekterm,.LadeSpec,.ZoektermCategorie) ;Do ##class(TimerUtils).Stop() @@ -212,5 +209,5 @@ ]]> - + Index: BL/Prod/Search.cls.xml =================================================================== diff -u -r937 -r946 --- BL/Prod/Search.cls.xml (.../Search.cls.xml) (revision 937) +++ BL/Prod/Search.cls.xml (.../Search.cls.xml) (revision 946) @@ -1,12 +1,12 @@ - + Search in the product index BL.Prod,%Prod.Product 1 %RegisteredObject -62164,48652.965688 +62171,39652.070701 60207,60266.090772 0 @@ -544,8 +544,6 @@ 1 PRNr:%Integer,pxCriteria:BL.Prod.sub.pxSearchCriteria,lbIndexContent:%List - + Index: vhUnitTest/DOM/PM/OL/Gamma/Verkoophandboek.cls.xml =================================================================== diff -u -r915 -r946 --- vhUnitTest/DOM/PM/OL/Gamma/Verkoophandboek.cls.xml (.../Verkoophandboek.cls.xml) (revision 915) +++ vhUnitTest/DOM/PM/OL/Gamma/Verkoophandboek.cls.xml (.../Verkoophandboek.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 vhUnitTest.TestCase -62147,59505.440663 +62168,55177.2979 0 @@ -152,7 +152,7 @@ - + Index: zJBL/Java/Facade.cls.xml =================================================================== diff -u --- zJBL/Java/Facade.cls.xml (revision 0) +++ zJBL/Java/Facade.cls.xml (revision 946) @@ -0,0 +1,78 @@ + + + +1 +%RegisteredObject +62151,43928.21746 +0 + + +%Projection.Java + + + + +ClassA + + + + +%ListOfObjects + + + + +%String + + + + +%String + + + + +A:ClassA + + + + +Lijstje:%ListOfDataTypes +%String + 0) + { + set return = Lijstje.GetAt(1) + }*/ + Quit return +]]> + + + + Index: APPS/common/GUI/dto/KolomInfo.cls.xml =================================================================== diff -u --- APPS/common/GUI/dto/KolomInfo.cls.xml (revision 0) +++ APPS/common/GUI/dto/KolomInfo.cls.xml (revision 946) @@ -0,0 +1,26 @@ + + + +1 +%RegisteredObject,%XML.Adaptor +62161,47127.957312 +0 + + +%Integer + + + +%Boolean + + + +%Integer + + + +%String + + + + Index: DOM/PM/enu/PMECType.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/PM/enu/PMECType.cls.xml (.../PMECType.cls.xml) (revision 903) +++ DOM/PM/enu/PMECType.cls.xml (.../PMECType.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + datatype 1 %String -62157,36237.580947 +62160,37241.657619 0 ,0,1,2 + +;Niet tonen;Tonen;Tonen zonder subgroepen + + 1 expression @@ -45,5 +49,5 @@ ]]> - + Index: TECH/ClassInfo/ClassDefinition.cls.xml =================================================================== diff -u -r931 -r946 --- TECH/ClassInfo/ClassDefinition.cls.xml (.../ClassDefinition.cls.xml) (revision 931) +++ TECH/ClassInfo/ClassDefinition.cls.xml (.../ClassDefinition.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject,TECH.ClassInfo.QNameFinder -62160,31607.215478 +62168,57401.729789 0 @@ -96,19 +96,14 @@ -%New method to -provide notification that a new instance of an object is being created. - -

If this method returns an error then the object will not be created.]]> ClassName:%String 1 1 %Status @@ -154,5 +149,5 @@ %Library.CustomStorage - + Index: BL/Flow/Factuur/Doc.cls.xml =================================================================== diff -u -r734 -r946 --- BL/Flow/Factuur/Doc.cls.xml (.../Doc.cls.xml) (revision 734) +++ BL/Flow/Factuur/Doc.cls.xml (.../Doc.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + BL.Sys.FOP.Common 1 BL.Flow.Docs.Basis,BL.Flow.Basis.DocNew -62020,54783.523454 +62164,56672.085511 0 @@ -587,5 +587,5 @@ ]]> - + Index: vhUnitTest/DOM/CRM/Klant.cls.xml =================================================================== diff -u -r734 -r946 --- vhUnitTest/DOM/CRM/Klant.cls.xml (.../Klant.cls.xml) (revision 734) +++ vhUnitTest/DOM/CRM/Klant.cls.xml (.../Klant.cls.xml) (revision 946) @@ -1,15 +1,15 @@ - + + +do ##class(vhUnitTest.Manager).RunTest("/Display=all","DOM.CRM.Klant") DOM.DomeinContext,BL.Derde.KlantSpecifiek 1 vhUnitTest.TestCase -62111,62289.346595 +62171,60065.725685 0 - -do ##class(vhUnitTest.Manager).RunTest("/Display=all","DOM.CRM.Klant") @@ -24,5 +24,5 @@ ]]> - + Index: zTryout/JCL/ErrorHandler.cls.xml =================================================================== diff -u --- zTryout/JCL/ErrorHandler.cls.xml (revision 0) +++ zTryout/JCL/ErrorHandler.cls.xml (revision 946) @@ -0,0 +1,31 @@ + + + +TECH.Error +1 +%RegisteredObject +62153,62412.956484 +0 + + + + + + + Index: zTryout/PRA/Concurrency/VirtueelBankLoketViaSql.cls.xml =================================================================== diff -u -r734 -r946 --- zTryout/PRA/Concurrency/VirtueelBankLoketViaSql.cls.xml (.../VirtueelBankLoketViaSql.cls.xml) (revision 734) +++ zTryout/PRA/Concurrency/VirtueelBankLoketViaSql.cls.xml (.../VirtueelBankLoketViaSql.cls.xml) (revision 946) @@ -1,12 +1,13 @@ - + Dit stelt een applicatie-level klasse voor. TECH.ExcHandling,zTryout.PRA.Concurrency,zTryout.PRA TECH.Error +1 %RegisteredObject -62111,47197.740415 +62136,28569.532728 62045,47466.966909 0 @@ -238,5 +239,5 @@ ]]> - + Index: zTryout/JBL/TestPers.cls.xml =================================================================== diff -u --- zTryout/JBL/TestPers.cls.xml (revision 0) +++ zTryout/JBL/TestPers.cls.xml (revision 946) @@ -0,0 +1,41 @@ + + + +persistent +1 +TECH.Concurrency.VhPersistent +62166,39496.619695 +0 + + +TestPers1 + + + +Prod.Kenmerk.MetaDefinitie + + + +%Library.CacheStorage +^zTryout.JBL.TestPersD +TestPersDefaultData +^zTryout.JBL.TestPersD +^zTryout.JBL.TestPersI +^zTryout.JBL.TestPersS + +listnode + + +%%CLASSNAME + + +A + + +InstanceVersion + + + + + + Index: WV_GAProduct_Flow.prj.xml =================================================================== diff -u --- WV_GAProduct_Flow.prj.xml (revision 0) +++ WV_GAProduct_Flow.prj.xml (revision 946) @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: APPS/PM/Maatwerk/BerekeningService.cls.xml =================================================================== diff -u --- APPS/PM/Maatwerk/BerekeningService.cls.xml (revision 0) +++ APPS/PM/Maatwerk/BerekeningService.cls.xml (revision 946) @@ -0,0 +1,73 @@ + + + + +Berekent de HalffabItemBoom en KostItemBoom voor een gegeven MaatwerkProduct +Optioneel kan een BerekeningsSpecificatie opgegeven worden. +Indien dit niet wordt gedaan dan wordt de BerekeningsSpecificatie gebruikt die voor het product is opgeslagen. +1 +%RegisteredObject +62172,37666.280881 +0 + + +DOM.PM.MaatwerkProduct +1 + + + +Product:DOM.PM.MaatwerkProduct +1 +1 +%Status + + + + +BerekeningsSpecificatie:DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie="" +DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom + + + + + +Deze method geeft de wortel terug van de KostItems boom. +Een DOM.PM.Maatwerk.Calc.Kost.IKostItemVisitor kan gebruikt worden om alle items te overlopen. +HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,BerekeningsSpecificatie:DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie="" +DOM.PM.Maatwerk.Calc.Kost.KostItem + + + + + Index: TECH/StringUtils.cls.xml =================================================================== diff -u -r924 -r946 --- TECH/StringUtils.cls.xml (.../StringUtils.cls.xml) (revision 924) +++ TECH/StringUtils.cls.xml (.../StringUtils.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject -62158,56342.61432 +62164,34491.061469 62118,40201.439469 0 @@ -32,34 +32,6 @@ - - - -Vervangt alle "Search" items door de "Replace" items die zich bevinden tussen de prefix en de suffix -Bv: -ReplaceBetween("...[Iets]....[Iets]....Iets...","[","]","Iets","Niets") -wordt "...[Niets]....[Niets]....Iets..." -1 -String:%String,Prefix:%String,Suffix:%String,Search:%String,Replace:%String -%String - - - + Index: DOM/PM/Maatwerk/Calc/Kost/impl/OLM/VariabeleAantalProducten.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/PM/Maatwerk/Calc/Kost/impl/OLM/VariabeleAantalProducten.cls.xml (.../VariabeleAantalProducten.cls.xml) (revision 903) +++ DOM/PM/Maatwerk/Calc/Kost/impl/OLM/VariabeleAantalProducten.cls.xml (.../VariabeleAantalProducten.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 -DOM.PM.Maatwerk.Calc.Kost.IMultiplier -62151,28885.285539 +%RegisteredObject,DOM.PM.Maatwerk.Calc.Kost.IMultiplier +62172,28567.608655 0 @@ -15,5 +15,5 @@ ]]> - + Index: DOM/PR/BouwStenen/BouwSteen.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PR/BouwStenen/BouwSteen.cls.xml (.../BouwSteen.cls.xml) (revision 734) +++ DOM/PR/BouwStenen/BouwSteen.cls.xml (.../BouwSteen.cls.xml) (revision 946) @@ -1,11 +1,11 @@ - + persistent 1 VHOpslag %Persistent -61767,27721.955691 +62168,47198.713046 59772,53878.611013 0 @@ -14,16 +14,17 @@ %Library.Status @@ -127,5 +128,5 @@ - + Index: TECH/PiecesIterator.cls.xml =================================================================== diff -u -r924 -r946 --- TECH/PiecesIterator.cls.xml (.../PiecesIterator.cls.xml) (revision 924) +++ TECH/PiecesIterator.cls.xml (.../PiecesIterator.cls.xml) (revision 946) @@ -1,12 +1,14 @@ - + + +Een lege string wordt niet aanschouwd als een piece. De HasNext() zal dus false teruggeven als de string leeg is. 1 %RegisteredObject,TECH.Iterator -62157,30897.162303 +62164,34892.356359 0 - + %Integer 1 @@ -21,14 +23,20 @@ 1 + +%Integer +1 + + Pieces:%String,Delimiter:%String 1 %Status @@ -37,7 +45,7 @@ Returns true if the iteration has more elements. %Boolean - @@ -48,10 +56,10 @@ Causes an error if HasNext() returns false %CacheString - + Index: zTryout/WV/PM/IK/TBXKenmAntaro.cls.xml =================================================================== diff -u --- zTryout/WV/PM/IK/TBXKenmAntaro.cls.xml (revision 0) +++ zTryout/WV/PM/IK/TBXKenmAntaro.cls.xml (revision 946) @@ -0,0 +1,28 @@ + + + +persistent +1 +zTryout.WV.PM.IK.TBXKenmerkenv01 +62167,51489.534396 +0 + + + + + + +%Library.CacheStorage + + + + Index: APPS/Halux/common/BatchService.cls.xml =================================================================== diff -u --- APPS/Halux/common/BatchService.cls.xml (revision 0) +++ APPS/Halux/common/BatchService.cls.xml (revision 946) @@ -0,0 +1,41 @@ + + + +1 +%RegisteredObject +62159,55755.955894 +0 + + +BatchID:%Integer +APPS.Halux.common.Batch + + + + + +Toeleveringen van het type DOM.LEV.Toelevering +Toeleveringen:%ListOfObjects +APPS.Halux.common.Batch + + + + +BatchID:%Integer +%Status + + + + + Index: vhUnitTest/DOM/PM/Maatwerk/HF/TBX/TestDataSet.cls.xml =================================================================== diff -u --- vhUnitTest/DOM/PM/Maatwerk/HF/TBX/TestDataSet.cls.xml (revision 0) +++ vhUnitTest/DOM/PM/Maatwerk/HF/TBX/TestDataSet.cls.xml (revision 946) @@ -0,0 +1,93 @@ + + + + +Oproepen via : + do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","DOM.PM.Maatwerk.HF.TBX.TestDataSet") +1 +vhUnitTest.DOM.PM.Maatwerk.HF.ITestDataSetIngegevenKenmerken +62167,59071.911198 +0 + + +DOM.PM.enu.Familie + + + + + + + + + + + + + + + + + + + + + + + + +Context:DOM.PM.Maatwerk.Calc.HF.HalffabContext,TestItem:vhUnitTest.DOM.PM.Maatwerk.HF.DataSetTestItem +%Boolean +Links") + Do Rollen.Insert($$$enuTBXRol.Bodem()) + Do Rollen.Insert($$$enuTBXRol.Rug()) + Do Rollen.Insert($$$enuTBXRol.RugHouder()_"->Links") + + If TestItem.IngegevenKenmerken.IsBinnenLade { + Do Rollen.Insert(##class(DOM.PM.Maatwerk.Calc.HF.enu.TBXRol).FrontHouder()) + } + + Set HalffabItemsBoom=Context.HalffabItemsBoom + Set IsRolAanwezig=1 + Set itRollen=##class(TECH.ListIterator).%New(Rollen) + While (itRollen.HasNext())&&(IsRolAanwezig) { + Set IsRolAanwezig=($IsObject(HalffabItemsBoom.GeefHalffabItem(itRollen.Next()))) + } + + Quit IsRolAanwezig +]]> + + + + FishEye: Tag 946 refers to a dead (removed) revision in file `vhUnitTest/APPS/PM/Maatwerk/TestDBGIngegevenKenmConverter.cls.xml'. FishEye: No comparison available. Pass `N' to diff? Index: DOM/common/impl/Adres.cls.xml =================================================================== diff -u --- DOM/common/impl/Adres.cls.xml (revision 0) +++ DOM/common/impl/Adres.cls.xml (revision 946) @@ -0,0 +1,122 @@ + + + +1 +%RegisteredObject,DOM.common.Adres +62167,41092.198604 +0 + + +%String + + + +%String + + + +%String + + + +%String + + + +%String + + + +%String + + + +%String + + + +%String + + + +%String + + + +%String + + + +%String + + + + +%String + + + + +%String + + + + +%String + + + + +%String + + + + +%String + + + + +%Integer + + + + +%String + + + + +%String + + + + +%String + + + + +%String + + + + +%String + + + + + Index: DOM/OV/impl/DataM/DataMBonAbstract.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/OV/impl/DataM/DataMBonAbstract.cls.xml (.../DataMBonAbstract.cls.xml) (revision 903) +++ DOM/OV/impl/DataM/DataMBonAbstract.cls.xml (.../DataMBonAbstract.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 DOM.OV.Bon,%RegisteredObject -62157,70295.403308 +62159,28290.142058 0 @@ -53,6 +53,12 @@ ]]> + +%Date + + + DataMAdres + +%String + + + 1 Nummer:%Integer @@ -87,5 +99,5 @@ ]]> - + Index: DOM/PM/Maatwerk/Calc/Kost/impl/KAD/Zagen/FactorHalenProfielen.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PM/Maatwerk/Calc/Kost/impl/KAD/Zagen/FactorHalenProfielen.cls.xml (.../FactorHalenProfielen.cls.xml) (revision 734) +++ DOM/PM/Maatwerk/Calc/Kost/impl/KAD/Zagen/FactorHalenProfielen.cls.xml (.../FactorHalenProfielen.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 -DOM.PM.Maatwerk.Calc.Kost.IMultiplier -62080,52333.797295 +%RegisteredObject,DOM.PM.Maatwerk.Calc.Kost.IMultiplier +62172,28578.684501 0 @@ -23,5 +23,5 @@ ]]> - + Index: vhUnitTest/DOM/PM/Maatwerk/HF/TBX/DataSetTBXIntivo.cls.xml =================================================================== diff -u --- vhUnitTest/DOM/PM/Maatwerk/HF/TBX/DataSetTBXIntivo.cls.xml (revision 0) +++ vhUnitTest/DOM/PM/Maatwerk/HF/TBX/DataSetTBXIntivo.cls.xml (revision 946) @@ -0,0 +1,24 @@ + + + +1 +%RegisteredObject +62165,55337.0062 +0 + + +1 + + + + + Index: DOM/OV/impl/DataM/DataMAdres.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/OV/impl/DataM/DataMAdres.cls.xml (.../DataMAdres.cls.xml) (revision 903) +++ DOM/OV/impl/DataM/DataMAdres.cls.xml (.../DataMAdres.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject,DOM.common.Adres -62158,59740.873847 +62167,40638.834617 0 @@ -37,7 +37,7 @@ -%String +%Integer 1 @@ -52,7 +52,7 @@ -Naam:%String,Toenaam:%String,Aanspreking:%String,Straat:%String,Postcode:%String,Gemeente:%String,LandNr:%String,Taal:%String,KlantAdresNr:%String +Naam:%String,Toenaam:%String,Aanspreking:%String,Straat:%String,Postcode:%String,Gemeente:%String,LandNr:%Integer,Taal:%String,KlantAdresNr:%String 1 1 %Status @@ -119,11 +119,17 @@ -%String +%Integer + +%String + + + %String - + FishEye: Tag 946 refers to a dead (removed) revision in file `vhUnitTest/DOM/PM/OL/Gamma/TestData.cls.xml'. FishEye: No comparison available. Pass `N' to diff? Index: DOM/PM/OL/Gamma/impl/ProductenNaarPrijslijst.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/PM/OL/Gamma/impl/ProductenNaarPrijslijst.cls.xml (.../ProductenNaarPrijslijst.cls.xml) (revision 903) +++ DOM/PM/OL/Gamma/impl/ProductenNaarPrijslijst.cls.xml (.../ProductenNaarPrijslijst.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + vhLib.Macro,DOM.PM.OL,DOM.DomeinContext 1 DOM.PM.OL.Gamma.IProductenNaarPrijslijst -62151,51542.54206 +62167,47288.676866 0 @@ -260,7 +260,8 @@ set ProductInfo.EAN = oKenmerk.GetProduct().BarcodeWaarde set ProductInfo.Omschrijving=oKenmerk.GetLangTekst() - set ProductInfo.LadeDieptes = $$ListToPieces^vhLib(oKenmerk.GetLadeDieptesInMM(),..WaardeDelim) + set LadeDieptes = oKenmerk.GetLadeDieptesInMM() if LadeDieptes = 0 set LadeDieptes = "" + set ProductInfo.LadeDieptes = $$ListToPieces^vhLib(LadeDieptes,..WaardeDelim) set ProductInfo.LadeBreedtes = ..GetLadeBreedteString(oKenmerk.GetLadeBreedteMin(),oKenmerk.GetLadeBreedteMax()) set ProductInfo.WandDiktes = $$ListToPieces^vhLib(oKenmerk.GetWandDiktes(),..WaardeDelim) @@ -271,9 +272,7 @@ set ProductInfo.volDiepte = OptiDiepte set ProductInfo.volHoogte = OptiHoogte - set HogeLadeLageLade = ..GetHogeLageLade(oKenmerk.GetLadeTypes()) - set LadeFamilieOmschrijving = $listget(oKenmerk.GetLadeFamilieOmschrijvingen()) - if $length(HogeLadeLageLade) && $length(LadeFamilieOmschrijving) set ProductInfo.LadeType = HogeLadeLageLade_"_"_LadeFamilieOmschrijving + set ProductInfo.LadeType = ..GeefLadeFamilieTekst($listget(oKenmerk.GetLadeFamilies())) set ProductInfo.GroepOmschrijving = oKenmerk.GetProductGroepOmschrijving() set ProductInfo.Gewicht = oKenmerk.GetProduct().GewichtPerDuizendStuksInKG/1000 @@ -303,15 +302,15 @@ -1 Min,Max 1 %String ="_(Min*10) if $length(Max) set result = result_$select($length(result):" ",1:"")_"<="_(Max*10) - if Min=Max set result = Min*10 ; [Review WV] Wat als Min=Max="" (leeg) ? + if (Min=Max)&&(Min'="") set result = Min*10 + if result = 0 set result = "" quit result ]]> @@ -357,6 +356,23 @@ quit result ]]> + + +LadeFamilie +1 + + - + Index: TECH/Error/impl/ErrorHandler.cls.xml =================================================================== diff -u -r924 -r946 --- TECH/Error/impl/ErrorHandler.cls.xml (.../ErrorHandler.cls.xml) (revision 924) +++ TECH/Error/impl/ErrorHandler.cls.xml (.../ErrorHandler.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Deze class doet de eigenlijke error afhandeling. @@ -8,7 +8,7 @@ TECH.Error 1 %RegisteredObject -62154,39102.635211 +62172,56692.637432 62025,48050.831801 0 @@ -95,7 +95,7 @@ @@ -136,17 +135,14 @@ do Body.WriteLine() do Body.WriteLine("Variabelen : ") + /** / set Var = "%" for { set Var = $order(@Var) quit:Var="" - ;continue:Var="%vhLastError" - ;continue:Var="%ErrorObject" - ;continue:Var="%this" - + ;continue:Var="%vhLastError" ;continue:Var="%ErrorObject" ;continue:Var="%this" do Body.WriteLine(Var_" : "_@Var) - if $IsObject(@Var) { - //do Body.WriteLine($$ObjToText^vhLib(@Var)) - } + ;if $IsObject(@Var) { do Body.WriteLine($$ObjToText^vhLib(@Var)) } } + /**/ Set From=$$$SystemMail("TECH ErrorHandler") @@ -205,5 +201,5 @@ ]]> - + Index: DOM/PM/Maatwerk/Calc/Kost/IMultiplier.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PM/Maatwerk/Calc/Kost/IMultiplier.cls.xml (.../IMultiplier.cls.xml) (revision 734) +++ DOM/PM/Maatwerk/Calc/Kost/IMultiplier.cls.xml (.../IMultiplier.cls.xml) (revision 946) @@ -1,10 +1,9 @@ - + 1 1 -%RegisteredObject -62076,36809.680661 +62172,28524.290442 62070,52454.279455 0 @@ -16,5 +15,5 @@ %Float - + Index: DOM/LEV/ToeleveringLijn.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/LEV/ToeleveringLijn.cls.xml (.../ToeleveringLijn.cls.xml) (revision 903) +++ DOM/LEV/ToeleveringLijn.cls.xml (.../ToeleveringLijn.cls.xml) (revision 946) @@ -1,15 +1,30 @@ - + 1 1 -62129,55364.115515 +62171,30682.828313 0 1 %Integer + + +1 +DOM.OV.Order + + + +1 +DOM.OV.Orderlijn + + + +1 +%Date + - + Index: DOM/PM/Maatwerk/Calc/Kost/impl/TBX/PlanZagenv001.cls.xml =================================================================== diff -u --- DOM/PM/Maatwerk/Calc/Kost/impl/TBX/PlanZagenv001.cls.xml (revision 0) +++ DOM/PM/Maatwerk/Calc/Kost/impl/TBX/PlanZagenv001.cls.xml (revision 946) @@ -0,0 +1,44 @@ + + + +persistent +1 +DOM.PM.Maatwerk.Calc.Kost.SamengesteldKostItemBuilder +62171,59898.383196 +0 + + +SamengesteldKostItemBuilder:DOM.PM.Maatwerk.Calc.Kost.SamengesteldKostItemBuilder +1 +1 +%Status + + + + +%Library.CacheStorage + + + + Index: Tools/MoveClass.cls.xml =================================================================== diff -u -r932 -r946 --- Tools/MoveClass.cls.xml (.../MoveClass.cls.xml) (revision 932) +++ Tools/MoveClass.cls.xml (.../MoveClass.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 TECH.ClassInfo.QNameFinder -62161,34466.097579 +62168,50420.352489 62161,32256.917774 0 @@ -43,7 +43,7 @@ While ResultSet.Next() { Set ClassName = ResultSet.Data("Name") - continue:$extract(ClassName)="%" + continue:($extract(ClassName,1)="%") ; Geen %-klassen onderzoeken Set ClassDefinition = ##class(%Dictionary.ClassDefinition).%OpenId(ClassName) If (ClassDefinition '= "") @@ -112,6 +112,7 @@ } // -- Controleer implementatie + Set Implementatie = Method.GeefImplementatie() Set i = 0 Set Lijnen = ##class(%ListOfDataTypes).%New() @@ -157,6 +158,11 @@ Set Klasse = $Order(Berichten(Klasse)) } + If (##class(%Dictionary.ClassDefinition).%ExistsId(ClassTo)) + { + w !,"WAARSCHUWING: "_ClassTo_" bestaat reeds en zal worden overschreven!",! + } + Set Input = "" While (Input '= "Y") && (Input '= "N") { @@ -180,7 +186,7 @@ Set Status = Command.Execute() w ! - If ('Status) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),! + If ($$$ISERR(Status)) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),! } Set ClassesIterator = ##class(TECH.ListIterator).%New(ClassesToSave) @@ -189,8 +195,8 @@ Set Class = ClassesIterator.Next() w $J(" ",4)_"- Opslaan "_Class.GeefNaam(),! Set Status = Class.Save() - If ('Status) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),! - else do ..ExportToSVN(Class.GeefNaam()) + If ($$$ISERR(Status)) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),! + Else Do ..ExportToSVN(Class.GeefNaam()) } Set ClassFromDefinition = ##class(%Dictionary.ClassDefinition).%OpenId(ClassFrom) @@ -202,8 +208,8 @@ Set Clone = ClassFromDefinition.%ConstructClone(1) Set Clone.Name = ClassTo Set Status = Clone.%Save() - If ('Status) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),! - else do ..ExportToSVN(Class.GeefNaam()) + If ($$$ISERR(Status)) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),! + Else Do ..ExportToSVN(Clone.Name) Set Input = "" While (Input '= "Y") && (Input '= "N") @@ -215,11 +221,11 @@ If (Input = "Y") { Set Status = ##class(%Dictionary.ClassDefinition).%DeleteId(ClassFrom) - If ('Status) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),! - else do ..DeleteFromSVN(ClassFrom) + If ($$$ISERR(Status)) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),! + Else Do ..DeleteFromSVN(ClassFrom) } - do ..svnHelper.CompileImportedSourceCode() + Do ..svnHelper.CompileImportedSourceCode() } Else { @@ -256,22 +262,22 @@ Classname:%String 1 Classname:%String 1 - + Index: WV_OL_WebShop.prj.xml =================================================================== diff -u --- WV_OL_WebShop.prj.xml (revision 0) +++ WV_OL_WebShop.prj.xml (revision 946) @@ -0,0 +1,250 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: DOM/PM/Maatwerk/Calc/Kost/impl/KAD/Zagen/VariabeleDoorschuivenProfielen.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PM/Maatwerk/Calc/Kost/impl/KAD/Zagen/VariabeleDoorschuivenProfielen.cls.xml (.../VariabeleDoorschuivenProfielen.cls.xml) (revision 734) +++ DOM/PM/Maatwerk/Calc/Kost/impl/KAD/Zagen/VariabeleDoorschuivenProfielen.cls.xml (.../VariabeleDoorschuivenProfielen.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 -DOM.PM.Maatwerk.Calc.Kost.IMultiplier -62080,49804.533743 +%RegisteredObject,DOM.PM.Maatwerk.Calc.Kost.IMultiplier +62172,28572.396275 0 @@ -15,5 +15,5 @@ ]]> - + Index: vhUnitTest/APPS/common/TestData.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/common/TestData.cls.xml (revision 0) +++ vhUnitTest/APPS/common/TestData.cls.xml (revision 946) @@ -0,0 +1,110 @@ + + + +1 +%RegisteredObject +62172,31917.045843 +0 + + +1 + + + + +1 + + + + + Index: DOM/PM/Maatwerk/Calc/Kost/IEvaluator.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PM/Maatwerk/Calc/Kost/IEvaluator.cls.xml (.../IEvaluator.cls.xml) (revision 734) +++ DOM/PM/Maatwerk/Calc/Kost/IEvaluator.cls.xml (.../IEvaluator.cls.xml) (revision 946) @@ -1,19 +1,19 @@ - + 1 1 -62080,58976.368635 +62171,49380.678236 62070,52454.219343 0 1 -HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,Context:DOM.PM.Maatwerk.Calc.Kost.KostContext +HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,Context:DOM.PM.Maatwerk.Calc.Kost.KostContext,IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken %Boolean - + Index: DOM/LEV/impl/DataM/DataMToeleveringLijn.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/LEV/impl/DataM/DataMToeleveringLijn.cls.xml (.../DataMToeleveringLijn.cls.xml) (revision 903) +++ DOM/LEV/impl/DataM/DataMToeleveringLijn.cls.xml (.../DataMToeleveringLijn.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject,DOM.LEV.ToeleveringLijn -62130,31418.885709 +62168,59352.782163 0 @@ -28,17 +28,29 @@ ]]> + +DOM.OV.Orderlijn + + + %Integer + +%Date + + + DOM.OV.Order - - + Index: APPS/Halux/Planning/impl/RGDataMapALU.cls.xml =================================================================== diff -u --- APPS/Halux/Planning/impl/RGDataMapALU.cls.xml (revision 0) +++ APPS/Halux/Planning/impl/RGDataMapALU.cls.xml (revision 946) @@ -0,0 +1,107 @@ + + + +1 +%RegisteredObject +62172,42071.237757 +0 + + +%ArrayOfObjects +1 + + + +DOM.PM.MaatwerkProduct +1 + + + +Product:DOM.PM.MaatwerkProduct +1 +1 +%Status + + + + +APPS.Halux.Planning.impl.ResourceGebruik + + + + +ResourceGebruik:APPS.Halux.Planning.impl.ResourceGebruik +1 + + + + +ActiviteitID:%String +1 +APPS.Halux.Planning.impl.ResourceGebruikData + + + + + Index: DOM/PM/Maatwerk/Calc/Kost/impl/TBX/PlanPersenv001.cls.xml =================================================================== diff -u --- DOM/PM/Maatwerk/Calc/Kost/impl/TBX/PlanPersenv001.cls.xml (revision 0) +++ DOM/PM/Maatwerk/Calc/Kost/impl/TBX/PlanPersenv001.cls.xml (revision 946) @@ -0,0 +1,70 @@ + + + +persistent +1 +DOM.PM.Maatwerk.Calc.Kost.SamengesteldKostItemBuilder +62171,52476.069212 +0 + + +SamengesteldKostItemBuilder:DOM.PM.Maatwerk.Calc.Kost.SamengesteldKostItemBuilder +1 +1 +%Status + + + + +%Library.CacheStorage + + + + Index: zTryout/CSC/ResultSetWriter.cls.xml =================================================================== diff -u --- zTryout/CSC/ResultSetWriter.cls.xml (revision 0) +++ zTryout/CSC/ResultSetWriter.cls.xml (revision 946) @@ -0,0 +1,81 @@ + + + +1 +%RegisteredObject +62153,46810.123536 +0 + + + +Do ##class(zTryout.CSC.ResultSetWriter).Write() +1 +ResultSet:%ResultSet + + + + + Index: DOM/PM/Maatwerk/Calc/Kost/impl/TBX/BevatSifonEvaluator.cls.xml =================================================================== diff -u --- DOM/PM/Maatwerk/Calc/Kost/impl/TBX/BevatSifonEvaluator.cls.xml (revision 0) +++ DOM/PM/Maatwerk/Calc/Kost/impl/TBX/BevatSifonEvaluator.cls.xml (revision 946) @@ -0,0 +1,17 @@ + + + +1 +%RegisteredObject,DOM.PM.Maatwerk.Calc.Kost.IEvaluator +62171,50385.35426 +0 + + +HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,Context:DOM.PM.Maatwerk.Calc.Kost.KostContext,IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken +%Boolean + + + + + Index: WV_Logging.prj.xml =================================================================== diff -u --- WV_Logging.prj.xml (revision 0) +++ WV_Logging.prj.xml (revision 946) @@ -0,0 +1,6 @@ + + + + + + Index: vhUnitTest/APPS/HR/ProTime/Facade.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/HR/ProTime/Facade.cls.xml (revision 0) +++ vhUnitTest/APPS/HR/ProTime/Facade.cls.xml (revision 946) @@ -0,0 +1,53 @@ + + + +1 +APPS.HR.ProTime.Facade +62172,56447.793674 +0 + + +%ListOfObjects + + + + + Index: vhUnitTest/APPS/PM/Maatwerk/impl/upg/UTKenmerkenv00v01Upgrader.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/PM/Maatwerk/impl/upg/UTKenmerkenv00v01Upgrader.cls.xml (revision 0) +++ vhUnitTest/APPS/PM/Maatwerk/impl/upg/UTKenmerkenv00v01Upgrader.cls.xml (revision 946) @@ -0,0 +1,34 @@ + + + +1 +APPS.PM.Maatwerk.IngegevenKenmUpgrader +62160,42359.722471 +0 + + +1 +%Integer + + + + + +De NewVersionClassName is de ClassName van de nieuwe versie van de IngegevenKenmeken +1 +Kenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken,NewVersionClassName:%String +DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken + + + + + Index: APPS/common/enu/StockType.cls.xml =================================================================== diff -u --- APPS/common/enu/StockType.cls.xml (revision 0) +++ APPS/common/enu/StockType.cls.xml (revision 946) @@ -0,0 +1,56 @@ + + + +datatype +1 +TECH.Enumeration +62164,52205.53827 +0 + + +,F,P,PmR,T + + + +1 +%String + + + + +1 +%String + + + + +1 +%String + + + + +1 +%String + + + + +1 +%String + + + + + Index: DOM/LEV/Toelevering.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/LEV/Toelevering.cls.xml (.../Toelevering.cls.xml) (revision 903) +++ DOM/LEV/Toelevering.cls.xml (.../Toelevering.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 1 -62144,37592.871983 +62161,30342.562287 0 @@ -16,11 +16,6 @@ %Integer - -1 -DOM.OV.Order - - 1 TECH.Iterator @@ -36,6 +31,17 @@ Type:DOM.OV.enu.OrderlijnType TECH.Iterator + + +1 +DOM.OV.Order + + + +1 +LijnNr:%Integer +DOM.LEV.ToeleveringLijn + - + Index: DOM/LEV/impl/DataM/DataMTekstToeleveringLijn.cls.xml =================================================================== diff -u --- DOM/LEV/impl/DataM/DataMTekstToeleveringLijn.cls.xml (revision 0) +++ DOM/LEV/impl/DataM/DataMTekstToeleveringLijn.cls.xml (revision 946) @@ -0,0 +1,16 @@ + + + +1 +DOM.LEV.impl.DataM.DataMToeleveringLijn,DOM.LEV.TekstToeleveringLijn +62160,41179.93045 +0 + + +%String + + + + + Index: WV_PM_Maatwerk.prj.xml =================================================================== diff -u --- WV_PM_Maatwerk.prj.xml (revision 0) +++ WV_PM_Maatwerk.prj.xml (revision 946) @@ -0,0 +1,301 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: vhUnitTest/DOM/PM/Maatwerk/Kost/TestHalffabKostItemBuilder.cls.xml =================================================================== diff -u -r915 -r946 --- vhUnitTest/DOM/PM/Maatwerk/Kost/TestHalffabKostItemBuilder.cls.xml (.../TestHalffabKostItemBuilder.cls.xml) (revision 915) +++ vhUnitTest/DOM/PM/Maatwerk/Kost/TestHalffabKostItemBuilder.cls.xml (.../TestHalffabKostItemBuilder.cls.xml) (revision 946) @@ -1,11 +1,11 @@ - + do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","DOM.PM.Maatwerk.Kost.TestHalffabKostItemBuilder") 1 vhUnitTest.TestCase -62153,28926.028276 +62171,49018.855733 0 @@ -36,7 +36,7 @@ Set Personality = ##class(DOM.common.VanHoeckePersonality).Instance() Set BerekeningsSpecificatie = ##class(DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie).%New(1,KlantID,Personality) Set KostContext = ##class(vhUnitTest.DOM.PM.Maatwerk.Kost.impl.UTKostContext).%New(Familie,ProductType,BerekeningsSpecificatie) - Set KostItemsBoom = HFKostItemBuilder.Bereken(KostContext,HFItemsBoom) + Set KostItemsBoom = HFKostItemBuilder.Bereken(KostContext,HFItemsBoom,"") Do $$$AssertTrue($IsObject(KostItemsBoom),"De boom is een object") Do $$$AssertEquals(KostItemsBoom.GeefNaam(),"Materiaal","Dit is de wortel met naam Materiaal") @@ -69,12 +69,12 @@ Do KostItemBuildersIterator.Next() Do $$$AssertTrue(KostItemBuildersIterator.HasNext(),"KostItemBuilderB is toegevoegd") - Set SamengesteldKostItem = SamengesteldKostItemBuilder.Bereken("","") + Set SamengesteldKostItem = SamengesteldKostItemBuilder.Bereken("","","") Set KostItemsIterator = SamengesteldKostItem.GeefKostItemsIterator() Do $$$AssertEquals(KostItemsIterator.Next().GeefNaam(),"KostItemA","Het eerste kostitem") Do $$$AssertEquals(KostItemsIterator.Next().GeefNaam(),"KostItemB","Het tweede kostitem") ]]> - + Index: DOM/OV/impl/DataM/DataMOrderVerwijzingOrderlijn.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/OV/impl/DataM/DataMOrderVerwijzingOrderlijn.cls.xml (.../DataMOrderVerwijzingOrderlijn.cls.xml) (revision 903) +++ DOM/OV/impl/DataM/DataMOrderVerwijzingOrderlijn.cls.xml (.../DataMOrderVerwijzingOrderlijn.cls.xml) (revision 946) @@ -1,21 +1,21 @@ - + 1 DOM.OV.impl.DataM.DataMOrderlijn,DOM.OV.OrderVerwijzingOrderlijn -62154,39998.165377 +62168,38973.191673 0 \\\1071#1094#62067,31220\199974 - 07.12.10 - 07.12.10 Nr.10300310\\\\\\\\\\100\\KF5\\1071#62067,31480#199974\\\Dhr Wouters Jeroen#\\\\]]> -LijnNr:%Integer,LijnInfo:%String +Order:DOM.OV.Order,LijnNr:%Integer,LijnInfo:%String 1 1 %Status + +KlantNr +%Boolean + + + %String - " _ ##class(DOM.OV.impl.DataM.DataMOrderlijn)%this.ToString() + " _ ##class(DOM.OV.impl.DataM.DataMOrderlijn)%this.ToString() ]]> - + Index: DOM/LEV/ToeleveringAPI.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/LEV/ToeleveringAPI.cls.xml (.../ToeleveringAPI.cls.xml) (revision 903) +++ DOM/LEV/ToeleveringAPI.cls.xml (.../ToeleveringAPI.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 1 -62152,60159.06947 +62166,29288.377693 0 @@ -12,11 +12,11 @@ DOM.LEV.Toelevering - + 1 -PRNr:%Integer -%Integer +LeverancierNummer:%Integer +TECH.Iterator - + Index: zTryout/CSC/Timing/TimingUnit.cls.xml =================================================================== diff -u -r734 -r946 --- zTryout/CSC/Timing/TimingUnit.cls.xml (.../TimingUnit.cls.xml) (revision 734) +++ zTryout/CSC/Timing/TimingUnit.cls.xml (.../TimingUnit.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject -62083,29042.448658 +62160,38606.065761 0 @@ -35,5 +35,5 @@ list - + Index: APPS/Halux/Planning/dto/MaakBatchError.cls.xml =================================================================== diff -u --- APPS/Halux/Planning/dto/MaakBatchError.cls.xml (revision 0) +++ APPS/Halux/Planning/dto/MaakBatchError.cls.xml (revision 946) @@ -0,0 +1,18 @@ + + + +1 +%RegisteredObject,%XML.Adaptor +62168,31908.964859 +0 + + +%Integer + + + +%String + + + + Index: DOM/PM/KADProduct/KADKaderdeur.cls.xml =================================================================== diff -u --- DOM/PM/KADProduct/KADKaderdeur.cls.xml (revision 0) +++ DOM/PM/KADProduct/KADKaderdeur.cls.xml (revision 946) @@ -0,0 +1,11 @@ + + + +1 +1 +DOM.PM.MaatwerkProduct +62172,56593.378103 +0 + + + FishEye: Tag 946 refers to a dead (removed) revision in file `vhUnitTest/APPS/PM/Maatwerk/UTKenmv01v02Upgrader.cls.xml'. FishEye: No comparison available. Pass `N' to diff? Index: DOM/PM/OL/Gamma/dtoUtils.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/PM/OL/Gamma/dtoUtils.cls.xml (.../dtoUtils.cls.xml) (revision 903) +++ DOM/PM/OL/Gamma/dtoUtils.cls.xml (.../dtoUtils.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + TECH.Error,Prod.Kenmerk,DOM.PM.OL,vhLib.Macro 1 %RegisteredObject -62153,57773.401732 +62166,34468.272916 61986,30861.155352 0 @@ -29,41 +29,9 @@ set dtoProduct.Munt = Context.blPrijs.Munt set lbTips = oKenmerkOrgalux.GetTipsKorteOmschrijvingen(";BL;") ; ExtraTips: BL="Past (niet) in binnenlade" + for ctrTips=1:1:$listlength(lbTips) do dtoProduct.Tips.Insert($listget(lbTips,ctrTips)) - - set lbLadeFamilies = oKenmerkOrgalux.GetLadeFamilieOmschrijvingen() - set lbLadeTypes = oKenmerkOrgalux.GetLadeTypeLangeOmschrijvingen() - - set lbLadeKleuren = oKenmerkOrgalux.GetLadeKleurOmschrijvingen() - - /// JBL - 2011-02-18 : deze ladevereisten worden vervangen door een list of %string in het product, - /// om momenteel compatibel te blijven behouden we de ladevereiste. - // opbouw lade vereisten - set dtoLadeVereisten = ##class(DOM.PM.OL.Gamma.dto.LadeVereisten).%New() - set dtoLadeVereisten.BreedteMaximum = oKenmerkOrgalux.GetLadeBinnenBreedteMax() - if dtoLadeVereisten.BreedteMaximum = 0 set dtoLadeVereisten.BreedteMaximum = "" - - set dtoLadeVereisten.BreedteMinimum = oKenmerkOrgalux.GetLadeBinnenBreedteMin() - if dtoLadeVereisten.BreedteMinimum = 0 set dtoLadeVereisten.BreedteMinimum = "" - - set dtoLadeVereisten.DiepteMaximum = oKenmerkOrgalux.GetLadeBinnenDiepteMax() - if dtoLadeVereisten.DiepteMaximum = 0 set dtoLadeVereisten.DiepteMaximum = "" - - set dtoLadeVereisten.DiepteMinimum = oKenmerkOrgalux.GetLadeBinnenDiepteMin() - if dtoLadeVereisten.DiepteMinimum = 0 set dtoLadeVereisten.DiepteMinimum = "" - - for ctrLadeKleuren=1:1:$listlength(lbLadeKleuren) do dtoLadeVereisten.LadeKleuren.Insert($listget(lbLadeKleuren,ctrLadeKleuren)) - - set Types = "" - for ctrLadeFamilies = 1 : 1 : $listlength(lbLadeFamilies) Set Types = Types _ $listget(lbLadeFamilies,ctrLadeFamilies)_". " - for ctrLadeTypes = 1:1:$listlength(lbLadeTypes) Set Types = Types _ $listget(lbLadeTypes,ctrLadeTypes)_". " - do dtoLadeVereisten.Types.Insert(Types) - - set dtoLadeVereisten.VrijeHoogte = oKenmerkOrgalux.GetVrijeHoogte() - - set dtoProduct.LadeVereisten = dtoLadeVereisten - set dtoProduct.LadeVereistenTeksten = oKenmerkOrgalux.GetLadeVereistenOmschrList() set dtoProduct.Afmetingen = ##class(DOM.PM.OL.Gamma.dto.Afmetingen).%New() @@ -81,5 +49,5 @@ ]]> - + Index: DOM/PM/Maatwerk/Calc/HF/impl/OLM/SpecOpMaatv001.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/PM/Maatwerk/Calc/HF/impl/OLM/SpecOpMaatv001.cls.xml (.../SpecOpMaatv001.cls.xml) (revision 903) +++ DOM/PM/Maatwerk/Calc/HF/impl/OLM/SpecOpMaatv001.cls.xml (.../SpecOpMaatv001.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + persistent 1 DOM.PM.Maatwerk.Calc.HF.HalffabSpec -62147,56060.172081 +62167,50674.403441 0 @@ -19,6 +19,16 @@ Quit ##super() ]]> + + +%Integer + + + + +%Library.CacheStorage + - + Index: DOM/PM/Maatwerk/Calc/Kost/impl/TBX/PlanPersen.cls.xml =================================================================== diff -u --- DOM/PM/Maatwerk/Calc/Kost/impl/TBX/PlanPersen.cls.xml (revision 0) +++ DOM/PM/Maatwerk/Calc/Kost/impl/TBX/PlanPersen.cls.xml (revision 946) @@ -0,0 +1,56 @@ + + + +persistent +1 +DOM.PM.Maatwerk.Calc.Kost.SamengesteldKostItemBuilder +62171,50605.082498 +0 + + +SamengesteldKostItemBuilder:DOM.PM.Maatwerk.Calc.Kost.SamengesteldKostItemBuilder +1 +1 +%Status + + + + +%Library.CacheStorage + + + + Index: DOM/OV/impl/DataM/DataMProductOrderlijn.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/OV/impl/DataM/DataMProductOrderlijn.cls.xml (.../DataMProductOrderlijn.cls.xml) (revision 903) +++ DOM/OV/impl/DataM/DataMProductOrderlijn.cls.xml (.../DataMProductOrderlijn.cls.xml) (revision 946) @@ -1,18 +1,18 @@ - + 1 DOM.OV.impl.DataM.DataMOrderlijn,DOM.OV.ProductOrderlijn -62158,38091.076128 +62168,56733.740222 0 -LijnNr:%Integer,LijnInfo:%String +Order:DOM.OV.Order,LijnNr:%Integer,LijnInfo:%String 1 1 %Status + +%Date + + + %String " _ ##class(DOM.OV.impl.DataM.DataMOrderlijn)%this.ToString() @@ -84,5 +90,5 @@ ]]> - + Index: DOM/PM/impl/DataM/DataMGroepClassificatie.cls.xml =================================================================== diff -u -r939 -r946 --- DOM/PM/impl/DataM/DataMGroepClassificatie.cls.xml (.../DataMGroepClassificatie.cls.xml) (revision 939) +++ DOM/PM/impl/DataM/DataMGroepClassificatie.cls.xml (.../DataMGroepClassificatie.cls.xml) (revision 946) @@ -1,9 +1,10 @@ - + 1 DOM.PM.Classificatie,%RegisteredObject 62160,40037.654054 +62165,31033.687996 0 @@ -88,5 +89,5 @@ ]]> - + Index: DOM/PM/Maatwerk/Calc/Kost/KostContext.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/PM/Maatwerk/Calc/Kost/KostContext.cls.xml (.../KostContext.cls.xml) (revision 903) +++ DOM/PM/Maatwerk/Calc/Kost/KostContext.cls.xml (.../KostContext.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + De kostcontext heeft referenties naar allerlei tabellen en dient als facade voor het gebruik van die tabellen. @@ -23,7 +23,7 @@ TECH.Error 1 %RegisteredObject -62152,47625.175899 +62172,39061.773861 0 @@ -89,13 +89,20 @@ Set KostenPlaatsWaardeInfo = "" If (..IsZoekOpTag) { + Set $ZTRAP = "GeenKostenPlaatsWaardeTag" Set KostenPlaatsWaardeInfo = ..KostenPlaatsWaardeTabel.GeefKostenPlaatsWaardeTag(KostenPlaats, ..BerekeningsSpecificatie.GeefBerekenTag()) + Set $ZTRAP = "" } Else { Set KostenPlaatsWaardeInfo = ..KostenPlaatsWaardeTabel.GeefKostenPlaatsWaardeDatum(KostenPlaats, ..BerekeningsSpecificatie.GeefBerekenDatum()) } Quit KostenPlaatsWaardeInfo + +GeenKostenPlaatsWaardeTag + Set $ZTRAP = "" + Set KostenPlaatsWaardeInfo = ..KostenPlaatsWaardeTabel.GeefKostenPlaatsWaardeDatum(KostenPlaats, ##class(TECH.DateTime).CurrentDate()) + Quit KostenPlaatsWaardeInfo ]]> @@ -172,5 +179,5 @@ ]]> - + Index: CSC_Opsplitsen_toelevering.prj.xml =================================================================== diff -u --- CSC_Opsplitsen_toelevering.prj.xml (revision 0) +++ CSC_Opsplitsen_toelevering.prj.xml (revision 946) @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: DOM/PM/Maatwerk/Calc/Kost/impl/TBX/BevatTiponEvaluator.cls.xml =================================================================== diff -u --- DOM/PM/Maatwerk/Calc/Kost/impl/TBX/BevatTiponEvaluator.cls.xml (revision 0) +++ DOM/PM/Maatwerk/Calc/Kost/impl/TBX/BevatTiponEvaluator.cls.xml (revision 946) @@ -0,0 +1,19 @@ + + + +1 +%RegisteredObject,DOM.PM.Maatwerk.Calc.Kost.IEvaluator +62171,50409.911238 +0 + + + + +HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,Context:DOM.PM.Maatwerk.Calc.Kost.KostContext,IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken +%Boolean + + + + + Index: CSC_Halux_Planningsoverzicht.prj.xml =================================================================== diff -u -r922 -r946 --- CSC_Halux_Planningsoverzicht.prj.xml (.../CSC_Halux_Planningsoverzicht.prj.xml) (revision 922) +++ CSC_Halux_Planningsoverzicht.prj.xml (.../CSC_Halux_Planningsoverzicht.prj.xml) (revision 946) @@ -1,29 +1,42 @@ - - + + + + - + + + + + + + + + + + + @@ -69,51 +82,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + Index: CHUI/Orgalux/PrintSelect.cls.xml =================================================================== diff -u -r902 -r946 --- CHUI/Orgalux/PrintSelect.cls.xml (.../PrintSelect.cls.xml) (revision 902) +++ CHUI/Orgalux/PrintSelect.cls.xml (.../PrintSelect.cls.xml) (revision 946) @@ -1,12 +1,12 @@ - + d OrgaluxPrintSelect^CHUI.Projects() %occInclude,%Prod.Product,APPS.PM.OL.Common,DOM.PM.OL,DOM.DomeinContext 1 %CHUI.TForm -62150,32751.36011 +62167,41042.012469 60290,55550.636499 0 @@ -386,7 +386,7 @@ } else { set Klant = $$$CRMGeefKlant(..ExportFilter.KlantNr) - set LandKlant = Klant.GeefLand() + set LandKlant = Klant.GeefAdres().GeefLandNr() if (LandKlant'=1019)&&(LandKlant'=1147) //&&(LandKlant'=1120) { set errMessage=errMessage_"Klant is niet afkomstig van Belgie of Nederland"_$$$CRLF } if ..pmTaal.Value = "K" { @@ -782,5 +782,5 @@ ]]> - + Index: vhUnitTest/APPS/Web/OLParticulier/Verlanglijst.cls.xml =================================================================== diff -u -r867 -r946 --- vhUnitTest/APPS/Web/OLParticulier/Verlanglijst.cls.xml (.../Verlanglijst.cls.xml) (revision 867) +++ vhUnitTest/APPS/Web/OLParticulier/Verlanglijst.cls.xml (.../Verlanglijst.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Oproepen via @@ -50,7 +50,7 @@ set sc = ##super() - do ##class(vhUnitTest.DOM.PM.OL.Gamma.TestData).%New().CreeerTestData() + do ##class(vhUnitTest.DOM.PM.TestData).%New().CreeerTestData() do ..BepaalVerlanglijstID() do ..VerwijderVerlanglijst() @@ -64,7 +64,7 @@ %Status @@ -228,5 +228,5 @@ ]]> - + Index: APPS/CRM/Interacties/dto/BehandeldOnderwerp/Actie.cls.xml =================================================================== diff -u -r734 -r946 --- APPS/CRM/Interacties/dto/BehandeldOnderwerp/Actie.cls.xml (.../Actie.cls.xml) (revision 734) +++ APPS/CRM/Interacties/dto/BehandeldOnderwerp/Actie.cls.xml (.../Actie.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject,%XML.Adaptor -61892,37569 +62172,39540.451393 61879,57172.720323 0 @@ -19,6 +19,10 @@ %String + +%String + + @@ -31,5 +35,5 @@ %String - + Index: DOM/LEV/impl/DataM/DataMToeleveringLijnFactory.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/LEV/impl/DataM/DataMToeleveringLijnFactory.cls.xml (.../DataMToeleveringLijnFactory.cls.xml) (revision 903) +++ DOM/LEV/impl/DataM/DataMToeleveringLijnFactory.cls.xml (.../DataMToeleveringLijnFactory.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject -62129,56977.484302 +62160,50695.455621 0 @@ -18,12 +18,11 @@ } ElseIf (Type = ##class(DOM.LEV.enu.ToeleveringLijnType).Tekst()) { - // Moet nog een specifieke implementatieklasse krijgen - Set ToeleveringLijn = ##class(DOM.LEV.impl.DataM.DataMToeleveringLijn).%New(LijnNummer, LijnInfo) + Set ToeleveringLijn = ##class(DOM.LEV.impl.DataM.DataMTekstToeleveringLijn).%New(LijnNummer, LijnInfo) } Quit ToeleveringLijn ]]> - + Index: DOM/OV/impl/DataM/DataMOrderlijnIterator.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/OV/impl/DataM/DataMOrderlijnIterator.cls.xml (.../DataMOrderlijnIterator.cls.xml) (revision 734) +++ DOM/OV/impl/DataM/DataMOrderlijnIterator.cls.xml (.../DataMOrderlijnIterator.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 TECH.Iterator,%RegisteredObject -62108,54327.923101 +62168,39288.775714 0 @@ -83,7 +83,7 @@ // Return the in-memory object if present if (obj '= "") { Quit obj } // Otherwise return a new object - Quit ##class(DOM.OV.impl.DataM.DataMOrderlijnFactory).Create(olijn, result) + Quit ##class(DOM.OV.impl.DataM.DataMOrderlijnFactory).Create(..Order,olijn, result) ]]> @@ -119,5 +119,5 @@ ]]> - + Index: TECH/Files.cls.xml =================================================================== diff -u -r748 -r946 --- TECH/Files.cls.xml (.../Files.cls.xml) (revision 748) +++ TECH/Files.cls.xml (.../Files.cls.xml) (revision 946) @@ -1,16 +1,28 @@ - + +vhLib.Macro 1 %RegisteredObject -62117,63482.297804 +62164,51244.217362 62118,40201.271394 0 %ListOfObjects + +1 +Directory:%String,Filename:%String + + + Directory:%String,FileMask:%String="*.*",AddSubDir:%Boolean=1,IncludeDirs:%Boolean=0 %ListOfObjects @@ -125,5 +137,5 @@ ]]> - + Index: zTryout/PRA/Concurrency/Tryouts/LockTryouts.cls.xml =================================================================== diff -u -r734 -r946 --- zTryout/PRA/Concurrency/Tryouts/LockTryouts.cls.xml (.../LockTryouts.cls.xml) (revision 734) +++ zTryout/PRA/Concurrency/Tryouts/LockTryouts.cls.xml (.../LockTryouts.cls.xml) (revision 946) @@ -1,12 +1,13 @@ - + Enkele aparte uitprobeersels rond locks op objecten. persistent TECH.ExcHandling +1 %Persistent -62109,58636.896742 +62136,28463.321491 62021,43720.532361 0 @@ -58,5 +59,5 @@ - + Index: zTryout/WV/PM/IK/TBXKenmBinnenlade.cls.xml =================================================================== diff -u --- zTryout/WV/PM/IK/TBXKenmBinnenlade.cls.xml (revision 0) +++ zTryout/WV/PM/IK/TBXKenmBinnenlade.cls.xml (revision 946) @@ -0,0 +1,23 @@ + + + +persistent +1 +zTryout.WV.PM.IK.TBXKenmerkenv01 +62167,51497.699682 +0 + + + + + + +%Library.CacheStorage + + + + Index: DOM/EC/OL/Winkelkar/Visitor/WinkelkarToOfferte.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/EC/OL/Winkelkar/Visitor/WinkelkarToOfferte.cls.xml (.../WinkelkarToOfferte.cls.xml) (revision 734) +++ DOM/EC/OL/Winkelkar/Visitor/WinkelkarToOfferte.cls.xml (.../WinkelkarToOfferte.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + -BL.EC.Common,BL.Derde.KlantSpecifiek,%VHMacro,%occStatus +BL.EC.Common,BL.Derde.KlantSpecifiek,%VHMacro,%occStatus,TECH.Error 1 WinkelkarVisitor -61998,43777.068214 +62171,48787.963771 0 @@ -72,13 +72,10 @@ 1 + +Hoofding:DOM.EC.OL.Winkelkar.Hoofding +1 +DOM.CRM.Klant + + + 1 - + Index: DOM/CRM/dto/Klant.cls.xml =================================================================== diff -u --- DOM/CRM/dto/Klant.cls.xml (revision 0) +++ DOM/CRM/dto/Klant.cls.xml (revision 946) @@ -0,0 +1,65 @@ + + + +1 +%RegisteredObject +62171,50493.684504 +0 + + +%Integer + + + +%String + + + +%String + + + +%String + + + +DOM.common.Adres + + + +%String + + + +%String + + + +%Integer + + + +%String + + + +%String + + + +%String + + + +%String + + + + + + + + Index: APPS/PM/dto/ZoekCriteria.cls.xml =================================================================== diff -u -r937 -r946 --- APPS/PM/dto/ZoekCriteria.cls.xml (.../ZoekCriteria.cls.xml) (revision 937) +++ APPS/PM/dto/ZoekCriteria.cls.xml (.../ZoekCriteria.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + 1 %RegisteredObject,%XML.Adaptor @@ -44,5 +44,5 @@ list - + Index: DOM/CRM/impl/DataM/DataMKlant.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/CRM/impl/DataM/DataMKlant.cls.xml (.../DataMKlant.cls.xml) (revision 903) +++ DOM/CRM/impl/DataM/DataMKlant.cls.xml (.../DataMKlant.cls.xml) (revision 946) @@ -1,68 +1,191 @@ - + +TECH.Error 1 -DOM.CRM.Klant,%RegisteredObject -62153,42652.849333 +DOM.CRM.impl.DataM.DataMKlantBase +62173,35998.059502 0 - -%String + +%Boolean +"0" 1 - -%Integer + +%Boolean 1 + +%Boolean +1 + + + +%Boolean +1 + + + +%Boolean +1 + + + +%Boolean +1 + + + +%Boolean +1 + + KlantNummer:%Integer %Status - -%Integer - +%Status + - + +%Status + + + + + + + + + + + + + + + + +1 %String - - + +1 %String - - + +1 %String - - + +1 %String - - + +1 +%String + + +1 +%String + + - + Index: DOM/LEV/impl/DataM/DataMLeverancierToeleveringIt.cls.xml =================================================================== diff -u --- DOM/LEV/impl/DataM/DataMLeverancierToeleveringIt.cls.xml (revision 0) +++ DOM/LEV/impl/DataM/DataMLeverancierToeleveringIt.cls.xml (revision 946) @@ -0,0 +1,59 @@ + + + +1 +%RegisteredObject,TECH.Iterator +62166,55599.107681 +0 + + +%Integer +1 + + + +%Integer +1 + + + +LeverancierNummer:%Integer +1 +1 +%Status + + + + + +Returns true if the iteration has more elements. +%Boolean + + + + + +Returns the next element in the iteration. +Only returns a valid element if HasNext() returns true +Causes an error if HasNext() returns false +%CacheString + + + + +1 + + + + + Index: DOM/OV/ProductOrderlijn.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/OV/ProductOrderlijn.cls.xml (.../ProductOrderlijn.cls.xml) (revision 903) +++ DOM/OV/ProductOrderlijn.cls.xml (.../ProductOrderlijn.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 DOM.OV.Orderlijn -62157,72259.344739 +62168,56724.186527 0 @@ -36,6 +36,11 @@ %Float + +1 +%Date + + 1 %Float @@ -67,5 +72,5 @@ - + Index: DOM/PM/TBXProduct/TBXRug.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/PM/TBXProduct/TBXRug.cls.xml (.../TBXRug.cls.xml) (revision 903) +++ DOM/PM/TBXProduct/TBXRug.cls.xml (.../TBXRug.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 DOM.PM.Product -62127,66160.363655 +62168,41418.854546 0 @@ -16,6 +16,14 @@ DOM.PM.enu.TBXLadehoogte + +%Float + + + +%Float + + %List @@ -25,5 +33,5 @@ %String - + Index: PRA_LeveringsTermijn.prj.xml =================================================================== diff -u --- PRA_LeveringsTermijn.prj.xml (revision 0) +++ PRA_LeveringsTermijn.prj.xml (revision 946) @@ -0,0 +1,11 @@ + + + + + + + + + + + Index: vhUnitTest/DOM/LEV/TestToelevering.cls.xml =================================================================== diff -u -r915 -r946 --- vhUnitTest/DOM/LEV/TestToelevering.cls.xml (.../TestToelevering.cls.xml) (revision 915) +++ vhUnitTest/DOM/LEV/TestToelevering.cls.xml (.../TestToelevering.cls.xml) (revision 946) @@ -1,23 +1,33 @@ - + do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","DOM.LEV.TestToelevering") 1 vhUnitTest.TestCase -62144,37807.79331 +62168,59334.126581 0 %Status @@ -28,10 +38,10 @@ Do $$$AssertTrue(ToeleveringAPI.%Extends("DOM.LEV.ToeleveringAPI"),"Het object is van het juiste type") - Set Toelevering = ToeleveringAPI.GeefToelevering(298006) + Set Toelevering = ToeleveringAPI.GeefToelevering(298104) Do $$$AssertTrue(Toelevering.%Extends("DOM.LEV.Toelevering"),"De toelevering is van het juiste type") - Do $$$AssertEquals(Toelevering.GeefDueOutTime(),"62151,43200","De due out time") + Do $$$AssertEquals(Toelevering.GeefDueOutTime(),"62168,43200","De due out time") Set Iterator = Toelevering.GeefToeleveringLijnIterator() @@ -41,7 +51,8 @@ Do $$$AssertTrue(ProductLijn.%Extends("DOM.LEV.ProductToeleveringLijn"),"De huidige lijn is een productlijn") Do $$$AssertTrue(ProductLijn.GeefProduct().%Extends("DOM.PM.Product"),"Het product is van het juiste type") - Do $$$AssertEquals(ProductLijn.GeefAantal(),250,"250 bestelde items") + Do $$$AssertEquals(ProductLijn.GeefAantal(),1,"250 bestelde items") + Do $$$AssertEquals(ProductLijn.GeefLeverdag(),62166,"Voorziene leverdag") Do $$$AssertTrue(Iterator.HasNext(),"De iterator heeft een volgende lijn") Set ProductLijn = Iterator.Next() @@ -58,7 +69,7 @@ Do $$$AssertTrue(ProductLijn.%Extends("DOM.LEV.ProductToeleveringLijn"),"De huidige lijn is een productlijn") Do $$$AssertTrue(ProductLijn.GeefProduct().%Extends("DOM.PM.Product"),"Het product is van het juiste type") - Do $$$AssertEquals(ProductLijn.GeefAantal(),250,"250 bestelde items") + Do $$$AssertEquals(ProductLijn.GeefAantal(),1,"1 bestelde item") Do $$$AssertTrue(Iterator.HasNext(),"De iterator heeft een volgende lijn") Set ProductLijn = Iterator.Next() @@ -70,8 +81,24 @@ Set Iterator = Toelevering.GeefTypeToeleveringLijnIterator(##class(DOM.LEV.enu.ToeleveringLijnType).Tekst()) Do $$$AssertFalse(Iterator.HasNext(),"De iterator heeft geen volgende lijn") + + Set Order = Toelevering.GeefOrder() + Do $$$AssertTrue($IsObject(Order),"Het bijhorende order werd gevonden") + + Set ToeleveringLijn = Toelevering.GeefToeleveringLijn(101) + Do $$$AssertTrue($IsObject(ToeleveringLijn),"De toeleveringlijn werd gevonden") + Do $$$AssertTrue($IsObject(ToeleveringLijn.GeefOrderlijn()),"De bijhorende orderlijn werd gevonden") ]]> + + + + - + Index: DOM/PR/BouwStenen/Product.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/PR/BouwStenen/Product.cls.xml (.../Product.cls.xml) (revision 903) +++ DOM/PR/BouwStenen/Product.cls.xml (.../Product.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Verplaatsen naar DOM.PM.impl.Bouwstenen.ProductMetBouwstenen. @@ -68,5 +68,5 @@ - + Index: TECH/ClassInfo/FormalSpecParser.cls.xml =================================================================== diff -u -r924 -r946 --- TECH/ClassInfo/FormalSpecParser.cls.xml (.../FormalSpecParser.cls.xml) (revision 924) +++ TECH/ClassInfo/FormalSpecParser.cls.xml (.../FormalSpecParser.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject -62158,55955.164293 +62164,32435.997622 0 @@ -60,14 +60,15 @@ Set Part = "" Set AantalOpenBrackets = 0 Set AantalQuotes = 0 - While (..Position <= $Length(..FormalSpec)) && ((AantalOpenBrackets > 0) || (AantalQuotes#2 = 1) || ((..GeefChar() '= "=") && (..GeefChar() '= ",") && (..GeefChar() '= ":"))) + Set Char = ..GeefChar() + While (..Position <= $Length(..FormalSpec)) && ((AantalOpenBrackets > 0) || (AantalQuotes#2 = 1) || ((Char '= "=") && (Char '= ",") && (Char '= ":"))) { - Set Char = ..GeefChar() - Set Part = Part _ ..GeefChar() + Set Part = Part _ Char Set ..Position = ..Position + 1 Set AantalOpenBrackets = AantalOpenBrackets + (Char = "(") - (Char = ")") Set AantalQuotes = AantalQuotes + (Char = """") + Set Char = ..GeefChar() } Quit Part ]]> @@ -76,9 +77,9 @@ 1 %String - - + Index: zTryout/PRA/Concurrency/BankRekening.cls.xml =================================================================== diff -u -r734 -r946 --- zTryout/PRA/Concurrency/BankRekening.cls.xml (.../BankRekening.cls.xml) (revision 734) +++ zTryout/PRA/Concurrency/BankRekening.cls.xml (.../BankRekening.cls.xml) (revision 946) @@ -1,14 +1,15 @@ - + Dit is een voorbeeld persistent object. Het kan als object, maar ook via SQL werken. persistent TECH.ExcHandling TECH.Error +1 TECH.Concurrency.VhPersistent -62111,50089.417594 +62136,28517.373684 62004,58141.437349 0 @@ -137,5 +138,5 @@ - + Index: WV_FOP_Proxy.prj.xml =================================================================== diff -u --- WV_FOP_Proxy.prj.xml (revision 0) +++ WV_FOP_Proxy.prj.xml (revision 946) @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: TECH/Concurrency/DbUtils.cls.xml =================================================================== diff -u -r924 -r946 --- TECH/Concurrency/DbUtils.cls.xml (.../DbUtils.cls.xml) (revision 924) +++ TECH/Concurrency/DbUtils.cls.xml (.../DbUtils.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Utility methods voor open en save van objecten. @@ -8,7 +8,7 @@ TECH.Error 1 %RegisteredObject -62140,41880.692646 +62171,46545.583309 62007,44253.966022 0 @@ -60,6 +60,7 @@ } Set Object.InstanceVersion = Object.InstanceVersion + 1 } + Quit $$$OK ]]> @@ -70,7 +71,9 @@ %Status - + Index: vhUnitTest/APPS/PM/OrderData.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/PM/OrderData.cls.xml (revision 0) +++ vhUnitTest/APPS/PM/OrderData.cls.xml (revision 946) @@ -0,0 +1,58 @@ + + + +1 +%RegisteredObject +62167,53331.454383 +0 + + +1 + + + + +1 + + + + + FishEye: Tag 946 refers to a dead (removed) revision in file `vhUnitTest/APPS/PM/Maatwerk/UTKenmUpgradeWrapperv02v03.cls.xml'. FishEye: No comparison available. Pass `N' to diff? Index: DOM/OV/impl/DataM/DataMAbstractLijnIterator.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/OV/impl/DataM/DataMAbstractLijnIterator.cls.xml (.../DataMAbstractLijnIterator.cls.xml) (revision 903) +++ DOM/OV/impl/DataM/DataMAbstractLijnIterator.cls.xml (.../DataMAbstractLijnIterator.cls.xml) (revision 946) @@ -1,18 +1,20 @@ - + 1 DOM.common.DataM.DataMAbstractLijnIterator -62129,49594.873719 +62168,39483.019115 0 + +JCL : zou handig zijn als er hier als eerste parameter een abstract document zou kunnen meegegeven worden. LijnNummer:%String,LijnData:%String 1 %RegisteredObject - - + Index: DOM/PM/Maatwerk/Calc/HF/impl/TBX/SpecAntaroHFv001.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PM/Maatwerk/Calc/HF/impl/TBX/SpecAntaroHFv001.cls.xml (.../SpecAntaroHFv001.cls.xml) (revision 734) +++ DOM/PM/Maatwerk/Calc/HF/impl/TBX/SpecAntaroHFv001.cls.xml (.../SpecAntaroHFv001.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + persistent 1 DOM.PM.Maatwerk.Calc.HF.HalffabSpec -62115,35631.41937 +62167,50640.861977 0 @@ -20,9 +20,15 @@ ]]> + +%Integer + + + %Library.CacheStorage - + Index: DOM/PM/Maatwerk/Calc/Kost/ExtraKostItemBuilder.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/PM/Maatwerk/Calc/Kost/ExtraKostItemBuilder.cls.xml (.../ExtraKostItemBuilder.cls.xml) (revision 903) +++ DOM/PM/Maatwerk/Calc/Kost/ExtraKostItemBuilder.cls.xml (.../ExtraKostItemBuilder.cls.xml) (revision 946) @@ -1,12 +1,12 @@ - + Eventuele supplementen en kostfactoren die niet in de rest passen. persistent 1 IKostItemBuilder -62150,35676.074463 +62171,48817.125643 62070,52454.114465 0 @@ -37,7 +37,7 @@ -Context:KostContext,HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom +Context:KostContext,HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken DOM.PM.Maatwerk.Calc.Kost.KostItem @@ -55,5 +55,5 @@ - + Index: APPS/PM/DataMProductToelevLijnIterator.cls.xml =================================================================== diff -u --- APPS/PM/DataMProductToelevLijnIterator.cls.xml (revision 0) +++ APPS/PM/DataMProductToelevLijnIterator.cls.xml (revision 946) @@ -0,0 +1,103 @@ + + + +1 +TECH.Iterator,%RegisteredObject +62168,58334.596269 +0 + + +%Integer +1 + + + +%String +1 + + + +%String +1 + + + +ProductNr:%Integer +1 +1 +%Status + + + + +HuidigeIndex:%Integer +1 +%String + + + + +Index:%String +1 +%Integer + + + + +%Boolean + + + + +%CacheString + + + + +Lijn:%String +%Boolean + + + + +HuidigeIndex:%Integer +1 + + + + + Index: zTryout/JCL/Error.cls.xml =================================================================== diff -u --- zTryout/JCL/Error.cls.xml (revision 0) +++ zTryout/JCL/Error.cls.xml (revision 946) @@ -0,0 +1,74 @@ + + + +1 +%RegisteredObject,TECH.Error.ErrorAdaptor +62158,58360.386414 +0 + + + +do ##class(vhUnitTest.Manager).RunTest("/Display=all","TECH.Error") +%Boolean +1 + + + + + + + + + + + + + + + + + + + + + + + +Label,Options + + + + + Index: vhUnitTest/DOM/CRM/TestMaakKlant.cls.xml =================================================================== diff -u --- vhUnitTest/DOM/CRM/TestMaakKlant.cls.xml (revision 0) +++ vhUnitTest/DOM/CRM/TestMaakKlant.cls.xml (revision 946) @@ -0,0 +1,65 @@ + + + +1 +vhUnitTest.TestCase +62168,55606.563208 +0 + + + + do ##class(vhUnitTest.Manager).RunTest("/Display=all","DOM.CRM.TestMaakKlant") + + + + +%Status + + + + + Index: DOM/HR/Protime/Werknemer.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/HR/Protime/Werknemer.cls.xml (.../Werknemer.cls.xml) (revision 903) +++ DOM/HR/Protime/Werknemer.cls.xml (.../Werknemer.cls.xml) (revision 946) @@ -1,13 +1,13 @@ - + persistent vhLib.Macro 1 Werknemers MySQLStorage %Library.Persistent -62137,31992.580408 +62172,40003.420733 61699,60987.846246 0 @@ -127,16 +127,34 @@ if $$$Not($length($$$Trim(..NrSocSec))) { set resList = resList _ $listbuild("Nr Sociaal Secretariaat is niet ingevuld") - } - + } quit resList ]]> + +DOM.CRM.dto.Klant + + + %CacheSQLStorage ^DOM.HR.Protime.WerknemerS - + Index: DOM/LEV/impl/DataM/DataMToeleveringAPI.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/LEV/impl/DataM/DataMToeleveringAPI.cls.xml (.../DataMToeleveringAPI.cls.xml) (revision 903) +++ DOM/LEV/impl/DataM/DataMToeleveringAPI.cls.xml (.../DataMToeleveringAPI.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject,DOM.LEV.ToeleveringAPI -62129,56283.770546 +62166,30417.380907 0 @@ -12,6 +12,13 @@ + + +LeverancierNummer:%Integer +TECH.Iterator + + - + Index: zTryout/PRA/Concurrency/VirtueelBankLoketViaObjecten.cls.xml =================================================================== diff -u -r734 -r946 --- zTryout/PRA/Concurrency/VirtueelBankLoketViaObjecten.cls.xml (.../VirtueelBankLoketViaObjecten.cls.xml) (revision 734) +++ zTryout/PRA/Concurrency/VirtueelBankLoketViaObjecten.cls.xml (.../VirtueelBankLoketViaObjecten.cls.xml) (revision 946) @@ -1,12 +1,13 @@ - + Dit stelt een applicatie-level klasse voor. TECH.ExcHandling,zTryout.PRA TECH.Error +1 %RegisteredObject -62116,29492.145873 +62136,28559.847959 62045,47449.539827 0 @@ -268,5 +269,5 @@ ]]> - + Index: DOM/LEV/ProductToeleveringLijn.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/LEV/ProductToeleveringLijn.cls.xml (.../ProductToeleveringLijn.cls.xml) (revision 903) +++ DOM/LEV/ProductToeleveringLijn.cls.xml (.../ProductToeleveringLijn.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + 1 1 -DOM.LEV.Toelevering -62129,55746.332016 +DOM.LEV.ToeleveringLijn +62168,59681.792958 0 @@ -16,6 +16,11 @@ 1 %Integer + + +1 +%Date + - + Index: APPS/Halux/Planning/impl/EventCatcher.cls.xml =================================================================== diff -u -r917 -r946 --- APPS/Halux/Planning/impl/EventCatcher.cls.xml (.../EventCatcher.cls.xml) (revision 917) +++ APPS/Halux/Planning/impl/EventCatcher.cls.xml (.../EventCatcher.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject -62144,46799.409645 +62172,55140.1952 0 @@ -25,7 +25,6 @@ Event:TECH.Events.ToeleveringCreatedEvent Event:TECH.Events.ToeleveringModifiedEvent @@ -71,11 +71,10 @@ Event:TECH.Events.ToeleveringDeletedEvent - + FishEye: Tag 946 refers to a dead (removed) revision in file `vhUnitTest/APPS/PM/Maatwerk/TestIngegevenKenmConverter.cls.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 803 refers to a dead (removed) revision in file `zTryout/JCL/Validation/Webserver.cls.xml'. FishEye: No comparison available. Pass `N' to diff? Index: vhUnitTest/APPS/PM/Maatwerk/impl/upg/UTKenmerkenv02v03Upgrader.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/PM/Maatwerk/impl/upg/UTKenmerkenv02v03Upgrader.cls.xml (revision 0) +++ vhUnitTest/APPS/PM/Maatwerk/impl/upg/UTKenmerkenv02v03Upgrader.cls.xml (revision 946) @@ -0,0 +1,30 @@ + + + +1 +APPS.PM.Maatwerk.IngegevenKenmUpgrader +62160,52807.839799 +0 + + +1 +%Integer + + + + + +De Default conversiestijl is UpgradeViaCopy. +Alternatief kan je deze overriden om UpgradeViaInherit() of UpgradeViaWrapper() te implementeren +1 +Kenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken +DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken + + + + + Index: APPS/common/GUI/impl/DataGrid.cls.xml =================================================================== diff -u --- APPS/common/GUI/impl/DataGrid.cls.xml (revision 0) +++ APPS/common/GUI/impl/DataGrid.cls.xml (revision 946) @@ -0,0 +1,85 @@ + + + +persistent +1 +%Persistent +62166,57781.00547 +0 + + +%String +1 + + + +%String +1 + + + +%String +1 + + + +APPS.common.GUI.impl.KolomInfo +list +1 + + + +1 +1 +ApplicatieNaam,DataGridNaam,Gebruiker +1 + + + +ApplicatieNaam:%String,DataGridNaam:%String,Gebruiker:%String +1 +1 +%Status + + + + + +KolomInfo is een lijst van KolomInfo objecten +KolomInfo:%ListOfObjects + + + + +APPS.common.GUI.impl.KolomInfo + + + + +%Library.CacheStorage +^APPS.common.GUI.impl.DataGridD +DataGridDefaultData +^APPS.common.GUI.impl.DataGridD +^APPS.common.GUI.impl.DataGridI +^APPS.common.GUI.impl.DataGridS + +listnode + + +%%CLASSNAME + + +KolomInfo + + + + + + Index: vhUnitTest/APPS/PM/Maatwerk/impl/upg/UTKenmUpgradeWrapperv02v03.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/PM/Maatwerk/impl/upg/UTKenmUpgradeWrapperv02v03.cls.xml (revision 0) +++ vhUnitTest/APPS/PM/Maatwerk/impl/upg/UTKenmUpgradeWrapperv02v03.cls.xml (revision 946) @@ -0,0 +1,66 @@ + + + + +Deze wrapper doet zich in alles voor als TBXKenmerkenV02. + +Wanneer de waarde van een kenmerk (property) wordt opgevraagd, kijkt +de wrapper of het kenmerk al een waarde heeft in het basisobject van +klasse TBXKenmerkenV2. Indien dit het geval is, wordt deze waarde +teruggegeven. Indien dit niet het geval is, wordt de waarde berekend +uit een of meerdere kenmerken van het gewrapte object van klasse +TBXKenmerkenV1, en opgeslagen in het basisobject. De volgende keer +dat de waarde wordt gevraagd kan deze meteen gegeven worden vermits +ze al eens berekend is. Op deze manier wordt on the fly een +conversie gedaan. + +Een wrapper-object kan niet gesaved worden ! +persistent +1 +vhUnitTest.APPS.PM.Maatwerk.impl.UTKenmerkenv03 +62164,34695.518023 +62153,33910.500773 +0 + + +vhUnitTest.APPS.PM.Maatwerk.impl.UTKenmerkenv02 +1 + + + +Kenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken +1 +1 +%Status + + + + +insert:%Boolean +1 +%Status + + + + +%String + + + + +%String + + + + +%Library.CacheStorage + + + + Index: zTryout/WV/PM/IK/TBXKenmIntivo.cls.xml =================================================================== diff -u --- zTryout/WV/PM/IK/TBXKenmIntivo.cls.xml (revision 0) +++ zTryout/WV/PM/IK/TBXKenmIntivo.cls.xml (revision 946) @@ -0,0 +1,40 @@ + + + +persistent +1 +zTryout.WV.PM.IK.TBXKenmerkenv01 +62167,51503.140443 +0 + + + + + + +%Library.CacheStorage + + + + Index: APPS/Halux/Planning/impl/ResourceGebruikCalculator.cls.xml =================================================================== diff -u -r917 -r946 --- APPS/Halux/Planning/impl/ResourceGebruikCalculator.cls.xml (.../ResourceGebruikCalculator.cls.xml) (revision 917) +++ APPS/Halux/Planning/impl/ResourceGebruikCalculator.cls.xml (.../ResourceGebruikCalculator.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject -62144,39189.203146 +62173,27881.765969 0 @@ -32,11 +32,9 @@ While (ToeleveringLijnIterator.HasNext()) { Set ProductToeleveringsLijn = ToeleveringLijnIterator.Next() - Set ResourceGebruik = ##class(APPS.Halux.Planning.impl.ResourceGebruik).%New() - Set ResourceGebruikDataFactory = ##class(APPS.Halux.Planning.impl.ResourceGebruikDataMap).%New(ResourceGebruik) + + Set ResourceGebruik = ..BepaalResourceGebruikProduct(ProductToeleveringsLijn.GeefProduct()) - Do ..BepaalResourceGebruikProduct(ProductToeleveringsLijn.GeefProduct(), ResourceGebruikDataFactory) - Set PlanningDataItem = ##class(APPS.Halux.Planning.impl.PlanningDataItem).%New() Set PlanningDataItem.ALUFrees = ProductToeleveringsLijn.GeefAantal() * ResourceGebruik.ALUFrees.Hoeveelheid @@ -55,7 +53,11 @@ Set PlanningDataItem.Categorie = ##class(APPS.Halux.Planning.enu.Categorie).TBXLadeStd1() Set PlanningDataItem.ToeleveringsNummer = ..Toelevering.GeefToeNr() Set PlanningDataItem.ToeleveringsLijn = ProductToeleveringsLijn.GeefLijnNr() - Set PlanningDataItem.DueOut = $zdt(..Toelevering.GeefDueOutTime(),3) + If (..Toelevering.GeefDueOutTime() '= "") + { + Set PlanningDataItem.DueOut = $zdt(..Toelevering.GeefDueOutTime(),3) + } + If (PlanningDatum = "") { Set PlanningDataItem.Gepland = PlanningDataItem.DueOut @@ -67,14 +69,19 @@ Set Order = ..Toelevering.GeefOrder() + If ($IsObject(Order)) + { + Set PlanningDataItem.IsASAP = Order.IsASAP() + Set PlanningDataItem.IngegevenDoor = Order.GeefIngegevenDoor() + Set PlanningDataItem.Klant = Order.GeefKlant().GeefNaam() + } + Else + { + Set PlanningDataItem.IsASAP = 0 + Set PlanningDataItem.IngegevenDoor = "" + Set PlanningDataItem.Klant = "Stock" + } - Set PlanningDataItem.IsASAP = Order.IsASAP() - Set PlanningDataItem.IngegevenDoor = Order.GeefIngegevenDoor() - - Set Klant = Order.GeefKlant() - - Set PlanningDataItem.Klant = Klant.GeefNaam() - Do PlanningDataItems.Insert(PlanningDataItem) } @@ -83,24 +90,24 @@ -Product:DOM.PM.Product,ResourceGebruikDataFactory:APPS.Halux.Planning.impl.IResourceGebruikDataFactory +Product:DOM.PM.Product 1 +APPS.Halux.Planning.impl.ResourceGebruik - + Index: vhUnitTest/APPS/PM/DataMProductOrderLijnIterator.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/PM/DataMProductOrderLijnIterator.cls.xml (revision 0) +++ vhUnitTest/APPS/PM/DataMProductOrderLijnIterator.cls.xml (revision 946) @@ -0,0 +1,68 @@ + + + +1 +vhUnitTest.TestCase +62167,64517.08347 +0 + + + +d ##class(vhUnitTest.Manager).RunTest(,"APPS.PM.DataMProduct") +%Status + + + + +%Status + + + + + + + + + + + + + Index: vhUnitTest/APPS/PM/Maatwerk/TestIngegevenKenmUpgradeV.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/PM/Maatwerk/TestIngegevenKenmUpgradeV.cls.xml (revision 0) +++ vhUnitTest/APPS/PM/Maatwerk/TestIngegevenKenmUpgradeV.cls.xml (revision 946) @@ -0,0 +1,190 @@ + + + + +Oproepen via + do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.PM.Maatwerk.TestIngegevenKenmUpgradeV") +1 +vhUnitTest.TestCase,TECH.Error.ErrorAdaptor +62161,40353.895942 +0 + + +%String + + + + VersieNr is 0 + Set UTKenmVersie02=##class(DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken).%New() + Do ##class(APPS.PM.Maatwerk.IngegevenKenmUpgrade).AnalyseerKenmerkenClassName(UTKenmVersie02, .PackageName, .BaseName, .InputVersieNr, .VersiePrefix) + + Do $$$AssertEquals(PackageName,"DOM.PM.Maatwerk.Calc.Common.impl","De PackageName is correct") + Do $$$AssertEquals(BaseName,"TBXKenmerken","De BaseName is correct") + Do $$$AssertEquals(InputVersieNr,0,"InputVersieNr is correct") + Do $$$AssertEquals(VersiePrefix,"v","VersiePrefix is correct") +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Label,Options + + + + +ErrorMsg:%String + + + + + Index: DOM/PM/Maatwerk/Calc/Kost/HalffabKostItemBuilder.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PM/Maatwerk/Calc/Kost/HalffabKostItemBuilder.cls.xml (.../HalffabKostItemBuilder.cls.xml) (revision 734) +++ DOM/PM/Maatwerk/Calc/Kost/HalffabKostItemBuilder.cls.xml (.../HalffabKostItemBuilder.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Overloopt alle HF uit de geselecteerde halffabrikaten en voert er @@ -17,7 +17,7 @@ persistent 1 DOM.PM.Maatwerk.Calc.Kost.IKostItemBuilder,DOM.PM.Maatwerk.Calc.HF.HalffabItemVisitor -62115,57195.512325 +62172,32661.707064 62070,52454.170023 0 @@ -59,20 +59,23 @@ Loopt de items van de HalffabItemsBoom af en maakt voor ieder HalffabItem een KostItem aan. Resultaat is een samengesteld KostItem, dat dezelfde Boom-structuur heeft als de HalffabItems (builders). -Context:DOM.PM.Maatwerk.Calc.Kost.KostContext,HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom +Context:DOM.PM.Maatwerk.Calc.Kost.KostContext,HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken DOM.PM.Maatwerk.Calc.Kost.KostItem @@ -176,5 +179,5 @@ - + Index: DOM/CRM/Interacties/MetadataActie.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/CRM/Interacties/MetadataActie.cls.xml (.../MetadataActie.cls.xml) (revision 734) +++ DOM/CRM/Interacties/MetadataActie.cls.xml (.../MetadataActie.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + persistent 1 %Persistent -61901,41073.175187 +62172,39391.908616 61879,57172.720323 0 @@ -26,6 +26,10 @@ %String + +%String + + @@ -64,5 +68,5 @@ - + Index: DOM/PM/impl/DataM/DataMSubgroepClassificatie.cls.xml =================================================================== diff -u -r937 -r946 --- DOM/PM/impl/DataM/DataMSubgroepClassificatie.cls.xml (.../DataMSubgroepClassificatie.cls.xml) (revision 937) +++ DOM/PM/impl/DataM/DataMSubgroepClassificatie.cls.xml (.../DataMSubgroepClassificatie.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + 1 DOM.PM.Classificatie,%RegisteredObject @@ -74,5 +74,5 @@ ]]> - + Index: vhUnitTest/DOM/LEV/TestToeleveringAPI.cls.xml =================================================================== diff -u --- vhUnitTest/DOM/LEV/TestToeleveringAPI.cls.xml (revision 0) +++ vhUnitTest/DOM/LEV/TestToeleveringAPI.cls.xml (revision 946) @@ -0,0 +1,23 @@ + + + + +do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","DOM.LEV.TestToeleveringAPI") +1 +vhUnitTest.TestCase +62166,30336.953462 +0 + + + + + + + Index: zTryout/JBL/TestPers1.cls.xml =================================================================== diff -u --- zTryout/JBL/TestPers1.cls.xml (revision 0) +++ zTryout/JBL/TestPers1.cls.xml (revision 946) @@ -0,0 +1,15 @@ + + + +persistent +1 +%Persistent +62166,38777.321921 +0 + + +%String + + + + Index: vhUnitTest/DOM/PM/OL/Gamma/OPGZoekProductInhoud.cls.xml =================================================================== diff -u -r915 -r946 --- vhUnitTest/DOM/PM/OL/Gamma/OPGZoekProductInhoud.cls.xml (.../OPGZoekProductInhoud.cls.xml) (revision 915) +++ vhUnitTest/DOM/PM/OL/Gamma/OPGZoekProductInhoud.cls.xml (.../OPGZoekProductInhoud.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Oproepen via @@ -37,7 +37,7 @@ Test voor OrgaluxProductGamma http://www.pivotaltracker.com/projects/72006?story_id=5088499 - + Index: vhUnitTest/DOM/PM/Maatwerk/HF/TBX/DataSetTBXAntaro.cls.xml =================================================================== diff -u --- vhUnitTest/DOM/PM/Maatwerk/HF/TBX/DataSetTBXAntaro.cls.xml (revision 0) +++ vhUnitTest/DOM/PM/Maatwerk/HF/TBX/DataSetTBXAntaro.cls.xml (revision 946) @@ -0,0 +1,24 @@ + + + +1 +%RegisteredObject +62165,55355.198917 +0 + + +1 + + + + + Index: DOM/OV/impl/DataM/DataMOrderlijnFactory.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/OV/impl/DataM/DataMOrderlijnFactory.cls.xml (.../DataMOrderlijnFactory.cls.xml) (revision 734) +++ DOM/OV/impl/DataM/DataMOrderlijnFactory.cls.xml (.../DataMOrderlijnFactory.cls.xml) (revision 946) @@ -1,33 +1,33 @@ - + 1 %RegisteredObject -62108,54297.150388 +62168,39295.810138 0 1 -OLijn:%Integer,LijnInfo:%String +Order:DOM.OV.Order="",LijnNr:%Integer,LijnInfo:%String DOM.OV.Orderlijn - + Index: vhUnitTest/DOM/PM/OL/Gamma/GetZoektermen.cls.xml =================================================================== diff -u -r734 -r946 --- vhUnitTest/DOM/PM/OL/Gamma/GetZoektermen.cls.xml (.../GetZoektermen.cls.xml) (revision 734) +++ vhUnitTest/DOM/PM/OL/Gamma/GetZoektermen.cls.xml (.../GetZoektermen.cls.xml) (revision 946) @@ -1,18 +1,37 @@ - + do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","DOM.PM.OL.Gamma.GetZoektermen") +BL.Derde.KlantSpecifiek 1 vhUnitTest.TestCase -62060,47114.201315 +62161,39918.738758 0 - + +1 + + + 0,"Er zijn meer dan 0 zoektermen aanwezig") + #define TestInfo "DOM.PM.OL.Gamma","GetZoektermen" + + set objTestData = ##class(vhUnitTest.DOM.PM.TestData).%New() + + do objTestData.CreeerTestData() + do $$$AssertEquals($data(^KPR(1001,0)),1,"Producten aangemaakt") + + Set OPG = ##class(DOM.PM.OL.Gamma.impl.OrgaluxProductGamma).%New(..GetContext()) + Set Zoektermen = OPG.GetZoektermen() + + set File = $$$UnitTestUtils.LoadFile($$$TestInfo) + do Zoektermen.XMLExportToStream(.strXML,"","literal,indent") + + if ..#CanCreateFiles { set sc=$$$UnitTestUtils.CreateNewTestFile(strXML,$$$TestInfo) } + + do $$$AssertEquals($$$UnitTestUtils.CheckSum(strXML),$$$UnitTestUtils.CheckSum(File),"Compare resultaat met ref GetZoektermen") + Set Iterator = ##class(TECH.ListIterator).%New(Zoektermen.GekendeZoektermen) If (Iterator.HasNext()) { @@ -24,20 +43,30 @@ } } Do $$$AssertTrue(IsGesorteerd,"De lijst is gesorteerd") + + do objTestData.VerwijderTestData() + do $$$AssertEquals($data(^KPR(1001,0)),0,"Producten verwijderd") + + set blnMetaDefOpgekuisd = objTestData.IsMetaDefMooiOpgekuisd() + do $$$AssertEquals(blnMetaDefOpgekuisd,1,"Sorteringswaarde opgekuisd in metadefs") ]]> - -WS.Web.OLParticulier.dto.Sessie + +1 +DOM.PM.OL.Gamma.Context - + Index: DOM/PM/Maatwerk/Calc/Kost/AantalStuksMultiplier.cls.xml =================================================================== diff -u --- DOM/PM/Maatwerk/Calc/Kost/AantalStuksMultiplier.cls.xml (revision 0) +++ DOM/PM/Maatwerk/Calc/Kost/AantalStuksMultiplier.cls.xml (revision 946) @@ -0,0 +1,44 @@ + + + +1 +%RegisteredObject,DOM.PM.Maatwerk.Calc.Kost.IMultiplier +62172,59045.62739 +0 + + +%String +1 + + + +RolID:%String +1 +1 +%Status + + + + + + +Context:DOM.PM.Maatwerk.Calc.Kost.KostContext,HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom +%Float + + + + + Index: APPS/HR/ProTime/Facade.cls.xml =================================================================== diff -u --- APPS/HR/ProTime/Facade.cls.xml (revision 0) +++ APPS/HR/ProTime/Facade.cls.xml (revision 946) @@ -0,0 +1,134 @@ + + + +%VHMacro +1 +%RegisteredObject +62172,57065.218936 +0 + + +%SQLGatewayConnection + + + +%String +ZI + + + +%String +ZJ + + + +%String +Interim + + + +1 +1 +%Status + + + + +1 +%ListOfDataTypes + + + + +%ListOfObjects + + + + + +Werknemers vanuit ProTime synchroniseren als Klant +Als er nieuwe werknemers zijn, deze toevoegen als klant. +Als er gegevens gewijzigd zijn, de bestaande gegevens van de klant aanpassen. +%Status + + + + + Index: vhUnitTest/DOM/PM/Maatwerk/Kost/TestBewerkingsCalculator.cls.xml =================================================================== diff -u -r734 -r946 --- vhUnitTest/DOM/PM/Maatwerk/Kost/TestBewerkingsCalculator.cls.xml (.../TestBewerkingsCalculator.cls.xml) (revision 734) +++ vhUnitTest/DOM/PM/Maatwerk/Kost/TestBewerkingsCalculator.cls.xml (.../TestBewerkingsCalculator.cls.xml) (revision 946) @@ -1,11 +1,11 @@ - + Do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","DOM.PM.Maatwerk.Kost.TestBewerkingsCalculator") 1 vhUnitTest.TestCase -62105,42332.452766 +62173,31522.03346 0 @@ -56,12 +56,12 @@ Set IndividueleBrutoHoeveelheid = Calculator.GeefIndividueleBrutoHoeveelheid(AantalStuks,NettoAfmetingPerStuk) Set VerwachteIndBrutoHoeveelheid = (NettoAfmetingPerStuk*(1+BrutoPercentage) + BrutoVast) / Calculator.NettoAfmetingHalffabrikaat - Set VerwachteTotaalAantalNodig = ((VerwachteIndBrutoHoeveelheid * Calculator.NettoAfmetingHalffabrikaat * AantalStuks) /(Calculator.NettoAfmetingHalffabrikaat*(1-UitvalPercentage)-UitvalVast)) + Set VerwachteTotaalAantalNodig = ((VerwachteIndBrutoHoeveelheid * Calculator.NettoAfmetingHalffabrikaat * AantalStuks * (1+UitvalPercentage) + UitvalVast) / Calculator.NettoAfmetingHalffabrikaat) Do $$$AssertEquals(IndividueleBrutoHoeveelheid,VerwachteIndBrutoHoeveelheid,"De individuele bruto hoeveelheid") Do $$$AssertEquals(Calculator.GeefTotaalAantalNodig(IndividueleBrutoHoeveelheid*AantalStuks),VerwachteTotaalAantalNodig,"Verwacht aantal nodig HF") ]]> - + Index: DOM/PM/Maatwerk/Calc/HF/impl/TBX/SpecIntivoHFv002.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PM/Maatwerk/Calc/HF/impl/TBX/SpecIntivoHFv002.cls.xml (.../SpecIntivoHFv002.cls.xml) (revision 734) +++ DOM/PM/Maatwerk/Calc/HF/impl/TBX/SpecIntivoHFv002.cls.xml (.../SpecIntivoHFv002.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + persistent 1 DOM.PM.Maatwerk.Calc.HF.HalffabSpec -62115,35611.919443 +62167,50663.850548 0 @@ -20,9 +20,15 @@ ]]> + +%Integer + + + %Library.CacheStorage - + Index: zTryout/PRA/Concurrency/RekeningHistoriekItem.cls.xml =================================================================== diff -u -r734 -r946 --- zTryout/PRA/Concurrency/RekeningHistoriekItem.cls.xml (.../RekeningHistoriekItem.cls.xml) (revision 734) +++ zTryout/PRA/Concurrency/RekeningHistoriekItem.cls.xml (.../RekeningHistoriekItem.cls.xml) (revision 946) @@ -1,9 +1,10 @@ - + persistent +1 TECH.Concurrency.VhPersistent -62111,38071.884263 +62136,28527.66462 62013,43107.78475 0 @@ -48,5 +49,5 @@ - + Index: zTryout/JCL/Datum.cls.xml =================================================================== diff -u --- zTryout/JCL/Datum.cls.xml (revision 0) +++ zTryout/JCL/Datum.cls.xml (revision 946) @@ -0,0 +1,71 @@ + + + +persistent +1 +%Persistent +62168,43464.446839 +0 + + +%TimeStamp + + + +%TimeStamp + + + +%Time + + + +%Date + + + +1 + + + + +%Library.CacheStorage +^zTryout.JCL.DatumD +DatumDefaultData +^zTryout.JCL.DatumD +^zTryout.JCL.DatumI +^zTryout.JCL.DatumS + +listnode + + +%%CLASSNAME + + +Datum + + +Tijd + + +Tijdstip + + +DatumTijd + + + + + + Index: DOM/PM/Maatwerk/Calc/Kost/StaffelMultiplier.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PM/Maatwerk/Calc/Kost/StaffelMultiplier.cls.xml (.../StaffelMultiplier.cls.xml) (revision 734) +++ DOM/PM/Maatwerk/Calc/Kost/StaffelMultiplier.cls.xml (.../StaffelMultiplier.cls.xml) (revision 946) @@ -1,11 +1,11 @@ - + Het equivalent van 1/Staffel 1 -DOM.PM.Maatwerk.Calc.Kost.IMultiplier -62097,50351.888165 +%RegisteredObject,DOM.PM.Maatwerk.Calc.Kost.IMultiplier +62172,28562.795069 62070,52454.507752 0 @@ -18,5 +18,5 @@ ]]> - + Index: TECH/Concurrency/VhPersistent.cls.xml =================================================================== diff -u -r937 -r946 --- TECH/Concurrency/VhPersistent.cls.xml (.../VhPersistent.cls.xml) (revision 937) +++ TECH/Concurrency/VhPersistent.cls.xml (.../VhPersistent.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Persistence methods die via inheritance overgenomen worden. @@ -14,7 +14,7 @@ 1 1 %Persistent -62161,36689.896368 +62171,31995.080914 62013,59285.30253 0 @@ -92,5 +92,5 @@ ]]> - + Index: APPS/PM/Maatwerk/TBX/Conversie/KenmerkConvertor.cls.xml =================================================================== diff -u -r917 -r946 --- APPS/PM/Maatwerk/TBX/Conversie/KenmerkConvertor.cls.xml (.../KenmerkConvertor.cls.xml) (revision 917) +++ APPS/PM/Maatwerk/TBX/Conversie/KenmerkConvertor.cls.xml (.../KenmerkConvertor.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject -62140,39766.133358 +62172,28927.142911 0 @@ -61,6 +61,11 @@ Do ..Controleer(TBXKenmerken.InschuifElementMatCode,Product.GeefInschuifElementMatCode(),"InschuifElementMatCode", ErrorLijst) Do ..IsValid(TBXKenmerken.InschuifElementMatCode,"DOM.PM.enu.TBXInschuifElementMatCode", ErrorLijst) + Set Klasse = ##class(DOM.PM.enu.TBXKlas).Lade() + If (Product.IsSpoelbakLade()) { Set Klasse = ##class(DOM.PM.enu.TBXKlas).Spoelbak() } + If (Product.IsSifonLade()) { Set Klasse = ##class(DOM.PM.enu.TBXKlas).Sifon() } + Set TBXKenmerken.Klasse = Klasse + Set TBXKenmerken.OpvullijstLinks = Product.BevatOpvullijstLinks() If (TBXKenmerken.OpvullijstLinks = "") { Do ErrorLijst.Insert("OpvulLijstLinks niet ingevuld") } @@ -161,7 +166,8 @@ } If ($LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",Product.GeefPRNr(),"NMRL"))) { - Do TBXKenmerken.NietMeeleveren.Insert(##class(DOM.PM.Maatwerk.Calc.HF.enu.TBXRol).Reling()) + Do TBXKenmerken.NietMeeleveren.Insert(##class(DOM.PM.Maatwerk.Calc.HF.enu.TBXRol).ZijReling()) + Do TBXKenmerken.NietMeeleveren.Insert(##class(DOM.PM.Maatwerk.Calc.HF.enu.TBXRol).FrontReling()) } If ($LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",Product.GeefPRNr(),"NMAK"))) { @@ -204,5 +210,5 @@ ]]> - + Index: zTryout/CSC/FormalspecTest.cls.xml =================================================================== diff -u --- zTryout/CSC/FormalspecTest.cls.xml (revision 0) +++ zTryout/CSC/FormalspecTest.cls.xml (revision 946) @@ -0,0 +1,34 @@ + + + +1 +%RegisteredObject +62173,35586.207639 +0 + + + +Do ##class(zTryout.CSC.FormalspecTest).Do() +1 + + + + + Index: BL/PPS/TBX/WPPers.cls.xml =================================================================== diff -u -r901 -r946 --- BL/PPS/TBX/WPPers.cls.xml (.../WPPers.cls.xml) (revision 901) +++ BL/PPS/TBX/WPPers.cls.xml (.../WPPers.cls.xml) (revision 946) @@ -1,13 +1,13 @@ - + Production Process Steering - Tandembox Genereert van een Toelevering de verpakkingsdefinitie %Prod.Product,BL.Prod.OptiBox,BL.PPS.TBX.Common,BL.Sys.Toegang,BL.Sys.Proxy 1 WPAbstract -62145,37064.487572 +62172,60211.787147 60974,31788.004962 0 @@ -487,6 +487,7 @@ Set DK=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"DK")) Set DC=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"DC")) Set BM=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"BM")) + Set LT=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"LT")) ; Front type Set IsSR=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"IsSR")) Set ODSP=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"ODSP")) ; onderdelen speciaal Set IsSpoel=KLAS'?1(1"L",1"B") @@ -500,6 +501,7 @@ Set:IsSpoel PersStatus="?" Set:ODSP'="" PersStatus="?" Set (Info1,Info2)="" + Set:LT="B" Info1=$S($L(Info1):Info1_"; ",1:"R:")_"FRONT" Set:ODSP'="" Info1=$S($L(Info1):Info1_"; ",1:"R:")_"SPECIAAL : "_$CASE(ODSP,"F":"FRONT","R":"RUG","B":"BODEM","BR":"BODEM&RUG",:ODSP) Set:IsSpoel Info1=$S($L(Info1):Info1_"; ",1:"R:")_"SPOELBAK/SYFON" Set:BM="T" Info1=$S($L(Info1):Info1_"; ",1:"R:")_"TIP-ON" @@ -725,5 +727,5 @@ - + FishEye: Tag 946 refers to a dead (removed) revision in file `vhUnitTest/APPS/PM/Maatwerk/UTKenmv02v03Upgrader.cls.xml'. FishEye: No comparison available. Pass `N' to diff? Index: DOM/PM/TBXProduct/TBXLade.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/PM/TBXProduct/TBXLade.cls.xml (.../TBXLade.cls.xml) (revision 903) +++ DOM/PM/TBXProduct/TBXLade.cls.xml (.../TBXLade.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + 1 1 DOM.PM.MaatwerkProduct -62146,58729.242483 +62172,59930.1041 0 @@ -13,10 +13,20 @@ ]]> + +1 +%Boolean + + %Boolean + +1 +%Boolean + + %Boolean @@ -25,6 +35,11 @@ %Boolean + +1 +%Boolean + + %Boolean @@ -92,6 +107,11 @@ %Integer + +1 +%Integer + + DOM.PM.enu.TBXBlumotion @@ -246,5 +266,5 @@ %String - + Index: vhUnitTest/DOM/PM/Classificaties/TestClassificaties.cls.xml =================================================================== diff -u -r937 -r946 --- vhUnitTest/DOM/PM/Classificaties/TestClassificaties.cls.xml (.../TestClassificaties.cls.xml) (revision 937) +++ vhUnitTest/DOM/PM/Classificaties/TestClassificaties.cls.xml (.../TestClassificaties.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + 1 vhUnitTest.TestCase @@ -90,5 +90,5 @@ ]]> - + Index: DOM/PM/Maatwerk/Calc/HF/impl/TBX/SpecIntivoHFv001.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PM/Maatwerk/Calc/HF/impl/TBX/SpecIntivoHFv001.cls.xml (.../SpecIntivoHFv001.cls.xml) (revision 734) +++ DOM/PM/Maatwerk/Calc/HF/impl/TBX/SpecIntivoHFv001.cls.xml (.../SpecIntivoHFv001.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + persistent 1 DOM.PM.Maatwerk.Calc.HF.HalffabSpec -62115,35622.168618 +62167,50590.310728 0 @@ -20,9 +20,15 @@ ]]> + +%Integer + + + %Library.CacheStorage - + Index: DOM/CRM/enu/TypeTemplateKlant.cls.xml =================================================================== diff -u --- DOM/CRM/enu/TypeTemplateKlant.cls.xml (revision 0) +++ DOM/CRM/enu/TypeTemplateKlant.cls.xml (revision 946) @@ -0,0 +1,33 @@ + + + +datatype +1 +%String +62172,56849.334299 +0 + + +,CONSUMENT,CONSUMENT MEDEWERKER + + + +;Consument;Medewerker + + + +1 +expression + + + + +1 +expression + + + + + Index: DOM/common/Adres.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/common/Adres.cls.xml (.../Adres.cls.xml) (revision 903) +++ DOM/common/Adres.cls.xml (.../Adres.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 1 -62158,59203.01087 +62167,40425.169301 0 @@ -38,6 +38,11 @@ 1 +%Integer + + + +1 %String @@ -61,5 +66,5 @@ %String - + Index: APPS/CRM/Interacties/enu/Type.cls.xml =================================================================== diff -u -r734 -r946 --- APPS/CRM/Interacties/enu/Type.cls.xml (.../Type.cls.xml) (revision 734) +++ APPS/CRM/Interacties/enu/Type.cls.xml (.../Type.cls.xml) (revision 946) @@ -1,14 +1,14 @@ - + datatype 1 %String -62046,41948.170198 +62172,40459.830313 0 -,ToonzaalBezoek,Bezoek +,ToonzaalBezoek,Bezoek,Tel,Email,Fax,Onbepaald,Beurs @@ -40,6 +40,18 @@ + + +1 + + + + +1 + + - + Index: zJBL/Java/ClassSuper.cls.xml =================================================================== diff -u --- zJBL/Java/ClassSuper.cls.xml (revision 0) +++ zJBL/Java/ClassSuper.cls.xml (revision 946) @@ -0,0 +1,31 @@ + + + +1 +1 +%RegisteredObject +62137,39930.60092 +0 + + +%String + + + +%New method to +provide notification that a new instance of an object is being created. + +

If this method returns an error then the object will not be created.]]> +initvalue:%CacheString +1 +1 +%Status + + + + + Index: vhUnitTest/DOM/PM/Maatwerk/HF/ITestDataSetIngegevenKenmerken.cls.xml =================================================================== diff -u --- vhUnitTest/DOM/PM/Maatwerk/HF/ITestDataSetIngegevenKenmerken.cls.xml (revision 0) +++ vhUnitTest/DOM/PM/Maatwerk/HF/ITestDataSetIngegevenKenmerken.cls.xml (revision 946) @@ -0,0 +1,121 @@ + + + +1 +1 +vhUnitTest.TestCase,TECH.Error.ErrorAdaptor +62167,62162.118 +0 + + +%String + + + + + + + +1 +DOM.PM.enu.Familie + + + + +Variant:DOM.PM.enu.Variant,DataSet:vhUnitTest.DOM.PM.Maatwerk.HF.DataSet + + + + +Context:DOM.PM.Maatwerk.Calc.HF.HalffabContext,TestItem:vhUnitTest.DOM.PM.Maatwerk.HF.DataSetTestItem +%Boolean + + + + +Context:DOM.PM.Maatwerk.Calc.HF.HalffabContext,TestItem:vhUnitTest.DOM.PM.Maatwerk.HF.DataSetTestItem + + + + +1 +Context:DOM.PM.Maatwerk.Calc.HF.HalffabContext,TestItem:vhUnitTest.DOM.PM.Maatwerk.HF.DataSetTestItem +%Boolean + + + + +Label,Options + + + + + Index: zTryout/PRA/Concurrency/Tryouts/VhPersistentMetVersion.cls.xml =================================================================== diff -u -r734 -r946 --- zTryout/PRA/Concurrency/Tryouts/VhPersistentMetVersion.cls.xml (.../VhPersistentMetVersion.cls.xml) (revision 734) +++ zTryout/PRA/Concurrency/Tryouts/VhPersistentMetVersion.cls.xml (.../VhPersistentMetVersion.cls.xml) (revision 946) @@ -1,10 +1,12 @@ - + zTryout.PRA.Concurrency +1 TECH.Concurrency.VhPersistent -62109,54551 +62136,28489.819306 62060,45864.054817 +0 - + Index: vhUnitTest/APPS/common/StockOverKinderenMock.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/common/StockOverKinderenMock.cls.xml (revision 0) +++ vhUnitTest/APPS/common/StockOverKinderenMock.cls.xml (revision 946) @@ -0,0 +1,52 @@ + + + +1 +APPS.common.impl.StockOverKinderen +62172,57153.293491 +0 + + +MoederPRNr:%Integer,StockType:APPS.common.enu.StockType,Datum:%Date="" +1 +1 +%Status + + + + +PRNr +%String + + + + +PRNr +%String + + + + +PRNr +1 +%String + + + + +PRNr +1 +%String + + + + + Index: DOM/PM/Maatwerk/Calc/Kost/impl/TBX/PlanBewerkenv001.cls.xml =================================================================== diff -u --- DOM/PM/Maatwerk/Calc/Kost/impl/TBX/PlanBewerkenv001.cls.xml (revision 0) +++ DOM/PM/Maatwerk/Calc/Kost/impl/TBX/PlanBewerkenv001.cls.xml (revision 946) @@ -0,0 +1,60 @@ + + + +persistent +1 +DOM.PM.Maatwerk.Calc.Kost.SamengesteldKostItemBuilder +62171,50929.29154 +0 + + +SamengesteldKostItemBuilder:DOM.PM.Maatwerk.Calc.Kost.SamengesteldKostItemBuilder +1 +1 +%Status + + + + +%Library.CacheStorage + + + + Index: zTryout/WV/PM/IK/TBXKenmPlusLade.cls.xml =================================================================== diff -u --- zTryout/WV/PM/IK/TBXKenmPlusLade.cls.xml (revision 0) +++ zTryout/WV/PM/IK/TBXKenmPlusLade.cls.xml (revision 946) @@ -0,0 +1,18 @@ + + + +persistent +1 +zTryout.WV.PM.IK.TBXKenmPlus,zTryout.WV.PM.IK.TBXKenmLade +62167,49644.189238 +0 + + + + + + + Index: BL/PPS/TBX/DocsProPlus.cls.xml =================================================================== diff -u -r734 -r946 --- BL/PPS/TBX/DocsProPlus.cls.xml (.../DocsProPlus.cls.xml) (revision 734) +++ BL/PPS/TBX/DocsProPlus.cls.xml (.../DocsProPlus.cls.xml) (revision 946) @@ -1,13 +1,13 @@ - + Production Process Steering - Tandembox Genereert van een Toelevering de verpakkingsdefinitie %Prod.Product,BL.Prod.OptiBox,BL.PPS.TBX.Common,BL.Sys.Toegang,BL.Sys.Proxy,BL.Sys.FOP.Common,BL.Derde.KlantSpecifiek 1 %RegisteredObject -62062,35590.724464 +62168,58852.833069 60997,54476.941438 0 @@ -108,7 +108,7 @@ 0 KarMin Do ; bodems per kar . . . Set oQ=##class(DS.PPS.TBX.Queue).%OpenId($LI(Sort(VHossNr,VolgNr))) . . . Set PRNr=oQ.ProductGetObjectId() + . . . Set TBXLade=ProductAPI.GeefProduct(PRNr) ; Voorlopig alleen gebruikt voor het opvragen van de Ruggen . . . Set Klas=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"KLAS")) ; klasse . . . Set MatKl=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"MATKL")) ; Materiaal klant . . . Set LC=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"LC")) ; frontType @@ -582,11 +588,12 @@ . . . Set BodemPRNr=$LI(Sort(VHossNr,VolgNr),3) . . . Quit:'BodemPRNr . . . Set TeZagen=MatKl="HS" ; Te zagen + . . . Set MetHoutenRug=(TBXLade.GeefRugMateriaal()=##class(DOM.PM.enu.TBXRugMateriaal).Hout()) ; Added by WimV on 18/03/2011 . . . Set MetInkeeping=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TB",BodemPRNr,"Opties"))="INKEPING" ; Opties . . . Set:MetInkeeping TeZagen=1 . . . ; Toevoegen aan BODEM PERS lijst voor picking . . . Set VHoss=oQ.WPVerpak.UnitNr_"."_$C(64+oQ.WPVerpak.SubNr)_"."_oQ.WPVerpak.SlotNr - . . . Set Oms2=$S(MetInkeeping:"INK",1:"") + . . . Set Oms2=$S(MetInkeeping:"INK",1:"")_$S(MetHoutenRug:"+RUG", 1:"") . . . Set Oms1=$S(TeZagen:"ZAAG",1:"") . . . Set KT=$P(^KPR(BodemPRNr,0),"\") . . . Set BodemBreedte=IB-75 @@ -611,6 +618,18 @@ . . . . . . Set ZaagBreedte1=(BodemIB-IB)/2-5 ; -5 toegevoegd : PV 27/11/08 . . . . Else Do ; zonder inkeeping uit stroken . . . . . Set ZaagBreedte1="" + . . . . + . . . . If MetHoutenRug Do + . . . . . // Houten ruggen voor Keller mee opnemen in de zaaglijst (Added by WimV on 18/03/2011) + . . . . . ;New TBXRug,RugPRNr,RugHoogte,RugBreedte,OmsRug,RugKT + . . . . . Set TBXRug=TBXLade.GeefRug() + . . . . . Set RugPRNr=TBXRug.GeefPRNr() + . . . . . Set RugHoogte=TBXLade.GeefRugHoogteMM() + . . . . . Set RugBreedte=TBXLade.GeefRugBreedte() + . . . . . Set OmsRug="RUG" + . . . . . Set RugKT=TBXRug.GeefKorttekst() + . . . . . Set ^HULP(%J,"ZT",$I(^HULP(%J,"ZT")))=oQ.Sequence_"\"_oQ.%Id()_"\"_RugPRNr_"\"_oQ.TOENr_"\"_oQ.DOSNr_"\"_RugKT_"\"_KB_"\"_RugHoogte _"\"_RugBreedte _"\"_ZaagBreedte1_"\"_VHoss_"\"_OmsRug_"\\"_oQ.WPVerpak.UnitNr_"\"_Kar + . . . . . . . . Set Oms=$S(MetInkeeping:"INK",1:"") . . . . Set ^HULP(%J,"ZT",$I(^HULP(%J,"ZT")))=oQ.Sequence_"\"_oQ.%Id()_"\"_BodemPRNr_"\"_oQ.TOENr_"\"_oQ.DOSNr_"\"_KT_"\"_KB_"\"_BodemDiepte_"\"_BodemBreedte_"\"_ZaagBreedte1_"\"_VHoss_"\"_Oms_"\\"_oQ.WPVerpak.UnitNr_"\"_Kar . . . @@ -1048,5 +1067,6 @@ ]]> - + + FishEye: Tag 803 refers to a dead (removed) revision in file `zTryout/JCL/Validation/dtoMain.cls.xml'. FishEye: No comparison available. Pass `N' to diff? Index: APPS/PM/Maatwerk/impl/upg/TBXKenmerkenv00v01Upgrader.cls.xml =================================================================== diff -u --- APPS/PM/Maatwerk/impl/upg/TBXKenmerkenv00v01Upgrader.cls.xml (revision 0) +++ APPS/PM/Maatwerk/impl/upg/TBXKenmerkenv00v01Upgrader.cls.xml (revision 946) @@ -0,0 +1,18 @@ + + + +1 +APPS.PM.Maatwerk.IngegevenKenmUpgrader +62160,42506.786479 +0 + + + + + + + Index: DOM/EC/OL/Winkelkar/Adres.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/EC/OL/Winkelkar/Adres.cls.xml (.../Adres.cls.xml) (revision 734) +++ DOM/EC/OL/Winkelkar/Adres.cls.xml (.../Adres.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + serial 1 -%SerialObject -61964,39428.478416 +%SerialObject,DOM.common.Adres +62167,40511.870126 61947,47931.535359 0 @@ -32,6 +32,30 @@ %String + +%String + + + + +%String + + + + +%String + + + + +%String + + + %Library.CacheSerialState AdresState @@ -54,5 +78,5 @@ - + Index: DOM/OV/Orderlijn.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/OV/Orderlijn.cls.xml (.../Orderlijn.cls.xml) (revision 903) +++ DOM/OV/Orderlijn.cls.xml (.../Orderlijn.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Deze klasse stelt een orderlijn voor. elke orderlijn heeft een nummer. @@ -9,9 +9,14 @@ dezelfde orderlijn een ander nummer hebben. 1 1 -62157,72355.661765 +62171,51993.375906 0 + +1 +DOM.OV.Order + + 1 %Integer @@ -31,6 +36,23 @@ 1 %String + + +1 +DOM.LEV.Toelevering + + + +1 +DOM.LEV.ToeleveringLijn + + + +1 +%Boolean + + - + Index: vhUnitTest/DOM/PM/Maatwerk/Kost/impl/KostItemBuilderB.cls.xml =================================================================== diff -u -r734 -r946 --- vhUnitTest/DOM/PM/Maatwerk/Kost/impl/KostItemBuilderB.cls.xml (.../KostItemBuilderB.cls.xml) (revision 734) +++ vhUnitTest/DOM/PM/Maatwerk/Kost/impl/KostItemBuilderB.cls.xml (.../KostItemBuilderB.cls.xml) (revision 946) @@ -1,14 +1,14 @@ - + persistent 1 DOM.PM.Maatwerk.Calc.Kost.IKostItemBuilder -62115,58207.800769 +62171,48680.314597 0 -Context:KostContext,HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom +Context:KostContext,HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken DOM.PM.Maatwerk.Calc.Kost.KostItem @@ -18,5 +18,5 @@ %Library.CacheStorage - + Index: zTryout/CSC/TestKlas2.cls.xml =================================================================== diff -u --- zTryout/CSC/TestKlas2.cls.xml (revision 0) +++ zTryout/CSC/TestKlas2.cls.xml (revision 946) @@ -0,0 +1,22 @@ + + + +1 +%RegisteredObject +62168,50431 + + +i:%Integer=1 +%Integer + + + + + Index: DOM/PM/Maatwerk/Calc/HF/impl/ContinuFlowCalculator.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PM/Maatwerk/Calc/HF/impl/ContinuFlowCalculator.cls.xml (.../ContinuFlowCalculator.cls.xml) (revision 734) +++ DOM/PM/Maatwerk/Calc/HF/impl/ContinuFlowCalculator.cls.xml (.../ContinuFlowCalculator.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Onder continue flow verstaan we de gevallen waarbij we veronderstellen dat we reststukken in zekere mate kunnen hergebruiken. @@ -13,13 +13,13 @@ persistent 1 DOM.PM.Maatwerk.Calc.HF.impl.BewerkingsCalculator -62105,42248.864162 +62173,31206.819906 0 TotaleBrutoHoeveelheid:%Float %Float - @@ -39,5 +39,5 @@ %Library.CacheStorage - + Index: BL/PPS/TBX/DocsV1.cls.xml =================================================================== diff -u -r901 -r946 --- BL/PPS/TBX/DocsV1.cls.xml (.../DocsV1.cls.xml) (revision 901) +++ BL/PPS/TBX/DocsV1.cls.xml (.../DocsV1.cls.xml) (revision 946) @@ -1,13 +1,13 @@ - + Production Process Steering - Tandembox Genereert van een Toelevering de verpakkingsdefinitie BL.Derde.KlantSpecifiek,BL.Derde.LevSpecifiek,%Prod.Product,BL.Prod.OptiBox,BL.PPS.TBX.Common,BL.Sys.Toegang,BL.Sys.Proxy,BL.Sys.FOP.Common,vhLib.Macro 1 %RegisteredObject -62144,59523.134042 +62172,63260.169549 60997,54476.941438 0 @@ -303,10 +303,13 @@ New Rec,PRNr,GVP Set Rec=$$$GetRec(From) Set PRNr=$$$GetZijPRNr(From) - Set GVP=$$$PRGet($$$GrootVerpakking) + Set GVP=$$GrootVerpakking(PRNr) Set Rec=$$$GetRec(VolgNr) Set $P(Rec,"\",19)="D"_PRNr - Set $P(Rec,"\",20)="Doos V"_GVP + If $$$PRGet($$$VerpakkingsProduct) Do + . Set $P(Rec,"\",20)="Eco V"_GVP + Else Do + . Set $P(Rec,"\",20)="Doos V"_GVP $$$SetRec(Rec) Quit @@ -316,7 +319,7 @@ Quit:PRNr'?4.7N "" Set KVP=$$$PRGet($$$KleinVerpakking) Set NVP=$$$PRGet($$$NormaleVerpakking) - Set GVP=$$$PRGet($$$GrootVerpakking) + Set GVP=$$GrootVerpakking(PRNr) If (KVP=1)||(NVP=1)||(GVP=1) Quit "" Set Done=0 For Do Quit:Done @@ -326,6 +329,10 @@ . If PRNr'=$$$GetZijPRNr(VolgNr) Set Done=1 Quit If 'GVP Quit VolgNr Quit "" + +GrootVerpakking(PRNr) + If PRNr=457010 Quit 10 ;358M5002S Z R+L EP WA/G - ecopack met R + L op een pallet gestapeld + Quit $$$PRGet($$$GrootVerpakking) ]]> @@ -706,7 +713,6 @@ 1 - + Index: APPS/common/GUI/impl/KolomInfo.cls.xml =================================================================== diff -u --- APPS/common/GUI/impl/KolomInfo.cls.xml (revision 0) +++ APPS/common/GUI/impl/KolomInfo.cls.xml (revision 946) @@ -0,0 +1,114 @@ + + + +serial +1 +%SerialObject +62166,57817.241253 +0 + + +%Integer +1 + + + +%Boolean +1 + + + +%Integer +1 + + + +%String +1 + + + +KolomID:%String,Breedte:%Integer,IsZichtbaar:%Boolean,Volgnummer:%Integer +1 +1 +%Status + + + + +%Integer + + + + +%Boolean + + + + +%Integer + + + + +%String + + + + +%Library.CacheStorage +^APPS.common.GUI.i6DE.KolomInfoD +KolomInfoDefaultData +^APPS.common.GUI.i6DE.KolomInfoD +^APPS.common.GUI.i6DE.KolomInfoI +KolomInfoState +^APPS.common.GUI.i6DE.KolomInfoS + +listnode + + +%%CLASSNAME + + +Breedte + + +IsZichtbaar + + +KolomID + + +Volgnummer + + + +listnode +"APPS.common.GUI.impl.KolomInfo" + +Breedte + + +IsZichtbaar + + +KolomID + + +Volgnummer + + + + + + Index: DOM/PM/impl/ProductImpl.cls.xml =================================================================== diff -u -r939 -r946 --- DOM/PM/impl/ProductImpl.cls.xml (.../ProductImpl.cls.xml) (revision 939) +++ DOM/PM/impl/ProductImpl.cls.xml (.../ProductImpl.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + 1 %RegisteredObject,DOM.PM.Product @@ -96,5 +96,5 @@ ]]> - + Index: vhUnitTest/ClassInfo/impl/sub/Subklasse.cls.xml =================================================================== diff -u -r915 -r946 --- vhUnitTest/ClassInfo/impl/sub/Subklasse.cls.xml (.../Subklasse.cls.xml) (revision 915) +++ vhUnitTest/ClassInfo/impl/sub/Subklasse.cls.xml (.../Subklasse.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + vhUnitTest.ClassInfo.impl.sub2 1 vhUnitTest.ClassInfo.impl.ImplKlasse -62157,49450.207547 +62164,34795.084968 0 @@ -17,5 +17,5 @@ SubKlasse2 - + Index: DOM/PM/Maatwerk/Calc/Kost/KostSpec.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PM/Maatwerk/Calc/Kost/KostSpec.cls.xml (.../KostSpec.cls.xml) (revision 734) +++ DOM/PM/Maatwerk/Calc/Kost/KostSpec.cls.xml (.../KostSpec.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Aanvaardt enkel Kenmerken van het juiste ProductType. @@ -18,7 +18,7 @@ persistent 1 %Persistent -62115,36412.703747 +62171,48893.550826 62070,52454.382918 0 @@ -72,14 +72,14 @@ Berekent voor iedere KostItemBuilder het KostItem en voegt dit toe aan het TotaalKostItem Geeft het TotaalKostItem terug -Context:KostContext,HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom +Context:KostContext,HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken DOM.PM.Maatwerk.Calc.Kost.SamengesteldKostItem - + Index: APPS/common/StockNiveauService.cls.xml =================================================================== diff -u -r917 -r946 --- APPS/common/StockNiveauService.cls.xml (.../StockNiveauService.cls.xml) (revision 917) +++ APPS/common/StockNiveauService.cls.xml (.../StockNiveauService.cls.xml) (revision 946) @@ -1,26 +1,33 @@ - + 1 -62154,59032.282248 +62173,34264.890788 0 + +1 +PRNr:%Integer,Datum:%Date="",Magazijn:APPS.common.enu.MagazijnMetStock="" + + + 1 APPS.common.dto.StockNiveaus - + 1 %Float - + 1 %Float - + 1 %Float @@ -30,15 +37,30 @@ %Float - + 1 %Float - + 1 %Float + + +1 +%Float + + + +1 +%Float + + + +1 +%Float + - + Index: zTryout/WV/PM/IK/TBXKenmSifonBinnenlade.cls.xml =================================================================== diff -u --- zTryout/WV/PM/IK/TBXKenmSifonBinnenlade.cls.xml (revision 0) +++ zTryout/WV/PM/IK/TBXKenmSifonBinnenlade.cls.xml (revision 946) @@ -0,0 +1,25 @@ + + + +persistent +1 +zTryout.WV.PM.IK.TBXKenmerkenv01 +62172,34122.560429 +0 + + + + + + +%Library.CacheStorage + + + + Index: DOM/CRM/enu/DoorstuurwijzeWMS.cls.xml =================================================================== diff -u --- DOM/CRM/enu/DoorstuurwijzeWMS.cls.xml (revision 0) +++ DOM/CRM/enu/DoorstuurwijzeWMS.cls.xml (revision 946) @@ -0,0 +1,47 @@ + + + +datatype +1 +%String +62168,41457.859397 +0 + + +1,0,M,M1 + + + +;Automatisch zonder vrijgave door boekhouding;Automatisch zonder vrijgave door boekhouding;Manueel met vrijgave door boekhouding;Manueel zonder vrijgave door boekhouding + + + +1 +expression + + + + +1 +expression + + + + +1 +expression + + + + +1 +expression + + + + + Index: DOM/CRM/KlantAPI.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/CRM/KlantAPI.cls.xml (.../KlantAPI.cls.xml) (revision 903) +++ DOM/CRM/KlantAPI.cls.xml (.../KlantAPI.cls.xml) (revision 946) @@ -1,19 +1,41 @@ - + 1 1 -62152,60240.21843 +62171,50092.383067 0 + +1 +KlantObject:DOM.CRM.dto.Klant +DOM.CRM.Klant + + + +1 Nr:%Integer DOM.CRM.Klant +1 TECH.Iterator + + + +Zoekt tussen de klanten de medewerkers van VanHoecke en Halux +Dit op basis van het PersNr vanuit ProTime dat kan worden opgegeven. +Als dit niet is opgegeven, geeft hij alle medewerkers terug. +1 +ProTimeNr:%Integer +DOM.CRM.Klant + + - + Index: vhUnitTest/APPS/PM/Maatwerk/TestIngegevenKenmUpgrader.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/PM/Maatwerk/TestIngegevenKenmUpgrader.cls.xml (revision 0) +++ vhUnitTest/APPS/PM/Maatwerk/TestIngegevenKenmUpgrader.cls.xml (revision 946) @@ -0,0 +1,125 @@ + + + + +Oproepen via + do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.PM.Maatwerk.TestIngegevenKenmUpgrader") +1 +vhUnitTest.TestCase,TECH.Error.ErrorAdaptor +62161,36020.558286 +0 + + +%String + + + + + + + + + + + + + + + + + + + + + + + + + + + +Label,Options + + + + +ErrorMsg:%String + + + + + Index: TECH/ClassInfo/QNameFinder.cls.xml =================================================================== diff -u -r931 -r946 --- TECH/ClassInfo/QNameFinder.cls.xml (.../QNameFinder.cls.xml) (revision 931) +++ TECH/ClassInfo/QNameFinder.cls.xml (.../QNameFinder.cls.xml) (revision 946) @@ -1,14 +1,12 @@ - + 1 %RegisteredObject -62160,60267.357823 +62164,33995.87503 0 - -Beter existsid ip openid gebruiken Klasse:%String,ContextClassDefinition:TECH.ClassInfo.ClassDefinition 1 %String @@ -18,29 +16,19 @@ Set ClassDefinition = ##class(%Dictionary.ClassDefinition).%OpenId(Klasse) If ($Extract(Klasse,1,1) '= "%") && (ClassDefinition = "") { - Set ClassDefinition = ##class(%Dictionary.ClassDefinition).%OpenId(Klasse) - /// kijk of de klasse in de huidige package zit Set Piece = $Length(ContextClassDefinition.GeefPackage(),".") While ((Piece > 0) && (QualifiedName = "")) { - Set ClassDefinition = ##class(%Dictionary.ClassDefinition).%OpenId($Piece(ContextClassDefinition.GeefPackage(),".",1,Piece)_"."_Klasse) - If (ClassDefinition '= "") + Set KlasseNaam = $Piece(ContextClassDefinition.GeefPackage(),".",1,Piece)_"."_Klasse + If (##class(%Dictionary.ClassDefinition).%ExistsId(KlasseNaam)) { - Set QualifiedName = $Piece(ContextClassDefinition.GeefPackage(),".",1,Piece)_"."_Klasse + Set QualifiedName = KlasseNaam } Set Piece = Piece - 1 } - // Probeer de package van de bovenklassen, hier is het niet nodig om alle lager liggende packages te controleren - // - /*Set SuperIterator = ##class(TECH.PiecesIterator).%New(..CurrentClassDefinition.Super,",") - While (SuperIterator.HasNext() && (QualifiedName = "")) { - Set Name = SuperIterator.Next() - - }*/ - /// Kijk naar de imports If (QualifiedName = "") { @@ -49,9 +37,7 @@ While (ImportsIterator.HasNext() && (QualifiedName = "")) { Set Import = ImportsIterator.Next() - Set ClassDefinition = ##class(%Dictionary.ClassDefinition).%OpenId(Import_"."_Klasse) - - If (ClassDefinition '= "") + If (##class(%Dictionary.ClassDefinition).%ExistsId(Import_"."_Klasse)) { Set QualifiedName = Import_"."_Klasse } @@ -66,5 +52,5 @@ ]]> - + Index: zJBL/Java/ClassA.cls.xml =================================================================== diff -u --- zJBL/Java/ClassA.cls.xml (revision 0) +++ zJBL/Java/ClassA.cls.xml (revision 946) @@ -0,0 +1,76 @@ + + + +1 +ClassSuper +62151,38436.510734 +0 + + +%Projection.Java + + + + + + +%String + + + +%String + + + +%String + + + + +Number:%Integer +%String + + + + +1 +Number:%Integer +%String + + + + +%New method to +provide notification that a new instance of an object is being created. + +

If this method returns an error then the object will not be created.]]> +initvalue:%CacheString +1 +1 +%Status + + + + +ClassA + + + + + Index: APPS/PM/dto/Classificatie.cls.xml =================================================================== diff -u -r938 -r946 --- APPS/PM/dto/Classificatie.cls.xml (.../Classificatie.cls.xml) (revision 938) +++ APPS/PM/dto/Classificatie.cls.xml (.../Classificatie.cls.xml) (revision 946) @@ -1,11 +1,12 @@ - + JBL + 2011-03-04 1 %RegisteredObject,%XML.Adaptor 62160,36812.224656 +62165,30923.903189 0 @@ -27,5 +28,5 @@ - + Index: vhUnitTest/APPS/HR/ProTime/FacadeUpdate.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/HR/ProTime/FacadeUpdate.cls.xml (revision 0) +++ vhUnitTest/APPS/HR/ProTime/FacadeUpdate.cls.xml (revision 946) @@ -0,0 +1,42 @@ + + + +1 +APPS.HR.ProTime.Facade +62173,29803.783468 +0 + + +%ListOfObjects + + + + + Index: vhUnitTest/APPS/PM/Maatwerk/impl/upg/UTKenmerkenv01v02Upgrader.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/PM/Maatwerk/impl/upg/UTKenmerkenv01v02Upgrader.cls.xml (revision 0) +++ vhUnitTest/APPS/PM/Maatwerk/impl/upg/UTKenmerkenv01v02Upgrader.cls.xml (revision 946) @@ -0,0 +1,49 @@ + + + +1 +APPS.PM.Maatwerk.IngegevenKenmUpgrader +62160,47590.036564 +0 + + +1 +%Integer + + + + + +De Default conversiestijl is UpgradeViaCopy. +Alternatief kan je deze overriden om UpgradeViaInherit() of UpgradeViaWrapper() te implementeren +1 +Kenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken +DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken + + + + + +De method Upgrade() moet overschreven worden om deze method op te roepen +De NewVersionClassName is de ClassName van de nieuwe versie van de IngegevenKenmeken +1 +Kenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken,NewVersionClassName:%String +DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken + + + + + Index: APPS/Halux/Planning/dto/MaakBatchResultaat.cls.xml =================================================================== diff -u --- APPS/Halux/Planning/dto/MaakBatchResultaat.cls.xml (revision 0) +++ APPS/Halux/Planning/dto/MaakBatchResultaat.cls.xml (revision 946) @@ -0,0 +1,23 @@ + + + +1 +%RegisteredObject,%XML.Adaptor +62168,31920.03334 +0 + + +%Boolean + + + +%Integer + + + +APPS.Halux.Planning.dto.MaakBatchError +list + + + + Index: DOM/PM/Maatwerk/Calc/Kost/IKostItemBuilder.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PM/Maatwerk/Calc/Kost/IKostItemBuilder.cls.xml (.../IKostItemBuilder.cls.xml) (revision 734) +++ DOM/PM/Maatwerk/Calc/Kost/IKostItemBuilder.cls.xml (.../IKostItemBuilder.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + persistent 1 %Persistent -62098,55731.608109 +62171,48617.03763 62070,52454.24698 0 @@ -59,7 +59,7 @@ 1 -Context:DOM.PM.Maatwerk.Calc.Kost.KostContext,HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom +Context:DOM.PM.Maatwerk.Calc.Kost.KostContext,HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken DOM.PM.Maatwerk.Calc.Kost.KostItem @@ -99,5 +99,5 @@ - + Index: vhUnitTest/APPS/HR/ProTime/TestFacade.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/HR/ProTime/TestFacade.cls.xml (revision 0) +++ vhUnitTest/APPS/HR/ProTime/TestFacade.cls.xml (revision 946) @@ -0,0 +1,152 @@ + + + + +do ##class(vhUnitTest.Manager).RunTest("/display=all","APPS.HR.ProTime.TestFacade") +1 +vhUnitTest.TestCase +62173,29970.444684 +0 + + +%Integer +1 + + + +DOM.CRM.KlantAPI +1 + + + + +Eerst volgend klantnummer bijhouden +%Status + + + + + +Aangemaakte klanten terug verwijderen +En eerst volgend klantnummmer opnieuw op oude waarde instellen +%Status + + + + + +Enkele gecreeerde pro-time medewerkers aanmaken en laten synchroniseren met de klant. +Bij deze medewerkers is het de 'initiële' import zogezegd. + + + + + +Enkele gecreeerde pro-time medewerkers aanmaken en laten synchroniseren met de klant. +Bij deze bestonden de medewerkers reeds en worden ze geupdate + + + + +%Library.CacheStorage +^vhUnitTest.APPS936.TestFacadeD +TestFacadeDefaultData +^vhUnitTest.APPS936.TestFacadeD +^vhUnitTest.APPS936.TestFacadeI +^vhUnitTest.APPS936.TestFacadeS + +listnode + + +%%CLASSNAME + + +Debug + + +Manager + + + + + + Index: APPS/Halux/Planning/impl/Queries.cls.xml =================================================================== diff -u -r917 -r946 --- APPS/Halux/Planning/impl/Queries.cls.xml (.../Queries.cls.xml) (revision 917) +++ APPS/Halux/Planning/impl/Queries.cls.xml (.../Queries.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject -62154,35537.611017 +62166,49720.597406 0 @@ -57,6 +57,11 @@ FROM APPS_Halux_Planning_impl.PlanningDataItem WHERE TO_DATE(Gepland,'YYYY-MM-DD') = TO_Date(:Datum,'YYYY-MM-DD') + + +%SQLQuery + SELECT DISTINCT ToeleveringsNummer FROM APPS_Halux_Planning_impl.PlanningDataItem ORDER BY ToeleveringsNummer ASC + - + Index: zTryout/CSC/ZoekTypeProduct.cls.xml =================================================================== diff -u -r734 -r946 --- zTryout/CSC/ZoekTypeProduct.cls.xml (.../ZoekTypeProduct.cls.xml) (revision 734) +++ zTryout/CSC/ZoekTypeProduct.cls.xml (.../ZoekTypeProduct.cls.xml) (revision 946) @@ -1,30 +1,30 @@ - + 1 %RegisteredObject -62101,28824.983531 +62143,42572.133411 0 Do ##class(zTryout.CSC.ZoekTypeProduct).Zoek() 1 0) - { - w !,TandemBox.GeefPRNr()_" "_TandemBox.GeefInterneBreedte() - } + If (Product.IsSpoelbakLade() && ($LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",Product.GeefPRNr(),"ASM"))'="")) w PRNr,! } + Set PRNr = $Order(^KPR(PRNr)) } ]]> - + Index: CSC_Rename_bouwstenen.prj.xml =================================================================== diff -u --- CSC_Rename_bouwstenen.prj.xml (revision 0) +++ CSC_Rename_bouwstenen.prj.xml (revision 946) @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + Index: vhUnitTest/DOM/PM/OL/Gamma/ProductenNaarVerkoophandboekMock.cls.xml =================================================================== diff -u --- vhUnitTest/DOM/PM/OL/Gamma/ProductenNaarVerkoophandboekMock.cls.xml (revision 0) +++ vhUnitTest/DOM/PM/OL/Gamma/ProductenNaarVerkoophandboekMock.cls.xml (revision 946) @@ -0,0 +1,22 @@ + + + +1 +DOM.PM.OL.Gamma.impl.ProductenNaarVerkoophandboek +62168,53047.832111 +0 + + +ExportFilter:DOM.PM.OL.Gamma.dto.ExportFilter +1 +1 +%Status + + + + + Index: WS/PM/ProductService.cls.xml =================================================================== diff -u -r937 -r946 --- WS/PM/ProductService.cls.xml (.../ProductService.cls.xml) (revision 937) +++ WS/PM/ProductService.cls.xml (.../ProductService.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + JBL + 2011-03-03 @@ -36,5 +36,5 @@ ]]> - + Index: APPS/Halux/Planning/PlanningService.cls.xml =================================================================== diff -u -r917 -r946 --- APPS/Halux/Planning/PlanningService.cls.xml (.../PlanningService.cls.xml) (revision 917) +++ APPS/Halux/Planning/PlanningService.cls.xml (.../PlanningService.cls.xml) (revision 946) @@ -1,14 +1,18 @@ - + Service voor de Halux planningstool. Ondersteunt het visulaliseren van het resourcegebruik voor alle toeleveringen die reeds ingegeven zijn. 1 %RegisteredObject -62154,37367.760866 +62168,43309.773643 0 + +Halux_Planning_PlanningService + + @@ -51,8 +53,6 @@ Set DataSet = ##class(%XML.DataSet).%New("APPS.Halux.Planning.impl.Queries:qGeefPlanningOverzicht") Do DataSet.SetArgs(Van, Tot) - Set DataSet.NeedSchema = 0 - Quit DataSet ]]> @@ -84,6 +84,23 @@ ]]> + + +Geeft de settings van de kolommen (o.a. volgorde en breedte) terug. +DataGridNaam:%String,Gebruiker:%String +APPS.common.GUI.dto.KolomInfoLijst + + + + + +Bewaart de settings van de kolommen. +DataGridNaam:%String,Gebruiker:%String,KolomInfoLijst:APPS.common.GUI.dto.KolomInfoLijst + + + ID:%String 1 @@ -102,6 +119,60 @@ ]]> + +ToeleveringNummers:%ListOfDataTypes +APPS.Halux.Planning.dto.MaakBatchResultaat + + + Gebruiker:%String,Opmerking:%String,Datum:%Date,ToeleveringNummers:%ListOfDataTypes APPS.Halux.Planning.dto.VerplaatsToeleveringenResultaat @@ -140,7 +211,7 @@ TSTART &SQL(UPDATE APPS_Halux_Planning_impl.PlanningDataItem SET Gepland = (SELECT VerplaatstVan FROM APPS_Halux_Planning_impl.ExplicietePlanning P - WHERE ToeleveringsNummer = :ToeleveringsNummer AND ID = (SELECT Max(ID) FROM APPS_Halux_Planning_impl.ExplicietePlanning WHERE P.ToeleveringsNummer = ToeleveringsNummer))) + WHERE ToeleveringsNummer = :ToeleveringsNummer AND ID = (SELECT Max(ID) FROM APPS_Halux_Planning_impl.ExplicietePlanning WHERE P.ToeleveringsNummer = ToeleveringsNummer)) WHERE ToeleveringsNummer = :ToeleveringsNummer) If ('%ROWCOUNT) { Do Resultaat.MislukteVerplaatsingen.Insert(ToeleveringsNummer) @@ -189,6 +260,81 @@ Quit Resultaat ]]> + + + + - + Index: vhUnitTest/APPS/Web/OLParticulier/Winkelkar.cls.xml =================================================================== diff -u -r867 -r946 --- vhUnitTest/APPS/Web/OLParticulier/Winkelkar.cls.xml (.../Winkelkar.cls.xml) (revision 867) +++ vhUnitTest/APPS/Web/OLParticulier/Winkelkar.cls.xml (.../Winkelkar.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Oproepen via @@ -8,7 +8,7 @@ DOM.PM.OL,BL.Derde.KlantSpecifiek 1 vhUnitTest.TestCase -62131,53829.808395 +62160,29765.33106 0 @@ -50,7 +50,7 @@ set sc = ##super() - do ##class(vhUnitTest.DOM.PM.OL.Gamma.TestData).%New().CreeerTestData() + do ##class(vhUnitTest.DOM.PM.TestData).%New().CreeerTestData() do ..BepaalWinkelkarID() do ..VerwijderWinkelkar() @@ -65,7 +65,7 @@ @@ -160,6 +160,7 @@ if ..#CanCreateFiles { set sc=$$$UnitTestUtils.CreateNewTestFile(strXML,"WS.Web.OLParticulier","Winkelkar_ControleItemLijst") } + w File,! do $$$AssertEquals($$$UnitTestUtils.CheckSum(strXML),$$$UnitTestUtils.CheckSum(File),"Compare resultaat met ref inhoud Winkelkar_ControleItemLijst") quit @@ -254,5 +255,5 @@ ]]> - + Index: DOM/EC/OL/Winkelkar/Winkelkar.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/EC/OL/Winkelkar/Winkelkar.cls.xml (.../Winkelkar.cls.xml) (revision 734) +++ DOM/EC/OL/Winkelkar/Winkelkar.cls.xml (.../Winkelkar.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Winkelkar. Een Winkelkar kan concrete producten bevatten, tekstlijnen en @@ -14,7 +14,7 @@ TECH.Error,vhLib.Macro 1 %Persistent -62052,60289.104676 +62167,59151.676495 61909,56218.627839 0 @@ -237,7 +237,7 @@ - + Index: APPS/common/GUI/DataGridService.cls.xml =================================================================== diff -u --- APPS/common/GUI/DataGridService.cls.xml (revision 0) +++ APPS/common/GUI/DataGridService.cls.xml (revision 946) @@ -0,0 +1,67 @@ + + + +1 +%RegisteredObject +62167,29099.814964 +0 + + + +Geeft KolomInfo dto's terug van het type APPS.common.GUI.dto.KolomInfo +ApplicatieNaam:%String,DataGridNaam:%String,Gebruiker:%String +APPS.common.GUI.dto.KolomInfoLijst + + + + + +KolomInfo is een lijst van APPS.common.GUI.dto.KolomInfo dto objecten +ApplicatieNaam:%String,DataGridNaam:%String,Gebruiker:%String,KolomInfoLijst:APPS.common.GUI.dto.KolomInfoLijst +%Status + + + + +ApplicatieNaam:%String,DataGridNaam:%String,Gebruiker:%String,KolomInfo:%ListOfObjects +%Status + + + + + Index: vhUnitTest/DOM/PM/OL/Gamma/OPGZoekProductGroepen.cls.xml =================================================================== diff -u -r734 -r946 --- vhUnitTest/DOM/PM/OL/Gamma/OPGZoekProductGroepen.cls.xml (.../OPGZoekProductGroepen.cls.xml) (revision 734) +++ vhUnitTest/DOM/PM/OL/Gamma/OPGZoekProductGroepen.cls.xml (.../OPGZoekProductGroepen.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Oproepen via @@ -14,7 +14,7 @@ DOM.PM.OL,BL.Derde.KlantSpecifiek 1 vhUnitTest.TestCase -62095,30200.010573 +62161,40715.280388 0 @@ -31,7 +31,7 @@ Test voor OrgaluxProductGamma http://www.pivotaltracker.com/projects/72006?story_id=5088499 @@ -597,6 +599,62 @@ ]]> + +implOrgaluxProductGamma:DOM.PM.OL.Gamma.impl.OrgaluxProductGamma +1 + + + + +implOrgaluxProductGamma:DOM.PM.OL.Gamma.impl.OrgaluxProductGamma +1 + + + Met toepassing en met zoekterm en met ladespec @@ -921,5 +979,5 @@ ]]> - + Index: vhUnitTest/DOM/PM/OL/Gamma/ProductenNaarPrijslijst.cls.xml =================================================================== diff -u -r867 -r946 --- vhUnitTest/DOM/PM/OL/Gamma/ProductenNaarPrijslijst.cls.xml (.../ProductenNaarPrijslijst.cls.xml) (revision 867) +++ vhUnitTest/DOM/PM/OL/Gamma/ProductenNaarPrijslijst.cls.xml (.../ProductenNaarPrijslijst.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + do ##class(vhUnitTest.Manager).RunTest("/Display=all","DOM.PM.OL.Gamma.ProductenNaarPrijslijst") @@ -94,7 +94,7 @@ %Status - + Index: zTryout/CSC/Timing/Writer.cls.xml =================================================================== diff -u -r734 -r946 --- zTryout/CSC/Timing/Writer.cls.xml (.../Writer.cls.xml) (revision 734) +++ zTryout/CSC/Timing/Writer.cls.xml (.../Writer.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject -62083,29974.409693 +62160,39576.375264 0 @@ -107,5 +107,5 @@ GROUP BY ParentLabel, Label - + Index: DOM/PM/Maatwerk/Calc/Kost/NotEvaluator.cls.xml =================================================================== diff -u --- DOM/PM/Maatwerk/Calc/Kost/NotEvaluator.cls.xml (revision 0) +++ DOM/PM/Maatwerk/Calc/Kost/NotEvaluator.cls.xml (revision 946) @@ -0,0 +1,35 @@ + + + +1 +%RegisteredObject,DOM.PM.Maatwerk.Calc.Kost.IEvaluator +62172,38267.33876 +0 + + +DOM.PM.Maatwerk.Calc.Kost.IEvaluator +1 + + + +Evaluator:DOM.PM.Maatwerk.Calc.Kost.IEvaluator +1 +1 +%Status + + + + + + +HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,Context:DOM.PM.Maatwerk.Calc.Kost.KostContext,IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken +%Boolean + + + + + Index: vhUnitTest/ClassInfo/TestFormalSpecParser.cls.xml =================================================================== diff -u -r915 -r946 --- vhUnitTest/ClassInfo/TestFormalSpecParser.cls.xml (.../TestFormalSpecParser.cls.xml) (revision 915) +++ vhUnitTest/ClassInfo/TestFormalSpecParser.cls.xml (.../TestFormalSpecParser.cls.xml) (revision 946) @@ -1,17 +1,17 @@ - + Do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","ClassInfo.TestFormalSpecParser") 1 vhUnitTest.TestCase -62158,29079.192731 +62164,34762.93653 0 - + Index: zTryout/CSC/TestKlasjeuuuh.cls.xml =================================================================== diff -u --- zTryout/CSC/TestKlasjeuuuh.cls.xml (revision 0) +++ zTryout/CSC/TestKlasjeuuuh.cls.xml (revision 946) @@ -0,0 +1,21 @@ + + + +DOM.OV +1 +%RegisteredObject +62151,43589.805976 +0 + + +DOM.PM.Product +1 + + + +Order +1 + + + + Index: vhUnitTest/APPS/Halux/common/TestBatchService.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/Halux/common/TestBatchService.cls.xml (revision 0) +++ vhUnitTest/APPS/Halux/common/TestBatchService.cls.xml (revision 946) @@ -0,0 +1,53 @@ + + + + +do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.Halux.common.TestBatchService") +1 +vhUnitTest.TestCase +62167,40965.716886 +0 + + +%Status + + + + +%Status +0,"Er is een batch id verkregen") + Do $$$AssertEquals(Batch.GeefVroegsteDueOutTime(),$ZDT("62151,43200",3),"De due out time") + Do $$$AssertEquals(Batch.GeefProductieGroep(),##class(APPS.Halux.enu.ProductieGroep).Stuk(),"De productiegroep") + + Set BatchID = Batch.GeefBatchID() + Set Batch = "" + + Do BatchService.VerwijderBatch(BatchID) + + Set Batch = BatchService.GeefBatch(BatchID) + + Do $$$AssertFalse($IsObject(Batch),"De batch is niet meer aanwezig in het systeem") +]]> + + + + Index: DOM/PM/Maatwerk/Calc/Kost/SamengesteldKostItemBuilder.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PM/Maatwerk/Calc/Kost/SamengesteldKostItemBuilder.cls.xml (.../SamengesteldKostItemBuilder.cls.xml) (revision 734) +++ DOM/PM/Maatwerk/Calc/Kost/SamengesteldKostItemBuilder.cls.xml (.../SamengesteldKostItemBuilder.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Name: onderdeel bv. pressen, extra montage @@ -10,7 +10,7 @@ persistent 1 DOM.PM.Maatwerk.Calc.Kost.IKostItemBuilder -62098,55135.128157 +62171,49515.240538 62070,52454.482666 0 @@ -39,18 +39,18 @@ -Context:KostContext,HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom +Context:KostContext,HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken DOM.PM.Maatwerk.Calc.Kost.KostItem - + Index: DOM/PM/Maatwerk/Calc/Kost/BucketMultiplier.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PM/Maatwerk/Calc/Kost/BucketMultiplier.cls.xml (.../BucketMultiplier.cls.xml) (revision 734) +++ DOM/PM/Maatwerk/Calc/Kost/BucketMultiplier.cls.xml (.../BucketMultiplier.cls.xml) (revision 946) @@ -1,12 +1,12 @@ - + =Self.Val("BUCKET"):0.5,1:1)*0. 5]]> 1 -DOM.PM.Maatwerk.Calc.Kost.IMultiplier -62076,36852.617826 +%RegisteredObject,DOM.PM.Maatwerk.Calc.Kost.IMultiplier +62172,28589.641506 62070,52454.085316 0 @@ -33,5 +33,5 @@ %Float - + Index: APPS/HR/ProTime/Synchronize.cls.xml =================================================================== diff -u --- APPS/HR/ProTime/Synchronize.cls.xml (revision 0) +++ APPS/HR/ProTime/Synchronize.cls.xml (revision 946) @@ -0,0 +1,29 @@ + + + +1 +%RegisteredObject +62171,42295.602292 +0 + + +%Library.CacheStorage +^APPS.HR.ProTime.SynchronizeD +SynchronizeDefaultData +^APPS.HR.ProTime.SynchronizeD +^APPS.HR.ProTime.SynchronizeI +^APPS.HR.ProTime.SynchronizeS + +listnode + + +%%CLASSNAME + + +SQLConnection + + + + + + Index: APPS/PM/Maatwerk/IngegevenKenmUpgrader.cls.xml =================================================================== diff -u -r923 -r946 --- APPS/PM/Maatwerk/IngegevenKenmUpgrader.cls.xml (.../IngegevenKenmUpgrader.cls.xml) (revision 923) +++ APPS/PM/Maatwerk/IngegevenKenmUpgrader.cls.xml (.../IngegevenKenmUpgrader.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Een upgrader van ingegeven kenmerken converteert de kenmerken die als parameter zijn opgegeven naar een hogere versie. Geeft een object terug van de hogere versie. @@ -22,10 +22,11 @@ Inherit is handig als er geen echte conversie moet gebeuren, bv. als er enkel kenmerken bijkomen. Upgrade kan dan met weinig code een object maken van de nieuwe klasse: clone + invullen defaults voor de nieuwe kenmerken. +1 vhLib.Macro,TECH.Error 1 %RegisteredObject -62158,62446.214638 +62164,36670.344325 62152,61291.983584 0 @@ -43,7 +44,11 @@ 1 Kenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken %String - + v... + @@ -134,14 +139,8 @@ 1 TBX / KAD - If $$$Not(Kenmerken.%Classname()="") { - $$$ThrowError($$$errInvalidInput,"Ongeldige ClassName van de IK") - } - */ Quit ]]> @@ -162,5 +161,5 @@ ]]> - + Index: vhUnitTest/DOM/PM/Maatwerk/HF/DataSet.cls.xml =================================================================== diff -u --- vhUnitTest/DOM/PM/Maatwerk/HF/DataSet.cls.xml (revision 0) +++ vhUnitTest/DOM/PM/Maatwerk/HF/DataSet.cls.xml (revision 946) @@ -0,0 +1,104 @@ + + + +1 +1 +%RegisteredObject +62167,50218.955079 +0 + + +DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie + + + +%ListOfObjects +1 + + + +%Integer + + + +1 +1 +%Status + + + + +Hoeveelheid:%Integer=1,KlantID:%String="",Personality:DOM.common.Personality="",BerekenDatum:%Date +DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie + + + + +TECH.Iterator + + + + + +De DataSet opvullen met alle mogelijke test cases (voor deze variant) +Gebruik de method VoegToeAanDataSet() om de IngegevenKenmerken toe te voegen aan de DataSet. +1 +1 + + + + +IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken,Key:%String="",Omschrijving:%String,BerekeningsSpecificatie:DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie="" +1 + + + + +1 + + + + + Index: APPS/PM/DataMProductOrderLijnIterator.cls.xml =================================================================== diff -u --- APPS/PM/DataMProductOrderLijnIterator.cls.xml (revision 0) +++ APPS/PM/DataMProductOrderLijnIterator.cls.xml (revision 946) @@ -0,0 +1,103 @@ + + + +1 +TECH.Iterator,%RegisteredObject +62167,64071.433374 +0 + + +%Integer +1 + + + +%String +1 + + + +%String +1 + + + +ProductNr:%Integer +1 +1 +%Status + + + + +HuidigeIndex:%Integer +1 +%String + + + + +Index:%String +1 +%Integer + + + + +%Boolean + + + + +%CacheString + + + + +Lijn:%String +%Boolean + + + + +HuidigeIndex:%Integer +1 + + + + + Index: DOM/OV/Order.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/OV/Order.cls.xml (.../Order.cls.xml) (revision 903) +++ DOM/OV/Order.cls.xml (.../Order.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Interface voor orders. @@ -17,7 +17,7 @@ waardoor ze een nummer krijgen. 1 1 -62154,29299.651066 +62168,56510.060767 0 @@ -51,6 +51,12 @@ DOM.common.Adres + +1 +LijnNr:%Integer +DOM.OV.Orderlijn + + 1 TECH.Iterator @@ -72,5 +78,5 @@ %Boolean - + Index: APPS/CRM/Interacties/BehandeldOnderwerp.cls.xml =================================================================== diff -u -r794 -r946 --- APPS/CRM/Interacties/BehandeldOnderwerp.cls.xml (.../BehandeldOnderwerp.cls.xml) (revision 794) +++ APPS/CRM/Interacties/BehandeldOnderwerp.cls.xml (.../BehandeldOnderwerp.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + vhLib.Macro 1 %RegisteredObject -62123,49838.77593 +62172,39578.295623 61886,61062.984522 0 @@ -99,8 +99,6 @@ set OnderwerpID = "" set dtoMetadata = ##class(APPS.CRM.Interacties.dto.Metadata).%New() - ;do WLIP^vhDBG(195,"Toepassing : "_Toepassing_" KlantDivisie : "_KlantDivisie) - set query = " SELECT Metadata , Metadata->Onderwerp AS Onderwerp , Toepassingen_Toepassing AS Toepassing" _ " FROM DOM_CRM_Interacties.Metadata_Toepassingen " _ " WHERE Toepassingen_Toepassing = ? AND Toepassingen_KlantDivisie = ? " @@ -124,6 +122,7 @@ set Actie = ##class(APPS.CRM.Interacties.dto.BehandeldOnderwerp.Actie).%New() set Actie.Omschrijving = Metadata.Actie.Omschrijving set Actie.ParamDataType = Metadata.Actie.ParamDataType + set Actie.ParamOmschrijving = Metadata.Actie.ParamOmschrijving set Actie.ParamExecCode = Metadata.Actie.ParamExecCode set Actie.ParamValidation = Metadata.Actie.ParamValidation do Item.Acties.Insert(Actie) @@ -163,8 +162,11 @@ do BehandeldOnderwerp.KlantSetObjectId("") do BehandeldOnderwerp.LevSetObjectId("") - set BehandeldOnderwerp.Oorsprong.ID = dtoBehandeldOnderwerp.OorsprongID + if $length(dtoBehandeldOnderwerp.OorsprongID) { + set BehandeldOnderwerp.Oorsprong.ID = dtoBehandeldOnderwerp.OorsprongID + } + if dtoBehandeldOnderwerp.DerdeType = "K" { do BehandeldOnderwerp.KlantSetObjectId(dtoBehandeldOnderwerp.DerdeID) } elseif dtoBehandeldOnderwerp.DerdeType = "L" { do BehandeldOnderwerp.LevSetObjectId(dtoBehandeldOnderwerp.DerdeID) } @@ -210,10 +212,13 @@ %List - + Index: DOM/LEV/TekstToeleveringLijn.cls.xml =================================================================== diff -u --- DOM/LEV/TekstToeleveringLijn.cls.xml (revision 0) +++ DOM/LEV/TekstToeleveringLijn.cls.xml (revision 946) @@ -0,0 +1,16 @@ + + + +1 +1 +DOM.LEV.ToeleveringLijn +62160,40745.062753 +0 + + +1 +%String + + + + Index: DOM/PM/Maatwerk/Calc/Kost/impl/TBX/SpecAntaroPlanv001.cls.xml =================================================================== diff -u --- DOM/PM/Maatwerk/Calc/Kost/impl/TBX/SpecAntaroPlanv001.cls.xml (revision 0) +++ DOM/PM/Maatwerk/Calc/Kost/impl/TBX/SpecAntaroPlanv001.cls.xml (revision 946) @@ -0,0 +1,26 @@ + + + +persistent +1 +DOM.PM.Maatwerk.Calc.Kost.impl.TBX.SpecTBXPlanv001 +62171,34069.256247 +0 + + +1 +1 +%Status + + + + +%Library.CacheStorage + + + + Index: TECH/Concurrency/TxScope.cls.xml =================================================================== diff -u -r868 -r946 --- TECH/Concurrency/TxScope.cls.xml (.../TxScope.cls.xml) (revision 868) +++ TECH/Concurrency/TxScope.cls.xml (.../TxScope.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Koppeling van Transactie aan locks en aan het huidige proces. @@ -9,7 +9,7 @@ TECH.Error 1 %RegisteredObject -62131,34139.927666 +62171,42309.778488 62055,48616.45905 0 @@ -169,9 +169,10 @@ - + Index: vhUnitTest/TestCase.cls.xml =================================================================== diff -u -r915 -r946 --- vhUnitTest/TestCase.cls.xml (.../TestCase.cls.xml) (revision 915) +++ vhUnitTest/TestCase.cls.xml (.../TestCase.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Adopted from InterSystems's %UnitTest.TestCase by logist (Dimas ltd., Russia) @@ -11,7 +11,7 @@ %outUnitTest,vhUnitTest 1 %RegisteredObject -62146,38225.206527 +62168,62325.255802 59429,64520.016065 0 @@ -33,9 +33,7 @@ %Status - @@ -235,5 +233,5 @@ ]]> - + Index: DOM/PM/Maatwerk/Calc/Kost/impl/TBX/SpecPlusPlanv001.cls.xml =================================================================== diff -u --- DOM/PM/Maatwerk/Calc/Kost/impl/TBX/SpecPlusPlanv001.cls.xml (revision 0) +++ DOM/PM/Maatwerk/Calc/Kost/impl/TBX/SpecPlusPlanv001.cls.xml (revision 946) @@ -0,0 +1,26 @@ + + + +persistent +1 +DOM.PM.Maatwerk.Calc.Kost.impl.TBX.SpecTBXPlanv001 +62172,37917.708024 +0 + + +1 +1 +%Status + + + + +%Library.CacheStorage + + + + Index: BL/PR/GA/TandemBoxRecalc.cls.xml =================================================================== diff -u -r734 -r946 --- BL/PR/GA/TandemBoxRecalc.cls.xml (.../TandemBoxRecalc.cls.xml) (revision 734) +++ BL/PR/GA/TandemBoxRecalc.cls.xml (.../TandemBoxRecalc.cls.xml) (revision 946) @@ -1,11 +1,11 @@ - + 1 PRGACNTs,%Prod.Product,BL.Derde.KlantSpecifiek 1 %RegisteredObject -62112,62248.49527 +62171,53615.306974 0 @@ -26,6 +26,15 @@ %String + +%Boolean + + + +%String +list + + %String 1 @@ -56,6 +65,7 @@ Set ..KlantNr=KLNr Set ..Stap=Stap Set ..FilterMethod=$S($L(FilterMethodName):FilterMethodName, 1:"ProductFilterTBXDefault") + Set ..blnCheckVersieNrPRBS=..#blnCheckVersieNrPRBS Quit $$$OK ]]> @@ -189,6 +199,12 @@ Else { Write "The array ""arProd"" will not be displayed (too many items)." } + w !,"test",! + If ..ManuelePRBSProducten.Count() { + Write ! + Write "Manuele PRBS-producten : "_$$$LCVT($$ObjectListToLB^vhLib(..ManuelePRBSProducten)) + } + Write ! Quit ]]> @@ -283,17 +299,23 @@ Set blnAddProduct=..ProductFilterTBXSpecific(PRNr,.LadeInfo) Quit:('blnAddProduct) - Set ControleerVersieNrPRBS=(..#blnCheckVersieNrPRBS) + Set VersieNrPRBS="" + Set ControleerVersieNrPRBS=(..blnCheckVersieNrPRBS) If ControleerVersieNrPRBS { Set VersieNrPRBS=$P($G(^PRBS("BS",PRNr),"\\1.0.0"),"\",3) ; Steeds controleren - Quit:(VersieNrPRBS="") + d WLIP^vhDBG(97,"v PRBS = "_VersieNrPRBS) + If VersieNrPRBS="" { + Do ..ManuelePRBSProducten.Insert(PRNr) + } } - Set Prijs=$S(KLNr?4.5N:..KlantPrijs(KLNr,PRNr), 1:$$$PRGet($$$PPLMTL) ) - Set $P(Prijs,"\",16)=From - Set $P(Prijs,"\",17)=$G(LadeInfo,"LadeInfo?") - Set arProd(PRNr)=Prijs - ;Do GetLO(PRNr,.LOAll,.arProd,From) + If VersieNrPRBS'="" { + Set Prijs=$S(KLNr?4.5N:..KlantPrijs(KLNr,PRNr), 1:$$$PRGet($$$PPLMTL) ) + Set $P(Prijs,"\",16)=From + Set $P(Prijs,"\",17)=$G(LadeInfo,"LadeInfo?") + Set arProd(PRNr)=Prijs + ;Do GetLO(PRNr,.LOAll,.arProd,From) + } Quit ]]> @@ -319,5 +341,5 @@ ]]> - + Index: DOM/PM/Maatwerk/Calc/Kost/impl/TBX/PlanVerpakkenv001.cls.xml =================================================================== diff -u --- DOM/PM/Maatwerk/Calc/Kost/impl/TBX/PlanVerpakkenv001.cls.xml (revision 0) +++ DOM/PM/Maatwerk/Calc/Kost/impl/TBX/PlanVerpakkenv001.cls.xml (revision 946) @@ -0,0 +1,47 @@ + + + +persistent +1 +DOM.PM.Maatwerk.Calc.Kost.SamengesteldKostItemBuilder +62171,53717.1458 +0 + + +SamengesteldKostItemBuilder:DOM.PM.Maatwerk.Calc.Kost.SamengesteldKostItemBuilder +1 +1 +%Status + + + + +%Library.CacheStorage + + + + Index: APPS/common/impl/StockOverKinderen.cls.xml =================================================================== diff -u -r917 -r946 --- APPS/common/impl/StockOverKinderen.cls.xml (.../StockOverKinderen.cls.xml) (revision 917) +++ APPS/common/impl/StockOverKinderen.cls.xml (.../StockOverKinderen.cls.xml) (revision 946) @@ -1,103 +1,197 @@ - + 1 %RegisteredObject -62154,61366.059403 +62172,58265.669066 0 + +%Date +1 + + + +%Integer + + + +APPS.common.enu.StockType +1 + + DOM.PR.BouwStenen.BouwSteenKind array +1 - -DOM.PR.BouwStenen.Product + +%Integer array +1 - -DOM.PR.BouwStenen.BouwSteenKind + +%Integer array +1 + +%Integer +array +1 + + + +%Integer +array +1 + + + +MoederPRNr:%Integer,StockType:APPS.common.enu.StockType,Datum:%Date="" +1 +1 +%Status + + + + +PRNr +1 +%String + + + + +PRNr +1 +%String + + + + +PRNr +1 +%String + + + + +PRNr +1 +%String + + + + + +Afhankelijk van het stocktype worden zaken al dan niet berekenend zodat die bij de bepaling van het aantal beschikbaar al dan niet +in rekening gebracht worden.. +%String + + + Moeder %ArrayOfDataTypes 0 - + set arKinderen = ##class(%ArrayOfObjects).%New() set oMoeder = ##class(DOM.PR.BouwStenen.Product).%OpenId(Moeder) + set itBouwStenen = ##class(TECH.ListIterator).%New(oMoeder.BouwStenen) while itBouwStenen.HasNext() { set BouwSteen = itBouwStenen.Next() - if BouwSteen.Type = ##class(DOM.PR.enu.BouwSteenType).KindProduct() { - do ..Kinderen.SetAt(BouwSteen,Kind) + if $IsObject(BouwSteen) && ( BouwSteen.Type = ##class(DOM.PR.enu.BouwSteenType).KindProduct() ) { + Set Kind = BouwSteen.KindProductGetObjectId() + do arKinderen.SetAt(BouwSteen,Kind) } } - quit ..Kinderen + quit arKinderen ]]> Kind %ArrayOfDataTypes Moeder %ArrayOfDataTypes - -Moeder -%String - - - -listKinderen %ArrayOfDataTypes -arMoedersOpOrder:%ArrayOfDataTypes 1 -%ArrayOfDataTypes - -listKinderen:%ListOfDataTypes + %ArrayOfDataTypes -listKinderen:%ListOfDataTypes %ArrayOfDataTypes -listKinderen:%ListOfDataTypes,arKinderenOpOrder:%ArrayOfDataTypes,arKinderenOpToelev:%ArrayOfDataTypes -listKinderen:%ListOfDataTypes,arKindBeschikbaar:%ArrayOfDataTypes AantalMogelijk) { set AantalMoedersMogelijk = AantalMogelijk } + set KindInfo = itKinderen.Next(),Kind = itKinderen.Key() + set AantalKinderenNodigVoorMoeder = KindInfo.Aantal + set AantalMogelijk = ##class(TECH.Math).Floor(..KinderenBeschikbaar.GetAt(Kind)/AantalKinderenNodigVoorMoeder) + if '$length(AantalMoedersMogelijk) { + set AantalMoedersMogelijk = AantalMogelijk + } + elseif (AantalMoedersMogelijk > AantalMogelijk) { + set AantalMoedersMogelijk = AantalMogelijk + } } - quit +AantalMoedersMogelijk ]]> - - -PRNr -1 -%String - - - -PRNr -1 -%String - - - - -PRNr -1 -%String - - - - -PRNr -1 -%String - - - + Index: DOM/OV/impl/DataM/DataMOrder.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/OV/impl/DataM/DataMOrder.cls.xml (.../DataMOrder.cls.xml) (revision 903) +++ DOM/OV/impl/DataM/DataMOrder.cls.xml (.../DataMOrder.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject,DOM.OV.Order -62154,29745.14952 +62168,56533.686918 62063,29965.721214 0 @@ -43,10 +43,18 @@ 1 %Status @@ -123,6 +131,20 @@ ]]> + +LijnNr:%Integer +DOM.OV.Orderlijn + + + %ListOfObjects - + Index: vhUnitTest/TECH/RoutineUtils.cls.xml =================================================================== diff -u -r734 -r946 --- vhUnitTest/TECH/RoutineUtils.cls.xml (.../RoutineUtils.cls.xml) (revision 734) +++ vhUnitTest/TECH/RoutineUtils.cls.xml (.../RoutineUtils.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 vhUnitTest.TestCase -62108,55564.022075 +62166,31522.088791 0 @@ -16,12 +16,12 @@ set ClassName = ##class(TECH.RoutineUtils).GeneratedClassCode("vhLib.String.MAC") do $$$AssertEquals("",ClassName) - set ClassName = ##class(TECH.RoutineUtils).GeneratedClassCode("WS.Web.OLParticulier.LadeSelector.2.INT") - do $$$AssertEquals("WS.Web.OLParticulier.LadeSelector",ClassName) + set ClassName = ##class(TECH.RoutineUtils).GeneratedClassCode("vhUnitTest.TECH.RoutineUtils.1.INT") + do $$$AssertEquals("vhUnitTest.TECH.RoutineUtils",ClassName) quit ]]> - + Index: DOM/PM/Maatwerk/Calc/HF/enu/TBXRol.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/PM/Maatwerk/Calc/HF/enu/TBXRol.cls.xml (.../TBXRol.cls.xml) (revision 903) +++ DOM/PM/Maatwerk/Calc/HF/enu/TBXRol.cls.xml (.../TBXRol.cls.xml) (revision 946) @@ -1,14 +1,14 @@ - + datatype 1 DOM.PM.Maatwerk.Calc.HF.enu.HalffabRol -62138,41783.6322 +62172,29389.065623 0 -,Antislipmat,Boxside,Reling,Opvullijst,LadeZijkant,FrontHouder,Bodem,Afdekkap,CorpusProfiel,FrontBevestiging,Zijwand,FrontRelingHouder,BoxCover,RugHouder,Rug +,Antislipmat,Boxside,ZijReling,FrontReling,Opvullijst,LadeZijkant,Front,FrontHouder,Bodem,Afdekkap,CorpusProfiel,FrontBevestiging,Zijwand,FrontRelingHouder,BoxCover,RugHouder,Rug,Tipon @@ -41,6 +41,12 @@ ]]> + +1 + + + 1 - + 1 - + +1 + + + 1 + +1 + + + 1 - + Index: DOM/OV/impl/DataM/DataMFactProfAbstract.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/OV/impl/DataM/DataMFactProfAbstract.cls.xml (.../DataMFactProfAbstract.cls.xml) (revision 903) +++ DOM/OV/impl/DataM/DataMFactProfAbstract.cls.xml (.../DataMFactProfAbstract.cls.xml) (revision 946) @@ -1,11 +1,11 @@ - + TO DO : BTW uitsplitising 1 %RegisteredObject -62154,39150.005731 +62159,28604.367381 0 @@ -37,6 +37,12 @@ ]]> + +%Date + + + %Date - + Index: BL/PPS/TBX/MultiProcessorEN.cls.xml =================================================================== diff -u -r901 -r946 --- BL/PPS/TBX/MultiProcessorEN.cls.xml (.../MultiProcessorEN.cls.xml) (revision 901) +++ BL/PPS/TBX/MultiProcessorEN.cls.xml (.../MultiProcessorEN.cls.xml) (revision 946) @@ -1,11 +1,11 @@ - + De verschillende processoren worden gecombineerd met een EN relatie 1 BL.PPS.TBX.MultiProcessor -62137,71291.994254 +62161,49955.410841 0 @@ -30,7 +30,21 @@ Quit Result ]]> + + +labelprinter:BL.Sys.LabelPrinter +%Boolean + + - + Index: Tools/MovePackage.cls.xml =================================================================== diff -u -r931 -r946 --- Tools/MovePackage.cls.xml (.../MovePackage.cls.xml) (revision 931) +++ Tools/MovePackage.cls.xml (.../MovePackage.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject -62160,38340.367545 +62164,34627.895877 0 @@ -19,12 +19,12 @@ Set ClassNameFrom = ResultSet.Data("Name") If (##class(TECH.StringUtils).StartsWith(ClassNameFrom,PackageFrom_".")) { - Set ClassNameTo = PackageTo_$Extract(ClassNameFrom,$Length(PackageFrom)+1,$Length(ClassNameFrom)) + Set ClassNameTo = PackageTo_$zobjclassmethod(ClassNameFrom,"%ClassName",0) Do ##class(Tools.MoveClass).%New().Move(ClassNameFrom,ClassNameTo) } } ]]> - + Index: DOM/PM/Maatwerk/Calc/Common/impl/TBXKenmerken.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/PM/Maatwerk/Calc/Common/impl/TBXKenmerken.cls.xml (.../TBXKenmerken.cls.xml) (revision 903) +++ DOM/PM/Maatwerk/Calc/Common/impl/TBXKenmerken.cls.xml (.../TBXKenmerken.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + persistent 1 DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken -62158,49418.937395 +62171,49959.218969 0 @@ -92,9 +92,7 @@ - -!!! nog niet geconverteerd, kanshebber om te vervallen -%String +DOM.PM.enu.TBXKlas @@ -432,5 +430,5 @@ - + Index: Default_JCL.prj.xml =================================================================== diff -u -r921 -r946 --- Default_JCL.prj.xml (.../Default_JCL.prj.xml) (revision 921) +++ Default_JCL.prj.xml (.../Default_JCL.prj.xml) (revision 946) @@ -1,11 +1,12 @@ - - + + + @@ -14,6 +15,8 @@ + + @@ -52,10 +55,17 @@ + + + + + + + @@ -67,5 +77,5 @@ - + Index: APPS/PM/KenmerkenService.cls.xml =================================================================== diff -u -r937 -r946 --- APPS/PM/KenmerkenService.cls.xml (.../KenmerkenService.cls.xml) (revision 937) +++ APPS/PM/KenmerkenService.cls.xml (.../KenmerkenService.cls.xml) (revision 946) @@ -1,12 +1,12 @@ - + JBL + 2011-02-28 TECH.Error 1 %RegisteredObject -62164,61084.207615 +62172,60463.727826 62159,61291.134957 0 @@ -17,6 +17,26 @@ 15 + +%String + + + +%ArrayOfObjects + + + +KenmerkGroep:%String +BL.Kenm.ProdMulti + + + Zoek productkenmerken aan de hand van de opgegeven PRNrs en productgroepen. @@ -37,6 +57,7 @@ Set KenmerkGroepen = ##class(Prod.Kenmerk.MetaGroep).GetAllMetaGroupsAsList() } Set ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI() + Set PRNrIterator = ##class(TECH.ListIterator).%New(PRNrs) While (PRNrIterator.HasNext()){ Set PRNr = PRNrIterator.Next() @@ -56,21 +77,18 @@ //MetaDefinities voor een hoofdgroep inlezen... Set RS=##class(%ResultSet).%New("Prod.Kenmerk.MetaDefinitie:FilterMetaDefsViaGroep") ///Multiple's inlezen - Set MultipleNrs = ##class(BL.Kenm.ProdMulti).Create(KenmerkGroep).GetMultiplesLB(PRNr) - If ($ll(MultipleNrs)=0) Set MultipleNrs = $lb("") + Set MultipleNrs = ..GeefBLProdMulti(KenmerkGroep).GetMultiplesLB(PRNr) + set bl=..GeefBLProdMulti(KenmerkGroep) + If ($ll(MultipleNrs)=0) Set MultipleNrs = $listbuild("") If ($Data(MultipleNrs)){ for i=1:1:$ll(MultipleNrs) { - Set MultipleNr = $p($lg(MultipleNrs,i),".",2) + Set MultipleNr = $Piece($listget(MultipleNrs,i),".",2) Set ProductKenmerken = ##class(APPS.PM.dto.Kenm.ProductKenmerken).%New() - Set ProductKenmerken.IDs = ##class(APPS.PM.dto.ProductIDs).%New() - Set ProductKenmerken.IDs.IdentNr = Product.GeefIdentNr() - Set ProductKenmerken.IDs.PRNr = PRNr - Set ProductKenmerken.IDs.Korttekst = Product.GeefKorttekst() - Set ProductKenmerken.IDs.MultipleNr = MultipleNr + - Set UnID = ##class(BL.Kenm.ProdMulti).%New().GetFullID(PRNr,MultipleNr) + Set UnID = ##class(BL.Kenm.ProdMulti).GetFullID(PRNr,MultipleNr) Set tmpStatus=RS.Execute(KenmerkGroep) Set KenmerkAanwezig = 0 @@ -79,7 +97,7 @@ Set DataDefID= ##class(Prod.Kenmerk.DataDefinitie).BuildDataDefinitionID(KenmerkGroep,UnID,RS.Get("Kenmerk")) If ##class(Prod.Kenmerk.DataDefinitie).%ExistsId(DataDefID){ - Set tmpDataDef=##class(Prod.Kenmerk.DataDefinitie).%OpenId(DataDefID) + Set tmpDataDef=##class(Prod.Kenmerk.DataDefinitie).%OpenId(DataDefID) Set ProductKenmerk = ##class(APPS.PM.dto.Kenm.ProductKenmerk).%New() Set ProductKenmerk.KenmerkNaam = tmpDataDef.Kenmerk.Kenmerk Set ProductKenmerk.Waarden = tmpDataDef.Waarden @@ -92,6 +110,11 @@ } if (KenmerkAanwezig){ /// ProductKenmerken toevoegen. + Set ProductKenmerken.IDs = ##class(APPS.PM.dto.ProductIDs).%New() + Set ProductKenmerken.IDs.IdentNr = Product.GeefIdentNr() + Set ProductKenmerken.IDs.PRNr = PRNr + Set ProductKenmerken.IDs.Korttekst = Product.GeefKorttekst() + Set ProductKenmerken.IDs.MultipleNr = MultipleNr Do ProductenKenmerken.Kenmerken.Insert(ProductKenmerken) } } @@ -170,57 +193,61 @@ "_ProductKenmerk.Waarden.GetAt(1)) - Set Kenmerk.Waarden = ProductKenmerk.Waarden - Set Status = Kenmerk.%Save() - If $$$ISERR(Status) + Set ErrorMsg = "Kenmerk "_Identifier_" voor UnID "_UnID_" is niet gevonden." + }Else{ + Set Kenmerk = ##class(Prod.Kenmerk.DataDefinitie).OpenId(Identifier) + + If ($IsObject(Kenmerk)) { - Set ErrorMsg = "Kenmerk "_ProductKenmerk.Groep_"||"_ProductKenmerk.KenmerkNaam_" voor UnID "_UnID_" kon niet worden gesaved.("_$$ParseStatus^vhLib(Status)_")" + Do Kenmerk.Waarden.Clear() + Do ##class(TECH.ListUtils).CopyList(ProductKenmerk.Waarden,Kenmerk.Waarden) + + Set Status = Kenmerk.Save() + If $$$ISERR(Status) + { + Set ErrorMsg = "Kenmerk "_ProductKenmerk.Groep_"||"_ProductKenmerk.KenmerkNaam_" voor UnID "_UnID_" kon niet worden gesaved.("_$$ParseStatus^vhLib(Status)_")" + } + }Else + { + Set ErrorMsg = "Kenmerk "_ProductKenmerk.Groep_"||"_ProductKenmerk.KenmerkNaam_" voor UnID "_UnID_" is niet gevonden." } - - }Else - { - Set ErrorMsg = "Kenmerk "_ProductKenmerk.Groep_"||"_ProductKenmerk.KenmerkNaam_" voor UnID "_UnID_" is niet gevonden." } } } If (ErrorMsg = ""){ - Do TxScope.Commit() + Do OperatieScope.Gelukt() }Else{ - Do TxScope.Rollback() - $$$ThrowError($$$errGeneralError,"Rollback KenmerkService->BewaarProductenKenmerk"_ErrorMsg) + Do OperatieScope.Gefaald(ErrorMsg) } Quit $$$OK ]]> - + Index: zTryout/PRA/Concurrency/WachtObject.cls.xml =================================================================== diff -u -r734 -r946 --- zTryout/PRA/Concurrency/WachtObject.cls.xml (.../WachtObject.cls.xml) (revision 734) +++ zTryout/PRA/Concurrency/WachtObject.cls.xml (.../WachtObject.cls.xml) (revision 946) @@ -1,8 +1,9 @@ - + +1 %RegisteredObject -62110,54807.213512 +62136,28578.97459 62103,53761.931853 0 @@ -37,5 +38,5 @@ ]]> - + Index: vhUnitTest/TECH/Error.cls.xml =================================================================== diff -u -r915 -r946 --- vhUnitTest/TECH/Error.cls.xml (.../Error.cls.xml) (revision 915) +++ vhUnitTest/TECH/Error.cls.xml (.../Error.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 vhUnitTest.TestCase,TECH.Error.ErrorAdaptor -62158,58414.557381 +62171,30162.434236 0 @@ -13,6 +13,11 @@ 1 + +%String +1 + + @@ -69,6 +77,40 @@ ]]> + + + + + + + + @@ -78,10 +120,11 @@ Label,Options - + Index: DOM/PM/Maatwerk/Calc/Kost/FixedMultiplier.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PM/Maatwerk/Calc/Kost/FixedMultiplier.cls.xml (.../FixedMultiplier.cls.xml) (revision 734) +++ DOM/PM/Maatwerk/Calc/Kost/FixedMultiplier.cls.xml (.../FixedMultiplier.cls.xml) (revision 946) @@ -1,11 +1,11 @@ - + Gewoon een vaste factor 1 -DOM.PM.Maatwerk.Calc.Kost.IMultiplier -62076,43961.108887 +%RegisteredObject,DOM.PM.Maatwerk.Calc.Kost.IMultiplier +62172,28584.22257 62070,52454.14338 0 @@ -32,5 +32,5 @@ ]]> - + Index: TECH/SourceCodeUtils.cls.xml =================================================================== diff -u -r877 -r946 --- TECH/SourceCodeUtils.cls.xml (.../SourceCodeUtils.cls.xml) (revision 877) +++ TECH/SourceCodeUtils.cls.xml (.../SourceCodeUtils.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject -62136,63719.06485 +62173,36075.248007 62118,40201.414242 0 @@ -81,27 +81,6 @@ quit InternalName ]]> - - -1 -InternalName:%String -%Date - - - + Index: DOM/PM/Maatwerk/Calc/Kost/impl/OLM/SpecOpMaatKostv001.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/PM/Maatwerk/Calc/Kost/impl/OLM/SpecOpMaatKostv001.cls.xml (.../SpecOpMaatKostv001.cls.xml) (revision 903) +++ DOM/PM/Maatwerk/Calc/Kost/impl/OLM/SpecOpMaatKostv001.cls.xml (.../SpecOpMaatKostv001.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + persistent 1 DOM.PM.Maatwerk.Calc.Kost.KostSpec -62150,36592.243497 +62171,48955.648017 0 @@ -22,10 +22,10 @@ -Context:KostContext,HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom +Context:KostContext,HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken DOM.PM.Maatwerk.Calc.Kost.SamengesteldKostItem %Library.CacheStorage - + Index: vhUnitTest/APPS/Halux/Planning/TestPlanningService.cls.xml =================================================================== diff -u -r915 -r946 --- vhUnitTest/APPS/Halux/Planning/TestPlanningService.cls.xml (.../TestPlanningService.cls.xml) (revision 915) +++ vhUnitTest/APPS/Halux/Planning/TestPlanningService.cls.xml (.../TestPlanningService.cls.xml) (revision 946) @@ -1,11 +1,11 @@ - + do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.Halux.Planning.TestPlanningService") 1 vhUnitTest.TestCase -62145,30393.86532 +62168,39788.499721 0 @@ -21,10 +21,29 @@ Set ^KTO(6332,296195,101)="\629192\1\\\47.68\#\\47.68\47.68\\L\1\\100\47.68\KTRPL\\\\E\EUR\\\11/06\\118153\101\\\\\\\\" Set ^KTO(6332,296195,102)="\629192\1\\\47.68\#\\47.68\47.68\\L\1\\100\47.68\KTRPL\\\\E\EUR\\\11/06\\118153\102\\\\\\\\" + Set ^KTO1(298209) ="6332\" + + Set ^KTO(6332,298209,0)=102 + Set ^KTO(6332,298209,1)="\18.03.11\KOMM. TESTKLANT VAN HOECK\\\6332\123441\1000\\\\\\\\\\EUR\62172,43200\\\2\\\\" + Set ^KTO(6332,298209,4)=2 + Set ^KTO(6332,298209,101)="\614077\1\\\21.14\#\\21.14\21.14\\L\1\\100\21.14\KTRPL\\\\E\EUR\\\11/12\\123441\101\\\\\\\\" + Quit $$$OK ]]> + +%Status + + + 0 @@ -78,7 +97,7 @@ Do $$$AssertEquals($Piece(Gepland," "),$zdt(62135,3),"Het item is gepland op de nieuwe datum") Set Bestaat = "" - &SQL(SELECT ID INTO :Bestaat FROM APPS_Halux_Planning_impl.ExplicietePlanning WHERE ToeleveringsNummer = 296196) + &SQL(SELECT ID INTO :Bestaat FROM APPS_Halux_Planning_impl.ExplicietePlanning WHERE ToeleveringsNummer = 133333) Set Bestaat = $Get(Bestaat,0) > 0 Do $$$AssertFalse(Bestaat, "De data voor de expliciete planning is niet bewaard") @@ -160,6 +179,40 @@ Do ##class(APPS.Halux.Planning.impl.EventCatcher).ToeleveringDeletedEventListener(ToeleveringDeletedEvent) ]]> + + + 0,"Een batch werd aangemaakt") + Do $$$AssertTrue(Resultaat.IsGeslaagd,"De batch werd gemaakt") + Do $$$AssertEquals(Resultaat.Errors.Count(),0,"Er zijn geen problemen") + + Do ##class(APPS.Halux.common.BatchService).%New().VerwijderBatch(Resultaat.BatchID) +]]> + + + + + - + Index: DOM/CRM/Interacties/MetadataImport/Parser.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/CRM/Interacties/MetadataImport/Parser.cls.xml (.../Parser.cls.xml) (revision 734) +++ DOM/CRM/Interacties/MetadataImport/Parser.cls.xml (.../Parser.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject -61901,55555.180915 +62172,39473.509016 0 @@ -25,6 +25,16 @@ 1 + +%String +1 + + + +%String +1 + + %String 1 @@ -42,7 +52,6 @@ %String -1 @@ -70,7 +79,10 @@ %String - @@ -86,41 +98,53 @@ ]]> - + %String - + %String + +%String + + + + +%String + + + %String - %String - %String - %String - - + Index: DOM/CRM/Stat/dto/KlantBeoordeling.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/CRM/Stat/dto/KlantBeoordeling.cls.xml (.../KlantBeoordeling.cls.xml) (revision 903) +++ DOM/CRM/Stat/dto/KlantBeoordeling.cls.xml (.../KlantBeoordeling.cls.xml) (revision 946) @@ -1,54 +1,50 @@ - + BL.Derde.LevSpecifiek,BL.Derde.KlantSpecifiek,%VHMacro,BL.EC.Common,%Prod.Product,TECH.Error 1 %RegisteredObject -62158,36456.499653 +62167,39855.436322 61807,38311.621993 0 %Integer - + %String - -%Float + +%String - -%Float + +%String - -%Float + +%String - -%Float + +%Integer - -%Float + +%String - -%Float + +%String - -%Float + +%Integer - -%Float - - - + %String @@ -60,10 +56,6 @@ %Float - -%Integer - - %Integer @@ -76,19 +68,13 @@ %Integer - -%Integer - - - -%Integer - - - + + +vermoedelijke %Date - + %Integer @@ -108,56 +94,82 @@ %Float - -1 - +%Float + + +%Float + - Set EDIRef=$P(FakRec,"\",21) - If (EDIRef'?4.8N)&&(..dto.KlantNr=1239)&&($P(FakRec,"\",5)["EDI") Do - . Set EDIRef=$P($P(FakRec,"\",5),"EDI",2) - . Set EDIRef=$P($P(EDIRef,"."),"/") - . Set EDIRef=$$TRIMN^vhRtn1(EDIRef) - Set IsEDI=''$L(EDIRef) - Set ..bl.OrdCache(ORDNr)=$G(..bl.OrdCache(ORDNr))+1 - Set Key4=ORDNr ; TODO maandafhankelijk - Set ..dto.ORDNr=ORDNr - Set ..dto.IsEDI=IsEDI - */ -]]> - + +%Float + + +%Float + + + +%Float + + + +%Float + + + +%Float + + + +%Float + + -Factuur:DOM.OV.Factuur +Klant:DOM.CRM.Klant,Factuur:DOM.OV.Factuur + -Bon:DOM.OV.Bon +Bon:DOM.OV.Bon,AdresKey:%String + OrderVerwijzing:DOM.OV.OrderVerwijzingOrderlijn + @@ -174,23 +186,23 @@ FactuurLijnAantal:%Integer,FactuurGroepAantal:%Integer,AdresLijnAantal:%Integer,AdresGroepAantal:%Integer,BonLijnAantal:%Integer,BonGroepAantal:%Integer,OrderLijnAantal:%Integer,OrderGroepAantal:%Integer - + Index: zTryout/WV/PM/IK/TBXKenmPlusSifonLade.cls.xml =================================================================== diff -u --- zTryout/WV/PM/IK/TBXKenmPlusSifonLade.cls.xml (revision 0) +++ zTryout/WV/PM/IK/TBXKenmPlusSifonLade.cls.xml (revision 946) @@ -0,0 +1,22 @@ + + + +persistent +1 +zTryout.WV.PM.IK.TBXKenmPlus,zTryout.WV.PM.IK.TBXKenmSifonLade +62167,49658.307469 +0 + + + + + + +%Library.CacheStorage + + + + Index: zJBL/Java/ExtraFacade.cls.xml =================================================================== diff -u --- zJBL/Java/ExtraFacade.cls.xml (revision 0) +++ zJBL/Java/ExtraFacade.cls.xml (revision 946) @@ -0,0 +1,18 @@ + + + +1 +Facade +62139,42153.303989 +0 + + +%String + + + + + Index: zTryout/WS/Webserver.cls.xml =================================================================== diff -u --- zTryout/WS/Webserver.cls.xml (revision 0) +++ zTryout/WS/Webserver.cls.xml (revision 946) @@ -0,0 +1,36 @@ + + + +1 +WS.WebService +62133,47200.171611 +0 + + + +Name of the WebService. +Webserver + + + +http://vhisie.vanhoecke.be/V3 + + + +%String +1 + + + + +initvalue:%CacheString +1 +1 +%Status + + + + + Index: DOM/PM/GroepClassificatie.cls.xml =================================================================== diff -u -r937 -r946 --- DOM/PM/GroepClassificatie.cls.xml (.../GroepClassificatie.cls.xml) (revision 937) +++ DOM/PM/GroepClassificatie.cls.xml (.../GroepClassificatie.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + ^KPHG1, ^KPSG1, ^KPGR1 @@ -34,5 +34,5 @@ %String - + Index: WS/Halux/Planning/Planningstool.cls.xml =================================================================== diff -u -r913 -r946 --- WS/Halux/Planning/Planningstool.cls.xml (.../Planningstool.cls.xml) (revision 913) +++ WS/Halux/Planning/Planningstool.cls.xml (.../Planningstool.cls.xml) (revision 946) @@ -1,14 +1,13 @@ - + +TECH.Error 1 WS.WebService -62158,60303.558611 +62165,34452.075427 0 - -Name of the WebService. Planningstool @@ -28,9 +27,7 @@ Van:%Date,Tot:%Date TECH.XMLDataSet 1 - @@ -41,6 +38,29 @@ ]]> + +DataGridNaam:%String,Gebruiker:%String +APPS.common.GUI.dto.KolomInfoLijst +1 + + + + +DataGridNaam:%String,Gebruiker:%String,KolomInfoLijst:APPS.common.GUI.dto.KolomInfoLijst +1 + + + + +ToeleveringNummers:%ListOfDataTypes +APPS.Halux.Planning.dto.MaakBatchResultaat +1 + + + Gebruiker:%String,Opmerking:%String,Datum:%Date,ToeleveringNummers:%ListOfDataTypes APPS.Halux.Planning.dto.VerplaatsToeleveringenResultaat @@ -65,5 +85,5 @@ ]]> - + Index: zTryout/CSC/TimingCopy/Writer.cls.xml =================================================================== diff -u --- zTryout/CSC/TimingCopy/Writer.cls.xml (revision 0) +++ zTryout/CSC/TimingCopy/Writer.cls.xml (revision 946) @@ -0,0 +1,111 @@ + + + +1 +%RegisteredObject +62160,39172.002386 +0 + + +%String + + + +Context:%String +1 +1 +%Status + + + + +StartLabel:%String + 0) + { + Set ParentLabel = LabelsQueue.GetAt(1) + Set ParentTimingUnit = Index.GetAt(ParentLabel) + Do LabelsQueue.RemoveAt(1) + + Set ResultSet = ##class(%ResultSet).%New("zTryout.CSC.Timing.Writer:GeefKnopen") + Do ResultSet.Execute(..Context, ParentLabel) + While (ResultSet.Next()) + { + Do LabelsQueue.Insert(ResultSet.Data("Label")) + + Set TimingUnit = ##class(zTryout.CSC.TimingCopy.TimingUnit).%New() + Set TimingUnit.Label = ResultSet.Data("Label") + Set TimingUnit.ParentLabel = ResultSet.Data("ParentLabel") + Set TimingUnit.Aantal = ResultSet.Data("Aantal") + Set TimingUnit.Minimum = ResultSet.Data("Minimum") + Set TimingUnit.Average = ResultSet.Data("Average") + Set TimingUnit.Maximum = ResultSet.Data("Maximum") + + Do Index.SetAt(TimingUnit, TimingUnit.Label) + Do ParentTimingUnit.Children.Insert(TimingUnit) + } + } + + Do ..Verwerk(Index.GetAt(StartLabel)) +]]> + + + +Knoop:zTryout.CSC.TimingCopy.TimingUnit,Niveau:%Integer=0 + 0) + { + w ", Aant: "_Knoop.Aantal_", Avg: "_$Piece(Knoop.Average,".")_"."_$Extract($Piece(Knoop.Average,".",2),1,2) + w !,Indentatie_"Min: "_Knoop.Minimum_", Max: "_Knoop.Maximum + } + + Set Iterator = ##class(TECH.ListIterator).%New(Knoop.Children) + While (Iterator.HasNext()) + { + Do ..Verwerk(Iterator.Next(),(Niveau+1)) + } +]]> + + + +%SQLQuery +Context:%String,ParentLabel:%String + SELECT Label, ParentLabel, count(1) as Aantal, min(Duurtijd) as Minimum, avg(Duurtijd) as Average, max(Duurtijd) as Maximum + FROM TECH_Timing.Timer + WHERE Context = :Context AND ParentLabel = :ParentLabel + GROUP BY ParentLabel, Label + + + + Index: vhUnitTest/DOM/PM/Maatwerk/OLM/TestBuilders.cls.xml =================================================================== diff -u -r915 -r946 --- vhUnitTest/DOM/PM/Maatwerk/OLM/TestBuilders.cls.xml (.../TestBuilders.cls.xml) (revision 915) +++ vhUnitTest/DOM/PM/Maatwerk/OLM/TestBuilders.cls.xml (.../TestBuilders.cls.xml) (revision 946) @@ -1,11 +1,11 @@ - + do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","DOM.PM.Maatwerk.OLM.TestBuilders") 1 vhUnitTest.TestCase -62150,36179.110841 +62173,31377.685969 0 @@ -23,7 +23,8 @@ Set Context=##class(vhUnitTest.DOM.PM.Maatwerk.OLM.impl.UTContext).%New(Familie,Variant,BerekeningsSpecificatie) Set PRNr = 191579 //202630 - Do ##class(Prod.Product).SetPropViaNr(PRNr,"HFNettoLengte",1000) + Set LengteOrigineelProduct = 1000 + Do ##class(Prod.Product).SetPropViaNr(PRNr,"HFNettoLengte",LengteOrigineelProduct) Set IngegevenKenmerken=##class(DOM.PM.Maatwerk.Calc.Common.impl.OLMKenmerken).%New() Set IngegevenKenmerken.InTeKortenPRNr = PRNr @@ -40,11 +41,11 @@ Do $$$AssertEquals(BewerktItem.GeefRol(),##class(DOM.PM.Maatwerk.Calc.HF.enu.OLMRol).OpMaatProduct(),"Het orgalux product op maat") Do $$$AssertEquals(BewerktItem.AfwijkendeKenmerkenToString(),"Lengte","Het product wijkt af in de lengte") - Do $$$AssertEquals(BewerktItem.Aantal,(IngegevenKenmerken.TeBekomenLengte+3)/(800),"Het te verwerken aantal") + Do $$$AssertEquals(BewerktItem.Aantal,((IngegevenKenmerken.TeBekomenLengte+3)*1.2)/(LengteOrigineelProduct),"Het te verwerken aantal") Do $$$AssertEquals(BewerktItem.TeBekomenAantal,1,"Het te bekomen aantal") Set KostContext = ##class(vhUnitTest.DOM.PM.Maatwerk.OLM.impl.UTKostContext).%New(Familie, Variant, BerekeningsSpecificatie) - Set KostItem = KostContext.GeefKostSpec().BerekenKostDetails(KostContext,HalffabItemsBoom) + Set KostItem = KostContext.GeefKostSpec().BerekenKostDetails(KostContext,HalffabItemsBoom,IngegevenKenmerken) Set KostIterator = KostItem.GeefKostItemsIterator() @@ -84,5 +85,5 @@ ]]> - + Index: vhUnitTest/DOM/PM/Maatwerk/HF/DataSetTestItem.cls.xml =================================================================== diff -u --- vhUnitTest/DOM/PM/Maatwerk/HF/DataSetTestItem.cls.xml (revision 0) +++ vhUnitTest/DOM/PM/Maatwerk/HF/DataSetTestItem.cls.xml (revision 946) @@ -0,0 +1,77 @@ + + + +1 +%RegisteredObject +62166,55053.536091 +0 + + +DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken + + + +DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie + + + + +Key van het te testen item +%String + + + + +Omschrijving van het te testen item +%String + + + +%Float + + + +%String + + + +%Float + + + +%String + + + +%String + + + +IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken,Key:%String,Omschrijving:%String="",BerekeningsSpecificatie:DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie="" +1 +1 +%Status + + + + +%String + + + + +%String + + + + + Index: DOM/PM/Maatwerk/Calc/HF/impl/KAD/SpecMainHFv001.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PM/Maatwerk/Calc/HF/impl/KAD/SpecMainHFv001.cls.xml (.../SpecMainHFv001.cls.xml) (revision 734) +++ DOM/PM/Maatwerk/Calc/HF/impl/KAD/SpecMainHFv001.cls.xml (.../SpecMainHFv001.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + persistent 1 DOM.PM.Maatwerk.Calc.HF.HalffabSpec -62115,35652.760153 +62167,50687.179089 62012,63523.549779 0 @@ -21,9 +21,15 @@ ]]> + +%Integer + + + %Library.CacheStorage - + Index: WS/PM/KenmerkenService.cls.xml =================================================================== diff -u -r937 -r946 --- WS/PM/KenmerkenService.cls.xml (.../KenmerkenService.cls.xml) (revision 937) +++ WS/PM/KenmerkenService.cls.xml (.../KenmerkenService.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + JBL + 2011-03-03 @@ -67,5 +67,5 @@ ]]> - + Index: APPS/PM/dto/ProductIDs.cls.xml =================================================================== diff -u -r937 -r946 --- APPS/PM/dto/ProductIDs.cls.xml (.../ProductIDs.cls.xml) (revision 937) +++ APPS/PM/dto/ProductIDs.cls.xml (.../ProductIDs.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + JBL + 2011-02-28 @@ -25,5 +25,5 @@ %String - + Index: DOM/PM/Product.cls.xml =================================================================== diff -u -r937 -r946 --- DOM/PM/Product.cls.xml (.../Product.cls.xml) (revision 937) +++ DOM/PM/Product.cls.xml (.../Product.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 1 -62164,43960.244482 +62164,53153.825679 62129,41516.729033 0 @@ -57,6 +57,11 @@ %Boolean + +1 +%Boolean + + 1 %String @@ -69,5 +74,5 @@ TECH.Iterator - + Index: vhUnitTest/DOM/PM/Maatwerk/TBXProduct/TestTBXLade.cls.xml =================================================================== diff -u -r915 -r946 --- vhUnitTest/DOM/PM/Maatwerk/TBXProduct/TestTBXLade.cls.xml (.../TestTBXLade.cls.xml) (revision 915) +++ vhUnitTest/DOM/PM/Maatwerk/TBXProduct/TestTBXLade.cls.xml (.../TestTBXLade.cls.xml) (revision 946) @@ -1,11 +1,11 @@ - + do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","DOM.PM.Maatwerk.TBXProduct.TestTBXLade") 1 vhUnitTest.TestCase -62152,29552.705212 +62172,60117.682003 0 @@ -29,10 +29,12 @@ Do $$$AssertTrue($IsObject(Product),"De API gaf een correct object terug") Do $$$AssertTrue(Product.%Extends("DOM.PM.TBXProduct.TBXLade"),"Het product is een tandembox lade") - + Do $$$AssertTrue('Product.BevatInTeKortenAntislipmat(),"Bevat geen in te korten antislipmat") + Do $$$AssertTrue('Product.BevatInTeKortenFront(),"Bevat geen in te korten front") Do $$$AssertTrue('Product.BevatInTeKortenGlas(),"Bevat geen in te korten glas") Do $$$AssertTrue('Product.BevatInTeKortenFrontGlas(),"Bevat geen in te korten front glas") Do $$$AssertTrue('Product.BevatInTeKortenReling(),"Bevat geen in te korten reling") + Do $$$AssertTrue('Product.BevatInTeKortenFrontReling(),"Bevat geen in te korten frontreling") Do $$$AssertTrue('Product.BevatInTeKortenStabilisator(),"Bevat geen in te korten stabilisatoren") Do $$$AssertTrue('Product.BevatInTeKortenZijkantGlas(),"Bevat geen in te korten zijkantglas") Do $$$AssertTrue(Product.BevatReling(),"Bevat een reling") @@ -46,6 +48,7 @@ Do $$$AssertTrue('Product.BevatVoorgezaagdeBodem(),"Bevat een voorgezaagde bodem") Do $$$AssertTrue(Product.BevatRug(),"Bevat een rug") Do $$$AssertTrue($IsObject(Product.GeefRug()),"De rug is een object") + Do $$$AssertEquals(Product.GeefAantalRelingen(),4,"Bevat 4 relingen") Do $$$AssertEquals(Product.GeefBlumotion(),##class(DOM.PM.enu.TBXBlumotion).Geintegreerd(),"Geïntegreerde blumotion") Do $$$AssertEquals(Product.GeefBodemKleur(),"LG","Bodemkleur lichtgrijs") Do $$$AssertEquals(Product.GeefBodemBreedte(),1059,"Breedte van de bodem") @@ -76,7 +79,7 @@ Do $$$AssertEquals(Product.GeefWandDikte(),0,"Wanddikte 0 (niet ingesteld)") Do $$$AssertEquals(Product.GeefZijkantDesign(),##class(DOM.PM.enu.TBXZijkantDesign).S(),"S design") Do $$$AssertEquals(Product.GeefSpoelbakDiepte(),360,"SpoelbakDiepte 360") - Do $$$AssertEquals(Product.GeefVerpakking(),##class(DOM.PM.enu.TBXVerpakking).S(),"De verpakking") + Do $$$AssertEquals(Product.GeefVerpakking(),##class(DOM.PM.enu.TBXVerpakking).StukMetOnderdelen(),"De verpakking") Do $$$AssertEquals(Product.GeefZijkantHoogte(),##class(DOM.PM.enu.TBXZijkantHoogte).M(),"M hoogte") Do $$$AssertEquals(Product.GeefZijkantKleur(),"MG","Zijkantkleur") Do $$$AssertEquals(Product.GeefZijwandHoogte(),##class(DOM.PM.enu.TBXZijwandHoogte).D(),"M hoogte") @@ -146,5 +149,5 @@ ]]> - + Index: DOM/PM/Maatwerk/Calc/Kost/StandaardActiviteitKostItemBuilder.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PM/Maatwerk/Calc/Kost/StandaardActiviteitKostItemBuilder.cls.xml (.../StandaardActiviteitKostItemBuilder.cls.xml) (revision 734) +++ DOM/PM/Maatwerk/Calc/Kost/StandaardActiviteitKostItemBuilder.cls.xml (.../StandaardActiviteitKostItemBuilder.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + To keep it simple, this class represents a linear approximation for @@ -32,7 +32,7 @@ vhLib.Macro 1 DOM.PM.Maatwerk.Calc.Kost.ActiviteitKostItemBuilder -62115,58002.601863 +62172,38331.890465 62070,52453.999389 0 @@ -97,11 +97,11 @@ -Context:DOM.PM.Maatwerk.Calc.Kost.KostContext,HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom +Context:DOM.PM.Maatwerk.Calc.Kost.KostContext,HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken DOM.PM.Maatwerk.Calc.Kost.ActiviteitKostItem @@ -187,5 +187,5 @@ - + Index: APPS/PM/dto/ProductZoekResultaat.cls.xml =================================================================== diff -u -r917 -r946 --- APPS/PM/dto/ProductZoekResultaat.cls.xml (.../ProductZoekResultaat.cls.xml) (revision 917) +++ APPS/PM/dto/ProductZoekResultaat.cls.xml (.../ProductZoekResultaat.cls.xml) (revision 946) @@ -1,12 +1,13 @@ - + JBL + 2011-02-24 Een restultaat product van een zoekopdracht, met enkele property's van een product. 1 %RegisteredObject,%XML.Adaptor 62153,29166.407612 +62165,30924.77405 0 @@ -43,5 +44,5 @@ - + Index: DOM/PM/Maatwerk/Calc/Kost/impl/TBX/SpecPlusKostv001.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PM/Maatwerk/Calc/Kost/impl/TBX/SpecPlusKostv001.cls.xml (.../SpecPlusKostv001.cls.xml) (revision 734) +++ DOM/PM/Maatwerk/Calc/Kost/impl/TBX/SpecPlusKostv001.cls.xml (.../SpecPlusKostv001.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + persistent 1 DOM.PM.Maatwerk.Calc.Kost.KostSpec -62115,37289.075501 +62172,32357.256143 0 @@ -13,7 +13,7 @@ %Status %Library.CacheStorage - + Index: zTryout/WV/PM/IK/TBXKenmSpoelbakLade.cls.xml =================================================================== diff -u --- zTryout/WV/PM/IK/TBXKenmSpoelbakLade.cls.xml (revision 0) +++ zTryout/WV/PM/IK/TBXKenmSpoelbakLade.cls.xml (revision 946) @@ -0,0 +1,23 @@ + + + +persistent +1 +zTryout.WV.PM.IK.TBXKenmerkenv01 +62167,51554.442453 +0 + + + + + + +%Library.CacheStorage + + + + Index: DOM/PM/Maatwerk/Calc/Kost/impl/TBX/SpecIntivoPlanv001.cls.xml =================================================================== diff -u --- DOM/PM/Maatwerk/Calc/Kost/impl/TBX/SpecIntivoPlanv001.cls.xml (revision 0) +++ DOM/PM/Maatwerk/Calc/Kost/impl/TBX/SpecIntivoPlanv001.cls.xml (revision 946) @@ -0,0 +1,26 @@ + + + +persistent +1 +DOM.PM.Maatwerk.Calc.Kost.impl.TBX.SpecTBXPlanv001 +62171,34080.447057 +0 + + +1 +1 +%Status + + + + +%Library.CacheStorage + + + + Index: zTryout/WV/PM/IK/TBXKenmPlus.cls.xml =================================================================== diff -u --- zTryout/WV/PM/IK/TBXKenmPlus.cls.xml (revision 0) +++ zTryout/WV/PM/IK/TBXKenmPlus.cls.xml (revision 946) @@ -0,0 +1,49 @@ + + + +persistent +1 +zTryout.WV.PM.IK.TBXKenmerkenv01 +62167,51515.833828 +0 + + + + + + +%Library.CacheStorage + + + + Index: DOM/PM/Maatwerk/Calc/Kost/impl/TBX/SpecMengvormPlanv001.cls.xml =================================================================== diff -u --- DOM/PM/Maatwerk/Calc/Kost/impl/TBX/SpecMengvormPlanv001.cls.xml (revision 0) +++ DOM/PM/Maatwerk/Calc/Kost/impl/TBX/SpecMengvormPlanv001.cls.xml (revision 946) @@ -0,0 +1,22 @@ + + + +persistent +1 +DOM.PM.Maatwerk.Calc.Kost.impl.TBX.SpecTBXPlanv001 +62172,44223.909039 +0 + + +1 +1 +%Status + + + + + Index: TECH/DataTime.cls.xml =================================================================== diff -u --- TECH/DataTime.cls.xml (revision 0) +++ TECH/DataTime.cls.xml (revision 946) @@ -0,0 +1,26 @@ + + + +1 +%RegisteredObject +62165,29740.476939 +0 + + +1 +Horologe:%String +%Integer + + + + +1 +Timestamp:%String +%Integer + + + + + Index: vhUnitTest/DOM/OV/OrderData.cls.xml =================================================================== diff -u -r915 -r946 --- vhUnitTest/DOM/OV/OrderData.cls.xml (.../OrderData.cls.xml) (revision 915) +++ vhUnitTest/DOM/OV/OrderData.cls.xml (.../OrderData.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject -62144,38954.728426 +62161,30868.90586 0 @@ -20,6 +20,26 @@ Set ^KOD(1000,"F",118382,101) = "\\\\Dit is een tekstlijn.\\\\\\\\\\100\\KF11#1\28591;T;;OWBFI\\\\\\\\\\\\\\\\\\" Set ^KOD(1000,"F",118382,102) = "703000\\1\\Dit is een manuele lijn\25.00\\8\25.00\25.00\703000\\\\110\25.00\KF1925###\\\\\EUR\\\\\\\\\\\\\\" Set ^KOD(1000,"F",118382,103) = "703000 \11611\1000\\\1.98\0#\8\19.80\19.80\703000 \L\\\120\19.80\KF0\\\\H1\EUR\\1\62129\\\\\\\\\\\\\\\\\\\\\1\\" + + + Set ^KO1(123346,"F") = "1000\" + + Set ^KOD(1000,"F",123346,0)=103 + Set ^KOD(1000,"F",123346,1)="\10.03.11\TEST\\\1000\EX;1`EX;3`EX;5\1111#2042#62160,53165\\cw@vanhoecke.be\\\\\\\\EUR\\\60\2\\DIV#62160,53165#123346\\\\\\\\\\\\\\\\\\\\\62160,53165" + Set ^KOD(1000,"F",123346,2)="\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\" + Set ^KOD(1000,"F",123346,3)="1\TESTKLANT VAN HOECKE nv\\FIRMA\Europark noord 9\9100\Sint-Niklaas\1019\N\\\\\\\\\\.\\\\test cw\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\" + Set ^KOD(1000,"F",123346,4)=3 + Set ^KOD(1000,"F",123346,101)="703100 \614305\1\\\97.14\0#\8\97.14\97.14\703100 \L\\\100\97.14\KF0\\\\E1\EUR\\1\62171\\298104\101\\\\\\\\\\\\\\\\\\1\\" + Set ^KOD(1000,"F",123346,102)="703100 \620939\1\\\78.75\0#\8\78.75\78.75\703100 \L\\\110\78.75\KF0\\\\E1\EUR\\1\62171\\298104\102\\\\\\\\\\\\\\\\\\1\\MC;5894.136619718309859" + + Set ^KTO1(298104)="6332\" + + Set ^KTO(6332,298104,0)=103 + Set ^KTO(6332,298104,1)="\10.03.11\KOMM. TESTKLANT VAN HOECK\\\6332\123346\1000\\\\\\\\\\EUR\62168,43200\\\2\\\\" + Set ^KTO(6332,298104,4)=3 + Set ^KTO(6332,298104,101)="\614305\1\\\46.16\#\\46.16\46.16\\L\1\\100\46.16\KTRPL\\\\E\EUR\\\11/11\\123346\101\\\\\\\\" + Set ^KTO(6332,298104,102)="\620939\1\\\37.42\#\\37.42\37.42\\L\2\\200\37.42\KTRPL\\\\E\EUR\\\11/11\\123346\102\\\\\\\\" + Quit $$$OK ]]> @@ -28,8 +48,14 @@ - + Index: vhUnitTest/DOM/PM/Maatwerk/HF/impl/UTHalffabSpec.cls.xml =================================================================== diff -u -r734 -r946 --- vhUnitTest/DOM/PM/Maatwerk/HF/impl/UTHalffabSpec.cls.xml (.../UTHalffabSpec.cls.xml) (revision 734) +++ vhUnitTest/DOM/PM/Maatwerk/HF/impl/UTHalffabSpec.cls.xml (.../UTHalffabSpec.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + persistent 1 DOM.PM.Maatwerk.Calc.HF.HalffabSpec -62115,39642.231204 +62167,50713.379797 0 @@ -30,9 +30,15 @@ ]]> + +%Integer + + + %Library.CacheStorage - + Index: APPS/PM/ProductService.cls.xml =================================================================== diff -u -r937 -r946 --- APPS/PM/ProductService.cls.xml (.../ProductService.cls.xml) (revision 937) +++ APPS/PM/ProductService.cls.xml (.../ProductService.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + TECH.Error 1 %RegisteredObject -62164,48757.3626 +62165,38046.539141 62159,61291.418178 0 @@ -99,12 +99,14 @@ $$$TECHErrorTrapOn Set DTOClassificatieRoot = ##class(APPS.PM.dto.Classificatie).%New() Set DTOClassificatieRoot.Omschrijving = "ROOT" + Set ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI() - + /// Doorlopen van hoofdgroepen Set HoofdgroepClassificatieIt = ProductAPI.GeefClassificaties() While(HoofdgroepClassificatieIt.HasNext()) { + Set HoofdgroepClassificatie = HoofdgroepClassificatieIt.Next() Set Classificatie = ProductAPI.GeefClassificatie(ClassificatieKey, HoofdgroepClassificatie.GeefClassificatieKey()) @@ -155,10 +157,10 @@ Set Classificatie = ##class(APPS.PM.dto.Classificatie).%New() Set Classificatie.Code = ClassificatieObject.GeefCode() Set Classificatie.Omschrijving = ClassificatieObject.GeefNederlands() - Set Classificatie.KKey = ClassificatieObject.GeefClassificatieKey() + Set Classificatie.ClassificatieKey = ClassificatieObject.GeefClassificatieKey() Quit Classificatie ]]> - + Index: zTryout/PRA/Concurrency/TxEnLocksViaSql.cls.xml =================================================================== diff -u -r734 -r946 --- zTryout/PRA/Concurrency/TxEnLocksViaSql.cls.xml (.../TxEnLocksViaSql.cls.xml) (revision 734) +++ zTryout/PRA/Concurrency/TxEnLocksViaSql.cls.xml (.../TxEnLocksViaSql.cls.xml) (revision 946) @@ -1,8 +1,9 @@ - + +1 %RegisteredObject -62109,57703.733999 +62136,28548.823487 62042,55871.268209 0 @@ -53,5 +54,5 @@ ]]> - + Index: DOM/PM/OL/Gamma/impl/ProductenNaarVerkoophandboek.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/PM/OL/Gamma/impl/ProductenNaarVerkoophandboek.cls.xml (.../ProductenNaarVerkoophandboek.cls.xml) (revision 903) +++ DOM/PM/OL/Gamma/impl/ProductenNaarVerkoophandboek.cls.xml (.../ProductenNaarVerkoophandboek.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + TECH.Error,BL.Sys.FOP.Common,DOM.DomeinContext 1 DOM.PM.OL.Gamma.IProductenNaarVerkoophandboek -62153,42914.009527 +62168,54567.607595 0 @@ -29,6 +29,7 @@ %Boolean +1 @@ -216,7 +217,9 @@ 1 DOM.PM.OL.Gamma.dto.ProductInfoVoorPrijslijst - + Index: vhUnitTest/APPS/common/GUI/TestDataGridService.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/common/GUI/TestDataGridService.cls.xml (revision 0) +++ vhUnitTest/APPS/common/GUI/TestDataGridService.cls.xml (revision 946) @@ -0,0 +1,90 @@ + + + + +do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.common.GUI.TestDataGridService") +1 +vhUnitTest.TestCase +62161,48932.160296 +0 + + + + + + + Index: DOM/PM/OL/Gamma/dto/Product.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/PM/OL/Gamma/dto/Product.cls.xml (.../Product.cls.xml) (revision 903) +++ DOM/PM/OL/Gamma/dto/Product.cls.xml (.../Product.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject,%XML.Adaptor -62144,36165.788113 +62159,52860.799101 61947,48025.510415 0 @@ -61,12 +61,6 @@ 1 - - - -LadeVereisten - - @@ -89,5 +83,5 @@ list - + Index: BL/FOP/Prod/Product.cls.xml =================================================================== diff -u -r734 -r946 --- BL/FOP/Prod/Product.cls.xml (.../Product.cls.xml) (revision 734) +++ BL/FOP/Prod/Product.cls.xml (.../Product.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + %VHMacro,BL.Derde.KlantSpecifiek,%Prod.Product 1 %RegisteredObject,%XML.Adaptor -62074,42182.415105 +62172,25618.434718 60017,33785.729951 0 @@ -20,6 +20,11 @@ %String + +%String + + + %String @@ -96,6 +101,7 @@ Set CodeMaatwerk=$$BARCODE^HAD(PRNr,"F") Set ..IDENTNR=$S($L(CodeMaatwerk):CodeMaatwerk, 1:$P(@Ref@(2),"\",25)) Set ..KORTTEKST=$P(@Ref@(0),"\",1) + Set ..EANCode=$P(@Ref@(2),"\",14) Set ..STOCK=$S($P(@Ref@(1),"\",20):"S",1:"N") If ..STOCK'="S" Do . Set ..LEVERTERMIJN=$P(RecJ,"\",7) @@ -122,7 +128,7 @@ . Quit:($G(OutputAction)?1(1"PRINT",1"FAX")) . Set ..InfoUrl=blImage.GetInfoPageURL(PRNr, "E", Taal) // URL van ProductBeeld om ge-embed te worden in de PDF door FOP; Returns proxy-object pxAttribType - If (Basis="[Prod.VoorraadTelling]")||(blImage.ShowProductImage(KLNr,PRNr,Basis)) Do + If (Basis="[Prod.VoorraadTellingXXX]")||(blImage.ShowProductImage(KLNr,PRNr,Basis)) Do ; (Basis="[Prod.VoorraadTelling]") ; modified by WimV on 11/03/2011 . Set ..ImageUrl=blImage.GetProductImageURL(PRNr,"FOPEMBED"_$S($G(OutputType)="PS":"PS", $G(OutputType)="PDF":"PDF", 1:"")) . ;d WLIP^vhDBG(97,$J(PRNr,8)_" : "_$S($IsObject(..ImageUrl):..ImageUrl.Content, 1:"")) @@ -174,5 +180,5 @@ ]]> - + Index: zTryout/CSC/TestKlas.cls.xml =================================================================== diff -u --- zTryout/CSC/TestKlas.cls.xml (revision 0) +++ zTryout/CSC/TestKlas.cls.xml (revision 946) @@ -0,0 +1,34 @@ + + + +DOM.OV,DOM.PM +1 +zTryout.CSC.TestKlas2 +62168,50431 + + +zTryout.CSC.TestKlas2 + + + +Product + + + + +zTryout.CSC.TestKlas2 + + + + + +Do ##class(zTryout.CSC.TestKlas).%New().DoeIets() +e:%Integer +%Integer + + + + + Index: vhUnitTest/APPS/PM/Maatwerk/IngegevenKenmUpgradeMock.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/PM/Maatwerk/IngegevenKenmUpgradeMock.cls.xml (revision 0) +++ vhUnitTest/APPS/PM/Maatwerk/IngegevenKenmUpgradeMock.cls.xml (revision 946) @@ -0,0 +1,18 @@ + + + +1 +APPS.PM.Maatwerk.IngegevenKenmUpgrade +62160,47917.494355 +0 + + +1 +1 +%String + + + + + Index: UnitTests.prj.xml =================================================================== diff -u --- UnitTests.prj.xml (revision 0) +++ UnitTests.prj.xml (revision 946) @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: DOM/PM/Maatwerk/Calc/Kost/BewerkingNodigEvaluator.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PM/Maatwerk/Calc/Kost/BewerkingNodigEvaluator.cls.xml (.../BewerkingNodigEvaluator.cls.xml) (revision 734) +++ DOM/PM/Maatwerk/Calc/Kost/BewerkingNodigEvaluator.cls.xml (.../BewerkingNodigEvaluator.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Evalueert of een bewerking nodig is voor een halffabrikaat. @@ -19,7 +19,7 @@ inschuifelement ingekort worden in de hoogte. 1 DOM.PM.Maatwerk.Calc.Kost.IEvaluator,%RegisteredObject -62081,28966.48292 +62172,29260.593832 62070,52454.057142 0 @@ -48,17 +48,18 @@ -HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,Context:DOM.PM.Maatwerk.Calc.Kost.KostContext +HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,Context:DOM.PM.Maatwerk.Calc.Kost.KostContext,IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken %Boolean - + Index: zTryout/CSC/KenmerkConversie.cls.xml =================================================================== diff -u --- zTryout/CSC/KenmerkConversie.cls.xml (revision 0) +++ zTryout/CSC/KenmerkConversie.cls.xml (revision 946) @@ -0,0 +1,129 @@ + + + +1 +%RegisteredObject +62137,39236.215885 +0 + + + +d ##class(zTryout.CSC.KenmerkConversie).ConverteerTBX() +1 + 0) + { + w "Probleem bij product "_PRNr_":",! + Set Iterator = ##class(TECH.ListIterator).%New(ErrorLijst) + While (Iterator.HasNext()) + { + w Iterator.Next(),! + } + } + Else + { + Set Familie = Product.GeefFamilie() + Set Variant = Product.GeefVariant() + Set ProductSpecificatie = ##class(DOM.PM.Maatwerk.Calc.Common.ProductSpecificatie).%New(Familie, Variant, Kenmerken) + Do ProductSpecificatie.Annotaties.SetAt("De ingegeven kenmerken werden gegenereerd door conversie van het oude product","Gegenereerd door") + Set Status = ProductSpecificatie.%Save() + + Set ParsedStatus = $$ParseStatus^vhLib(Status) + If (ParsedStatus '= "") + { + w "Save gefaald voor "_PRNr_": "_ParsedStatus,! + } + Else + { + Set $Piece(^KPR(Product.GeefPRNr(),15),"\",13) = ProductSpecificatie.%Id() + } + } + } + Set PRNr = $Order(^KPR(PRNr)) + } +]]> + + + + +d ##class(zTryout.CSC.KenmerkConversie).ConverteerKAD() +1 + 0) + { + w "Probleem bij product "_ID_":",! + Set Iterator = ##class(TECH.ListIterator).%New(ErrorLijst) + While (Iterator.HasNext()) + { + w Iterator.Next(),! + } + } + Else + { + Set Familie = ##class(DOM.PM.enu.Familie).AluKader() + Set Variant = ##class(DOM.PM.enu.AluKaderVariant).Basis() + Set ProductSpecificatie = ##class(DOM.PM.Maatwerk.Calc.Common.ProductSpecificatie).%New(Familie, Variant, Kenmerken) + Do ProductSpecificatie.Annotaties.SetAt("De ingegeven kenmerken werden gegenereerd door conversie van het oude product","Gegenereerd door") + Set Status = ProductSpecificatie.%Save() + + Set ParsedStatus = $$ParseStatus^vhLib(Status) + If (ParsedStatus '= "") + { + w "Save gefaald voor "_PRNr_": "_ParsedStatus,! + } + Else + { + Set $Piece(^KPR(PRNr,15),"\",13) = ProductSpecificatie.%Id() + } + } + Set i = i + 1 + } + } + } + w "# verwerkt: "_i +]]> + + + +%SQLQuery + SELECT ID + FROM Prod_GADef.KaderDeur where templateroutine is null + + + + Index: DOM/OV/impl/DataM/DataMOrderlijn.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/OV/impl/DataM/DataMOrderlijn.cls.xml (.../DataMOrderlijn.cls.xml) (revision 734) +++ DOM/OV/impl/DataM/DataMOrderlijn.cls.xml (.../DataMOrderlijn.cls.xml) (revision 946) @@ -1,11 +1,16 @@ - + 1 %RegisteredObject,DOM.OV.Orderlijn -62108,54314.793418 +62171,53116.815688 0 + +DOM.OV.Order +1 + + %String 1 @@ -16,18 +21,30 @@ 1 + +DOM.LEV.Toelevering +1 + + -LijnNr:%Integer,LijnInfo:%String +Order:DOM.OV.Order,LijnNr:%Integer,LijnInfo:%String 1 1 %Status + +DOM.OV.Order + + + %Integer + +DOM.LEV.Toelevering + + + + +DOM.LEV.ToeleveringLijn + + + DOM.OV.enu.OrderlijnType + + +%Boolean + + - + Index: zTryout/PRA/Concurrency/SaldoDto.cls.xml =================================================================== diff -u -r734 -r946 --- zTryout/PRA/Concurrency/SaldoDto.cls.xml (.../SaldoDto.cls.xml) (revision 734) +++ zTryout/PRA/Concurrency/SaldoDto.cls.xml (.../SaldoDto.cls.xml) (revision 946) @@ -1,9 +1,11 @@ - + +1 %RegisteredObject -62109,54551 +62136,28538.665387 62007,42369.439208 +0 %String @@ -29,5 +31,5 @@ ]]> - + Index: DOM/LEV/impl/DataM/DataMToelevering.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/LEV/impl/DataM/DataMToelevering.cls.xml (.../DataMToelevering.cls.xml) (revision 903) +++ DOM/LEV/impl/DataM/DataMToelevering.cls.xml (.../DataMToelevering.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject,DOM.LEV.Toelevering -62144,37637.432429 +62166,54968.125343 0 @@ -27,9 +27,17 @@ 1 %Status @@ -51,9 +59,27 @@ ]]> + +LijnNr:%Integer +DOM.LEV.ToeleveringLijn + + + DOM.OV.Order - @@ -81,5 +107,5 @@ ]]> - + Index: WV_vhLib_Logger.prj.xml =================================================================== diff -u --- WV_vhLib_Logger.prj.xml (revision 0) +++ WV_vhLib_Logger.prj.xml (revision 946) @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + Index: TECH/OperatieScope.cls.xml =================================================================== diff -u -r924 -r946 --- TECH/OperatieScope.cls.xml (.../OperatieScope.cls.xml) (revision 924) +++ TECH/OperatieScope.cls.xml (.../OperatieScope.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Stelt de scope van een APPS-level operatie voor. @@ -10,7 +10,7 @@ TECH.Error 1 %RegisteredObject -62136,28696.563694 +62171,42223.397608 62076,35776.81158 0 @@ -121,10 +121,13 @@ 0) + { + Set ..NestingNiveau = ..NestingNiveau - 1 + } + If (0 = ..NestingNiveau) { Do ..OperatieGelukt(Resultaat) - } Else { - Set ..NestingNiveau = ..NestingNiveau - 1 } ]]> @@ -142,12 +145,17 @@ 0) + { + Set ..NestingNiveau = ..NestingNiveau - 1 + } + If (0 = ..NestingNiveau) { Do ..OperatieGefaald(Exception) - } Else { - Set ..NestingNiveau = ..NestingNiveau - 1 } - Set $ECODE = Exception + + //Set $ECODE = Exception + $$$ThrowError($$$errGeneralError,Exception) ]]> @@ -156,6 +164,7 @@ @@ -213,5 +222,5 @@ 1 - + Index: Prod/Kenmerk/DataDefinitie.cls.xml =================================================================== diff -u -r937 -r946 --- Prod/Kenmerk/DataDefinitie.cls.xml (.../DataDefinitie.cls.xml) (revision 937) +++ Prod/Kenmerk/DataDefinitie.cls.xml (.../DataDefinitie.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Vaste leggen van de kenmerken per product. @@ -11,7 +11,7 @@ %VHMacro 1 TECH.Concurrency.VhPersistent -62161,42938.382223 +62171,38491.789967 59232,54592 0 @@ -716,5 +716,5 @@ - + Index: vhUnitTest/APPS/Halux/Planning/impl/ResourceGebruikCalcMock.cls.xml =================================================================== diff -u -r915 -r946 --- vhUnitTest/APPS/Halux/Planning/impl/ResourceGebruikCalcMock.cls.xml (.../ResourceGebruikCalcMock.cls.xml) (revision 915) +++ vhUnitTest/APPS/Halux/Planning/impl/ResourceGebruikCalcMock.cls.xml (.../ResourceGebruikCalcMock.cls.xml) (revision 946) @@ -1,16 +1,17 @@ - + 1 APPS.Halux.Planning.impl.ResourceGebruikCalculator -62129,40317.13933 +62172,40597.994801 0 -Product:DOM.PM.Product,ResourceGebruikDataFactory:APPS.Halux.Planning.impl.IResourceGebruikDataFactory -Product:DOM.PM.Product +APPS.Halux.Planning.impl.ResourceGebruik + - + Index: DOM/PM/Maatwerk/Calc/Kost/ActiviteitKostItemBuilder.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PM/Maatwerk/Calc/Kost/ActiviteitKostItemBuilder.cls.xml (.../ActiviteitKostItemBuilder.cls.xml) (revision 734) +++ DOM/PM/Maatwerk/Calc/Kost/ActiviteitKostItemBuilder.cls.xml (.../ActiviteitKostItemBuilder.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + persistent 1 DOM.PM.Maatwerk.Calc.Kost.IKostItemBuilder -62115,57540.519696 +62171,48749.867165 62070,52454.028885 0 @@ -26,11 +26,6 @@ ]]> - -Context:DOM.PM.Maatwerk.Calc.Kost.KostContext,HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom -DOM.PM.Maatwerk.Calc.Kost.ActiviteitKostItem - - %String - + Index: zTryout/WV/PM/IK/TBXKenmLade.cls.xml =================================================================== diff -u --- zTryout/WV/PM/IK/TBXKenmLade.cls.xml (revision 0) +++ zTryout/WV/PM/IK/TBXKenmLade.cls.xml (revision 946) @@ -0,0 +1,23 @@ + + + +persistent +1 +zTryout.WV.PM.IK.TBXKenmerkenv01 +62167,51510.12413 +0 + + + + + + +%Library.CacheStorage + + + + FishEye: Tag 946 refers to a dead (removed) revision in file `APPS/Halux/Planning/impl/ResourceGebruikDataMap.cls.xml'. FishEye: No comparison available. Pass `N' to diff? Index: zTryout/PRA/Concurrency/Tryouts/TryVhPersistentMetVersion.cls.xml =================================================================== diff -u -r734 -r946 --- zTryout/PRA/Concurrency/Tryouts/TryVhPersistentMetVersion.cls.xml (.../TryVhPersistentMetVersion.cls.xml) (revision 734) +++ zTryout/PRA/Concurrency/Tryouts/TryVhPersistentMetVersion.cls.xml (.../TryVhPersistentMetVersion.cls.xml) (revision 946) @@ -1,8 +1,9 @@ - + +1 VhPersistentMetVersion -62109,58654.86728 +62136,28476.885714 62060,44627.756768 0 @@ -56,5 +57,5 @@ - + Index: vhUnitTest/DOM/PM/OL/Gamma/ZoekProductGroepZoekterm.cls.xml =================================================================== diff -u -r793 -r946 --- vhUnitTest/DOM/PM/OL/Gamma/ZoekProductGroepZoekterm.cls.xml (.../ZoekProductGroepZoekterm.cls.xml) (revision 793) +++ vhUnitTest/DOM/PM/OL/Gamma/ZoekProductGroepZoekterm.cls.xml (.../ZoekProductGroepZoekterm.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Oproepen via @@ -36,7 +36,7 @@ Test voor OrgaluxProductGamma http://www.pivotaltracker.com/projects/72006?story_id=6777179 - + Index: DOM/PM/Maatwerk/Calc/HF/impl/TBX/SpecPlusHFv001.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PM/Maatwerk/Calc/HF/impl/TBX/SpecPlusHFv001.cls.xml (.../SpecPlusHFv001.cls.xml) (revision 734) +++ DOM/PM/Maatwerk/Calc/HF/impl/TBX/SpecPlusHFv001.cls.xml (.../SpecPlusHFv001.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + persistent 1 DOM.PM.Maatwerk.Calc.HF.HalffabSpec -62115,35514.185809 +62167,50576.137445 0 @@ -20,9 +20,15 @@ ]]> + +%Integer + + + %Library.CacheStorage - + Index: zTryout/WV/PM/IK/TBXKenmSifonLade.cls.xml =================================================================== diff -u --- zTryout/WV/PM/IK/TBXKenmSifonLade.cls.xml (revision 0) +++ zTryout/WV/PM/IK/TBXKenmSifonLade.cls.xml (revision 946) @@ -0,0 +1,25 @@ + + + +persistent +1 +zTryout.WV.PM.IK.TBXKenmerkenv01 +62167,51536.155188 +0 + + + + + + +%Library.CacheStorage + + + + Index: APPS/Halux/common/impl/BatchImpl.cls.xml =================================================================== diff -u --- APPS/Halux/common/impl/BatchImpl.cls.xml (revision 0) +++ APPS/Halux/common/impl/BatchImpl.cls.xml (revision 946) @@ -0,0 +1,182 @@ + + + +1 +%RegisteredObject,APPS.Halux.common.Batch +62168,47823.883823 +0 + + +DS.PPS.TBX.Batch +1 + + + +BatchID:%Integer="" +1 +1 +%Status + + + + +%Integer + + + + +%String + + + + +APPS.Halux.enu.ProductieGroep + + + + +%Status + + + + +Toelevering:DOM.LEV.Toelevering +%Status + + + + +ProductieGroep:%String +1 +%Boolean + + + + +Toelevering:DOM.LEV.Toelevering +1 +%Boolean + + + + +Toelevering:DOM.LEV.Toelevering,TBXLade:DOM.PM.TBXProduct.TBXLade +1 +APPS.Halux.enu.ProductieGroep + + + + + Index: DOM/PM/impl/DataM/DataMClassificatie.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/PM/impl/DataM/DataMClassificatie.cls.xml (.../DataMClassificatie.cls.xml) (revision 903) +++ DOM/PM/impl/DataM/DataMClassificatie.cls.xml (.../DataMClassificatie.cls.xml) (revision 946) @@ -1,9 +1,10 @@ - + 1 DOM.PM.Classificatie,%RegisteredObject 62157,49285.036165 +62165,31033.384972 0 @@ -54,5 +55,5 @@ ]]> - + Index: DOM/OV/impl/DataM/DataMTekstOrderlijn.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/OV/impl/DataM/DataMTekstOrderlijn.cls.xml (.../DataMTekstOrderlijn.cls.xml) (revision 734) +++ DOM/OV/impl/DataM/DataMTekstOrderlijn.cls.xml (.../DataMTekstOrderlijn.cls.xml) (revision 946) @@ -1,19 +1,19 @@ - + 1 DOM.OV.impl.DataM.DataMOrderlijn,DOM.OV.TekstOrderlijn -62108,54348.007997 +62168,38061.288461 0 -LijnNr:%Integer,LijnInfo:%String +Order:DOM.OV.Order,LijnNr:%Integer,LijnInfo:%String 1 1 %Status - + Index: CSC_Refactoring.prj.xml =================================================================== diff -u -r922 -r946 --- CSC_Refactoring.prj.xml (.../CSC_Refactoring.prj.xml) (revision 922) +++ CSC_Refactoring.prj.xml (.../CSC_Refactoring.prj.xml) (revision 946) @@ -1,15 +1,17 @@ - - + + + + @@ -25,8 +27,7 @@ - - + Index: vhUnitTest/APPS/PM/Maatwerk/impl/upg/UTKenmerkenv02v03bisUpgrad.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/PM/Maatwerk/impl/upg/UTKenmerkenv02v03bisUpgrad.cls.xml (revision 0) +++ vhUnitTest/APPS/PM/Maatwerk/impl/upg/UTKenmerkenv02v03bisUpgrad.cls.xml (revision 946) @@ -0,0 +1,40 @@ + + + + +Deze Upgrader is de bis-versie van de vorige. +M.a.w. een upgrade voor dezelfde versie, maar via een andere conversiestijl, met name UpgradeViaCopy() +1 +APPS.PM.Maatwerk.IngegevenKenmUpgrader +62161,33883.465031 +0 + + +1 +%Integer + + + + + +De NewVersionClassName is de ClassName van de nieuwe versie van de IngegevenKenmeken +1 +Kenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken,NewVersionClassName:%String +DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken + + + + + Index: JBL_ProTime.prj.xml =================================================================== diff -u --- JBL_ProTime.prj.xml (revision 0) +++ JBL_ProTime.prj.xml (revision 946) @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: zTryout/CSC/TestClassDefs.cls.xml =================================================================== diff -u --- zTryout/CSC/TestClassDefs.cls.xml (revision 0) +++ zTryout/CSC/TestClassDefs.cls.xml (revision 946) @@ -0,0 +1,101 @@ + + + +1 +%RegisteredObject +62157,48931.0787 +0 + + +%String + + + +TECH.ClassInfo.ClassDefinition + + + +%String + + + + +Do ##class(zTryout.CSC.TestClassDefs).%New().Do() + + + + + +Do ##class(zTryout.CSC.TestClassDefs).%New().VerwerkClass(##class(%Dictionary.ClassDefinition).%OpenId("vhUnitTest.DOM.PM.Maatwerk.Kost.impl.KostItemBuilderA")) +ClassDefinition:%Dictionary.ClassDefinition + 0 ) { w "::"_Method.GeefType() } w ! + + Set Implementation = Method.GeefImplementatie() + + While ('Implementation.AtEnd) + { + Set Lijn = Implementation.ReadLine() + If Lijn [ "##class(" + { + //w Lijn,! + } + } + } +]]> + + + + Index: DOM/PM/Maatwerk/Calc/Kost/impl/TBX/PlanInkortenv001.cls.xml =================================================================== diff -u --- DOM/PM/Maatwerk/Calc/Kost/impl/TBX/PlanInkortenv001.cls.xml (revision 0) +++ DOM/PM/Maatwerk/Calc/Kost/impl/TBX/PlanInkortenv001.cls.xml (revision 946) @@ -0,0 +1,93 @@ + + + +persistent +1 +DOM.PM.Maatwerk.Calc.Kost.SamengesteldKostItemBuilder +62172,29791.260863 +0 + + +SamengesteldKostItemBuilder:DOM.PM.Maatwerk.Calc.Kost.SamengesteldKostItemBuilder +1 +1 +%Status + + + + +%Library.CacheStorage + + + + Index: DOM/CRM/enu/CommercieleStatus.cls.xml =================================================================== diff -u --- DOM/CRM/enu/CommercieleStatus.cls.xml (revision 0) +++ DOM/CRM/enu/CommercieleStatus.cls.xml (revision 946) @@ -0,0 +1,33 @@ + + + +datatype +1 +%String +62172,61053.03987 +0 + + +,,1 + + + +;Actief;Niet Actief + + + +1 +expression + + + + +1 +expression + + + + + Index: DOM/PM/Maatwerk/Calc/Kost/impl/TBX/V1VerpakkingEvaluator.cls.xml =================================================================== diff -u --- DOM/PM/Maatwerk/Calc/Kost/impl/TBX/V1VerpakkingEvaluator.cls.xml (revision 0) +++ DOM/PM/Maatwerk/Calc/Kost/impl/TBX/V1VerpakkingEvaluator.cls.xml (revision 946) @@ -0,0 +1,19 @@ + + + +1 +%RegisteredObject,DOM.PM.Maatwerk.Calc.Kost.IEvaluator +62171,52156.504347 +0 + + + + +HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,Context:DOM.PM.Maatwerk.Calc.Kost.KostContext,IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken +%Boolean + + + + + Index: vhUnitTest/APPS/PM/TestProductService.cls.xml =================================================================== diff -u -r937 -r946 --- vhUnitTest/APPS/PM/TestProductService.cls.xml (.../TestProductService.cls.xml) (revision 937) +++ vhUnitTest/APPS/PM/TestProductService.cls.xml (.../TestProductService.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 vhUnitTest.TestCase -62164,45632.613536 +62165,38576.334646 62159,61432.98957 0 @@ -203,10 +203,10 @@ 1 - + Index: vhUnitTest/DOM/PM/Maatwerk/HF/TBX/DataSetTBXPlus.cls.xml =================================================================== diff -u --- vhUnitTest/DOM/PM/Maatwerk/HF/TBX/DataSetTBXPlus.cls.xml (revision 0) +++ vhUnitTest/DOM/PM/Maatwerk/HF/TBX/DataSetTBXPlus.cls.xml (revision 946) @@ -0,0 +1,243 @@ + + + +1 +vhUnitTest.DOM.PM.Maatwerk.HF.DataSet +62171,49097.775254 +0 + + + +De DataSet opvullen met alle mogelijke test cases (voor deze variant) +Gebruik de method VoegToeAanDataSet() om de IngegevenKenmerken toe te voegen aan de DataSet. +1 + + + + +LadeKleur:%String,HoutKleur:%String,LadeDiepte:%Integer,Draagkracht:%Integer,InbouwBreedte:%Integer +DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken + + + + +LadeKleur:%String,HoutKleur:%String,LadeDiepte:%Integer,Draagkracht:%Integer,InbouwBreedte:%Integer +DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken + + + + +IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken + + + + +IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken,Key:%String="",Omschrijving:%String,BerekeningsSpecificatie:DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie="" +1 + + + + +LadeKleur:%String,HoutKleur:%String,LadeDiepte:%Integer,Draagkracht:%Integer,InbouwBreedte:%Integer +DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken + + + + +LadeKleur:%String,HoutKleur:%String,LadeDiepte:%Integer,Draagkracht:%Integer,InbouwBreedte:%Integer +DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken + + + + +LadeKleur:%String,HoutKleur:%String,LadeDiepte:%Integer,Draagkracht:%Integer,InbouwBreedte:%Integer +DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken + + + + +LadeKleur:%String,HoutKleur:%String,LadeDiepte:%Integer,Draagkracht:%Integer,InbouwBreedte:%Integer +DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken + + + + +LadeKleur:%String,HoutKleur:%String,LadeDiepte:%Integer,Draagkracht:%Integer,InbouwBreedte:%Integer +DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken + + + + +LadeKleur:%String,HoutKleur:%String,LadeDiepte:%Integer,Draagkracht:%Integer,InbouwBreedte:%Integer +DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken + + + + +LadeKleur:%String,HoutKleur:%String,LadeDiepte:%Integer,Draagkracht:%Integer,InbouwBreedte:%Integer +DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken + + + + +LadeKleur:%String,HoutKleur:%String,LadeDiepte:%Integer,Draagkracht:%Integer,InbouwBreedte:%Integer +DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken + + + + + Index: DOM/PM/KADProduct/impl/KADKaderdeurImpl.cls.xml =================================================================== diff -u --- DOM/PM/KADProduct/impl/KADKaderdeurImpl.cls.xml (revision 0) +++ DOM/PM/KADProduct/impl/KADKaderdeurImpl.cls.xml (revision 946) @@ -0,0 +1,22 @@ + + + +1 +DOM.PM.impl.MaatwerkProductImpl,DOM.PM.KADProduct.KADKaderdeur +62173,27869.11488 +0 + + +DOM.PM.enu.Familie + + + + +DOM.PM.enu.Variant + + + + + Index: zTryout/JCL/TestProcedureBlock.cls.xml =================================================================== diff -u --- zTryout/JCL/TestProcedureBlock.cls.xml (revision 0) +++ zTryout/JCL/TestProcedureBlock.cls.xml (revision 946) @@ -0,0 +1,23 @@ + + + +1 +%RegisteredObject +62136,41253.457068 +0 + + + + + + + Index: PV_Klantbeoordeling.prj.xml =================================================================== diff -u -r918 -r946 --- PV_Klantbeoordeling.prj.xml (.../PV_Klantbeoordeling.prj.xml) (revision 918) +++ PV_Klantbeoordeling.prj.xml (.../PV_Klantbeoordeling.prj.xml) (revision 946) @@ -1,6 +1,6 @@ - - + + @@ -18,7 +18,9 @@ + + @@ -33,5 +35,5 @@ - + Index: DOM/OV/impl/DataM/DataMManueleOrderlijn.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/OV/impl/DataM/DataMManueleOrderlijn.cls.xml (.../DataMManueleOrderlijn.cls.xml) (revision 734) +++ DOM/OV/impl/DataM/DataMManueleOrderlijn.cls.xml (.../DataMManueleOrderlijn.cls.xml) (revision 946) @@ -1,19 +1,19 @@ - + 1 DOM.OV.impl.DataM.DataMOrderlijn,DOM.OV.ManueleOrderlijn -62108,54358.152995 +62168,38026.81993 0 -LijnNr:%Integer,LijnInfo:%String +Order:DOM.OV.Order,LijnNr:%Integer,LijnInfo:%String 1 1 %Status - + Index: DOM/PM/Maatwerk/Calc/Kost/impl/TBX/PlanVoorbereiden.cls.xml =================================================================== diff -u --- DOM/PM/Maatwerk/Calc/Kost/impl/TBX/PlanVoorbereiden.cls.xml (revision 0) +++ DOM/PM/Maatwerk/Calc/Kost/impl/TBX/PlanVoorbereiden.cls.xml (revision 946) @@ -0,0 +1,65 @@ + + + +persistent +1 +DOM.PM.Maatwerk.Calc.Kost.SamengesteldKostItemBuilder +62171,58053.709857 +0 + + +SamengesteldKostItemBuilder:DOM.PM.Maatwerk.Calc.Kost.SamengesteldKostItemBuilder +1 +1 +%Status + + + + +%Library.CacheStorage + + + + Index: DOM/CRM/Klant.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/CRM/Klant.cls.xml (.../Klant.cls.xml) (revision 903) +++ DOM/CRM/Klant.cls.xml (.../Klant.cls.xml) (revision 946) @@ -1,40 +1,136 @@ - + 1 1 -62157,73450.058643 +62172,61593.920663 0 - + +1 +%Status + + + +1 +%Status + + + +1 %String + +1 +DOM.common.Adres + + + +1 +DOM.CRM.enu.ActiefStatus + + + +1 +%String + + + +1 +DOM.CRM.enu.CommercieleStatus + + + + +1 +DOM.CRM.enu.DoorstuurwijzeWMS + + + +1 +%String + + +1 %Integer +1 %String - + +1 +%Integer + + + +1 %String - + +1 %String + +1 +%String + + + +1 +%String + + + +1 +%String + + +1 DatumVan:%Date,DatumTot:%Date TECH.Iterator +1 DatumVan:%Date,DatumTot:%Date TECH.Iterator + + +1 +%String + + + + +1 +Adres:DOM.common.Adres + + + +1 +Naam:%String + + + +1 +Email:%String + + + +1 +Telefoon1:%String + - + Index: JBL_Klant.prj.xml =================================================================== diff -u --- JBL_Klant.prj.xml (revision 0) +++ JBL_Klant.prj.xml (revision 946) @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: APPS/Halux/Planning/impl/RGDataMapTBX.cls.xml =================================================================== diff -u --- APPS/Halux/Planning/impl/RGDataMapTBX.cls.xml (revision 0) +++ APPS/Halux/Planning/impl/RGDataMapTBX.cls.xml (revision 946) @@ -0,0 +1,138 @@ + + + +1 +%RegisteredObject,DOM.PM.Maatwerk.Calc.Kost.IKostItemVisitor +62173,28610.865821 +0 + + +%ArrayOfObjects +1 + + + +DOM.PM.MaatwerkProduct +1 + + + +Product:DOM.PM.TBXProduct.TBXLade +1 +1 +%Status + + + + +APPS.Halux.Planning.impl.ResourceGebruik + + + + +Item:DOM.PM.Maatwerk.Calc.Kost.ActiviteitKostItem +%Status + + + + +ResourceGebruik:APPS.Halux.Planning.impl.ResourceGebruik +1 + + + + +ActiviteitID:%String +1 +APPS.Halux.Planning.impl.ResourceGebruikData + + + + + Index: DOM/PM/Maatwerk/Calc/Kost/impl/TBX/BevatSpoelbakEvaluator.cls.xml =================================================================== diff -u --- DOM/PM/Maatwerk/Calc/Kost/impl/TBX/BevatSpoelbakEvaluator.cls.xml (revision 0) +++ DOM/PM/Maatwerk/Calc/Kost/impl/TBX/BevatSpoelbakEvaluator.cls.xml (revision 946) @@ -0,0 +1,19 @@ + + + +1 +%RegisteredObject,DOM.PM.Maatwerk.Calc.Kost.IEvaluator +62171,50204.711274 +0 + + + + +HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,Context:DOM.PM.Maatwerk.Calc.Kost.KostContext,IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken +%Boolean + + + + + Index: APPS/PM/Maatwerk/OLM/OrgaluxOpMaatFactory.cls.xml =================================================================== diff -u -r917 -r946 --- APPS/PM/Maatwerk/OLM/OrgaluxOpMaatFactory.cls.xml (.../OrgaluxOpMaatFactory.cls.xml) (revision 917) +++ APPS/PM/Maatwerk/OLM/OrgaluxOpMaatFactory.cls.xml (.../OrgaluxOpMaatFactory.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject -62157,35047.011595 +62173,34352.829377 0 @@ -106,6 +106,7 @@ Set BreedteOLProduct = BreedteOLProduct - (2 * WandDikte) Set Delta = BreedteOLProduct - BreedteInTeKortenProduct + Set InTeKortenNaar = InbouwBreedte - Delta Set IngekortProduct = ..BerekenIngekortProduct(InTeKortenPRNr, (InbouwBreedte - Delta), $Piece(Rec,"\",2)) Set VrijLabel = $Order(^PRBS("BS",PRNr,"KIND.999"),-1) @@ -128,9 +129,12 @@ // Product op "niet-stock" plaatsen Set $Piece(^KPR(PRNr,1),"\",20) = "" + // Product op "beperkt actief" plaatsen + Set $Piece(^KPR(PRNr,1),"\",25) = 2 + // Korttekst herwerken Set Korttekst = $Piece(^KPR(PRNr,0),"\",1) - Set $Piece(^KPR(PRNr,0),"\",1) = $Extract(Korttekst,1,11)_" INGEKORT "_IngekortProduct.GeefDossierNr() + Set $Piece(^KPR(PRNr,0),"\",1) = $Extract(Korttekst,1,11)_" KORT"_$J(InbouwBreedte,4)_$Extract(Korttekst,21,25) // Classficiatie correct instellen Set Classificatie = 1328 @@ -147,7 +151,7 @@ Set Piece = $Piece(Positie,".",2) If ($Piece($Get(^KPR(PRNr,Node),""),"\",Piece) = "") { - Set $Piece(^KPR(PRNr,Node),"\",Piece) = "INGEKORT" + Set $Piece(^KPR(PRNr,Node),"\",Piece) = "INGEKORT NAAR "_InbouwBreedte_"mm BINNENMAAT" Quit } } @@ -158,7 +162,7 @@ Set Piece = $Piece(Positie,".",2) If ($Piece($Get(^KPR(PRNr,Node),""),"\",Piece) = "") { - Set $Piece(^KPR(PRNr,Node),"\",Piece) = "TRONQUé" + Set $Piece(^KPR(PRNr,Node),"\",Piece) = "RACCOURCIE" Quit } } @@ -223,7 +227,7 @@ Set HalffabItems=HalffabItemsBoom.Wortel Set KostContext = ##class(DOM.PM.Maatwerk.Calc.Kost.KostContext).%New(Familie, Variant, BerekeningsSpecificatie) - Set KostItem = KostContext.GeefKostSpec().BerekenKostDetails(KostContext,HalffabItemsBoom) + Set KostItem = KostContext.GeefKostSpec().BerekenKostDetails(KostContext,HalffabItemsBoom,IngegevenKenmerken) Set ProductSpecificatie = ##class(DOM.PM.Maatwerk.Calc.Common.ProductSpecificatie).%New(Familie, Variant, IngegevenKenmerken) @@ -234,5 +238,5 @@ ]]> - + Index: Derde/Klant/Klant.cls.xml =================================================================== diff -u -r734 -r946 --- Derde/Klant/Klant.cls.xml (.../Klant.cls.xml) (revision 734) +++ Derde/Klant/Klant.cls.xml (.../Klant.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + persistent DataM %Library.Persistent,Derde.Abstract.Derde -61913,29091.021533 +62171,53191.041675 58449,45194 0 @@ -727,6 +727,26 @@ + +%SQLQuery + SELECT ID, Naam, Opmerking12 + FROM Derde_Klant.Klant + WHERE (Opmerking12 LIKE "%ProTimeNr%") + + + + + +%SQLQuery +ProTimeNr:%Integer + + SELECT ID, Naam, Opmerking12 As ProTimeNr + FROM Derde_Klant.Klant + WHERE (Opmerking12 = "ProTimeNr " || :ProTimeNr) + + + + %CacheSQLStorage ^Derde.Kl.KlantS @@ -1171,5 +1191,5 @@ - + Index: DOM/PM/enu/TBXVerpakking.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/PM/enu/TBXVerpakking.cls.xml (.../TBXVerpakking.cls.xml) (revision 903) +++ DOM/PM/enu/TBXVerpakking.cls.xml (.../TBXVerpakking.cls.xml) (revision 946) @@ -1,64 +1,64 @@ - + datatype 1 %String -62133,30901.437405 +62167,34995.714871 0 ;S;Z;O;C;P;B;A - + 1 DOM.PM.enu.TBXVerpakking - + 1 DOM.PM.enu.TBXVerpakking - + 1 DOM.PM.enu.TBXVerpakking - + 1 DOM.PM.enu.TBXVerpakking - + 1 DOM.PM.enu.TBXVerpakking - + 1 DOM.PM.enu.TBXVerpakking - + 1 DOM.PM.enu.TBXVerpakking - + Index: BL/Kenm/ProdMulti.cls.xml =================================================================== diff -u -r734 -r946 --- BL/Kenm/ProdMulti.cls.xml (.../ProdMulti.cls.xml) (revision 734) +++ BL/Kenm/ProdMulti.cls.xml (.../ProdMulti.cls.xml) (revision 946) @@ -1,12 +1,12 @@ - + Basis-klasse voor het gebruik van de Kenmerk.Data/Meta-Definities %VHMacro,BL.Kenm.Common 1 BL.Kenm.Main -61977,40198.991453 +62171,38157.810308 0 @@ -35,7 +35,7 @@ oMetaGroep:%RegisteredObject ProdMulti - + Index: vhUnitTest/APPS/PM/TestKenmerkenService.cls.xml =================================================================== diff -u -r937 -r946 --- vhUnitTest/APPS/PM/TestKenmerkenService.cls.xml (.../TestKenmerkenService.cls.xml) (revision 937) +++ vhUnitTest/APPS/PM/TestKenmerkenService.cls.xml (.../TestKenmerkenService.cls.xml) (revision 946) @@ -1,11 +1,12 @@ - + -JBL + 2011-02-28 +JBL + 2011-02-28 +do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.PM.TestKenmerkenService") 1 vhUnitTest.TestCase,TECH.Error.ErrorAdaptor -62164,61944.212703 +62172,43580.458944 62159,61432.841501 0 @@ -81,6 +82,12 @@ do $$$AssertEquals(ProductenKenmerken.Kenmerken.GetAt(1).IDs.PRNr,PRNrs.GetAt(1),"PRNr komt overeen.") + do $$$AssertEquals(ProductenKenmerken.Kenmerken.GetAt(1).IDs.MultipleNr,1,"MultipleNr 1 is in orde.") + + do $$$AssertEquals(ProductenKenmerken.Kenmerken.GetAt(2).IDs.MultipleNr,2,"MultipleNr 1 is in orde.") + + ; [Review WV JBL Kenm] Property MultipleNr wordt niet uitgelezen. Is toch specifiek deze testmethod, hé ? + do $$$AssertEquals(ProductenKenmerken.Kenmerken.GetAt(2).Kenmerken.Count(),18,"Juiste aantal gedefineerde kenmerken ProductKenmerken2.") do $$$AssertEquals(ProductenKenmerken.Kenmerken.GetAt(2).Kenmerken.GetAt(1).KenmerkNaam,"ProductType","Kenmerknaam is correct ingevuld.") @@ -96,7 +103,7 @@ Set KenmerkMetadata = KenmerkenService.GeefMetadata(KenmerkGroepen).Items - Do $$$AssertEquals(KenmerkMetadata.Count(),51,"Correct aantal kenmerken (#51)") + Do $$$AssertEquals(KenmerkMetadata.Count(),50,"Correct aantal kenmerken (#50)") Set EenKenmerkMetadata = KenmerkMetadata.GetAt(1) Do $$$AssertEquals(EenKenmerkMetadata.Naam,"ProductType","Kenmerknaam is correct ingevuld.") @@ -106,6 +113,8 @@ + +Eén kenmerk bewaren van één product. + +Testen als er van een product een kenmerk goed wordt ingesteld en één slecht +Hierbij moet een rollback gebeuren en data moet ongewijzigd blijven + + +Kenmerk van twee producten wijzigen, maar meerdere producten zitten in de lijst. + + + Label,Options - + Index: DOM/CRM/impl/DataM/DataMKlantAPI.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/CRM/impl/DataM/DataMKlantAPI.cls.xml (.../DataMKlantAPI.cls.xml) (revision 903) +++ DOM/CRM/impl/DataM/DataMKlantAPI.cls.xml (.../DataMKlantAPI.cls.xml) (revision 946) @@ -1,17 +1,26 @@ - + -TECH.Error +TECH.Error,BL.Derde.KlantSpecifiek 1 DOM.CRM.KlantAPI,%RegisteredObject -62153,41924.00991 +62173,35359.94277 0 + +%String +\ + + KlantNummer:%Integer DOM.CRM.Klant @@ -21,6 +30,127 @@ + + +1 +%Integer + + + + +Klant:DOM.CRM.dto.Klant,TypeTemplateKlant:DOM.CRM.enu.TypeTemplateKlant +DOM.CRM.Klant + + + + + +Zoekt tussen de klanten de medewerkers van VanHoecke en Halux +Dit op basis van het PersNr vanuit ProTime dat kan worden opgegeven. +Als dit niet is opgegeven, geeft hij alle medewerkers terug. +ProTimeNr:%Integer +DOM.CRM.Klant + + - + Index: APPS/common/dto/StockNiveaus.cls.xml =================================================================== diff -u -r917 -r946 --- APPS/common/dto/StockNiveaus.cls.xml (.../StockNiveaus.cls.xml) (revision 917) +++ APPS/common/dto/StockNiveaus.cls.xml (.../StockNiveaus.cls.xml) (revision 946) @@ -1,26 +1,46 @@ - + 1 %RegisteredObject,%XML.Adaptor -62154,57793.335498 +62173,33828.712318 0 -%Float +%Integer -%Float +%Integer - -%Float + +%Integer -%Float +%Integer + + +%Integer + + + +%Integer + + + +%Integer + + + +%Integer + + + +%Integer + - + Index: TECH/ClassInfo/ParameterDefinition.cls.xml =================================================================== diff -u -r924 -r946 --- TECH/ClassInfo/ParameterDefinition.cls.xml (.../ParameterDefinition.cls.xml) (revision 924) +++ TECH/ClassInfo/ParameterDefinition.cls.xml (.../ParameterDefinition.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject -62158,57810.387658 +62164,32482.189036 0 @@ -58,5 +58,5 @@ ]]> - + Index: APPS/Halux/enu/ProductieGroep.cls.xml =================================================================== diff -u --- APPS/Halux/enu/ProductieGroep.cls.xml (revision 0) +++ APPS/Halux/enu/ProductieGroep.cls.xml (revision 946) @@ -0,0 +1,47 @@ + + + +datatype +1 +%String +62167,36729.417901 +0 + + +,P,A,S,+ + + + +,Pallet,Kast,Stuk,Plus + + + +1 +APPS.Halux.enu.ProductieGroep + + + + +1 +APPS.Halux.enu.ProductieGroep + + + + +1 +APPS.Halux.enu.ProductieGroep + + + + +1 +APPS.Halux.enu.ProductieGroep + + + + + Index: APPS/common/impl/StockNiveauService.cls.xml =================================================================== diff -u -r917 -r946 --- APPS/common/impl/StockNiveauService.cls.xml (.../StockNiveauService.cls.xml) (revision 917) +++ APPS/common/impl/StockNiveauService.cls.xml (.../StockNiveauService.cls.xml) (revision 946) @@ -1,13 +1,15 @@ - + TECH.Error 1 APPS.common.StockNiveauService,%RegisteredObject -62154,62104.89916 +62173,33961.755646 0 + +Bij de berekeningen wordt er momenteel nog geen rekening gehouden met magazijn waarin de goederen zich bevinden. %Integer 1 @@ -22,63 +24,217 @@ 1 + +DOM.PM.Product +1 + + + +%Integer +1 + + + +%Integer +1 + + + +%Integer +1 + + + +%Integer +1 + + + +%Integer +1 + + + +%Integer +1 + + + +%Integer +1 + + PRNr:%Integer,Datum:%Date="",Magazijn:APPS.common.enu.MagazijnMetStock="" 1 1 %Status APPS.common.dto.StockNiveaus - - + %Float - + %Float - %Float - + +%Float + + + %Float -(..Datum) ) ) + set Result = Result + OrderLijn.GeefAantal() + } + } + else { + set Result = +$piece(^PRSTOCK("D",..PRNr),"\",2) + } + set ..AantalInReservatie = Result + + quit Result ]]> - + %Float -(..Datum) ) ) + set Result = Result + ToelevLijn.GeefAantal() + } + } + else { set Result = +$piece($piece(^KPR(..PRNr,0),"\",17),"#",1) } + + set ..AantalInToelevering = Result + + quit Result ]]> - + %Float -(..Datum) ) ) + set Result = Result + OrderLijn.GeefAantal() + } + } + else { set Result = +$piece(^PRSTOCK("D",..PRNr),"\",3) } + + set ..AantalInOrder = Result + quit Result ]]> - + Index: zTryout/CSC/DataSet.cls.xml =================================================================== diff -u --- zTryout/CSC/DataSet.cls.xml (revision 0) +++ zTryout/CSC/DataSet.cls.xml (revision 946) @@ -0,0 +1,45 @@ + + + +1 +%XML.DataSet +62168,31318.474302 +0 + + +1 + + + + + +Generate hard coded schema that is used for DataSet +1 + +%Status +1 +",! + Write " ",! + Write " ",! + Write " ",! + Write "",! + Set schema(class)="" + Quit $$$OK +]]> + + + + Index: DOM/PM/OLProduct/impl/OLMProductCreator.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/PM/OLProduct/impl/OLMProductCreator.cls.xml (.../OLMProductCreator.cls.xml) (revision 903) +++ DOM/PM/OLProduct/impl/OLMProductCreator.cls.xml (.../OLMProductCreator.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 DOM.PM.impl.DataM.DataMProductCreator -62151,42940.471288 +62173,34516.527391 0 @@ -62,6 +62,14 @@ Quit i%InTeKortenProductKorttekst ]]> + + +1 + + - + Index: DOM/PM/impl/DataM/DataMProduct.cls.xml =================================================================== diff -u -r939 -r946 --- DOM/PM/impl/DataM/DataMProduct.cls.xml (.../DataMProduct.cls.xml) (revision 939) +++ DOM/PM/impl/DataM/DataMProduct.cls.xml (.../DataMProduct.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + BL.Kenm.Common 1 %RegisteredObject -62164,53409.503372 +62168,34068.195504 62159,61822.534455 0 @@ -210,5 +210,5 @@ ]]> - + Index: zTryout/PRA/Concurrency/BankLoketUI.cls.xml =================================================================== diff -u -r734 -r946 --- zTryout/PRA/Concurrency/BankLoketUI.cls.xml (.../BankLoketUI.cls.xml) (revision 734) +++ zTryout/PRA/Concurrency/BankLoketUI.cls.xml (.../BankLoketUI.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Initieel uit te voeren bij de eerste start: @@ -17,8 +17,9 @@ Set LoketUI = ##class(zTryout.PRA.Concurrency.BankLoketUI).%New(##class(zTryout.PRA.Concurrency.VirtueelBankLoketViaSql).%New()) Of: Set LoketUI = ##class(zTryout.PRA.Concurrency.BankLoketUI).%New(##class(zTryout.PRA.Concurrency.VirtueelBankLoketViaObjecten).%New()) +1 %RegisteredObject -62109,57616.203808 +62136,28503.079698 62004,58464.660232 0 @@ -178,5 +179,5 @@ ]]> - + Index: vhUnitTest/TECH/Files.cls.xml =================================================================== diff -u --- vhUnitTest/TECH/Files.cls.xml (revision 0) +++ vhUnitTest/TECH/Files.cls.xml (revision 946) @@ -0,0 +1,21 @@ + + + +1 +vhUnitTest.TestCase +62164,51205.100834 +0 + + + +do ##class(vhUnitTest.Manager).RunTest(,"vhUnitTest.TECH.Files") + + + + + Index: vhUnitTest/APPS/common/StockNiveauService.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/common/StockNiveauService.cls.xml (revision 0) +++ vhUnitTest/APPS/common/StockNiveauService.cls.xml (revision 946) @@ -0,0 +1,158 @@ + + + +1 +vhUnitTest.TestCase +62173,33898.72156 +0 + + + +do ##class(vhUnitTest.Manager).RunTest("/display=all","APPS.common.StockNiveauService") +%Status + + + + +%Status + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: DOM/CRM/Stat/KlantBeoordelingDetail.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/CRM/Stat/KlantBeoordelingDetail.cls.xml (.../KlantBeoordelingDetail.cls.xml) (revision 903) +++ DOM/CRM/Stat/KlantBeoordelingDetail.cls.xml (.../KlantBeoordelingDetail.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + BL.Derde.LevSpecifiek,BL.Derde.KlantSpecifiek,%VHMacro,BL.EC.Common,%Prod.Product,TECH.Error 1 %RegisteredObject -62158,36499.828409 +62159,30484.079337 61807,38311.621993 0 @@ -114,7 +114,7 @@ Set:($E(ProductGrp)="#") ProductGrp="???" Set TotaalVKP=ProductOrderlijn.GeefTotaalVerkoopPrijs() - Set TotaalAKP=ProductOrderlijn.GeefTotaalVerkoopPrijs() + Set TotaalAKP=ProductOrderlijn.GeefTotaalAankoopPrijs() Set Aantal=ProductOrderlijn.GeefAantal() Set Gewicht=$$$PRGet($$$Gewicht)*Aantal/1000 @@ -146,5 +146,5 @@ ]]> - + Index: DOM/CRM/Interacties/Metadata.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/CRM/Interacties/Metadata.cls.xml (.../Metadata.cls.xml) (revision 734) +++ DOM/CRM/Interacties/Metadata.cls.xml (.../Metadata.cls.xml) (revision 946) @@ -1,11 +1,11 @@ - + persistent vhLib.Macro 1 %Persistent -61901,57299.620327 +62172,40736.068883 61879,57172.763939 0 @@ -57,7 +57,10 @@ 1 Filename:%String - + Index: APPS/Halux/common/Batch.cls.xml =================================================================== diff -u --- APPS/Halux/common/Batch.cls.xml (revision 0) +++ APPS/Halux/common/Batch.cls.xml (revision 946) @@ -0,0 +1,31 @@ + + + +1 +1 +62159,57249.961387 +0 + + +1 +%Integer + + + +1 +Toelevering:DOM.LEV.Toelevering +%Status + + + +1 +%String + + + +1 +%Status + + + + Index: BL/Derde/Klant/Relaties.cls.xml =================================================================== diff -u -r734 -r946 --- BL/Derde/Klant/Relaties.cls.xml (.../Relaties.cls.xml) (revision 734) +++ BL/Derde/Klant/Relaties.cls.xml (.../Relaties.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Relaties tussen klanten onderling, tussen klant en leveanciers, tussen klant en derde @@ -18,7 +18,7 @@ De afgeleide, reverse types worden niet opgeslagen maar worden steeds als Relatie opgeslagen met de betrokkenen verwisseld 1 %RegisteredObject -61633,29945.764755 +62160,53474.940858 0 @@ -548,6 +548,22 @@ ]]> + + +Een relatie toevoegen aan een klant +1 +KLNr,Relatie,Value + + + - + Index: APPS/PM/dto/ProductZoekResultaatList.cls.xml =================================================================== diff -u -r917 -r946 --- APPS/PM/dto/ProductZoekResultaatList.cls.xml (.../ProductZoekResultaatList.cls.xml) (revision 917) +++ APPS/PM/dto/ProductZoekResultaatList.cls.xml (.../ProductZoekResultaatList.cls.xml) (revision 946) @@ -1,18 +1,19 @@ - + JBL + 2011-03-03 ifv webservice toegevoegd 1 %RegisteredObject,%XML.Adaptor 62153,31007.966389 +62165,30925.046294 0 APPS.PM.dto.ProductZoekResultaat list - + Index: vhUnitTest/DOM/PM/TestData.cls.xml =================================================================== diff -u --- vhUnitTest/DOM/PM/TestData.cls.xml (revision 0) +++ vhUnitTest/DOM/PM/TestData.cls.xml (revision 946) @@ -0,0 +1,601 @@ + + + +vhLib.Macro,vhUnitTest.DOM.PM.OL.Gamma +1 +%RegisteredObject +62171,50191.499508 +0 + + +BL.Kenm.ProdMulti +1 + + + + + + + + + + + + + + + +1 + + + + +1 + + + + +%List + + + + +PRNr:%String +1 + + + + +PRNr:%String +1 +","Sleutel") + Do $$$ProdKenmSetAt("","InfoSleutel") + Do $$$ProdKenmSetAt("ICT_GrpKey01","GroepSleutel") + Do $$$ProdKenmSetAt($LB("vhUnitTest.com"),"WebSites") + Do $$$ProdKenmSetAt($LB("Keuken"),"MeubelToepassing") + Do $$$ProdKenmSetAt($LB("Voorraad_Brood_Ontbijt"),"ZoneToepassing") + Do $$$ProdKenmSetAt($LB("Set"),"SamenstellingsType") + } + + if PRNr="1002" { + Do $$$ProdKenmSetAt("","Sleutel") + Do $$$ProdKenmSetAt("","InfoSleutel") + Do $$$ProdKenmSetAt("ICT_GrpKey02","GroepSleutel") + Do $$$ProdKenmSetAt($LB("vhUnitTest.com"),"WebSites") + Do $$$ProdKenmSetAt($LB("Badkamer"),"MeubelToepassing") + Do $$$ProdKenmSetAt($LB("Voorraad_OngekoeldeDranken"),"ZoneToepassing") + Do $$$ProdKenmSetAt($LB("Set"),"SamenstellingsType") + } + + If PRNr="1003" { + Set UnID = "1003.1" + Set sc=..BLProdMulti.AddProdMultiKenmerk(UnID) + Do $$$ProdKenmSetAt("","Sleutel") + Do $$$ProdKenmSetAt("","InfoSleutel") + Do $$$ProdKenmSetAt("ICT_GrpKey03","GroepSleutel") + Do $$$ProdKenmSetAt($LB("vhUnitTest.com"),"WebSites") + Do $$$ProdKenmSetAt($LB("Keuken"),"MeubelToepassing") + Do $$$ProdKenmSetAt($LB("Opbergen_Bestek","Voorbereiden_Snijplanken"),"ZoneToepassing") + Do $$$ProdKenmSetAt($LB("Set"),"SamenstellingsType") + ; + Do $$$ProdKenmSetAt("KLINE","ProductType") + Do $$$ProdKenmSetAt($LB("Alle_TBX_geen_bevestigingen_nodig"),"LadeFamilie") + Do $$$ProdKenmSetAt($LB("M","M/Z"),"LadeType") + ; + Do $$$ProdKenmSetAt($LB(50,55),"Diepte") + Do $$$ProdKenmSetAt("40","LadeBreedteMin") + Do $$$ProdKenmSetAt("50","LadeBreedteMax") + Do $$$ProdKenmSetAt("20","ProductHoogte") + ; + Do $$$ProdKenmSetAt("wit","Kleur") + Do $$$ProdKenmSetAt($LB("wit"),"KleurFilter") + + Do $$$ProdKenmSetAt($LB("TIPS_Staaf_geschikt_voor_bordenplaten","TIPS_Antislipmat_AanTeRaden_SepBestellen"),"BOWeten") + } + + If PRNr="1003" { + Set UnID = "1003.2" + Set sc=..BLProdMulti.AddProdMultiKenmerk(UnID) + Do $$$ProdKenmSetAt("","Sleutel") + Do $$$ProdKenmSetAt("","InfoSleutel") + Do $$$ProdKenmSetAt("ICT_GrpKey03","GroepSleutel") + Do $$$ProdKenmSetAt($LB("vhUnitTest.com"),"WebSites") + Do $$$ProdKenmSetAt($LB("Keuken"),"MeubelToepassing") + Do $$$ProdKenmSetAt($LB("Opbergen_Bestek","Voorbereiden_Snijplanken"),"ZoneToepassing") + Do $$$ProdKenmSetAt($LB("Set"),"SamenstellingsType") + ; + Do $$$ProdKenmSetAt("KLINE","ProductType") + Do $$$ProdKenmSetAt($LB("Alle_TBX_geen_bevestigingen_nodig"),"LadeFamilie") + Do $$$ProdKenmSetAt($LB("M","M/Z"),"LadeType") + ; + Do $$$ProdKenmSetAt($LB(50,55),"Diepte") + Do $$$ProdKenmSetAt("40","LadeBreedteMin") + Do $$$ProdKenmSetAt("50","LadeBreedteMax") + Do $$$ProdKenmSetAt("20","ProductHoogte") + ; + Do $$$ProdKenmSetAt("inox","Kleur") + Do $$$ProdKenmSetAt($LB("inox"),"KleurFilter") + + Do $$$ProdKenmSetAt($LB("TIPS_Staaf_geschikt_voor_bordenplaten"),"BOWeten") + } + + If PRNr="1004"{ + Do $$$ProdKenmSetAt("","Sleutel") + Do $$$ProdKenmSetAt("","InfoSleutel") + Do $$$ProdKenmSetAt("ICT_GrpKey04","GroepSleutel") + Do $$$ProdKenmSetAt($LB("vhUnitTest.com"),"WebSites") + Do $$$ProdKenmSetAt($LB("Keuken"),"MeubelToepassing") + Do $$$ProdKenmSetAt($LB("Opbergen_Borden"),"ZoneToepassing") + Do $$$ProdKenmSetAt($LB("Set"),"SamenstellingsType") + ; + Do $$$ProdKenmSetAt("WOODLINE_Beuk","ProductType") + Do $$$ProdKenmSetAt($LB("TBX_plus_Reling_of_BXglas"),"LadeFamilie") + Do $$$ProdKenmSetAt($LB("C","D"),"LadeType") + ; + Do $$$ProdKenmSetAt($LB(60,65),"Diepte") + Do $$$ProdKenmSetAt("90","LadeBreedteMin") + Do $$$ProdKenmSetAt("120","LadeBreedteMax") + Do $$$ProdKenmSetAt("40","ProductHoogte") + } + + If PRNr="1005" { + Do $$$ProdKenmSetAt("","Sleutel") + Do $$$ProdKenmSetAt("","InfoSleutel") + Do $$$ProdKenmSetAt("ICT_GrpKey05","GroepSleutel") + Do $$$ProdKenmSetAt($LB("vhUnitTest.com"),"WebSites") + Do $$$ProdKenmSetAt($LB("Keuken"),"MeubelToepassing") + Do $$$ProdKenmSetAt($LB("Opbergen_Borden"),"ZoneToepassing") + Do $$$ProdKenmSetAt($LB("Set"),"SamenstellingsType") + ; + Do $$$ProdKenmSetAt("ORGALINE","ProductType") + Do $$$ProdKenmSetAt($LB("TBX_plus_Reling_of_BXglas"),"LadeFamilie") + Do $$$ProdKenmSetAt($LB("D","D/Z"),"LadeType") + ; + Do $$$ProdKenmSetAt($LB(60),"Diepte") + Do $$$ProdKenmSetAt("90","LadeBreedteMin") + Do $$$ProdKenmSetAt("90","LadeBreedteMax") + Do $$$ProdKenmSetAt("50","ProductHoogte") + } + + If PRNr="1006" { + Do $$$ProdKenmSetAt("","Sleutel") + Do $$$ProdKenmSetAt("","InfoSleutel") + Do $$$ProdKenmSetAt("ICT_GrpKey06","GroepSleutel") + Do $$$ProdKenmSetAt($LB("vhUnitTest.com"),"WebSites") + Do $$$ProdKenmSetAt($LB("Keuken"),"MeubelToepassing") + Do $$$ProdKenmSetAt($LB("Opbergen_Borden"),"ZoneToepassing") + Do $$$ProdKenmSetAt($LB("Set"),"SamenstellingsType") + ; + Do $$$ProdKenmSetAt($LB("WOODLINE_Noot","WOODLINE_Beuk"),"ProductType") + Do $$$ProdKenmSetAt($LB("TBX_plus_Reling_of_BXglas"),"LadeFamilie") + Do $$$ProdKenmSetAt($LB("D","D/Z"),"LadeType") + ; + Do $$$ProdKenmSetAt($LB(60),"Diepte") + Do $$$ProdKenmSetAt("90","LadeBreedteMin") + Do $$$ProdKenmSetAt("90","LadeBreedteMax") + Do $$$ProdKenmSetAt("70","ProductHoogte") + } + + If PRNr="1007" { + Do $$$ProdKenmSetAt("","Sleutel") + Do $$$ProdKenmSetAt("","InfoSleutel") + Do $$$ProdKenmSetAt("ICT_GrpKey07","GroepSleutel") + Do $$$ProdKenmSetAt($LB("vhUnitTest.com"),"WebSites") + Do $$$ProdKenmSetAt($LB("Keuken"),"MeubelToepassing") + Do $$$ProdKenmSetAt($LB("Opbergen_Borden"),"ZoneToepassing") + Do $$$ProdKenmSetAt($LB("Set"),"SamenstellingsType") + ; + Do $$$ProdKenmSetAt("WOODLINE_Noot","ProductType") + Do $$$ProdKenmSetAt($LB("TBX_intivo"),"LadeFamilie") + Do $$$ProdKenmSetAt($LB("D","D/Z"),"LadeType") + ; + Do $$$ProdKenmSetAt($LB(60),"Diepte") + Do $$$ProdKenmSetAt("90","LadeBreedteMin") + Do $$$ProdKenmSetAt("90","LadeBreedteMax") + Do $$$ProdKenmSetAt("40","ProductHoogte") + Do $$$ProdKenmSetAt($LB("TIPS_Antislipmat_AanTeRaden_SepBestellen"),"BOWeten") + } + + + If PRNr="1008" { + Set sc=..BLProdMulti.AddProdMultiKenmerk(UnID) + Do $$$ProdKenmSetAt("","Sleutel") + Do $$$ProdKenmSetAt("","InfoSleutel") + Do $$$ProdKenmSetAt("ICT_GrpKey10","GroepSleutel") + Do $$$ProdKenmSetAt($LB("vhUnitTest.com"),"WebSites") + Do $$$ProdKenmSetAt($LB("Keuken"),"MeubelToepassing") + Do $$$ProdKenmSetAt($LB("SpoelenEnAfval_Afvalscheiding"),"ZoneToepassing") + Do $$$ProdKenmSetAt($LB("Set"),"SamenstellingsType") + ; + Do $$$ProdKenmSetAt("WOODLINE_Beuk","ProductType") + Do $$$ProdKenmSetAt($LB("TBX_intivo"),"LadeFamilie") + Do $$$ProdKenmSetAt($LB("D","D/Z"),"LadeType") + ; + Do $$$ProdKenmSetAt($LB(60),"Diepte") + Do $$$ProdKenmSetAt("90","LadeBreedteMin") + Do $$$ProdKenmSetAt("90","LadeBreedteMax") + Do $$$ProdKenmSetAt("40","ProductHoogte") + Do $$$ProdKenmSetAt($LB("TIPS_Antislipmat_AanTeRaden_SepBestellen"),"BOWeten") + } + + If PRNr="1009" { + Set sc=..BLProdMulti.AddProdMultiKenmerk(UnID) + Do $$$ProdKenmSetAt("","Sleutel") + Do $$$ProdKenmSetAt("","InfoSleutel") + Do $$$ProdKenmSetAt("ICT_GrpKey10","GroepSleutel") + Do $$$ProdKenmSetAt($LB("vhUnitTest.com"),"WebSites") + Do $$$ProdKenmSetAt($LB("Keuken"),"MeubelToepassing") + Do $$$ProdKenmSetAt($LB("SpoelenEnAfval_Afvalscheiding"),"ZoneToepassing") + Do $$$ProdKenmSetAt($LB("Set"),"SamenstellingsType") + ; + Do $$$ProdKenmSetAt("WOODLINE_Beuk","ProductType") + Do $$$ProdKenmSetAt($LB("TBX_intivo"),"LadeFamilie") + Do $$$ProdKenmSetAt($LB("D","D/Z"),"LadeType") + ; + Do $$$ProdKenmSetAt($LB(60),"Diepte") + Do $$$ProdKenmSetAt("90","LadeBreedteMin") + Do $$$ProdKenmSetAt("90","LadeBreedteMax") + Do $$$ProdKenmSetAt("40","ProductHoogte") + Do $$$ProdKenmSetAt($LB("TIPS_Antislipmat_AanTeRaden_SepBestellen"),"BOWeten") + } + + + If PRNr="1010" { + Set sc=..BLProdMulti.AddProdMultiKenmerk(UnID) + Do $$$ProdKenmSetAt("","Sleutel") + Do $$$ProdKenmSetAt("","InfoSleutel") + Do $$$ProdKenmSetAt("ICT_GrpKey10","GroepSleutel") + Do $$$ProdKenmSetAt($LB("vhUnitTest.com"),"WebSites") + Do $$$ProdKenmSetAt($LB("Keuken"),"MeubelToepassing") + Do $$$ProdKenmSetAt($LB("SpoelenEnAfval_Afvalscheiding"),"ZoneToepassing") + Do $$$ProdKenmSetAt($LB("Set"),"SamenstellingsType") + ; + Do $$$ProdKenmSetAt("WOODLINE_Beuk","ProductType") + Do $$$ProdKenmSetAt($LB("TBX_intivo"),"LadeFamilie") + Do $$$ProdKenmSetAt($LB("D","D/Z"),"LadeType") + ; + Do $$$ProdKenmSetAt($LB(60),"Diepte") + Do $$$ProdKenmSetAt("90","LadeBreedteMin") + Do $$$ProdKenmSetAt("90","LadeBreedteMax") + Do $$$ProdKenmSetAt("40","ProductHoogte") + Do $$$ProdKenmSetAt($LB("TIPS_Antislipmat_AanTeRaden_SepBestellen"),"BOWeten") + + Set $piece(^KPR(PRNr,"J5005"),"\",19)= 100 // ProductPrijs + } + + If PRNr="1011" { + Do $$$ProdKenmSetAt("","Sleutel") + Do $$$ProdKenmSetAt("","InfoSleutel") + Do $$$ProdKenmSetAt("ICT_GrpKey11","GroepSleutel") + Do $$$ProdKenmSetAt($LB("vhUnitTest.com"),"WebSites") + Do $$$ProdKenmSetAt($LB("Keuken"),"MeubelToepassing") + Do $$$ProdKenmSetAt($LB("SpoelenEnAfval_Afvalscheiding"),"ZoneToepassing") + Do $$$ProdKenmSetAt($LB("Set"),"SamenstellingsType") + ; + Do $$$ProdKenmSetAt("WOODLINE_Beuk","ProductType") + Do $$$ProdKenmSetAt($LB("TBX_plus_Boxside_Ew_of_Dw"),"LadeFamilie") + Do $$$ProdKenmSetAt($LB("D","D/Z"),"LadeType") + ; + Do $$$ProdKenmSetAt($LB(60),"Diepte") + Do $$$ProdKenmSetAt("90","LadeBreedteMin") + Do $$$ProdKenmSetAt("90","LadeBreedteMax") + Do $$$ProdKenmSetAt("10","ProductHoogte") + Do $$$ProdKenmSetAt($LB("TIPS_Antislipmat_AanTeRaden_SepBestellen"),"BOWeten") + + Set $piece(^KPR(PRNr,"J5005"),"\",19)= 100 // ProductPrijs + } + + If PRNr="1012" { + Do $$$ProdKenmSetAt("","Sleutel") + Do $$$ProdKenmSetAt("","InfoSleutel") + Do $$$ProdKenmSetAt("ICT_GrpKey12","GroepSleutel") + Do $$$ProdKenmSetAt($LB("vhUnitTest.com"),"WebSites") + Do $$$ProdKenmSetAt($LB("Keuken"),"MeubelToepassing") + Do $$$ProdKenmSetAt($LB("SpoelenEnAfval_Afvalscheiding"),"ZoneToepassing") + Do $$$ProdKenmSetAt($LB("Set"),"SamenstellingsType") + ; + Do $$$ProdKenmSetAt("WOODLINE_Beuk","ProductType") + Do $$$ProdKenmSetAt($LB("TBX_antaro_Reling"),"LadeFamilie") + Do $$$ProdKenmSetAt($LB("D","D/Z"),"LadeType") + ; + Do $$$ProdKenmSetAt($LB(60),"Diepte") + Do $$$ProdKenmSetAt("90","LadeBreedteMin") + Do $$$ProdKenmSetAt("90","LadeBreedteMax") + Do $$$ProdKenmSetAt("10","ProductHoogte") + Do $$$ProdKenmSetAt($LB("TIPS_Staaf_geschikt_voor_bordenplaten","TIPS_Antislipmat_AanTeRaden_SepBestellen"),"BOWeten") + + Set $piece(^KPR(PRNr,"J5005"),"\",19)= 100 // ProductPrijs + } + + + If PRNr="1013" { + Set UnID = "1013.1" + Set sc=..BLProdMulti.AddProdMultiKenmerk(UnID) + Do $$$ProdKenmSetAt("","Sleutel") + Do $$$ProdKenmSetAt("","InfoSleutel") + Do $$$ProdKenmSetAt("ICT_GrpKey13","GroepSleutel") + Do $$$ProdKenmSetAt($LB("vhUnitTest.com"),"WebSites") + Do $$$ProdKenmSetAt($LB("Keuken"),"MeubelToepassing") + Do $$$ProdKenmSetAt($LB("KokenEnBakken_Potten_Pannen"),"ZoneToepassing") + Do $$$ProdKenmSetAt($LB("Set"),"SamenstellingsType") + ; + Do $$$ProdKenmSetAt("WOODLINE_Beuk","ProductType") + Do $$$ProdKenmSetAt($LB("Alle_TBX_geen_bevestigingen_nodig"),"LadeFamilie") + Do $$$ProdKenmSetAt($LB("M","M/Z"),"LadeType") + ; + Do $$$ProdKenmSetAt($LB(50,55),"Diepte") + Do $$$ProdKenmSetAt("40","LadeBreedteMin") + Do $$$ProdKenmSetAt("50","LadeBreedteMax") + Do $$$ProdKenmSetAt("20","ProductHoogte") + ; + Do $$$ProdKenmSetAt("wit","Kleur") + Do $$$ProdKenmSetAt($LB("wit"),"KleurFilter") + + Do $$$ProdKenmSetAt($LB("TIPS_Staaf_geschikt_voor_bordenplaten","TIPS_Antislipmat_AanTeRaden_SepBestellen"),"BOWeten") + } + + If PRNr="1013" { + Set UnID = "1013.2" + Set sc=..BLProdMulti.AddProdMultiKenmerk(UnID) + Do $$$ProdKenmSetAt("","Sleutel") + Do $$$ProdKenmSetAt("","InfoSleutel") + Do $$$ProdKenmSetAt("ICT_GrpKey13","GroepSleutel") + Do $$$ProdKenmSetAt($LB("vhUnitTest.com"),"WebSites") + Do $$$ProdKenmSetAt($LB("Keuken"),"MeubelToepassing") + Do $$$ProdKenmSetAt($LB("KokenEnBakken_Potten_Pannen"),"ZoneToepassing") + Do $$$ProdKenmSetAt($LB("Set"),"SamenstellingsType") + ; + Do $$$ProdKenmSetAt("WOODLINE_Noot","ProductType") + Do $$$ProdKenmSetAt($LB("Alle_TBX_geen_bevestigingen_nodig"),"LadeFamilie") + Do $$$ProdKenmSetAt($LB("M","M/Z"),"LadeType") + ; + Do $$$ProdKenmSetAt($LB(50,55),"Diepte") + Do $$$ProdKenmSetAt("40","LadeBreedteMin") + Do $$$ProdKenmSetAt("50","LadeBreedteMax") + Do $$$ProdKenmSetAt("20","ProductHoogte") + ; + Do $$$ProdKenmSetAt("inox","Kleur") + Do $$$ProdKenmSetAt($LB("inox"),"KleurFilter") + + Do $$$ProdKenmSetAt($LB("TIPS_Staaf_geschikt_voor_bordenplaten"),"BOWeten") + } + + // 1014 en 1015 en 1016 (Added by WimV) + // Testen of producten geselecteerd worden indien kenmerk(en) niet aanwezig in product + If PRNr="1014" { + Do $$$ProdKenmSetAt("","Sleutel") + Do $$$ProdKenmSetAt("","InfoSleutel") + Do $$$ProdKenmSetAt("ICT_GrpKey14","GroepSleutel") + Do $$$ProdKenmSetAt($LB("vhUnitTest.com"),"WebSites") + Do $$$ProdKenmSetAt($LB("Keuken"),"MeubelToepassing") + Do $$$ProdKenmSetAt($LB("Voorbereiden_Messen"),"ZoneToepassing") + Do $$$ProdKenmSetAt($LB("Set"),"SamenstellingsType") + ; + Do $$$ProdKenmSetAt("ORGALINE","ProductType") + Do $$$ProdKenmSetAt($LB("TBX_plus_Reling_of_BXglas"),"LadeFamilie") + Do $$$ProdKenmSetAt($LB("D","D/Z"),"LadeType") + ; + Do $$$ProdKenmSetAt($LB(60),"Diepte") + Do $$$ProdKenmSetAt("90","LadeBreedteMin") + Do $$$ProdKenmSetAt("90","LadeBreedteMax") + Do $$$ProdKenmSetAt("50","ProductHoogte") + ; + Do $$$ProdKenmSetAt("grijs","Kleur") + Do $$$ProdKenmSetAt($LB("grijs"),"KleurFilter") + } + + If PRNr="1015" { + Do $$$ProdKenmSetAt("","Sleutel") + Do $$$ProdKenmSetAt("","InfoSleutel") + Do $$$ProdKenmSetAt("ICT_GrpKey14","GroepSleutel") + Do $$$ProdKenmSetAt($LB("vhUnitTest.com"),"WebSites") + Do $$$ProdKenmSetAt($LB("Keuken"),"MeubelToepassing") + Do $$$ProdKenmSetAt($LB("Voorbereiden_Messen"),"ZoneToepassing") + Do $$$ProdKenmSetAt($LB("Set"),"SamenstellingsType") + ; + Do $$$ProdKenmSetAt("ORGALINE","ProductType") + ; + Do $$$ProdKenmSetAt("grijs","Kleur") + } + + If PRNr="1016" { // Voor deze producten zijn de kenmerken Website, MeubelToepassing, ZoneToepassing (resp.) niet aanwezig, de rest is zelfde als PRNr 1014 + For idxSubID="1","2","3" + { + Set UnID = "1016"_"."_idxSubID + Set sc=..BLProdMulti.AddProdMultiKenmerk(UnID) + Do $$$ProdKenmSetAt("","Sleutel") + Do $$$ProdKenmSetAt("","InfoSleutel") + Do $$$ProdKenmSetAt("ICT_GrpKey14","GroepSleutel") + Do:(idxSubID'=1) $$$ProdKenmSetAt($LB("vhUnitTest.com"),"WebSites") + Do:(idxSubID'=2) $$$ProdKenmSetAt($LB("Keuken"),"MeubelToepassing") + Do:(idxSubID'=3) $$$ProdKenmSetAt($LB("Voorbereiden_Messen"),"ZoneToepassing") + Do $$$ProdKenmSetAt($LB("Set"),"SamenstellingsType") + ; + Do $$$ProdKenmSetAt("ORGALINE","ProductType") + Do $$$ProdKenmSetAt($LB("TBX_plus_Reling_of_BXglas"),"LadeFamilie") + Do $$$ProdKenmSetAt($LB("D","D/Z"),"LadeType") + ; + Do $$$ProdKenmSetAt($LB(60),"Diepte") + Do $$$ProdKenmSetAt("90","LadeBreedteMin") + Do $$$ProdKenmSetAt("90","LadeBreedteMax") + Do $$$ProdKenmSetAt("50","ProductHoogte") + ; + Do $$$ProdKenmSetAt("grijs","Kleur") + Do $$$ProdKenmSetAt($LB("grijs"),"KleurFilter") + } + } + + If PRNr="1017" { + Set UnID = "1017.1" + Set sc=..BLProdMulti.AddProdMultiKenmerk(UnID) + Do $$$ProdKenmSetAt("","Sleutel") + Do $$$ProdKenmSetAt("","InfoSleutel") + Do $$$ProdKenmSetAt("ICT_GrpKey17a","GroepSleutel") + Do $$$ProdKenmSetAt($LB("vhUnitTest.com"),"WebSites") + Do $$$ProdKenmSetAt($LB("Keuken"),"MeubelToepassing") + Do $$$ProdKenmSetAt($LB("Opbergen_Bestek","Voorbereiden_Snijplanken"),"ZoneToepassing") + Do $$$ProdKenmSetAt($LB("Set"),"SamenstellingsType") + ; + Do $$$ProdKenmSetAt("KLINE","ProductType") + Do $$$ProdKenmSetAt($LB("Alle_TBX_geen_bevestigingen_nodig"),"LadeFamilie") + Do $$$ProdKenmSetAt($LB("M","M/Z"),"LadeType") + ; + Do $$$ProdKenmSetAt($LB(50,55),"Diepte") + Do $$$ProdKenmSetAt("40","LadeBreedteMin") + Do $$$ProdKenmSetAt("50","LadeBreedteMax") + Do $$$ProdKenmSetAt("20","ProductHoogte") + ; + Do $$$ProdKenmSetAt("wit","Kleur") + Do $$$ProdKenmSetAt($LB("wit"),"KleurFilter") + + Do $$$ProdKenmSetAt($LB("TIPS_Staaf_geschikt_voor_bordenplaten","TIPS_Antislipmat_AanTeRaden_SepBestellen"),"BOWeten") + } + + If PRNr="1017" { + Set UnID = "1017.2" + Set sc=..BLProdMulti.AddProdMultiKenmerk(UnID) + Do $$$ProdKenmSetAt("","Sleutel") + Do $$$ProdKenmSetAt("","InfoSleutel") + Do $$$ProdKenmSetAt("ICT_GrpKey17b","GroepSleutel") + Do $$$ProdKenmSetAt($LB("vhUnitTest.com"),"WebSites") + Do $$$ProdKenmSetAt($LB("Keuken"),"MeubelToepassing") + Do $$$ProdKenmSetAt($LB("Opbergen_Bestek","Voorbereiden_Snijplanken"),"ZoneToepassing") + Do $$$ProdKenmSetAt($LB("Set"),"SamenstellingsType") + ; + Do $$$ProdKenmSetAt("KLINE","ProductType") + Do $$$ProdKenmSetAt($LB("Alle_TBX_geen_bevestigingen_nodig"),"LadeFamilie") + Do $$$ProdKenmSetAt($LB("M","M/Z"),"LadeType") + ; + Do $$$ProdKenmSetAt($LB(50,55),"Diepte") + Do $$$ProdKenmSetAt("40","LadeBreedteMin") + Do $$$ProdKenmSetAt("50","LadeBreedteMax") + Do $$$ProdKenmSetAt("20","ProductHoogte") + ; + Do $$$ProdKenmSetAt("inox","Kleur") + Do $$$ProdKenmSetAt($LB("inox"),"KleurFilter") + + Do $$$ProdKenmSetAt($LB("TIPS_Staaf_geschikt_voor_bordenplaten"),"BOWeten") + } + + If PRNr="1099" { + Set UnID = "1099.1" + Set sc=..BLProdMulti.AddProdMultiKenmerk(UnID) + Do $$$ProdKenmSetAt("","Sleutel") + Do $$$ProdKenmSetAt("","InfoSleutel") + Do $$$ProdKenmSetAt("GS_ACC_antislipmat","GroepSleutel") + Do $$$ProdKenmSetAt($LB("vhUnitTest.com"),"WebSites") + Do $$$ProdKenmSetAt($LB("Keuken"),"MeubelToepassing") + Do $$$ProdKenmSetAt($LB("Basisproducten_Antislipmatten"),"ZoneToepassing") + Do $$$ProdKenmSetAt($LB("Los"),"SamenstellingsType") + + Do $$$ProdKenmSetAt("Antislipmatten","ProductType") + Do $$$ProdKenmSetAt($LB("Alle_TBX_geen_bevestigingen_nodig"),"LadeFamilie") + Do $$$ProdKenmSetAt($LB("D","D/Z","M","M/Z"),"LadeType") + Do $$$ProdKenmSetAt($LB("ASM_Rood"),"Kleur") + + Do $$$ProdKenmSetAt($LB(60),"Diepte") + Do $$$ProdKenmSetAt("90","LadeBreedteMin") + Do $$$ProdKenmSetAt("90","LadeBreedteMax") + + Set UnID = "1099.2" + Set sc=..BLProdMulti.AddProdMultiKenmerk(UnID) + Do $$$ProdKenmSetAt("","Sleutel") + Do $$$ProdKenmSetAt("","InfoSleutel") + Do $$$ProdKenmSetAt("GS_ACC_antislipmat","GroepSleutel") + Do $$$ProdKenmSetAt($LB("vhUnitTest.com"),"WebSites") + Do $$$ProdKenmSetAt($LB("Keuken"),"MeubelToepassing") + Do $$$ProdKenmSetAt($LB("Basisproducten_Antislipmatten"),"ZoneToepassing") + ; + Do $$$ProdKenmSetAt("Antislipmatten","ProductType") + Do $$$ProdKenmSetAt($LB("Alle_TBX_geen_bevestigingen_nodig"),"LadeFamilie") + Do $$$ProdKenmSetAt($LB("D","D/Z","M","M/Z"),"LadeType") + Do $$$ProdKenmSetAt($LB("ASM_Zwart"),"Kleur") + ; + Do $$$ProdKenmSetAt($LB(60),"Diepte") + Do $$$ProdKenmSetAt("90","LadeBreedteMin") + Do $$$ProdKenmSetAt("90","LadeBreedteMax") + + } + + Quit +]]> + + + + Index: DOM/CRM/enu/ActiefStatus.cls.xml =================================================================== diff -u --- DOM/CRM/enu/ActiefStatus.cls.xml (revision 0) +++ DOM/CRM/enu/ActiefStatus.cls.xml (revision 946) @@ -0,0 +1,40 @@ + + + +datatype +1 +%String +62172,61581.132857 +0 + + +,,1,2 + + + +;Actief;Buitengebruik;Verwijderd + + + +1 +expression + + + + +1 +expression + + + + +1 +expression + + + + + Index: DOM/CRM/Stat/KlantBeoordeling.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/CRM/Stat/KlantBeoordeling.cls.xml (.../KlantBeoordeling.cls.xml) (revision 903) +++ DOM/CRM/Stat/KlantBeoordeling.cls.xml (.../KlantBeoordeling.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Leveringsperformantie vertrekt van de facturen, @@ -12,7 +12,7 @@ BL.Derde.LevSpecifiek,BL.Derde.KlantSpecifiek,%VHMacro,BL.EC.Common,%Prod.Product,TECH.Error 1 %RegisteredObject -62158,41513.229615 +62161,55722.913773 61807,38311.621993 0 @@ -86,23 +86,51 @@ 1 + + +Do ##class(DOM.CRM.Stat.KlantBeoordeling).Export() +1 + + + %Query AantalMaanden:%Integer 1 - + + @@ -175,7 +203,6 @@ If ..KlantenIterator.HasNext() { Set ..Klant=..KlantenIterator.Next() - w "Klant",..Klant.GeefNummer(),! Do ..GetKlantData() If ..StopAfter,$D(..RowCache)>1 { @@ -203,11 +230,14 @@ @@ -249,7 +279,7 @@ . . . . Set lb4=..DataCache(Key1,Key2,Key3,Key4) . . . . For Set Key5=$O(..DataCache(Key1,Key2,Key3,Key4,Key5)) Quit:Key5="" Do . . . . . Set Detail=..DataCache(Key1,Key2,Key3,Key4,Key5) - . . . . . Set dto=Detail.Convert2dto() + . . . . . Set dto=Detail.Convert2dto(..Klant) . . . . . Do dto.ToevoegenAantallen($LI(lb1,1),$LI(lb1,2),$LI(lb2,1),$LI(lb2,2),$LI(lb3,1),$LI(lb3,2),$LI(lb4,1),$LI(lb4,2)) . . . . . Set ..RowCache=$G(..RowCache)+1,..RowCache(..RowCache)=dto ]]> @@ -260,19 +290,22 @@ - + Index: zTryout/WV/PM/IK/TBXKenmerkenv01.cls.xml =================================================================== diff -u --- zTryout/WV/PM/IK/TBXKenmerkenv01.cls.xml (revision 0) +++ zTryout/WV/PM/IK/TBXKenmerkenv01.cls.xml (revision 946) @@ -0,0 +1,107 @@ + + + +persistent +1 +DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken +62167,53262.552669 +0 + + +%Integer + + + + +LadeKleur:%String="",BodemKleur:%String="",LadeDiepte:%Integer="",Draagkracht:%Integer="",InbouwBreedte:%Integer="" +1 +1 +%Status + + + + + + + + +LadeKleur:%String + + + + +BodemKleur:%String + + + + + + + + +%Library.CacheStorage + + + + Index: TECH/DateTime.cls.xml =================================================================== diff -u --- TECH/DateTime.cls.xml (revision 0) +++ TECH/DateTime.cls.xml (revision 946) @@ -0,0 +1,47 @@ + + + +1 +%RegisteredObject +62168,52814.245941 +0 + + +1 +Horologe:%String +%Integer + + + + +1 +Timestamp:%TimeStamp +%Integer + + + + +1 +%Date + + + + +1 +%Time + + + + +1 +%TimeStamp + + + + + Index: DOM/PM/impl/DataM/DataMProductAPI.cls.xml =================================================================== diff -u -r937 -r946 --- DOM/PM/impl/DataM/DataMProductAPI.cls.xml (.../DataMProductAPI.cls.xml) (revision 937) +++ DOM/PM/impl/DataM/DataMProductAPI.cls.xml (.../DataMProductAPI.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + TECH.Error 1 DOM.PM.ProductAPI,%RegisteredObject -62164,43808.024305 +62172,56682.587948 62159,61821.306225 0 @@ -13,8 +13,8 @@ DOM.PM.Product - + Index: BL/PPS/TBX/MultiProcessorOF.cls.xml =================================================================== diff -u -r901 -r946 --- BL/PPS/TBX/MultiProcessorOF.cls.xml (.../MultiProcessorOF.cls.xml) (revision 901) +++ BL/PPS/TBX/MultiProcessorOF.cls.xml (.../MultiProcessorOF.cls.xml) (revision 946) @@ -1,11 +1,11 @@ - + De verschillende processoren worden gecombineerd met een OF relatie 1 BL.PPS.TBX.MultiProcessor -62137,71318.123735 +62163,41317.783181 0 @@ -24,7 +24,21 @@ Quit Result ]]> + + +labelprinter:BL.Sys.LabelPrinter +%Boolean + + - + Index: vhUnitTest/DOM/PM/Maatwerk/Kost/impl/KostItemBuilderA.cls.xml =================================================================== diff -u -r734 -r946 --- vhUnitTest/DOM/PM/Maatwerk/Kost/impl/KostItemBuilderA.cls.xml (.../KostItemBuilderA.cls.xml) (revision 734) +++ vhUnitTest/DOM/PM/Maatwerk/Kost/impl/KostItemBuilderA.cls.xml (.../KostItemBuilderA.cls.xml) (revision 946) @@ -1,14 +1,14 @@ - + persistent 1 DOM.PM.Maatwerk.Calc.Kost.IKostItemBuilder -62115,58196.018686 +62171,48687.49897 0 -Context:KostContext,HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom +Context:KostContext,HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken DOM.PM.Maatwerk.Calc.Kost.KostItem @@ -18,5 +18,5 @@ %Library.CacheStorage - + Index: APPS/PM/dto/ProductIDsControleResult.cls.xml =================================================================== diff -u -r937 -r946 --- APPS/PM/dto/ProductIDsControleResult.cls.xml (.../ProductIDsControleResult.cls.xml) (revision 937) +++ APPS/PM/dto/ProductIDsControleResult.cls.xml (.../ProductIDsControleResult.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + 1 %RegisteredObject,%XML.Adaptor @@ -16,5 +16,5 @@ list - + Index: TECH/Concurrency/Transactie.cls.xml =================================================================== diff -u -r924 -r946 --- TECH/Concurrency/Transactie.cls.xml (.../Transactie.cls.xml) (revision 924) +++ TECH/Concurrency/Transactie.cls.xml (.../Transactie.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + Deze klasse combineert transacties (die een rollback toelaten) en locks. @@ -16,7 +16,7 @@ TECH.Error 1 %RegisteredObject -62144,42209.748046 +62172,37960.86956 62005,45656.8048 0 @@ -200,9 +200,11 @@ Bericht 1 - - + Index: TECH/ClassInfo/MethodDefinition.cls.xml =================================================================== diff -u -r931 -r946 --- TECH/ClassInfo/MethodDefinition.cls.xml (.../MethodDefinition.cls.xml) (revision 931) +++ TECH/ClassInfo/MethodDefinition.cls.xml (.../MethodDefinition.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject,TECH.ClassInfo.QNameFinder -62160,58574.962852 +62173,35294.73957 0 @@ -45,6 +45,12 @@ ]]> + +%String + + + TECH.Iterator - + Index: DOM/CRM/impl/KlantImpl.cls.xml =================================================================== diff -u -r903 -r946 --- DOM/CRM/impl/KlantImpl.cls.xml (.../KlantImpl.cls.xml) (revision 903) +++ DOM/CRM/impl/KlantImpl.cls.xml (.../KlantImpl.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 DOM.CRM.Klant,%RegisteredObject -62153,73754.152423 +62172,61609.546138 0 @@ -23,33 +23,107 @@ ]]> + +%Status + + + + +%Status + + + + +%String + + + + +DOM.CRM.enu.ActiefStatus + + + + +DOM.common.Adres + + + + +%String + + + + +DOM.CRM.enu.CommercieleStatus + + + + +DOM.CRM.enu.DoorstuurwijzeWMS + + + + +%String + + + + +%String + + + %Integer + +%String + + + + +%String + + + %String - + %String - - + %String - - + %String - @@ -66,6 +140,30 @@ + + +Adres:DOM.common.Adres + + + + +Naam:%String + + + + +Email:%String + + + + +Telefoon1:%String + + - + Index: DOM/CRM/impl/DataM/DataMKlantBase.cls.xml =================================================================== diff -u --- DOM/CRM/impl/DataM/DataMKlantBase.cls.xml (revision 0) +++ DOM/CRM/impl/DataM/DataMKlantBase.cls.xml (revision 946) @@ -0,0 +1,269 @@ + + + + +JBL + 2011-03-21 +1 +DOM.CRM.Klant,%RegisteredObject +62173,35946.25207 +0 + + +%Integer +1 + + + +%String +1 + + + +%String +1 + + + +%String +1 + + + +%String +1 + + + +%String +1 + + + +%String +1 + + + +%Boolean +0 +1 + + + +KlantNummer:%Integer +%Status + + + + + + + + +%String + + + + +DOM.CRM.enu.ActiefStatus + + + + +DOM.common.Adres + + + + +%String + + + + +DOM.CRM.enu.CommercieleStatus + + + + +DOM.CRM.enu.DoorstuurwijzeWMS + + + + +%String + + + + +%Integer + + + + +%String + + + + +%Integer + + + + +%String + + + + +%String + + + + +%String + + + + +%String + + + + +%String + + + + + +Index voor KKL via KK1 ophalen. +%String + + + + + + + + +Piece:%Integer,Waarde:%String +1 + + + + +Piece:%Integer,Waarde:%String +1 + + + + +Status:DOM.CRM.enu.ActiefStatus + + + + +Adres:DOM.common.Adres + + + + +Status:DOM.CRM.enu.CommercieleStatus + + + + +Naam:%String + + + + +Email:%String +%String + + + + +Telefoon1:%String + + + + + + + + +1 + + + +1 + + + + Index: APPS/PM/Maatwerk/IngegevenKenmUpgrade.cls.xml =================================================================== diff -u -r923 -r946 --- APPS/PM/Maatwerk/IngegevenKenmUpgrade.cls.xml (.../IngegevenKenmUpgrade.cls.xml) (revision 923) +++ APPS/PM/Maatwerk/IngegevenKenmUpgrade.cls.xml (.../IngegevenKenmUpgrade.cls.xml) (revision 946) @@ -1,47 +1,175 @@ - + -Deze klasse kan gebruikt worden om ingegeven kenmerken van een -bepaalde versie te bekomen. Geef kenmerken mee plus de versie die je -nodig hebt. +Deze klasse kan gebruikt worden om ingegeven kenmerken van een bepaalde versie te bekomen. +Geef kenmerken mee plus de versie die je nodig hebt. -Als de ingegeven kenmerken niet kunnen geconverteerd worden, wordt -een error teruggegeven. +Als de ingegeven kenmerken niet kunnen geconverteerd worden, wordt een error teruggegeven. vhLib.Macro,TECH.Error 1 %RegisteredObject -62158,60963.591057 +62164,36799.93487 62152,61291.714449 0 + +1 + +v + Set BaseName=$P(ClassName,VersiePrefix,1,$L(ClassName,VersiePrefix)-1) + Set VersieNr=+$$$LastPiece(ClassName,VersiePrefix) + } + Else { + // ClassName is NIET volgens de naming-conventie --> VersieNr is 0 + Set BaseName=ClassName + Set VersieNr=0 + } + } + Else { + Set BaseName="" + $$$ThrowError($$$errInvalidInput,"ClassName van Kenmerken is ongeldig") + } + Quit // +]]> + + + + +Geeft het VersieNr terug als opgemaakte tekst, i.e. met de nodige voorloopnullen. +1 +VersieNr:%Integer +%String + + + - +Dit is de hoofdfunctionaliteit van deze klasse: +Converteert de IngegevenKenmerken naar de gevraagde OutputVersie van de Kenmerken 1 -Kenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken,VersieNr:%Integer +Kenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken,OutputVersieNr:%Integer DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken + - + 1 -%String -Kenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken,InputVersieNr:%String,OutputVersieNr:%String,BaseName:%String,VersiePrefix:%String +1 +DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken +FromVersieNr) { + // Als de VersieNr niet verhoogd is, dan zou dit leiden tot een oneindige lus --> throw error + $$$ThrowError($$$errGeneralError,"UpgradeVersieNr is niet verhoogd na GeefVolgendeVersieKenmerken()") + } + + // Prep voor volgende iteratie + Set FromIK=NextIK + Set FromVersieNr=UpgradeVersieNr + + } + Quit NextIK ]]> - -1 + 1 -Kenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken + 1 +DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken + + +1 +FromVersieNr:%String,ToVersieNr:%String,BaseName:%String,VersiePrefix:%String +1 +%String + + + + +1 +1 +%String + + - + Index: vhUnitTest/APPS/common/StockOverKinderen.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/common/StockOverKinderen.cls.xml (revision 0) +++ vhUnitTest/APPS/common/StockOverKinderen.cls.xml (revision 946) @@ -0,0 +1,155 @@ + + + +1 +vhUnitTest.TestCase +62168,36114.697704 +0 + + + +do ##class(vhUnitTest.Manager).RunTest("/display=all","APPS.common.StockOverKinderen") +%Status + + + + + + + + + + + + +%Status + + + + + + + + + + + + + + + + + + + + + + + + + Index: APPS/PM/OL/ProductRepository.cls.xml =================================================================== diff -u -r917 -r946 --- APPS/PM/OL/ProductRepository.cls.xml (.../ProductRepository.cls.xml) (revision 917) +++ APPS/PM/OL/ProductRepository.cls.xml (.../ProductRepository.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + APPS.PM.OL.Common,,%Prod.Product,BL.Prod 1 %RegisteredObject -62157,56313.739707 +62171,39723.959864 0 @@ -19,7 +19,6 @@ Set pxCriteria=##class(BL.Prod.sub.pxSearchCriteria).Create("ALL") Set pxCriteria.At=Via Set pxCriteria.SearchTxt=ZoekKey - Do WLIP^vhDBG(127,"Zoek : "_ZoekKey) Set pxCriteria.Active=$LB($$$ProdCritActive,$$$ProdCritActiveLimited,$$$ProdCritActiveNon) ; Alleen Actieve producten Set ProdSearch=##class(BL.Prod.Search).Instantiate() @@ -61,5 +60,5 @@ ]]> - + Index: DOM/PM/impl/DataM/DataMHoofdgroepClassificatie.cls.xml =================================================================== diff -u -r939 -r946 --- DOM/PM/impl/DataM/DataMHoofdgroepClassificatie.cls.xml (.../DataMHoofdgroepClassificatie.cls.xml) (revision 939) +++ DOM/PM/impl/DataM/DataMHoofdgroepClassificatie.cls.xml (.../DataMHoofdgroepClassificatie.cls.xml) (revision 946) @@ -1,9 +1,10 @@ - + 1 DOM.PM.Classificatie,%RegisteredObject 62160,40051.971501 +62165,31033.980631 0 @@ -83,5 +84,5 @@ ]]> - + Index: vhUnitTest/DOM/PM/OL/Gamma/GetToepasssingen.cls.xml =================================================================== diff -u -r734 -r946 --- vhUnitTest/DOM/PM/OL/Gamma/GetToepasssingen.cls.xml (.../GetToepasssingen.cls.xml) (revision 734) +++ vhUnitTest/DOM/PM/OL/Gamma/GetToepasssingen.cls.xml (.../GetToepasssingen.cls.xml) (revision 946) @@ -1,5 +1,5 @@ - + @@ -26,7 +26,7 @@ - + Index: DOM/PM/Maatwerk/Calc/Kost/impl/TBX/SpecTBXPlanv001.cls.xml =================================================================== diff -u --- DOM/PM/Maatwerk/Calc/Kost/impl/TBX/SpecTBXPlanv001.cls.xml (revision 0) +++ DOM/PM/Maatwerk/Calc/Kost/impl/TBX/SpecTBXPlanv001.cls.xml (revision 946) @@ -0,0 +1,31 @@ + + + +persistent +1 +DOM.PM.Maatwerk.Calc.Kost.KostSpec +62172,37926.414455 +0 + + +1 +1 +%Status + + + + +%Library.CacheStorage + + + + Index: Tools/impl/RenameMethodCommand.cls.xml =================================================================== diff -u -r931 -r946 --- Tools/impl/RenameMethodCommand.cls.xml (.../RenameMethodCommand.cls.xml) (revision 931) +++ Tools/impl/RenameMethodCommand.cls.xml (.../RenameMethodCommand.cls.xml) (revision 946) @@ -1,9 +1,9 @@ - + 1 %RegisteredObject,Tools.impl.ICommand -62160,56307.345193 +62161,49428.805431 0 @@ -31,12 +31,12 @@ %Status - + Index: Prod/Kenmerk/Orgalux.cls.xml =================================================================== diff -u -r910 -r946 --- Prod/Kenmerk/Orgalux.cls.xml (.../Orgalux.cls.xml) (revision 910) +++ Prod/Kenmerk/Orgalux.cls.xml (.../Orgalux.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + DOM.PM.OL 1 Prod.Kenmerk.Product -62153,50337.294521 +62166,35546.494999 62081,42253.24661 0 @@ -330,24 +330,27 @@ %List - -%List - - - %List %List - + + set lbLadeFamiliesOmsch = ..GetVertaaldeKenmerkWaarden("LadeFamilie",lbLadeFamilies,..Taal) - -%List - 1){ + Set InfoMetLadehoogte = ##class(Res.Vertaling).GetVertaling("OLW","MetLadehoogtes","K",..Taal,,1) + } + Do ##class(TECH.ListUtils).CopyList(BinnenladenTypes,LadenTypes) + For ctrLadenTypes = 1 : 1 : LadenTypes.Count() { + Set InfoMetLadehoogte = InfoMetLadehoogte_LadenTypes.GetAt(ctrLadenTypes) + If (ctrLadenTypes < LadenTypes.Count()){ + Set InfoMetLadehoogte = InfoMetLadehoogte_" "_##class(Res.Vertaling).GetVertaling("OLW","LadeVereistenEn","K",..Taal,,1) + } + } + Set TypesInfoItem = $$REPLACE5^vhRtn1(TypesInfoItem,"::MetLadehoogtes"," "_InfoMetLadehoogte)_". " + + Set lbResult = lbResult _ $LB(TypesInfoItem) } + Quit lbResult ]]> @@ -385,6 +426,11 @@ If $L(TipPastInBinnenLade)&&($$$Not($LF(lbTips,TipPastInBinnenLade)>0)) Set lbTips=lbTips_$LB(TipPastInBinnenLade) } + If ($lf(..GetLadeFamilies(),"TBX_plus_Boxside_Ew_of_Dw")) + { + //TIPS_Dubbelw_Boxside_separaat_bestellen + Set lbTips=lbTips_$LB("TIPS_Dubbelw_Boxside_separaat_bestellen") + } set lbTips = ..SorteerKenmerkWaarden("BOWeten",lbTips) Quit lbTips @@ -853,12 +899,16 @@ set lbLadeFamilies = ..GetLadeFamilieOmschrijvingen() set lbLadeTypes = ..GetLadeTypeLangeOmschrijvingen() set lbLadeKleuren = ..GetLadeKleurOmschrijvingen() - Set TypesInfo = "" - /// JBL : nieuwe labels ophalen, een suffix "_info" toegevoegd aan sleutel. - set lbLadeFamiliesInfo = ..GetLadeFamilieOmschrijvingenInf() - set lbLadeTypes = ..GetLadeTypeLangeOmschrijvingenI() - set lbLadeTypesKenmerk = ..GetLadeTypes() + Set TypesInfo = "" + set lbLadeFamiliesInfo = ..GetLadeFamilieOmschrijvingen() + set lbLadeTypesKenmerk = ..GetLadeTypes() + for ctrLadeFamiliesInfo = 1:1:$listlength(lbLadeFamiliesInfo) + { + Do LadeVereisten.Insert($listget(lbLadeFamiliesInfo,ctrLadeFamiliesInfo)) + } + + /* for ctrLadeFamiliesInfo = 1 : 1 : $listlength(lbLadeFamiliesInfo) Set TypesInfo = TypesInfo _ $listget(lbLadeFamilies,ctrLadeFamiliesInfo)_". " /// LadeTypes : binnenladen , ... @@ -881,7 +931,7 @@ Set Ladehoogte = Ladehoogte_RughoogteTekst Do LadenTypes.Insert(Ladehoogte) } -} + } Set InfoMetBinnenladen = " "_##class(Res.Vertaling).GetVertaling("OLW","MetBinnenladen","K",..Taal,,1) Set InfoMetLadehoogte = "" @@ -912,7 +962,12 @@ } Set TypesInfoItem = $$REPLACE5^vhRtn1(TypesInfoItem,"::MetLadehoogtes"," "_InfoMetLadehoogte) do LadeVereisten.Insert(TypesInfoItem) - } Set LadebreedteTekst = ..GeefBreedteTekst() + + } + */ + + + Set LadebreedteTekst = ..GeefBreedteTekst() If ($length(LadebreedteTekst)){ Do LadeVereisten.Insert(LadebreedteTekst) } @@ -1101,5 +1156,5 @@ ]]> - + Index: vhUnitTest/DOM/OV/TestOrder.cls.xml =================================================================== diff -u -r915 -r946 --- vhUnitTest/DOM/OV/TestOrder.cls.xml (.../TestOrder.cls.xml) (revision 915) +++ vhUnitTest/DOM/OV/TestOrder.cls.xml (.../TestOrder.cls.xml) (revision 946) @@ -1,11 +1,11 @@ - + do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","DOM.OV.TestOrder") 1 vhUnitTest.TestCase -62158,59685.22643 +62168,59557.240422 0 @@ -40,6 +40,13 @@ Do $$$AssertEquals(Adres.GeefGemeente(),"Sint-Niklaas","Gemeente") Do $$$AssertEquals(Adres.GeefLandNr(),"1019","Land") + Set Orderlijn = Order.GeefOrderlijn(103) + Do $$$AssertTrue($IsObject(Orderlijn),"De orderlijn is een object") + Do $$$AssertEquals(Orderlijn.GeefLijnNr(),103,"Het lijnnr is correct") + + Set Orderlijn = Order.GeefOrderlijn(104) + Do $$$AssertFalse($IsObject(Orderlijn),"Orderlijn 104 bestaat niet") + Set OrderIterator = Order.GeefOrderlijnIterator() Do $$$AssertTrue($IsObject(OrderIterator),"De iterator is ingesteld") @@ -48,6 +55,30 @@ ]]> + + + + %Status - + Index: APPS/Halux/common/BatchAPI.cls.xml =================================================================== diff -u --- APPS/Halux/common/BatchAPI.cls.xml (revision 0) +++ APPS/Halux/common/BatchAPI.cls.xml (revision 946) @@ -0,0 +1,17 @@ + + + +1 +1 +62159,51964.707196 +0 + + + +Toeleveringen van het type DOM.LEV.Toelevering +Toeleveringen:%ListOfObjects +APPS.Halux.common.Batch + + + + Index: zTryout/CSC/PM/Maatwerk/HF/IntegratieTest.cls.xml =================================================================== diff -u -r822 -r946 --- zTryout/CSC/PM/Maatwerk/HF/IntegratieTest.cls.xml (.../IntegratieTest.cls.xml) (revision 822) +++ zTryout/CSC/PM/Maatwerk/HF/IntegratieTest.cls.xml (.../IntegratieTest.cls.xml) (revision 946) @@ -1,22 +1,23 @@ - + 1 %RegisteredObject -62126,48416.228961 +62171,49305.163974 0 -Do ##class(zTryout.CSC.PM.Maatwerk.HF.IntegratieTest).MaakProductTBXIntivo() +Set HFItemsBoom = ##class(zTryout.CSC.PM.Maatwerk.HF.IntegratieTest).MaakProductTBXIntivo() 1 +DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom @@ -71,7 +74,7 @@ Set Familie=##class(DOM.PM.enu.Familie).AluKader() Set Variant=##class(DOM.PM.enu.AluKaderVariant).Basis() - Set KlantID = 1000 + Set KlantID = 7587 Set Personality = ##class(DOM.common.VanHoeckePersonality).Instance() Set BerekeningsSpecificatie = ##class(DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie).%New(1,KlantID,Personality) Set Context=##class(DOM.PM.Maatwerk.Calc.HF.HalffabContext).%New(Familie,Variant,BerekeningsSpecificatie) @@ -86,7 +89,7 @@ Set KostContext = ##class(DOM.PM.Maatwerk.Calc.Kost.KostContext).%New(Familie, Variant, BerekeningsSpecificatie) - Set KostItem = KostContext.GeefKostSpec().BerekenKostDetails(KostContext,HalffabItemsBoom) + Set KostItem = KostContext.GeefKostSpec().BerekenKostDetails(KostContext,HalffabItemsBoom,IngegevenKenmerken) Set KostItemWriterVisitor = ##class(DOM.PM.Maatwerk.Calc.Kost.impl.KostItemWriterVisitor).%New() Set ProductSpecificatie = ##class(DOM.PM.Maatwerk.Calc.Common.ProductSpecificatie).%New(Familie, Variant, IngegevenKenmerken) @@ -140,7 +143,7 @@ Set KostContext = ##class(DOM.PM.Maatwerk.Calc.Kost.KostContext).%New(Familie, Variant, BerekeningsSpecificatie) - Set KostItem = KostContext.GeefKostSpec().BerekenKostDetails(KostContext,HalffabItemsBoom) + Set KostItem = KostContext.GeefKostSpec().BerekenKostDetails(KostContext,HalffabItemsBoom,IngegevenKenmerken) Set KostItemWriterVisitor = ##class(DOM.PM.Maatwerk.Calc.Kost.impl.KostItemWriterVisitor).%New() Set Stop = $ZU(188) @@ -160,7 +163,7 @@ { Set Start = $ZU(188) Do Context.GeefHalffabSpec().BerekenHalffabDetails(Context,IngegevenKenmerken) - Set KostItem = KostContext.GeefKostSpec().BerekenKostDetails(KostContext,HalffabItemsBoom) + Set KostItem = KostContext.GeefKostSpec().BerekenKostDetails(KostContext,HalffabItemsBoom,IngegevenKenmerken) Set Stop = $ZU(188) w (($Piece(Stop,",",2)-$Piece(Start,",",2))*1000)_"ms",! } @@ -192,7 +195,7 @@ Set KostContext = ##class(DOM.PM.Maatwerk.Calc.Kost.KostContext).%New(Familie, Variant, BerekeningsSpecificatie) - Set KostItem = KostContext.GeefKostSpec().BerekenKostDetails(KostContext,HalffabItemsBoom) + Set KostItem = KostContext.GeefKostSpec().BerekenKostDetails(KostContext,HalffabItemsBoom,IngegevenKenmerken) Set KostItemWriterVisitor = ##class(DOM.PM.Maatwerk.Calc.Kost.impl.KostItemWriterVisitor).%New() Set Stop = $ZU(188) @@ -212,12 +215,12 @@ { Set Start = $ZU(188) Do Context.GeefHalffabSpec().BerekenHalffabDetails(Context,IngegevenKenmerken) - Set KostItem = KostContext.GeefKostSpec().BerekenKostDetails(KostContext,HalffabItemsBoom) + Set KostItem = KostContext.GeefKostSpec().BerekenKostDetails(KostContext,HalffabItemsBoom,IngegevenKenmerken) Set Stop = $ZU(188) w (($Piece(Stop,",",2)-$Piece(Start,",",2))*1000)_"ms",! } ]]> - + Index: APPS/common/GUI/dto/KolomInfoLijst.cls.xml =================================================================== diff -u --- APPS/common/GUI/dto/KolomInfoLijst.cls.xml (revision 0) +++ APPS/common/GUI/dto/KolomInfoLijst.cls.xml (revision 946) @@ -0,0 +1,15 @@ + + + +1 +%RegisteredObject,%XML.Adaptor +62161,47121.884835 +0 + + +APPS.common.GUI.dto.KolomInfo +list + + + + Index: DOM/PM/Maatwerk/Calc/Kost/TrueEvaluator.cls.xml =================================================================== diff -u -r734 -r946 --- DOM/PM/Maatwerk/Calc/Kost/TrueEvaluator.cls.xml (.../TrueEvaluator.cls.xml) (revision 734) +++ DOM/PM/Maatwerk/Calc/Kost/TrueEvaluator.cls.xml (.../TrueEvaluator.cls.xml) (revision 946) @@ -1,19 +1,19 @@ - + 1 %RegisteredObject,DOM.PM.Maatwerk.Calc.Kost.IEvaluator -62080,61183.357016 +62171,49401.995848 0 -HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,Context:DOM.PM.Maatwerk.Calc.Kost.KostContext +HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,Context:DOM.PM.Maatwerk.Calc.Kost.KostContext,IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken %Boolean - + Index: zTryout/CSC/Try.cls.xml =================================================================== diff -u -r822 -r946 --- zTryout/CSC/Try.cls.xml (.../Try.cls.xml) (revision 822) +++ zTryout/CSC/Try.cls.xml (.../Try.cls.xml) (revision 946) @@ -1,11 +1,11 @@ - + persistent %VHMacro 1 %Persistent -62130,30323.040147 +62131,28320.485504 0 @@ -31,6 +31,30 @@ ]]> + + +Do ##class(zTryout.CSC.Try).Try2() +1 + + + %Library.CacheStorage ^zTryout.CSC.TryD @@ -47,5 +71,5 @@ - + Index: CHUI/PPS/TBX/LeanBatch.cls.xml =================================================================== diff -u -r734 -r946 --- CHUI/PPS/TBX/LeanBatch.cls.xml (.../LeanBatch.cls.xml) (revision 734) +++ CHUI/PPS/TBX/LeanBatch.cls.xml (.../LeanBatch.cls.xml) (revision 946) @@ -1,10 +1,10 @@ - + BL.Derde.KlantSpecifiek,BL.Derde.LevSpecifiek,%VHMacro 0 %RegisteredObject -62070,42903.784647 +62161,50844.606673 61671,56287.96672 0 @@ -662,7 +662,7 @@ Set BatchType=oBatch.Type Set TePrintenEtiketten = ..NogTePrintenEtiketten(BatchNr) If BatchType="+" Do ; ProPlus - Keller - . Set Opties="Z;E;F;R;D;B;P;G;X;A"_$S(..TipOnFreesStatus(BatchNr)'="N":";U",1:"")_$S(..SpoelSifonFreesStatus(BatchNr)'="N":";W",1:"") + . Set Opties="Z;E;F;D;B;P;G;X;A"_$S(..TipOnFreesStatus(BatchNr)'="N":";U",1:"")_$S(..SpoelSifonFreesStatus(BatchNr)'="N":";W",1:"") Else If BatchType="A" Do ; Kast . If TePrintenEtiketten '= "" Do . . Set Opties=TePrintenEtiketten @@ -1028,5 +1028,5 @@ ]]> - + FishEye: Tag 946 refers to a dead (removed) revision in file `vhUnitTest/zTryout/JCL/Stock/MoederProd.cls.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 946 refers to a dead (removed) revision in file `vhUnitTest/zTryout/JCL/Stock/MoederProdMock.cls.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 946 refers to a dead (removed) revision in file `WS/CRM/Interacties/GetRegistraties.cls.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 946 refers to a dead (removed) revision in file `WS/CRM/Interacties/UpdateRegistraties.cls.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 946 refers to a dead (removed) revision in file `WS/CRM/Interacties/GetMetadata.cls.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 946 refers to a dead (removed) revision in file `zJCL/Map/NewClass1.cls.xml'. FishEye: No comparison available. Pass `N' to diff?