Index: DOM/common/enu/Personality.cls.xml =================================================================== diff -u -r46612 -r52195 --- DOM/common/enu/Personality.cls.xml (.../Personality.cls.xml) (revision 46612) +++ DOM/common/enu/Personality.cls.xml (.../Personality.cls.xml) (revision 52195) @@ -6,11 +6,11 @@ TECH.Enumeration -,VanHoecke,VanHoeckeVoorHalux,SFS,Dupont,Kisch,Destil,HaefeleBE,VanRaemdonck,Noteborn,Daro,Hein,HaefeleNL,Seefelder +,VanHoecke,VanHoeckeVoorHalux,SFS,Dupont,Kisch,Destil,HaefeleBE,VanRaemdonck,Noteborn,Daro,Hein,HaefeleNL,Seefelder,BeslagDesign,Demo -,1,2,3,4,5,6,7,8,9,10,11,12,13 +,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 @@ -103,6 +103,20 @@ + + +1 +DOM.common.enu.Personality + + + + +1 +DOM.common.enu.Personality + + Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml =================================================================== diff -u -r52078 -r52195 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 52078) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 52195) @@ -69,9 +69,11 @@ While PersonalityIterator.HasNext() { #dim PersonalityID As DOM.common.enu.Personality = PersonalityIterator.Next() - #dim Sessie As APPS.EC.Transport.dto.KlantIdentificatie = ##class(APPS.EC.Transport.dto.KlantIdentificatie).%New(PersonalityID, "") - #dim VerkoopprijsBerekenaar = Factory.GeefVerkoopprijsBerekenaar(Sessie) - Do $$$AssertEquals(VerkoopprijsBerekenaar.%ClassName(1), VerwachteBepalers.GetAt(PersonalityID)) + If (($$$Not(PersonalityID = ##class(DOM.common.enu.Personality).BeslagDesign())) && ($$$Not(PersonalityID = ##class(DOM.common.enu.Personality).Demo()))) { + #dim Sessie As APPS.EC.Transport.dto.KlantIdentificatie = ##class(APPS.EC.Transport.dto.KlantIdentificatie).%New(PersonalityID, "") + #dim VerkoopprijsBerekenaar = Factory.GeefVerkoopprijsBerekenaar(Sessie) + Do $$$AssertEquals(VerkoopprijsBerekenaar.%ClassName(1), VerwachteBepalers.GetAt(PersonalityID)) + } } ]]> Index: DOM/VKP/enu/Klant/Verwerker.cls.xml =================================================================== diff -u -r51824 -r52195 --- DOM/VKP/enu/Klant/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 51824) +++ DOM/VKP/enu/Klant/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 52195) @@ -12,7 +12,9 @@ 1 Klant:DOM.VKP.enu.Klant + +1 +1 + + + 1 1 @@ -213,6 +223,12 @@ + +1 +1 + + + 1 1 Index: vhDeploy/D20180723xDemoPersonalityAanmaken.cls.xml =================================================================== diff -u --- vhDeploy/D20180723xDemoPersonalityAanmaken.cls.xml (revision 0) +++ vhDeploy/D20180723xDemoPersonalityAanmaken.cls.xml (revision 52195) @@ -0,0 +1,28 @@ + + + +vhDeploy.Deploy + + +%String +15 + + + +%String +Aanmaken van DemoPersonality (ID=15) + + + +1 + + + + + + Index: DOM/common/enu/Personality/Verwerker.cls.xml =================================================================== diff -u -r46612 -r52195 --- DOM/common/enu/Personality/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 46612) +++ DOM/common/enu/Personality/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 52195) @@ -12,8 +12,12 @@ 1 Personality:DOM.common.enu.Personality + +1 +1 + + + 1 1 + +1 +1 + + + 1 1 Index: vhUnitTest/APPS/EC/Winkelkar/impl/TestAuthorisatieControleur.cls.xml =================================================================== diff -u -r41411 -r52195 --- vhUnitTest/APPS/EC/Winkelkar/impl/TestAuthorisatieControleur.cls.xml (.../TestAuthorisatieControleur.cls.xml) (revision 41411) +++ vhUnitTest/APPS/EC/Winkelkar/impl/TestAuthorisatieControleur.cls.xml (.../TestAuthorisatieControleur.cls.xml) (revision 52195) @@ -97,7 +97,6 @@ Index: DOM/VKP/enu/Klant/AutoComplete.cls.xml =================================================================== diff -u -r51824 -r52195 --- DOM/VKP/enu/Klant/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 51824) +++ DOM/VKP/enu/Klant/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 52195) @@ -9,6 +9,13 @@ 1 %SerialObject + +%String +"K||29070" +1 +1 + + %String "K||4943" @@ -86,6 +93,13 @@ 1 + +%String +"K||30531" +1 +1 + + %String "K||4598" Index: DOM/common/DemoPersonality.cls.xml =================================================================== diff -u --- DOM/common/DemoPersonality.cls.xml (revision 0) +++ DOM/common/DemoPersonality.cls.xml (revision 52195) @@ -0,0 +1,45 @@ + + + +persistent +1 +DOM.common.impl.HandelPersonality + + +1 +DOM.common.impl.Personality + + + + +DOM.enu.Taal + + + + +%Boolean + + + + +%String + + + + +%String + + + + +%Library.CacheStorage + + + + + Index: DOM/common/BeslagDesignPersonality.cls.xml =================================================================== diff -u --- DOM/common/BeslagDesignPersonality.cls.xml (revision 0) +++ DOM/common/BeslagDesignPersonality.cls.xml (revision 52195) @@ -0,0 +1,45 @@ + + + +persistent +1 +DOM.common.impl.HandelPersonality + + +1 +DOM.common.impl.Personality + + + + +DOM.enu.Taal + + + + +%Boolean + + + + +%String + + + + +%String + + + + +%Library.CacheStorage + + + + + Index: DOM/VKP/enu/Klant.cls.xml =================================================================== diff -u -r51827 -r52195 --- DOM/VKP/enu/Klant.cls.xml (.../Klant.cls.xml) (revision 51827) +++ DOM/VKP/enu/Klant.cls.xml (.../Klant.cls.xml) (revision 52195) @@ -7,7 +7,7 @@ TECH.Enumeration -,K||1239,K||4682,K||1000,K||11708,K||4875,K||2671,K||6279,K||12130,K||7587,K||9365,K||12486,K||2523,K||1571,K||4451,K||4855,K||4830,K||9366,K||11211,K||12853,K||2999,K||6780,K||7833,K||1523,K||2669,K||6819,K||6820,K||6821,K||18455,K||27132,K||2009,K||23486,K||7606,K||23112,K||9382,K||18417,K||4073,K||1390,K||9197,K||3814,K||1387,K||8869,K||23968,K||11171,K||6261,K||24315,K||25868,K||24755,K||9905,K||10387,K||12983,K||9798,K||8092,K||3145,K||2265,K||4943,K||19485,K||1736,K||4875,K||4598,K||2254,K||2595,K||4026,K||14604,K||13446,K||13823 +,K||1239,K||4682,K||1000,K||11708,K||4875,K||2671,K||6279,K||12130,K||7587,K||9365,K||12486,K||2523,K||1571,K||4451,K||4855,K||4830,K||9366,K||11211,K||12853,K||2999,K||6780,K||7833,K||1523,K||2669,K||6819,K||6820,K||6821,K||18455,K||27132,K||2009,K||23486,K||7606,K||23112,K||9382,K||18417,K||4073,K||1390,K||9197,K||3814,K||1387,K||8869,K||23968,K||11171,K||6261,K||24315,K||25868,K||24755,K||9905,K||10387,K||12983,K||9798,K||8092,K||3145,K||2265,K||4943,K||19485,K||1736,K||4875,K||4598,K||2254,K||2595,K||4026,K||14604,K||13446,K||13823,K||29070,K||30531 @@ -460,6 +460,20 @@ ]]> + +1 +DOM.VKP.enu.Klant + + + + +1 +DOM.VKP.enu.Klant + + + 1 KlantNummer:%String Index: vhUnitTest/DOM/common/Personality/GeefLeverancierData/Test.cls.xml =================================================================== diff -u -r45709 -r52195 --- vhUnitTest/DOM/common/Personality/GeefLeverancierData/Test.cls.xml (.../Test.cls.xml) (revision 45709) +++ vhUnitTest/DOM/common/Personality/GeefLeverancierData/Test.cls.xml (.../Test.cls.xml) (revision 52195) @@ -8,11 +8,13 @@ #dim PersonalityIterator As TECH.ListIterator = ##class(DOM.common.enu.Personality).ValueListIterator() while PersonalityIterator.HasNext() { #dim Personality As DOM.common.Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(PersonalityIterator.Next()) - try { - do Personality.GeefLeverancierData() - } catch { - do ##class(TECH.ExceptionHandler).Catch() - do $$$AssertFalse(1,"GeefLeverancierData niet gedefinieerd voor "_Personality.%ClassName(1)) + If (($$$Not(Personality.%Extends(##class(DOM.common.BeslagDesignPersonality).%ClassName($$$True)))) && ($$$Not(Personality.%Extends(##class(DOM.common.DemoPersonality).%ClassName($$$True))))) { + try { + do Personality.GeefLeverancierData() + } catch { + do ##class(TECH.ExceptionHandler).Catch() + do $$$AssertFalse(1,"GeefLeverancierData niet gedefinieerd voor "_Personality.%ClassName(1)) + } } } ]]> Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml =================================================================== diff -u -r46605 -r52195 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 46605) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 52195) @@ -65,8 +65,10 @@ #dim PersonalityIterator As TECH.ListIterator = ##class(DOM.common.enu.Personality).ValueListIterator() While PersonalityIterator.HasNext() { #dim PersonalityID As DOM.common.enu.Personality = PersonalityIterator.Next() - #dim Sessie As APPS.EC.Transport.dto.KlantIdentificatie = ##class(APPS.EC.Transport.dto.KlantIdentificatie).%New(PersonalityID, "") - Do $$$AssertEquals($classname(LandenBepalerFactory.GeefLandenBepaler(Sessie)), VerwachteBepalers.GetAt(PersonalityID),PersonalityID) + If (($$$Not(PersonalityID = ##class(DOM.common.enu.Personality).BeslagDesign())) && ($$$Not(PersonalityID = ##class(DOM.common.enu.Personality).Demo()))) { + #dim Sessie As APPS.EC.Transport.dto.KlantIdentificatie = ##class(APPS.EC.Transport.dto.KlantIdentificatie).%New(PersonalityID, "") + Do $$$AssertEquals($classname(LandenBepalerFactory.GeefLandenBepaler(Sessie)), VerwachteBepalers.GetAt(PersonalityID),PersonalityID) + } } ]]> Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml =================================================================== diff -u -r52078 -r52195 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 52078) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 52195) @@ -69,9 +69,11 @@ #dim PersonalityIterator As TECH.ListIterator = ##class(DOM.common.enu.Personality).ValueListIterator() While PersonalityIterator.HasNext() { #dim PersonalityID As DOM.common.enu.Personality = PersonalityIterator.Next() - #dim Sessie As APPS.EC.Transport.dto.KlantIdentificatie = ##class(APPS.EC.Transport.dto.KlantIdentificatie).%New(PersonalityID, "") - #dim VerkoopprijsBerekenaar = TransportFirmaBepalerFactory.GeefTransportFirmaBepaler(Sessie) - Do $$$AssertEquals(VerkoopprijsBerekenaar.%ClassName(1), VerwachteBepalers.GetAt(PersonalityID)) + If (($$$Not(PersonalityID = ##class(DOM.common.enu.Personality).BeslagDesign())) && ($$$Not(PersonalityID = ##class(DOM.common.enu.Personality).Demo()))) { + #dim Sessie As APPS.EC.Transport.dto.KlantIdentificatie = ##class(APPS.EC.Transport.dto.KlantIdentificatie).%New(PersonalityID, "") + #dim VerkoopprijsBerekenaar = TransportFirmaBepalerFactory.GeefTransportFirmaBepaler(Sessie) + Do $$$AssertEquals(VerkoopprijsBerekenaar.%ClassName(1), VerwachteBepalers.GetAt(PersonalityID)) + } } ]]> Index: vhDeploy/D20180723xBeslagDesignPersonalityAanmaken.cls.xml =================================================================== diff -u --- vhDeploy/D20180723xBeslagDesignPersonalityAanmaken.cls.xml (revision 0) +++ vhDeploy/D20180723xBeslagDesignPersonalityAanmaken.cls.xml (revision 52195) @@ -0,0 +1,28 @@ + + + +vhDeploy.Deploy + + +%String +14 + + + +%String +Aanmaken van Personality voor Beslag Design (ID=14) + + + +1 + + + + + + Index: DOM/common/enu/Personality/AutoComplete.cls.xml =================================================================== diff -u -r46612 -r52195 --- DOM/common/enu/Personality/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 46612) +++ DOM/common/enu/Personality/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 52195) @@ -9,13 +9,27 @@ 1 %SerialObject + +%String +"14" +1 +1 + + %String "10" 1 1 + +%String +"15" +1 +1 + + %String "6"