Index: APPS/PM/Maatwerk/dto/VhConfig/BerekendeKenmerken.cls.xml
===================================================================
diff -u -r73444 -r73587
--- APPS/PM/Maatwerk/dto/VhConfig/BerekendeKenmerken.cls.xml (.../BerekendeKenmerken.cls.xml) (revision 73444)
+++ APPS/PM/Maatwerk/dto/VhConfig/BerekendeKenmerken.cls.xml (.../BerekendeKenmerken.cls.xml) (revision 73587)
@@ -4,36 +4,32 @@
serial
%SerialObject
-
+
TECH.String
TECH.String
-
+
TECH.String
-
+
TECH.String
-
+
TECH.String
-
-
-
-TECH.String
array
-
+
TECH.String
-
+
TECH.String
@@ -66,6 +62,24 @@
InterneBreedte
+
+ImageCode
+
+
+DescriptionShort
+
+
+ConfiguredProductCode
+
+
+DescriptionLong
+
+
+GenericProductId
+
+
+InternalWidth
+
Index: DOM/PM/impl/DataM/DataMLBXLadeCreator.cls.xml
===================================================================
diff -u -r73543 -r73587
--- DOM/PM/impl/DataM/DataMLBXLadeCreator.cls.xml (.../DataMLBXLadeCreator.cls.xml) (revision 73543)
+++ DOM/PM/impl/DataM/DataMLBXLadeCreator.cls.xml (.../DataMLBXLadeCreator.cls.xml) (revision 73587)
@@ -32,7 +32,7 @@
#dim Korttekst As %String
If (..BepaalIsMaatwerkCalculatieInEncoway()) {
- Set Korttekst = ##class(TECH.StringUtils).Replace(..VhConfig.CalculatedCharacteristics.Korttekst, "%1", $J(..DossierNummer,5))
+ Set Korttekst = ##class(TECH.StringUtils).Replace(..VhConfig.CalculatedCharacteristics.DescriptionLong, "%1", $J(..DossierNummer,5))
} Else {
Set Korttekst = ##class(DOM.PM.KorttekstUtils).BepaalKorttekstLBX(DossierNummer, ..ProductSpecificatie.GeefIngegevenKenmerken(), ..HalffabItemsBoom)
}
Index: APPS/PM/Maatwerk/impl/VhConfigHelper.cls.xml
===================================================================
diff -u -r73583 -r73587
--- APPS/PM/Maatwerk/impl/VhConfigHelper.cls.xml (.../VhConfigHelper.cls.xml) (revision 73583)
+++ APPS/PM/Maatwerk/impl/VhConfigHelper.cls.xml (.../VhConfigHelper.cls.xml) (revision 73587)
@@ -74,7 +74,7 @@
%String
%String
-
@@ -133,13 +133,13 @@
%String
-
%String
-
@@ -151,7 +151,7 @@
%String
-
Index: vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/ParseMaatwerkDetailsResponse/Test.cls.xml
===================================================================
diff -u -r73586 -r73587
--- vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/ParseMaatwerkDetailsResponse/Test.cls.xml (.../Test.cls.xml) (revision 73586)
+++ vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/ParseMaatwerkDetailsResponse/Test.cls.xml (.../Test.cls.xml) (revision 73587)
@@ -411,10 +411,10 @@
"Characteristics": {},
"Model": "M_LBX",
"CalculatedCharacteristics": {
- "AfbeeldingCode": "M_Legra.jpg",
- "ItemId": "9.657.336.8",
- "Korttekst": "LB4M/E%1 300x785 SWDG",
- "Langtekst": {
+ "ImageCode": "M_Legra.jpg",
+ "GenericProductId": "9.657.336.8",
+ "DescriptionShort": "LB4M/E%1 300x785 SWDG",
+ "DescriptionLong": {
"nl-BE": "LEGRABOX lade M\r\nD:300xB:785; bodem:Donkergrijs; \r\nladezijkant:Zijdewit; bevat: gemont. lade; \r\ncorpusprofiel 40kg; BLUMOTION; \r\nfrontbevest. EXPANDO; \r\nverpakt: karton",
"fr-FR": "LEGRABOX tiroir M\r\nP:300xL:785; fond:Gris foncé; \r\ncôté de tiroir:Blanc soie; \r\ncontient: tiroir monté; \r\ncoulisses corps de meuble 40kg; BLUMOTION; \r\nattache façade EXPANDO; \r\nemballé: carton",
"de-DE": "LEGRABOX Schubkasten M\r\nT:300xB:785; Boden:Dunkelgrau; \r\nZarge:Seidenweiss; \r\nbeinhaltet: fertigschubkasten; \r\nKorpusschienen 40kg; BLUMOTION; \r\nfrontbefest EXPANDO; \r\nverpackt: karton",
@@ -442,13 +442,13 @@
Do $$$AssertEquals(VhConfig.Model,"M_LBX")
If $$$AssertTrue($IsObject(VhConfig.CalculatedCharacteristics)) {
- Do $$$AssertEquals(VhConfig.CalculatedCharacteristics.AfbeeldingCode, "M_Legra.jpg")
- Do $$$AssertEquals(VhConfig.CalculatedCharacteristics.ItemId, "9.657.336.8")
- Do $$$AssertEquals(VhConfig.CalculatedCharacteristics.Korttekst, "LB4M/E%1 300x785 SWDG")
- Do $$$AssertEquals(VhConfig.CalculatedCharacteristics.AfbeeldingCode, "M_Legra.jpg")
- Do $$$AssertEquals(VhConfig.CalculatedCharacteristics.Langtekst.Count(), 4)
+ Do $$$AssertEquals(VhConfig.CalculatedCharacteristics.ImageCode, "M_Legra.jpg")
+ Do $$$AssertEquals(VhConfig.CalculatedCharacteristics.GenericProductId, "9.657.336.8")
+ Do $$$AssertEquals(VhConfig.CalculatedCharacteristics.DescriptionShort, "LB4M/E%1 300x785 SWDG")
+ Do $$$AssertEquals(VhConfig.CalculatedCharacteristics.ImageCode, "M_Legra.jpg")
+ Do $$$AssertEquals(VhConfig.CalculatedCharacteristics.DescriptionLong.Count(), 4)
- #dim LangtekstKeyValueList As TECH.KeyValue.List = ..GeefKeyValueListUitArray(VhConfig.CalculatedCharacteristics.Langtekst)
+ #dim LangtekstKeyValueList As TECH.KeyValue.List = ..GeefKeyValueListUitArray(VhConfig.CalculatedCharacteristics.DescriptionLong)
Do ..AssertKeyValuePair(LangtekstKeyValueList.GetAt(1), "de-DE", "LEGRABOX Schubkasten M\r\nT:300xB:785; Boden:Dunkelgrau; \r\nZarge:Seidenweiss; \r\nbeinhaltet: fertigschubkasten; \r\nKorpusschienen 40kg; BLUMOTION; \r\nfrontbefest EXPANDO; \r\nverpackt: karton")
Do ..AssertKeyValuePair(LangtekstKeyValueList.GetAt(2), "en-US", "LEGRABOX drawer M\r\nD:300xW:785; base:Dark grey; \r\ndrawer side:Silk white; \r\ncontains: premounted drawer; \r\ncabinet profiles 40kg; BLUMOTION; \r\nfixation expando; \r\npacked: box")
Do ..AssertKeyValuePair(LangtekstKeyValueList.GetAt(3), "fr-FR", "LEGRABOX tiroir M\r\nP:300xL:785; fond:Gris foncé; \r\ncôté de tiroir:Blanc soie; \r\ncontient: tiroir monté; \r\ncoulisses corps de meuble 40kg; BLUMOTION; \r\nattache façade EXPANDO; \r\nemballé: carton")
Index: DOM/PM/impl/LBXLangtekstCreatorEncoway.cls.xml
===================================================================
diff -u -r73543 -r73587
--- DOM/PM/impl/LBXLangtekstCreatorEncoway.cls.xml (.../LBXLangtekstCreatorEncoway.cls.xml) (revision 73543)
+++ DOM/PM/impl/LBXLangtekstCreatorEncoway.cls.xml (.../LBXLangtekstCreatorEncoway.cls.xml) (revision 73587)
@@ -23,7 +23,7 @@
VhConfig:APPS.PM.Maatwerk.dto.VhConfig,Taal:DOM.enu.Taal
DOM.PM.ProductLangtekst