Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Revego.Aansturing/TestUnoLinks/StartBatch/322222_2.xml =================================================================== diff -u -r74719 -r74720 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Revego.Aansturing/TestUnoLinks/StartBatch/322222_2.xml (.../322222_2.xml) (revision 74719) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Revego.Aansturing/TestUnoLinks/StartBatch/322222_2.xml (.../322222_2.xml) (revision 74720) @@ -31,7 +31,7 @@ REV_01 1 - PROGRAMME:=REVEGO|CABINET_DESIGN:=without plinth|DECOR_NAME_POCKET:=egger u708 st9 _ light grey|SELECTION_OF_THE_DECOR_VIA_D:=w1000 st9|DOOR_STABILISER:=412|DOOR_STABILISER_LEFT:=411|DOOR_STABILISER_RIGHT:=410|FIXED_SHELF_THICKNESS:=18|FRONT_WIDTH:=870|FRONT_THICKNESS:=18|FRONT_HEIGHT:=1900|FRONT_PROTRUSION:=730|MOUNTING_WIDTH:=876|INSTALLATION_DEPTH:=595|INSTALLATION_HEIGHT:=1928|SCUFF_GUARD:=no|OPTIONS:=Wooden components without Fronts|NOMINAL_LENGTH:=500|EXACT_NOMINAL_LENGTH:=155|NOMINAL_LENGTH_TRIMMED:=450|POCKET_BACK_THICKNESS:=320|POCKET_DEPTH:=575|POCKET_HEIGTH:=1915|SERVICE_LEVEL:=assembled|APPLICATION:=REV_01|TOP_GAP:=5|GAP_LEFT:=1|CENTRE_GAP:=1|BOTTOM_GAP:=10|GAP_RIGHT:=1|SIDE_GAP:=3|EDGE_POCKET:=KB_U708_ST9_08|MATERIAL_POCKET:=SM_U708_ST9_18|THICKNESS_POCKET:=18|Pocket_Connector_Set_L:=801V605B_L1|Track_Set_L:=802L1350DL3|Hinge_Bracket_Set_L:=802T1140_L3|Accessories1ID:=02066363|Accessories1Korttekst:=661_1450_HGSYSS1000NI|Accessories1Aantal:=1 + PROGRAMME:=REVEGO|ELECTRICAL_APPLIANCE:=no|CABINET_DESIGN:=without plinth|DECOR_NAME_POCKET:=egger u708 st9 _ light grey|SELECTION_OF_THE_DECOR_VIA_D:=w1000 st9|DOOR_STABILISER:=412|DOOR_STABILISER_LEFT:=411|DOOR_STABILISER_RIGHT:=410|FIXED_SHELF_THICKNESS:=18|FRONT_WIDTH:=870|FRONT_THICKNESS:=18|FRONT_HEIGHT:=1900|FRONT_PROTRUSION:=730|MOUNTING_WIDTH:=876|INSTALLATION_DEPTH:=595|INSTALLATION_HEIGHT:=1928|SCUFF_GUARD:=no|OPTIONS:=Wooden components without Fronts|NOMINAL_LENGTH:=500|EXACT_NOMINAL_LENGTH:=155|NOMINAL_LENGTH_TRIMMED:=450|POCKET_BACK_THICKNESS:=320|POCKET_DEPTH:=575|POCKET_HEIGTH:=1915|SERVICE_LEVEL:=assembled|APPLICATION:=REV_01|TOP_GAP:=5|GAP_LEFT:=1|CENTRE_GAP:=1|BOTTOM_GAP:=10|GAP_RIGHT:=1|SIDE_GAP:=3|EDGE_POCKET:=KB_U708_ST9_08|MATERIAL_POCKET:=SM_U708_ST9_18|THICKNESS_POCKET:=18|Pocket_Connector_Set_L:=801V605B_L1|Track_Set_L:=802L1350DL3|Hinge_Bracket_Set_L:=802T1140_L3|Accessories1ID:=02066363|Accessories1Korttekst:=661_1450_HGSYSS1000NI|Accessories1Aantal:=1 0.00,0.00,0.00 0.00,0.00,0.00 Index: APPS/Halux/PPS/Document/impl/RVG/VoorbereidingSpecialWorkshop/IngegevenKenmerkenNaarImosDataConverter.cls.xml =================================================================== diff -u -r74719 -r74720 --- APPS/Halux/PPS/Document/impl/RVG/VoorbereidingSpecialWorkshop/IngegevenKenmerkenNaarImosDataConverter.cls.xml (.../IngegevenKenmerkenNaarImosDataConverter.cls.xml) (revision 74719) +++ APPS/Halux/PPS/Document/impl/RVG/VoorbereidingSpecialWorkshop/IngegevenKenmerkenNaarImosDataConverter.cls.xml (.../IngegevenKenmerkenNaarImosDataConverter.cls.xml) (revision 74720) @@ -84,7 +84,7 @@ Set GeconverteerdeWaarde = ##class(TECH.StringUtils).Replace(GeconverteerdeWaarde, ">", "_") Set GeconverteerdeWaarde = ##class(TECH.StringUtils).Replace(GeconverteerdeWaarde, "+", "_") Set GeconverteerdeWaarde = ##class(TECH.StringUtils).Replace(GeconverteerdeWaarde, "&", "_") - + If ($$$HasLength(GeconverteerdeProperty) && $$$HasLength(GeconverteerdeWaarde)) { Set GeconverteerdeKenmerken = GeconverteerdeKenmerken _ GeconverteerdeProperty _ ..#GelijkAanTeken_GeconverteerdeWaarde_ ..#Delimiter } @@ -125,7 +125,7 @@ Quit:(RvgProperty = "DeurOndersteuning") "DOOR_SUPPORT" Quit:(RvgProperty = "DikteGeleiderAfdekking") "TRACK_COVER_PANEL_THICKNESS" Quit:(RvgProperty = "DikteTussenplank") "FIXED_SHELF_THICKNESS" - Quit:(RvgProperty = "ContactschakelaarHouderInbegrepen") "CONTACT_SWITCH_ADAPTER_FOR_ELECTRICAL_APPLIANCE_SWITCH_OFF" + Quit:(RvgProperty = "ContactSchakelaarHouderInbegrepen") "ELECTRICAL_APPLIANCE" Quit:(RvgProperty = "InbouwBreedte") "MOUNTING_WIDTH" Quit:(RvgProperty = "InbouwHoogte") "INSTALLATION_HEIGHT" Quit:(RvgProperty = "InbouwDiepte") "INSTALLATION_DEPTH" @@ -224,8 +224,8 @@ Quit:(RvgValue = ##class(DOM.PM.enu.RVGProductieWijze).Voorgemonteerd()) "assembled" Quit:(RvgValue = ##class(DOM.PM.enu.RVGProductieWijze).LosseComponentenOpMaat()) "components sized" Quit:(RvgValue = ##class(DOM.PM.enu.RVGProductieWijze).LosseComponenten()) "components only" - Quit:(RvgValue = ##class(DOM.PM.enu.RVGMateriaalOpties).TweeKleuren()) "Wooden components with Fronts_Two Colors" - Quit:(RvgValue = ##class(DOM.PM.enu.RVGMateriaalOpties).EenKleur()) "Wooden components with Fronts_One Color" + Quit:(RvgValue = ##class(DOM.PM.enu.RVGMateriaalOpties).TweeKleuren()) "Wooden components with Fronts" + Quit:(RvgValue = ##class(DOM.PM.enu.RVGMateriaalOpties).EenKleur()) "Wooden components with Fronts" Quit:(RvgValue = ##class(DOM.PM.enu.RVGMateriaalOpties).GeenFront()) "Wooden components without Fronts" Quit:(RvgValue = ##class(DOM.PM.enu.RVGDeurSteunNaarBinnen).LengteTot218()) "Length 70 - 218 mm" Quit:(RvgValue = ##class(DOM.PM.enu.RVGDeurSteunNaarBinnen).LengteTot350()) "Length 70 - 350 mm" Index: vhUnitTest/APPS/Halux/PPS/Document/impl/RVG/VoorbereidingSpecialWorkshop/IngegevenKenmerkenNaarImosDataConverter/ConverteerIngegevenKenmerken/Test.cls.xml =================================================================== diff -u -r74717 -r74720 --- vhUnitTest/APPS/Halux/PPS/Document/impl/RVG/VoorbereidingSpecialWorkshop/IngegevenKenmerkenNaarImosDataConverter/ConverteerIngegevenKenmerken/Test.cls.xml (.../Test.cls.xml) (revision 74717) +++ vhUnitTest/APPS/Halux/PPS/Document/impl/RVG/VoorbereidingSpecialWorkshop/IngegevenKenmerkenNaarImosDataConverter/ConverteerIngegevenKenmerken/Test.cls.xml (.../Test.cls.xml) (revision 74720) @@ -154,10 +154,10 @@ Set RvgKenmerken = ##class(DOM.PM.Maatwerk.Calc.Common.impl.RVGKenmerken).%New() Set RvgKenmerken.MateriaalOpties = "TweeKleuren" - Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|OPTIONS:=Wooden components with Fronts_Two Colors") + Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|OPTIONS:=Wooden components with Fronts") Set RvgKenmerken.MateriaalOpties = "EenKleur" - Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|OPTIONS:=Wooden components with Fronts_One Color") + Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|OPTIONS:=Wooden components with Fronts") Set RvgKenmerken.MateriaalOpties = "GeenFront" Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|OPTIONS:=Wooden components without Fronts") @@ -171,10 +171,10 @@ Set RvgKenmerken.DecornummerB = "DummyDecornummerB" Set RvgKenmerken.MateriaalOpties = "TweeKleuren" - Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|SELECTION_OF_THE_DECOR_VIA_D:=DummyDecornummerA|SELECTION_OF_THE_DECOR_VIA_D:=DummyDecornummerB|OPTIONS:=Wooden components with Fronts_Two Colors") + Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|SELECTION_OF_THE_DECOR_VIA_D:=DummyDecornummerA|SELECTION_OF_THE_DECOR_VIA_D:=DummyDecornummerB|OPTIONS:=Wooden components with Fronts") Set RvgKenmerken.MateriaalOpties = "EenKleur" - Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|SELECTION_OF_THE_DECOR_VIA_D:=DummyDecornummerA|SELECTION_OF_THE_DECOR_VIA_D:=DummyDecornummerB|OPTIONS:=Wooden components with Fronts_One Color") + Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|SELECTION_OF_THE_DECOR_VIA_D:=DummyDecornummerA|SELECTION_OF_THE_DECOR_VIA_D:=DummyDecornummerB|OPTIONS:=Wooden components with Fronts") ; Set RvgKenmerken.MateriaalOpties = "GeenFront" Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|SELECTION_OF_THE_DECOR_VIA_D:=DummyDecornummerA|OPTIONS:=Wooden components without Fronts") @@ -188,10 +188,10 @@ Set RvgKenmerken.DecornaamB = "DummyDecornaamB" Set RvgKenmerken.MateriaalOpties = "TweeKleuren" - Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|DECOR_NAME_POCKET:=DummyDecornaamA|DECOR_NAME_FRONT:=DummyDecornaamB|OPTIONS:=Wooden components with Fronts_Two Colors") + Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|DECOR_NAME_POCKET:=DummyDecornaamA|DECOR_NAME_FRONT:=DummyDecornaamB|OPTIONS:=Wooden components with Fronts") Set RvgKenmerken.MateriaalOpties = "EenKleur" - Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|DECOR_NAME_POCKET:=DummyDecornaamA|DECOR_NAME_FRONT:=DummyDecornaamB|OPTIONS:=Wooden components with Fronts_One Color") + Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|DECOR_NAME_POCKET:=DummyDecornaamA|DECOR_NAME_FRONT:=DummyDecornaamB|OPTIONS:=Wooden components with Fronts") Set RvgKenmerken.MateriaalOpties = "GeenFront" Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|DECOR_NAME_POCKET:=DummyDecornaamA|OPTIONS:=Wooden components without Fronts") @@ -207,10 +207,10 @@ Set RvgKenmerken.TypeMateriaalOppervlakteB = "DummyMateriaalOppervlakB" Set RvgKenmerken.MateriaalOpties = "TweeKleuren" - Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|DECOR_NAME_POCKET:=DummyDecornaamA|DECOR_NAME_FRONT:=DummyDecornaamB|OPTIONS:=Wooden components with Fronts_Two Colors") + Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|DECOR_NAME_POCKET:=DummyDecornaamA|DECOR_NAME_FRONT:=DummyDecornaamB|OPTIONS:=Wooden components with Fronts") Set RvgKenmerken.MateriaalOpties = "EenKleur" - Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|DECOR_NAME_POCKET:=DummyDecornaamA|DECOR_NAME_FRONT:=DummyDecornaamB|OPTIONS:=Wooden components with Fronts_One Color") + Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|DECOR_NAME_POCKET:=DummyDecornaamA|DECOR_NAME_FRONT:=DummyDecornaamB|OPTIONS:=Wooden components with Fronts") Set RvgKenmerken.MateriaalOpties = "GeenFront" Do ..AssertConversieIngegegevenKenmerkNaarImosKenmerken(RvgKenmerken, "|DECOR_NAME_POCKET:=DummyDecornaamA|OPTIONS:=Wooden components without Fronts") Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Revego.Aansturing/TestUnoLinks/StartBatch/322222_3.xml =================================================================== diff -u -r74719 -r74720 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Revego.Aansturing/TestUnoLinks/StartBatch/322222_3.xml (.../322222_3.xml) (revision 74719) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Revego.Aansturing/TestUnoLinks/StartBatch/322222_3.xml (.../322222_3.xml) (revision 74720) @@ -31,7 +31,7 @@ REV_01 1 - PROGRAMME:=REVEGO|CABINET_DESIGN:=without plinth|DECOR_NAME_POCKET:=egger u708 st9 _ light grey|SELECTION_OF_THE_DECOR_VIA_D:=w1000 st9|DOOR_STABILISER:=412|DOOR_STABILISER_LEFT:=411|DOOR_STABILISER_RIGHT:=410|FIXED_SHELF_THICKNESS:=18|FRONT_WIDTH:=870|FRONT_THICKNESS:=18|FRONT_HEIGHT:=1900|FRONT_PROTRUSION:=730|MOUNTING_WIDTH:=876|INSTALLATION_DEPTH:=595|INSTALLATION_HEIGHT:=1928|SCUFF_GUARD:=no|OPTIONS:=Wooden components without Fronts|NOMINAL_LENGTH:=500|EXACT_NOMINAL_LENGTH:=155|NOMINAL_LENGTH_TRIMMED:=450|POCKET_BACK_THICKNESS:=320|POCKET_DEPTH:=575|POCKET_HEIGTH:=1915|SERVICE_LEVEL:=assembled|APPLICATION:=REV_01|TOP_GAP:=5|GAP_LEFT:=1|CENTRE_GAP:=1|BOTTOM_GAP:=10|GAP_RIGHT:=1|SIDE_GAP:=3|EDGE_POCKET:=KB_U708_ST9_08|MATERIAL_POCKET:=SM_U708_ST9_18|THICKNESS_POCKET:=18|Pocket_Connector_Set_L:=801V605B_L1|Track_Set_L:=802L1350DL3|Hinge_Bracket_Set_L:=802T1140_L3|Accessories1ID:=02066363|Accessories1Korttekst:=661_1450_HGSYSS1000NI|Accessories1Aantal:=1 + PROGRAMME:=REVEGO|ELECTRICAL_APPLIANCE:=no|CABINET_DESIGN:=without plinth|DECOR_NAME_POCKET:=egger u708 st9 _ light grey|SELECTION_OF_THE_DECOR_VIA_D:=w1000 st9|DOOR_STABILISER:=412|DOOR_STABILISER_LEFT:=411|DOOR_STABILISER_RIGHT:=410|FIXED_SHELF_THICKNESS:=18|FRONT_WIDTH:=870|FRONT_THICKNESS:=18|FRONT_HEIGHT:=1900|FRONT_PROTRUSION:=730|MOUNTING_WIDTH:=876|INSTALLATION_DEPTH:=595|INSTALLATION_HEIGHT:=1928|SCUFF_GUARD:=no|OPTIONS:=Wooden components without Fronts|NOMINAL_LENGTH:=500|EXACT_NOMINAL_LENGTH:=155|NOMINAL_LENGTH_TRIMMED:=450|POCKET_BACK_THICKNESS:=320|POCKET_DEPTH:=575|POCKET_HEIGTH:=1915|SERVICE_LEVEL:=assembled|APPLICATION:=REV_01|TOP_GAP:=5|GAP_LEFT:=1|CENTRE_GAP:=1|BOTTOM_GAP:=10|GAP_RIGHT:=1|SIDE_GAP:=3|EDGE_POCKET:=KB_U708_ST9_08|MATERIAL_POCKET:=SM_U708_ST9_18|THICKNESS_POCKET:=18|Pocket_Connector_Set_L:=801V605B_L1|Track_Set_L:=802L1350DL3|Hinge_Bracket_Set_L:=802T1140_L3|Accessories1ID:=02066363|Accessories1Korttekst:=661_1450_HGSYSS1000NI|Accessories1Aantal:=1 0.00,0.00,0.00 0.00,0.00,0.00 Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Revego.Aansturing/TestUnoLinks/StartBatch/322222_1.xml =================================================================== diff -u -r74719 -r74720 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Revego.Aansturing/TestUnoLinks/StartBatch/322222_1.xml (.../322222_1.xml) (revision 74719) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Revego.Aansturing/TestUnoLinks/StartBatch/322222_1.xml (.../322222_1.xml) (revision 74720) @@ -31,7 +31,7 @@ REV_10 1 - PROGRAMME:=REVEGO|CABINET_DESIGN:=without plinth|DECOR_NAME_POCKET:=egger u708 st9 _ light grey|SELECTION_OF_THE_DECOR_VIA_D:=w1000 st9|DOOR_STABILISER:=412|DOOR_STABILISER_LEFT:=411|DOOR_STABILISER_RIGHT:=410|FIXED_SHELF_THICKNESS:=18|FRONT_WIDTH:=870|FRONT_THICKNESS:=18|FRONT_HEIGHT:=1900|FRONT_PROTRUSION:=730|MOUNTING_WIDTH:=876|INSTALLATION_DEPTH:=595|INSTALLATION_HEIGHT:=1928|SCUFF_GUARD:=no|OPTIONS:=Wooden components without Fronts|NOMINAL_LENGTH:=500|EXACT_NOMINAL_LENGTH:=155|NOMINAL_LENGTH_TRIMMED:=450|POCKET_BACK_THICKNESS:=320|POCKET_DEPTH:=575|POCKET_HEIGTH:=1915|SERVICE_LEVEL:=assembled|APPLICATION:=REV_10|TOP_GAP:=5|GAP_LEFT:=1|CENTRE_GAP:=1|BOTTOM_GAP:=10|GAP_RIGHT:=1|SIDE_GAP:=3|EDGE_POCKET:=KB_U708_ST9_08|MATERIAL_POCKET:=SM_U708_ST9_18|THICKNESS_POCKET:=18|Pocket_Connector_Set_L:=801V605B_L1|Track_Set_L:=802L1350DL3|Hinge_Bracket_Set_L:=802T1140_L3|Accessories1ID:=02066363|Accessories1Korttekst:=661_1450_HGSYSS1000NI|Accessories1Aantal:=1 + PROGRAMME:=REVEGO|ELECTRICAL_APPLIANCE:=no|CABINET_DESIGN:=without plinth|DECOR_NAME_POCKET:=egger u708 st9 _ light grey|SELECTION_OF_THE_DECOR_VIA_D:=w1000 st9|DOOR_STABILISER:=412|DOOR_STABILISER_LEFT:=411|DOOR_STABILISER_RIGHT:=410|FIXED_SHELF_THICKNESS:=18|FRONT_WIDTH:=870|FRONT_THICKNESS:=18|FRONT_HEIGHT:=1900|FRONT_PROTRUSION:=730|MOUNTING_WIDTH:=876|INSTALLATION_DEPTH:=595|INSTALLATION_HEIGHT:=1928|SCUFF_GUARD:=no|OPTIONS:=Wooden components without Fronts|NOMINAL_LENGTH:=500|EXACT_NOMINAL_LENGTH:=155|NOMINAL_LENGTH_TRIMMED:=450|POCKET_BACK_THICKNESS:=320|POCKET_DEPTH:=575|POCKET_HEIGTH:=1915|SERVICE_LEVEL:=assembled|APPLICATION:=REV_10|TOP_GAP:=5|GAP_LEFT:=1|CENTRE_GAP:=1|BOTTOM_GAP:=10|GAP_RIGHT:=1|SIDE_GAP:=3|EDGE_POCKET:=KB_U708_ST9_08|MATERIAL_POCKET:=SM_U708_ST9_18|THICKNESS_POCKET:=18|Pocket_Connector_Set_L:=801V605B_L1|Track_Set_L:=802L1350DL3|Hinge_Bracket_Set_L:=802T1140_L3|Accessories1ID:=02066363|Accessories1Korttekst:=661_1450_HGSYSS1000NI|Accessories1Aantal:=1 0.00,0.00,0.00 0.00,0.00,0.00