Index: DOM/PM/impl/DataM/DataMSubgroepClassificatie.cls.xml
===================================================================
diff -u -r1725 -r2084
--- DOM/PM/impl/DataM/DataMSubgroepClassificatie.cls.xml	(.../DataMSubgroepClassificatie.cls.xml)	(revision 1725)
+++ DOM/PM/impl/DataM/DataMSubgroepClassificatie.cls.xml	(.../DataMSubgroepClassificatie.cls.xml)	(revision 2084)
@@ -69,9 +69,15 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefUniekeCode">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $P(..DataKlas,"\",5)_"/"_$P(..DataKlas,"\",6)_"/"_$P(..DataKlas,"\",7)
+]]></Implementation>
+</Method>
+
 <Method name="GeefCode">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $P(..Data,"\",7)
+<Implementation><![CDATA[	Quit $P(..DataKlas,"\",7)
 ]]></Implementation>
 </Method>
 
Index: CSC common dtos.prj.xml
===================================================================
diff -u -r2080 -r2084
--- CSC common dtos.prj.xml	(.../CSC common dtos.prj.xml)	(revision 2080)
+++ CSC common dtos.prj.xml	(.../CSC common dtos.prj.xml)	(revision 2084)
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
-<Project name="CSC common dtos" LastModified="2011-09-14 16:11:25">
+<Project name="CSC common dtos" LastModified="2011-09-15 09:41:41">
   <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.ClassificatieData" 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"/>
Index: APPS/common/DataService.cls.xml
===================================================================
diff -u -r1980 -r2084
--- APPS/common/DataService.cls.xml	(.../DataService.cls.xml)	(revision 1980)
+++ APPS/common/DataService.cls.xml	(.../DataService.cls.xml)	(revision 2084)
@@ -69,5 +69,52 @@
 	Quit GebruikerData
 ]]></Implementation>
 </Method>
+
+<Method name="GeefProductData">
+<FormalSpec>ProductID:%String</FormalSpec>
+<ReturnType>DOM.common.dto.ProductData</ReturnType>
+<Implementation><![CDATA[
+	Set ProductData = ##class(DOM.common.dto.ProductData).%New()
+	
+	Set ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
+	Set Product = ProductAPI.GeefProduct(ProductID)
+	
+	If ('$IsObject(Product))
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Ongeldige product id "_ProductID))
+	}
+	
+	Set ProductData.ID = ProductID
+	Set ProductData.Code = Product.GeefKorttekst()
+	Set ProductData.IdentNr = Product.GeefIdentNr()
+	Set ProductData.Omschrijving = Product.GeefLangtekst("N")
+	Set ProductData.Classificatie = ..GeefClassificatieData(ProductAPI.GeefProductClassificatie(ProductID).GeefClassificatie().GeefID())
+	Set ProductData.ClassificatieID = ProductData.Classificatie.ID
+	
+	Quit ProductData
+]]></Implementation>
+</Method>
+
+<Method name="GeefClassificatieData">
+<FormalSpec>ClassificatieID:%String</FormalSpec>
+<ReturnType>DOM.common.dto.ClassificatieData</ReturnType>
+<Implementation><![CDATA[
+	Set ClassificatieData = ##class(DOM.common.dto.ClassificatieData).%New()
+	
+	Set Classificatie = ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefClassificatie(ClassificatieID)
+	
+	If ('$IsObject(Classificatie))
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Ongeldige classificatie id "_ClassificatieID))
+	}
+	
+	Set ClassificatieData.ID = ClassificatieID
+	Set ClassificatieData.Naam = Classificatie.GeefNederlands()
+	Set ClassificatieData.Code = Classificatie.GeefCode()
+	Set ClassificatieData.UniekeCode = Classificatie.GeefUniekeCode()
+	
+	Quit ClassificatieData
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: DOM/common/dto/ProductData.cls.xml
===================================================================
diff -u -r2080 -r2084
--- DOM/common/dto/ProductData.cls.xml	(.../ProductData.cls.xml)	(revision 2080)
+++ DOM/common/dto/ProductData.cls.xml	(.../ProductData.cls.xml)	(revision 2084)
@@ -8,5 +8,25 @@
 <Property name="ClassificatieID">
 <Type>%String</Type>
 </Property>
+
+<Property name="Code">
+<Type>%String</Type>
+</Property>
+
+<Property name="ID">
+<Type>%String</Type>
+</Property>
+
+<Property name="IdentNr">
+<Type>%String</Type>
+</Property>
+
+<Property name="Omschrijving">
+<Type>%String</Type>
+</Property>
+
+<Property name="Classificatie">
+<Type>DOM.common.dto.ClassificatieData</Type>
+</Property>
 </Class>
 </Export>
Index: DOM/PM/impl/DataM/DataMHoofdgroepClassificatie.cls.xml
===================================================================
diff -u -r1724 -r2084
--- DOM/PM/impl/DataM/DataMHoofdgroepClassificatie.cls.xml	(.../DataMHoofdgroepClassificatie.cls.xml)	(revision 1724)
+++ DOM/PM/impl/DataM/DataMHoofdgroepClassificatie.cls.xml	(.../DataMHoofdgroepClassificatie.cls.xml)	(revision 2084)
@@ -47,9 +47,15 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefUniekeCode">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $P(..DataKlas,"\",5)
+]]></Implementation>
+</Method>
+
 <Method name="GeefCode">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $P(..Data,"\",7)
+<Implementation><![CDATA[	Quit $P(..DataKlas,"\",5)
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/common/TestDataService.cls.xml
===================================================================
diff -u -r1982 -r2084
--- vhUnitTest/common/TestDataService.cls.xml	(.../TestDataService.cls.xml)	(revision 1982)
+++ vhUnitTest/common/TestDataService.cls.xml	(.../TestDataService.cls.xml)	(revision 2084)
@@ -62,5 +62,31 @@
 	Do Gebruiker.%DeleteId(Gebruiker.%Id())
 ]]></Implementation>
 </Method>
+
+<Method name="TestProductData">
+<Implementation><![CDATA[
+	Set Service = ##class(APPS.common.DataService).%New() 
+	Set ProductData = Service.GeefProductData(206440)
+	
+	Do $$$AssertEquals(ProductData.ID,206440,"De product id")
+	Do $$$AssertEquals(ProductData.Code,"358M2702I  Z LI   V20IG/G","De product code")
+	Do $$$AssertEquals(ProductData.IdentNr,"0.234.930.0","De ident nr")
+	Do $$$AssertEquals(ProductData.Omschrijving,"Tandembox PLUS ladeprofiel links, staal, 270mm diep","De omschrijving")
+	Do $$$AssertEquals(ProductData.ClassificatieID,"409","De classificatie id")
+	Do $$$AssertTrue($IsObject(ProductData.Classificatie),"De classificatie is ingesteld")
+]]></Implementation>
+</Method>
+
+<Method name="TestClassificatieData">
+<Implementation><![CDATA[
+	Set Service = ##class(APPS.common.DataService).%New() 
+	Set ClassificatieData = Service.GeefClassificatieData(409)
+	
+	Do $$$AssertEquals(ClassificatieData.ID,409,"De Classificatie id")
+	Do $$$AssertEquals(ClassificatieData.Code,"365/BL","De Classificatie code")
+	Do $$$AssertEquals(ClassificatieData.Naam,"Tandembox","De Classificatie naam")
+	Do $$$AssertEquals(ClassificatieData.UniekeCode,"BX/VVO/365/BL","De Classificatie unieke")
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: DOM/PM/Classificatie.cls.xml
===================================================================
diff -u -r1723 -r2084
--- DOM/PM/Classificatie.cls.xml	(.../Classificatie.cls.xml)	(revision 1723)
+++ DOM/PM/Classificatie.cls.xml	(.../Classificatie.cls.xml)	(revision 2084)
@@ -39,5 +39,10 @@
 <Abstract>1</Abstract>
 <ReturnType>%String</ReturnType>
 </Method>
+
+<Method name="GeefUniekeCode">
+<Abstract>1</Abstract>
+<ReturnType>%String</ReturnType>
+</Method>
 </Class>
 </Export>
Index: DOM/PM/impl/DataM/DataMGroepClassificatie.cls.xml
===================================================================
diff -u -r1724 -r2084
--- DOM/PM/impl/DataM/DataMGroepClassificatie.cls.xml	(.../DataMGroepClassificatie.cls.xml)	(revision 1724)
+++ DOM/PM/impl/DataM/DataMGroepClassificatie.cls.xml	(.../DataMGroepClassificatie.cls.xml)	(revision 2084)
@@ -47,9 +47,15 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefUniekeCode">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $P(..DataKlas,"\",5)_"/"_$P(..DataKlas,"\",6)
+]]></Implementation>
+</Method>
+
 <Method name="GeefCode">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $P(..Data,"\",7)
+<Implementation><![CDATA[	Quit $P(..DataKlas,"\",6)
 ]]></Implementation>
 </Method>
 
Index: DOM/common/dto/ClassificatieData.cls.xml
===================================================================
diff -u
--- DOM/common/dto/ClassificatieData.cls.xml	(revision 0)
+++ DOM/common/dto/ClassificatieData.cls.xml	(revision 2084)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="DOM.common.dto.ClassificatieData">
+<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>
+
+<Property name="UniekeCode">
+<Type>%String</Type>
+</Property>
+</Class>
+</Export>