Index: CSC common dtos.prj.xml
===================================================================
diff -u
--- CSC common dtos.prj.xml	(revision 0)
+++ CSC common dtos.prj.xml	(revision 1980)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Project name="CSC common dtos" LastModified="2011-09-05 07:46:04">
+  <Items>
+    <ProjectItem name="APPS.common.DataService" type="CLS"/>
+    <ProjectItem name="DOM.common.Gebruiker" type="CLS"/>
+    <ProjectItem name="DOM.common.Personality" type="CLS"/>
+    <ProjectItem name="DOM.common.dto.GebruikerData" type="CLS"/>
+    <ProjectItem name="DOM.common.dto.KlantData" type="CLS"/>
+    <ProjectItem name="DOM.common.dto.PersonalityData" type="CLS"/>
+    <ProjectItem name="WS.common.DataService" type="CLS"/>
+    <ProjectItem name="vhUnitTest.common.TestDataService" type="CLS"/>
+  </Items>
+</Project>
+</Export>
Index: vhUnitTest/common/TestDataService.cls.xml
===================================================================
diff -u
--- vhUnitTest/common/TestDataService.cls.xml	(revision 0)
+++ vhUnitTest/common/TestDataService.cls.xml	(revision 1980)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.common.TestDataService">
+<Description>
+Do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","common.TestDataService")</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhUnitTest.TestCase</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="TestPersonalityData">
+<Implementation><![CDATA[
+	Set Service = ##class(APPS.common.DataService).%New()
+	Set PersonalityData = Service.GeefPersonalityData(1)
+	
+	Do $$$AssertEquals(PersonalityData.ID,1,"De id is 1")
+	Do $$$AssertEquals(PersonalityData.Code,1,"De code is 1")
+	Do $$$AssertEquals(PersonalityData.Naam,"VAN HOECKE","De naam van de personality")
+]]></Implementation>
+</Method>
+
+<Method name="TestKlantData">
+<Implementation><![CDATA[
+	Set Service = ##class(APPS.common.DataService).%New()
+	Set KlantData = Service.GeefKlantData(4682)
+	
+	Do $$$AssertEquals(KlantData.ID,4682,"De klant id")
+	Do $$$AssertEquals(KlantData.Code,4682,"De klant code")
+	Do $$$AssertEquals(KlantData.Naam,"VAN HOECKE","De klant naam")
+	Do $$$AssertEquals(KlantData.Gemeente,"SINT-NIKLAAS","De gemeente")
+	Do $$$AssertEquals(KlantData.Land,"BE","Het land")
+	
+	Do $$$AssertEquals(KlantData.PersonalityData.ID,1,"De id is 1")
+	Do $$$AssertEquals(KlantData.PersonalityData.Code,1,"De code is 1")
+	Do $$$AssertEquals(KlantData.PersonalityData.Naam,"VAN HOECKE","De naam van de personality")
+]]></Implementation>
+</Method>
+
+<Method name="TestGebruikerData">
+<Implementation><![CDATA[
+	Set Gebruiker = ##class(DOM.common.Gebruiker).%New("UnitTest","UT",##class(Derde.Klant.Klant).%OpenId(4682))
+	Set Status = Gebruiker.%Save()
+	
+	Do $$$AssertTrue($$$ISOK(Status),"De gebruiker werd opgeslagen")
+	
+	Set Service = ##class(APPS.common.DataService).%New()
+	Set GebruikerData = Service.GeefGebruikerData(Gebruiker.%Id())
+	
+	Do $$$AssertEquals(GebruikerData.ID,Gebruiker.%Id(),"De gebruiker id")
+	Do $$$AssertEquals(GebruikerData.Naam,"UnitTest","De naam van de gebruiker")
+	Do $$$AssertEquals(GebruikerData.Code,"UT","De code van de gebruiker")
+	
+	Do $$$AssertEquals(GebruikerData.KlantData.ID,4682,"De klant id")
+	Do $$$AssertEquals(GebruikerData.KlantData.Code,4682,"De klant code")
+	Do $$$AssertEquals(GebruikerData.KlantData.Naam,"VAN HOECKE","De klant naam")
+	Do $$$AssertEquals(GebruikerData.KlantData.Gemeente,"SINT-NIKLAAS","De gemeente")
+	Do $$$AssertEquals(GebruikerData.KlantData.Land,"BE","Het land")
+	
+	Do $$$AssertEquals(GebruikerData.KlantData.PersonalityData.ID,1,"De id is 1")
+	Do $$$AssertEquals(GebruikerData.KlantData.PersonalityData.Code,1,"De code is 1")
+	Do $$$AssertEquals(GebruikerData.KlantData.PersonalityData.Naam,"VAN HOECKE","De naam van de personality")
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: WS/common/DataService.cls.xml
===================================================================
diff -u
--- WS/common/DataService.cls.xml	(revision 0)
+++ WS/common/DataService.cls.xml	(revision 1980)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="WS.common.DataService">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WS.WebService</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="SERVICENAME">
+<Default>DataService</Default>
+</Parameter>
+
+<Parameter name="NAMESPACE">
+<Default>http://www.vanhoecke.be/common/Data</Default>
+</Parameter>
+
+<Method name="GeefPersonalityData">
+<FormalSpec>PersonalityID:%String</FormalSpec>
+<ReturnType>DOM.common.dto.PersonalityData</ReturnType>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[	Quit ##class(APPS.common.DataService).%New().GeefPersonalityData(PersonalityID)
+]]></Implementation>
+</Method>
+
+<Method name="GeefKlantData">
+<FormalSpec>KlantID:%String</FormalSpec>
+<ReturnType>DOM.common.dto.KlantData</ReturnType>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[	Quit ##class(APPS.common.DataService).%New().GeefKlantData(KlantID)
+]]></Implementation>
+</Method>
+
+<Method name="GeefGebruikerData">
+<FormalSpec>GebruikerID:%String</FormalSpec>
+<ReturnType>DOM.common.dto.GebruikerData</ReturnType>
+<WebMethod>1</WebMethod>
+<Implementation><![CDATA[	Quit ##class(APPS.common.DataService).%New().GeefGebruikerData(GebruikerID)
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: APPS/common/DataService.cls.xml
===================================================================
diff -u
--- APPS/common/DataService.cls.xml	(revision 0)
+++ APPS/common/DataService.cls.xml	(revision 1980)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.common.DataService">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="GeefPersonalityData">
+<FormalSpec>PersonalityID:%String</FormalSpec>
+<ReturnType>DOM.common.dto.PersonalityData</ReturnType>
+<Implementation><![CDATA[
+	Set Personality = ##class(DOM.common.Personality).%OpenId(PersonalityID)
+	
+	If ('$IsObject(Personality))
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Ongeldige personality id "_PersonalityID))
+	}
+
+	Set PersonalityData = ##class(DOM.common.dto.PersonalityData).%New()
+	Set PersonalityData.ID = PersonalityID
+	Set PersonalityData.Code = PersonalityID
+	Set PersonalityData.Naam = Personality.GeefKlant().Naam
+	
+	Quit PersonalityData
+]]></Implementation>
+</Method>
+
+<Method name="GeefKlantData">
+<FormalSpec>KlantID:%String</FormalSpec>
+<ReturnType>DOM.common.dto.KlantData</ReturnType>
+<Implementation><![CDATA[
+	Set Klant = ##class(DOM.DomeinContext).Instance().GeefKlantAPI().GeefKlant(KlantID)
+	
+	If ('$IsObject(Klant))
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Ongeldige klant id "_KlantID))
+	}
+	
+	Set KlantData = ##class(DOM.common.dto.KlantData).%New()
+	Set KlantData.ID = KlantID
+	Set KlantData.Naam = Klant.GeefNaam()
+	Set KlantData.Code = KlantID
+	Set Adres = Klant.GeefAdres()
+	Set KlantData.Gemeente = Adres.GeefGemeente()
+	Set KlantData.Land = Adres.GeefLandCode()
+	Set KlantData.PersonalityData = ..GeefPersonalityData(##class(DOM.common.VanHoeckePersonality).Instance().%Id())
+	
+	Quit KlantData
+]]></Implementation>
+</Method>
+
+<Method name="GeefGebruikerData">
+<FormalSpec>GebruikerID:%String</FormalSpec>
+<ReturnType>DOM.common.dto.GebruikerData</ReturnType>
+<Implementation><![CDATA[
+	Set Gebruiker = ##class(DOM.common.Gebruiker).%OpenId(GebruikerID)
+	
+	If ('$IsObject(Gebruiker))
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Ongeldige gebruiker id "_GebruikerID))
+	}
+	
+	Set GebruikerData = ##class(DOM.common.dto.GebruikerData).%New()
+	Set GebruikerData.ID = Gebruiker.%Id()
+	Set GebruikerData.Code = Gebruiker.GeefCode()
+	Set GebruikerData.Naam = Gebruiker.GeefNaam()
+	Set GebruikerData.KlantData = ..GeefKlantData(Gebruiker.GeefKlantRelatie().%Id())
+	
+	Quit GebruikerData
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: DOM/common/dto/KlantData.cls.xml
===================================================================
diff -u
--- DOM/common/dto/KlantData.cls.xml	(revision 0)
+++ DOM/common/dto/KlantData.cls.xml	(revision 1980)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="DOM.common.dto.KlantData">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="ID">
+<Type>%String</Type>
+</Property>
+
+<Property name="Code">
+<Type>%String</Type>
+</Property>
+
+<Property name="Naam">
+<Type>%String</Type>
+</Property>
+
+<Property name="Land">
+<Type>%String</Type>
+</Property>
+
+<Property name="Gemeente">
+<Type>%String</Type>
+</Property>
+
+<Property name="PersonalityData">
+<Type>DOM.common.dto.PersonalityData</Type>
+</Property>
+</Class>
+</Export>
Index: DOM/common/Gebruiker.cls.xml
===================================================================
diff -u
--- DOM/common/Gebruiker.cls.xml	(revision 0)
+++ DOM/common/Gebruiker.cls.xml	(revision 1980)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="DOM.common.Gebruiker">
+<ClassType>persistent</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%Persistent</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="Naam">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Code">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="KlantRelatie">
+<Type>Derde.Klant.Klant</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>Naam:%String,Code:%String,KlantRelatie:Derde.Klant.Klant</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..Naam = Naam
+	Set ..Code = Code
+	Set ..KlantRelatie = KlantRelatie
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefNaam">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Naam
+]]></Implementation>
+</Method>
+
+<Method name="GeefCode">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Code
+]]></Implementation>
+</Method>
+
+<Method name="GeefKlantRelatie">
+<ReturnType>Derde.Klant.Klant</ReturnType>
+<Implementation><![CDATA[	Quit ..KlantRelatie
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+<DataLocation>^DOM.common.GebruikerD</DataLocation>
+<DefaultData>GebruikerDefaultData</DefaultData>
+<IdLocation>^DOM.common.GebruikerD</IdLocation>
+<IndexLocation>^DOM.common.GebruikerI</IndexLocation>
+<StreamLocation>^DOM.common.GebruikerS</StreamLocation>
+<Data name="GebruikerDefaultData">
+<Structure>listnode</Structure>
+<Subscript/>
+<Value name="1">
+<Value>%%CLASSNAME</Value>
+</Value>
+<Value name="2">
+<Value>Code</Value>
+</Value>
+<Value name="3">
+<Value>KlantRelatie</Value>
+</Value>
+<Value name="4">
+<Value>Naam</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+</Export>
Index: DOM/common/dto/PersonalityData.cls.xml
===================================================================
diff -u
--- DOM/common/dto/PersonalityData.cls.xml	(revision 0)
+++ DOM/common/dto/PersonalityData.cls.xml	(revision 1980)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="DOM.common.dto.PersonalityData">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="Code">
+<Type>%String</Type>
+</Property>
+
+<Property name="ID">
+<Type>%String</Type>
+</Property>
+
+<Property name="Naam">
+<Type>%String</Type>
+</Property>
+</Class>
+</Export>
Index: DOM/common/dto/GebruikerData.cls.xml
===================================================================
diff -u
--- DOM/common/dto/GebruikerData.cls.xml	(revision 0)
+++ DOM/common/dto/GebruikerData.cls.xml	(revision 1980)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="DOM.common.dto.GebruikerData">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="ID">
+<Type>%String</Type>
+</Property>
+
+<Property name="Code">
+<Type>%String</Type>
+</Property>
+
+<Property name="Naam">
+<Type>%String</Type>
+</Property>
+
+<Property name="KlantData">
+<Type>DOM.common.dto.KlantData</Type>
+</Property>
+</Class>
+</Export>