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

IVET#35505 ARD transportaanvraag layout aangepast + onderwerp regel

Browse Source 
svn path=/Website/branches/v2016.1/; revision=29942
This commit is contained in:
Ruud Lipper
2016-07-04 13:11:31 +00:00
parent 6b475aaa49
commit 85f34ddbcd
1 changed files with 90 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
CUST/IVET/xsl/cust.xsl
View File

@@ -373,11 +373,68 @@
</xsl:if>
</xsl:template>
<xsl:template name="vervoerdocument">
<xsl:param name="gevStof"/>
<tr>
<td height="20px" colspan="4"/>
</tr>
<tr>
<td colspan="4">
<table width="99%" border="1" cellpadding="5" style="border-collapse: collapse;">
<tr>
<td colspan="2"><b>Tekst tbv vervoer gevaarlijke stoffen:<br/><br/>
Melding <xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/><xsl:if test="onderwerp != ''">:&#160;<xsl:value-of select="onderwerp"/></xsl:if><br/></b>
</td>
</tr>
<tr>
<td>
Afzender:<br/>
MSD Animal Health<br/>
Inbound-CEW (PP070)<br/>
Exportstraat 44<br/>
5831 AL BOXMEER
</td>
<td>
Geadresseerde:<br/>
MSD Animal Health<br/>
Pharma-Outbound SHIPPING (VTS1)<br/>
Handelsstraat 28<br/>
5831 AV BOXMEER
</td>
</tr>
<tr>
<td colspan="2">
<xsl:if test="$gevStof='Ja'">
UN<xsl:value-of select="kenmerk[@naam='UN-nummer 1']"/>&#xA0;
<xsl:value-of select="kenmerk[@naam='Proper Shipping Name 1']"/>&#xA0;(<xsl:value-of select="kenmerk[@naam='Technische benaming 1']"/>),
<xsl:value-of select="kenmerk[@naam='Gevaarklasse(n) (Etiketten) 1']"/>,&#xA0;
<xsl:if test="kenmerk[@naam='Verpakkingsgroep 1'] != 'NVT'">
<xsl:value-of select="kenmerk[@naam='Verpakkingsgroep 1']"/>&#xA0;
</xsl:if>
<xsl:value-of select="kenmerk[@naam='Tunnelcode 1']"/>&#xA0;
<xsl:value-of select="kenmerk[@naam='Aantal colli 1']"/>x<xsl:value-of select="kenmerk[@naam='Hoeveelheid gevaarlijke stof 1']"/>
</xsl:if>
<xsl:choose>
<xsl:when test="starts-with(kenmerk[@naam='Transporttemp. 1'], 'UN')">
<br/><xsl:value-of select="kenmerk[@naam='Transporttemp. 1']"/>
</xsl:when>
<xsl:when test="starts-with(kenmerk[@naam='Transporttemperatuur'], 'UN')">
<br/><xsl:value-of select="kenmerk[@naam='Transporttemperatuur']"/>
</xsl:when>
<xsl:otherwise/>
</xsl:choose>
</td>
</tr>
</table>
</td>
</tr>
</xsl:template>
<xsl:template name="defaultmelding">
<tr><td colspan="2"><xsl:call-template name="pageheader"/></td></tr>
<tr>
<td colspan="2" class="caption" style="padding-top:20px;padding-bottom:20px">
<b>Melding <xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/></b>
<b>Melding <xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/><xsl:if test="onderwerp != ''">:&#160;<xsl:value-of select="onderwerp"/></xsl:if></b>
</td>
<td colspan="2" class="caption" style="padding-top:20px;padding-bottom:20px">
<!-- xsl:if test="discipline/key=130">
@@ -665,7 +722,7 @@
</td>
</tr>
</xsl:if>
</xsl:for-each>
</xsl:for-each>
</xsl:when>
<xsl:otherwise>
<xsl:for-each select="kenmerk[@type!='L' and @type!='Q' and not(@xmlnode)]">
@@ -684,6 +741,11 @@
</xsl:for-each>
</xsl:otherwise>
</xsl:choose>
<xsl:if test="starts-with(kenmerk[@naam='Transporttemp. 1'], 'UN') or starts-with(kenmerk[@naam='Transporttemperatuur'], 'UN')">
<xsl:call-template name="vervoerdocument">
<xsl:with-param name="gevStof">Nee</xsl:with-param>
</xsl:call-template>
</xsl:if>
</xsl:when>
<!-- ADR transport kenmerken -->
<xsl:when test="stdmelding/key=3742 or stdmelding/key=3741 or stdmelding/key=3681">
@@ -744,8 +806,8 @@
<xsl:value-of select="kenmerk[@xmlnode='bedrijf']/bedrijf/bezoek_land"/>
</td>
</tr>
</xsl:when>
<xsl:otherwise>
</xsl:when>
<xsl:otherwise>
<xsl:for-each select="kenmerk[@type!='L' and @type!='Q' and not(@xmlnode) and $UN-nummer > @volgnummer]">
<xsl:sort select="@volgnummer" data-type="number"/>
<xsl:if test=".!=''">
@@ -777,29 +839,25 @@
</tr>
</xsl:if>
</xsl:for-each>
</tr>
<tr>
<td height="20px" colspan="4"><hr/></td>
</tr>
<td><b>Tekst tbv vervoer gevaarlijke stoffen:</b></td><td colspan="4">
UN<xsl:value-of select="kenmerk[@naam='UN-nummer 1']"/>&#xA0;
<xsl:value-of select="kenmerk[@naam='Proper Shipping Name 1']"/>&#xA0;(<xsl:value-of select="kenmerk[@naam='Technische benaming 1']"/>),
<xsl:value-of select="kenmerk[@naam='Gevaarklasse(n) (Etiketten) 1']"/>,&#xA0;
<xsl:if test="kenmerk[@naam='Verpakkingsgroep 1'] != 'NVT'">
<xsl:value-of select="kenmerk[@naam='Verpakkingsgroep 1']"/>&#xA0;
</xsl:if>
<xsl:value-of select="kenmerk[@naam='Tunnelcode 1']"/>&#xA0;
<xsl:value-of select="kenmerk[@naam='Aantal colli 1']"/>x<xsl:value-of select="kenmerk[@naam='Hoeveelheid gevaarlijke stof 1']"/>
<xsl:choose>
<xsl:when test="starts-with(kenmerk[@naam='Transporttemp. 1'], 'UN')">
<br/><xsl:value-of select="kenmerk[@naam='Transporttemp. 1']"/>
</xsl:when>
<xsl:when test="starts-with(kenmerk[@naam='Transporttemperatuur'], 'UN')">
<br/><xsl:value-of select="kenmerk[@naam='Transporttemperatuur']"/>
</xsl:when>
<xsl:otherwise/>
</xsl:choose>
</td>
</tr>
<td height="10px" colspan="4"/>
</tr>
<xsl:if test="opmerking!=''">
<tr>
<td align="right" valign="top">
<b>Afhandeling:</b>
</td>
<td colspan="3">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="opmerking"/>
</xsl:call-template>
</td>
</tr>
</xsl:if>
<xsl:call-template name="vervoerdocument">
<xsl:with-param name="gevStof">Ja</xsl:with-param>
</xsl:call-template>
<tr>
<td height="20px" colspan="4"/>
</tr>
@@ -819,8 +877,6 @@
</tr>
</xsl:if>
</xsl:for-each>
</xsl:otherwise>
</xsl:choose>
<xsl:if test="count(deel)&gt;0">
<xsl:for-each select="deel">
<xsl:sort select="omschrijving"/>
@@ -856,6 +912,8 @@
</td>
</tr>
</xsl:if>
</xsl:otherwise>
</xsl:choose>
<tr><td colspan="2"><xsl:call-template name="pagefooter"/></td></tr>
</xsl:template>
@@ -992,7 +1050,7 @@ Servicepoint
</tr>
<tr>
<td class="label">Meldingnummer/Call number</td>
<td class="value">: <xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/></td>
<td class="value">: <xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/><xsl:if test="onderwerp != ''">:&#160;<xsl:value-of select="onderwerp"/></xsl:if></td>
</tr>
<!--<tr>
<td class="label">Kostenplaats</td>
@@ -1363,7 +1421,7 @@ Servicepoint
</xsl:element>
</td></tr>
<tr><td colspan="2">
<b>Melding <xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/></b>
<b>Melding <xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/><xsl:if test="onderwerp != ''">:&#160;<xsl:value-of select="onderwerp"/></xsl:if></b>
<br/>PO nummer: <xsl:value-of select="kenmerk[@key='13281']"/>
<br/><xsl:call-template name="linebreaks"><xsl:with-param name="string" select="omschrijving"/></xsl:call-template>
</td></tr>
@@ -1417,7 +1475,8 @@ Servicepoint
<b>
<xsl:value-of select="opdrachttype/omschrijving"/>&#160;
<xsl:value-of select="melding/discipline/srtdiscipline/prefix"/>
<xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/></b>
<xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/>
<xsl:if test="melding/onderwerp != ''">:&#160;<xsl:value-of select="melding/onderwerp"/></xsl:if></b>
</td>
</tr>
<tr>
@@ -1704,8 +1763,3 @@ Servicepoint
</xsl:template>
</xsl:stylesheet>
<!-- Stylus Studio meta-information - (c) 2004-2007. Progress Software Corporation. All rights reserved.
<metaInformation>
<scenarios ><scenario default="yes" name="Scenario1" userelativepaths="yes" externalpreview="no" url="..\..\..\TEMP\IVET_files\melding68879_20141009140830.xml" htmlbaseurl="" outputurl="" processortype="internal" useresolver="yes" profilemode="0" profiledepth="" profilelength="" urlprofilexml="" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext="" validateoutput="no" validator="internal" customvalidator=""/></scenarios><MapperMetaTag><MapperInfo srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/><MapperBlockPosition></MapperBlockPosition><TemplateContext></TemplateContext><MapperFilter side="source"></MapperFilter></MapperMetaTag>
</metaInformation>
-->