admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MARX#52271: Memo veld voorzien van regelovergangen

Browse Source 
svn path=/Website/branches/v2017.2/; revision=37032
This commit is contained in:
Marcel Bourseau
2018-02-16 18:03:38 +00:00
parent b7209530c8
commit aace9d249b
8 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB_INSBOU001_2016.2_soap.xsl
View File

@@ -107,8 +107,8 @@
<!-- Zie MARX#37078: Opdrachtomschrijving ook in de node in InstructionData/FreeText -->
<FreeText>
<xsl:choose>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(normalize-space(kenmerk[@key='12']),1,1000)"/></xsl:when>
<xsl:otherwise><xsl:value-of select="substring(normalize-space(omschrijving),1,1000)"/></xsl:otherwise>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(kenmerk[@key='12'],1,1000)"/></xsl:when>
<xsl:otherwise><xsl:value-of select="substring(omschrijving,1,1000)"/></xsl:otherwise>
</xsl:choose>
</FreeText>
<!-- SIDB - Gegevens waarmee gerefereerd wordt aan een contract. Optioneel -->
@@ -192,9 +192,9 @@
</xsl:with-param>
<xsl:with-param name="p_NormPriceCode" select="substring(normalize-space(code),1,17)"/>
<xsl:with-param name="p_Area" select="melding/kenmerk[@key='6']"/>
<xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/>
<xsl:with-param name="p_LongDescription" select="info"/>
<xsl:with-param name="p_FreeText" select="extra3"/>
<xsl:with-param name="p_ShortDescription" select="substring(omschrijving,1,35)"/>
<xsl:with-param name="p_LongDescription" select="substring(info,1,70)"/>
<xsl:with-param name="p_FreeText" select="substring(extra3,1,1000)"/>
</xsl:call-template>
<xsl:call-template name="construct_instruction_pricelines">
<xsl:with-param name="p_price" select="stuksprijs"/>
@@ -212,7 +212,7 @@
<xsl:with-param name="p_MeasurementUnitQuantity" select="'PCE'"/>
<xsl:with-param name="p_NormPriceCode" select="''"/>
<xsl:with-param name="p_Area" select="melding/kenmerk[@key='6']"/>
<xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/>
<xsl:with-param name="p_ShortDescription" select="substring(omschrijving,1,35)"/>
<xsl:with-param name="p_LongDescription">
<!-- als memo veld (key 12) is gevuld, dan gaan we die tonen, anders de opdrachtomschrijving (waar de memo ook in zit, dit is alleen bij oude opdrachten van voor release MARX07 -->
<xsl:choose>

12
CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB_INSBOU001_nov2015.xsl
View File

@@ -97,8 +97,8 @@
<!-- Zie MARX#37078: Opdrachtomschrijving ook in de node in InstructionData/FreeText -->
<FreeText>
<xsl:choose>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(normalize-space(kenmerk[@key='12']),1,1000)"/></xsl:when>
<xsl:otherwise><xsl:value-of select="substring(normalize-space(omschrijving),1,1000)"/></xsl:otherwise>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(kenmerk[@key='12'],1,1000)"/></xsl:when>
<xsl:otherwise><xsl:value-of select="substring(omschrijving,1,1000)"/></xsl:otherwise>
</xsl:choose>
</FreeText>
<!-- SIDB - Gegevens waarmee gerefereerd wordt aan een contract. Optioneel -->
@@ -182,9 +182,9 @@
</xsl:with-param>
<xsl:with-param name="p_NormPriceCode" select="substring(normalize-space(code),1,17)"/>
<xsl:with-param name="p_Area" select="melding/kenmerk[@key='6']"/>
<xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/>
<xsl:with-param name="p_LongDescription" select="info"/>
<xsl:with-param name="p_FreeText" select="extra3"/>
<xsl:with-param name="p_ShortDescription" select="substring(omschrijving,1,35)"/>
<xsl:with-param name="p_LongDescription" select="substring(info,1,70)"/>
<xsl:with-param name="p_FreeText" select="substring(extra3,1,1000)"/>
</xsl:call-template>
<xsl:call-template name="construct_instruction_pricelines">
<xsl:with-param name="p_price" select="stuksprijs"/>
@@ -202,7 +202,7 @@
<xsl:with-param name="p_MeasurementUnitQuantity" select="'PCE'"/>
<xsl:with-param name="p_NormPriceCode" select="''"/>
<xsl:with-param name="p_Area" select="melding/kenmerk[@key='6']"/>
<xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/>
<xsl:with-param name="p_ShortDescription" select="substring(omschrijving,1,35)"/>
<xsl:with-param name="p_LongDescription">
<!-- als memo veld (key 12) is gevuld, dan gaan we die tonen, anders de opdrachtomschrijving (waar de memo ook in zit, dit is alleen bij oude opdrachten van voor release MARX07 -->
<xsl:choose>

12
CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB_INSBOU001_nov2015_soap.xsl
View File

@@ -100,8 +100,8 @@
<!-- Zie MARX#37078: Opdrachtomschrijving ook in de node in InstructionData/FreeText -->
<FreeText>
<xsl:choose>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(normalize-space(kenmerk[@key='12']),1,1000)"/></xsl:when>
<xsl:otherwise><xsl:value-of select="substring(normalize-space(omschrijving),1,1000)"/></xsl:otherwise>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(kenmerk[@key='12'],1,1000)"/></xsl:when>
<xsl:otherwise><xsl:value-of select="substring(omschrijving,1,1000)"/></xsl:otherwise>
</xsl:choose>
</FreeText>
<!-- SIDB - Gegevens waarmee gerefereerd wordt aan een contract. Optioneel -->
@@ -185,9 +185,9 @@
</xsl:with-param>
<xsl:with-param name="p_NormPriceCode" select="substring(normalize-space(code),1,17)"/>
<xsl:with-param name="p_Area" select="melding/kenmerk[@key='6']"/>
<xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/>
<xsl:with-param name="p_LongDescription" select="info"/>
<xsl:with-param name="p_FreeText" select="extra3"/>
<xsl:with-param name="p_ShortDescription" select="substring(omschrijving,1,35)"/>
<xsl:with-param name="p_LongDescription" select="substring(info,1,70)"/>
<xsl:with-param name="p_FreeText" select="substring(extra3,1,1000)"/>
</xsl:call-template>
<xsl:call-template name="construct_instruction_pricelines">
<xsl:with-param name="p_price" select="stuksprijs"/>
@@ -205,7 +205,7 @@
<xsl:with-param name="p_MeasurementUnitQuantity" select="'PCE'"/>
<xsl:with-param name="p_NormPriceCode" select="''"/>
<xsl:with-param name="p_Area" select="melding/kenmerk[@key='6']"/>
<xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/>
<xsl:with-param name="p_ShortDescription" select="substring(omschrijving,1,35)"/>
<xsl:with-param name="p_LongDescription">
<!-- als memo veld (key 12) is gevuld, dan gaan we die tonen, anders de opdrachtomschrijving (waar de memo ook in zit, dit is alleen bij oude opdrachten van voor release MARX07 -->
<xsl:choose>

14
CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB_SALES005.xsl
View File

@@ -100,8 +100,8 @@
<!-- Zie MARX#37078: Opdrachtomschrijving ook in de node in InstructionData/FreeText -->
<FreeText>
<xsl:choose>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(normalize-space(kenmerk[@key='12']),1,1000)"/></xsl:when>
<xsl:otherwise><xsl:value-of select="substring(normalize-space(omschrijving),1,1000)"/></xsl:otherwise>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(kenmerk[@key='12'],1,1000)"/></xsl:when>
<xsl:otherwise><xsl:value-of select="substring(omschrijving,1,1000)"/></xsl:otherwise>
</xsl:choose>
</FreeText>
<!-- SIDB - Gegevens waarmee gerefereerd wordt aan een contract. Optioneel -->
@@ -184,9 +184,9 @@
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="p_NormPriceCode" select="substring(normalize-space(code),1,17)"/>
<xsl:with-param name="p_LEDOInformation" select="extra3"/>
<xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/>
<xsl:with-param name="p_LongDescription" select="info"/>
<xsl:with-param name="p_LEDOInformation" select="substring(extra3,1,1000)"/>
<xsl:with-param name="p_ShortDescription" select="substring(omschrijving,1,35)"/>
<xsl:with-param name="p_LongDescription" select="substring(info,1,70)"/>
<xsl:with-param name="p_FreeText" select="melding/kenmerk[@key='6']"/>
</xsl:call-template>
<xsl:call-template name="construct_instruction_pricelines">
@@ -211,8 +211,8 @@
<xsl:otherwise><xsl:value-of select="omschrijving"/></xsl:otherwise>
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/>
<xsl:with-param name="p_LongDescription" select="substring(normalize-space(omschrijving),1,70)"/>
<xsl:with-param name="p_ShortDescription" select="substring(omschrijving,1,35)"/>
<xsl:with-param name="p_LongDescription" select="substring(omschrijving,1,70)"/>
<xsl:with-param name="p_FreeText" select="melding/kenmerk[@key='6']"/>
</xsl:call-template>
</InstructionLine>

18
CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB_SALES005_etim.xsl
View File

@@ -113,8 +113,8 @@
<!-- Zie MARX#37078: Opdrachtomschrijving ook in de node in InstructionData/FreeText -->
<FreeText>
<xsl:choose>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(normalize-space(kenmerk[@key='12']),1,1000)"/></xsl:when>
<xsl:otherwise><xsl:value-of select="substring(normalize-space(omschrijving),1,1000)"/></xsl:otherwise>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(kenmerk[@key='12'],1,1000)"/></xsl:when>
<xsl:otherwise><xsl:value-of select="substring(omschrijving,1,1000)"/></xsl:otherwise>
</xsl:choose>
</FreeText>
<!-- SIDB - Gegevens waarmee gerefereerd wordt aan een contract. Optioneel -->
@@ -197,9 +197,9 @@
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="p_NormPriceCode" select="substring(normalize-space(code),1,17)"/>
<xsl:with-param name="p_LEDOInformation" select="substring(normalize-space(extra3),1,1000)"/>
<xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/>
<xsl:with-param name="p_LongDescription" select="substring(normalize-space(info),1,70)"/>
<xsl:with-param name="p_LEDOInformation" select="substring(extra3,1,1000)"/>
<xsl:with-param name="p_ShortDescription" select="substring(omschrijving,1,35)"/>
<xsl:with-param name="p_LongDescription" select="substring(info,1,70)"/>
<xsl:with-param name="p_FreeText" select="substring(melding/kenmerk[@key='6'],1,1000)"/>
</xsl:call-template>
<xsl:call-template name="construct_instruction_pricelines">
@@ -220,12 +220,12 @@
<xsl:with-param name="p_LEDOInformation">
<!-- als memo veld (key 12) is gevuld, dan gaan we die tonen, anders de opdrachtomschrijving (waar de memo ook in zit, dit is alleen bij oude opdrachten van voor release MARX07 -->
<xsl:choose>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(normalize-space(kenmerk[@key=12]),1,1000)"/></xsl:when>
<xsl:otherwise><xsl:value-of select="substring(normalize-space(omschrijving),1,1000)"/></xsl:otherwise>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(kenmerk[@key=12],1,1000)"/></xsl:when>
<xsl:otherwise><xsl:value-of select="substring(omschrijving,1,1000)"/></xsl:otherwise>
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/>
<xsl:with-param name="p_LongDescription" select="substring(normalize-space(omschrijving),1,70)"/>
<xsl:with-param name="p_ShortDescription" select="substring(omschrijving,1,35)"/>
<xsl:with-param name="p_LongDescription" select="substring(omschrijving,1,70)"/>
<xsl:with-param name="p_FreeText" select="substring(melding/kenmerk[@key='6'],1,1000)"/>
</xsl:call-template>
</InstructionLine>

18
CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB_SALES005_etim_cdata.xsl
View File

@@ -113,8 +113,8 @@
<!-- Zie MARX#37078: Opdrachtomschrijving ook in de node in InstructionData/FreeText -->
<FreeText>
<xsl:choose>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(normalize-space(kenmerk[@key='12']),1,1000)"/></xsl:when>
<xsl:otherwise><xsl:value-of select="substring(normalize-space(omschrijving),1,1000)"/></xsl:otherwise>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(kenmerk[@key='12'],1,1000)"/></xsl:when>
<xsl:otherwise><xsl:value-of select="substring(omschrijving,1,1000)"/></xsl:otherwise>
</xsl:choose>
</FreeText>
<!-- SIDB - Gegevens waarmee gerefereerd wordt aan een contract. Optioneel -->
@@ -197,9 +197,9 @@
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="p_NormPriceCode" select="substring(normalize-space(code),1,17)"/>
<xsl:with-param name="p_LEDOInformation" select="substring(normalize-space(extra3),1,1000)"/>
<xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/>
<xsl:with-param name="p_LongDescription" select="substring(normalize-space(info),1,70)"/>
<xsl:with-param name="p_LEDOInformation" select="substring(extra3,1,1000)"/>
<xsl:with-param name="p_ShortDescription" select="substring(omschrijving,1,35)"/>
<xsl:with-param name="p_LongDescription" select="substring(info,1,70)"/>
<xsl:with-param name="p_FreeText" select="substring(melding/kenmerk[@key='6'],1,1000)"/>
</xsl:call-template>
<xsl:call-template name="construct_instruction_pricelines">
@@ -220,12 +220,12 @@
<xsl:with-param name="p_LEDOInformation">
<!-- als memo veld (key 12) is gevuld, dan gaan we die tonen, anders de opdrachtomschrijving (waar de memo ook in zit, dit is alleen bij oude opdrachten van voor release MARX07 -->
<xsl:choose>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(normalize-space(kenmerk[@key=12]),1,1000)"/></xsl:when>
<xsl:otherwise><xsl:value-of select="substring(normalize-space(omschrijving),1,1000)"/></xsl:otherwise>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(kenmerk[@key=12],1,1000)"/></xsl:when>
<xsl:otherwise><xsl:value-of select="substring(omschrijving,1,1000)"/></xsl:otherwise>
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/>
<xsl:with-param name="p_LongDescription" select="substring(normalize-space(omschrijving),1,70)"/>
<xsl:with-param name="p_ShortDescription" select="substring(omschrijving,1,35)"/>
<xsl:with-param name="p_LongDescription" select="substring(omschrijving,1,70)"/>
<xsl:with-param name="p_FreeText" select="substring(melding/kenmerk[@key='6'],1,1000)"/>
</xsl:call-template>
</InstructionLine>

14
CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB_SALES005_soap.xsl
View File

@@ -113,8 +113,8 @@
<!-- Zie MARX#37078: Opdrachtomschrijving ook in de node in InstructionData/FreeText -->
<FreeText>
<xsl:choose>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(normalize-space(kenmerk[@key='12']),1,1000)"/></xsl:when>
<xsl:otherwise><xsl:value-of select="substring(normalize-space(omschrijving),1,1000)"/></xsl:otherwise>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(kenmerk[@key='12'],1,1000)"/></xsl:when>
<xsl:otherwise><xsl:value-of select="substring(omschrijving,1,1000)"/></xsl:otherwise>
</xsl:choose>
</FreeText>
<!-- SIDB - Gegevens waarmee gerefereerd wordt aan een contract. Optioneel -->
@@ -197,9 +197,9 @@
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="p_NormPriceCode" select="substring(normalize-space(code),1,17)"/>
<xsl:with-param name="p_LEDOInformation" select="extra3"/>
<xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/>
<xsl:with-param name="p_LongDescription" select="info"/>
<xsl:with-param name="p_LEDOInformation" select="substring(extra3,1,1000)"/>
<xsl:with-param name="p_ShortDescription" select="substring(omschrijving,1,35)"/>
<xsl:with-param name="p_LongDescription" select="substring(info,1,70)"/>
<xsl:with-param name="p_FreeText" select="melding/kenmerk[@key='6']"/>
</xsl:call-template>
<xsl:call-template name="construct_instruction_pricelines">
@@ -224,8 +224,8 @@
<xsl:otherwise><xsl:value-of select="omschrijving"/></xsl:otherwise>
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/>
<xsl:with-param name="p_LongDescription" select="substring(normalize-space(omschrijving),1,70)"/>
<xsl:with-param name="p_ShortDescription" select="substring(omschrijving,1,35)"/>
<xsl:with-param name="p_LongDescription" select="substring(omschrijving,1,70)"/>
<xsl:with-param name="p_FreeText" select="melding/kenmerk[@key='6']"/>
</xsl:call-template>
</InstructionLine>

18
CUST/MARX/xsl/F_SIDB_005.xsl
View File

@@ -105,8 +105,8 @@
<!-- SIDB - Tekstveld met de inhoud van aanvullende informatie. Optioneel, C(70) -->
<!-- Zie MARX#37078: Opdrachtomschrijving ook in de node in InstructionData/FreeText -->
<xsl:choose>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:call-template name="XMLnode_IfNotEmpty_sales005"><xsl:with-param name="p_nodename" select="'FreeText'"/><xsl:with-param name="p_value" select="substring(normalize-space(kenmerk[@key='12']),1,1000)"/></xsl:call-template></xsl:when>
<xsl:otherwise><xsl:call-template name="XMLnode_IfNotEmpty_sales005"><xsl:with-param name="p_nodename" select="'FreeText'"/><xsl:with-param name="p_value" select="substring(normalize-space(omschrijving),1,1000)"/></xsl:call-template></xsl:otherwise>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:call-template name="XMLnode_IfNotEmpty_sales005"><xsl:with-param name="p_nodename" select="'FreeText'"/><xsl:with-param name="p_value" select="substring(kenmerk[@key='12'],1,1000)"/></xsl:call-template></xsl:when>
<xsl:otherwise><xsl:call-template name="XMLnode_IfNotEmpty_sales005"><xsl:with-param name="p_nodename" select="'FreeText'"/><xsl:with-param name="p_value" select="substring(omschrijving,1,1000)"/></xsl:call-template></xsl:otherwise>
</xsl:choose>
<!-- SIDB - Gegevens waarmee gerefereerd wordt aan een contract. Optioneel -->
<ContractReference></ContractReference>
@@ -187,9 +187,9 @@
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="p_NormPriceCode" select="substring(normalize-space(code),1,17)"/>
<xsl:with-param name="p_LEDOInformation" select="substring(normalize-space(extra3),1,1000)"/>
<xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/>
<xsl:with-param name="p_LongDescription" select="substring(normalize-space(info),1,70)"/>
<xsl:with-param name="p_LEDOInformation" select="substring(extra3,1,1000)"/>
<xsl:with-param name="p_ShortDescription" select="substring(omschrijving,1,35)"/>
<xsl:with-param name="p_LongDescription" select="substring(info,1,70)"/>
<xsl:with-param name="p_FreeText" select="substring(melding/kenmerk[@key='6'],1,1000)"/>
</xsl:call-template>
<xsl:call-template name="construct_instruction_pricelines">
@@ -220,12 +220,12 @@
<xsl:with-param name="p_LEDOInformation">
<!-- als memo veld (key 12) is gevuld, dan gaan we die tonen, anders de opdrachtomschrijving (waar de memo ook in zit, dit is alleen bij oude opdrachten van voor release MARX07 -->
<xsl:choose>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(normalize-space(kenmerk[@key=12]),1,1000)"/></xsl:when>
<xsl:otherwise><xsl:value-of select="substring(normalize-space(omschrijving),1,1000)"/></xsl:otherwise>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(kenmerk[@key=12],1,1000)"/></xsl:when>
<xsl:otherwise><xsl:value-of select="substring(omschrijving,1,1000)"/></xsl:otherwise>
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/>
<xsl:with-param name="p_LongDescription" select="substring(normalize-space(omschrijving),1,70)"/>
<xsl:with-param name="p_ShortDescription" select="substring(omschrijving,1,35)"/>
<xsl:with-param name="p_LongDescription" select="substring(omschrijving,1,70)"/>
<xsl:with-param name="p_FreeText" select="substring(melding/kenmerk[@key='6'],1,1000)"/>
</xsl:call-template>
</InstructionLine>