svn path=/Website/branches/v2017.2/; revision=35685
This commit is contained in:
Dennis Hartmann
2017-10-13 08:02:20 +00:00
parent 3c075140b2
commit ff93f1b285

View File

@@ -29,23 +29,23 @@
<td width="32%" class="value" align="right">:
<xsl:value-of select="datum/datum"/>&#xA0;
<xsl:value-of select="datum/tijd"/>
</td>
</td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/BES/bestelvoor"/></td>
<td class="value">: <xsl:value-of select="voor/naam_full"/></td>
<td class="value">: <xsl:value-of select="voor/naam_full"/>&#xA0;[<xsl:value-of select="voor/oslogin"/>]</td>
<td colspan="2"/>
</tr>
</xsl:when>
<xsl:otherwise>
<tr>
<td width="13%" class="label" align="left"><xsl:value-of select="//lcl/FAC/aanvrager"/></td>
<td width="33%" class="value" align="right">: <xsl:value-of select="voor/naam_full"/></td>
<td width="33%" class="value" align="right">: <xsl:value-of select="voor/naam_full"/>&#xA0;[<xsl:value-of select="voor/oslogin"/>]</td>
<td width="20%" class="label" align="left"><xsl:value-of select="//lcl/BES/aanvraagdatum"/></td>
<td width="32%" class="value" align="right">:
<xsl:value-of select="datum/datum"/>&#xA0;
<xsl:value-of select="datum/tijd"/>
</td>
</td>
</tr>
</xsl:otherwise>
</xsl:choose>
@@ -64,7 +64,7 @@
<td class="label"><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></td>
<td class="value">:
<xsl:value-of select="leverdatum/datum"/>
</td>
</td>
</tr>
</xsl:when>
<xsl:when test="voor/mobiel!=''">
@@ -74,7 +74,7 @@
<td class="label"><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></td>
<td class="value">:
<xsl:value-of select="leverdatum/datum"/>
</td>
</td>
</tr>
</xsl:when>
<xsl:otherwise>
@@ -84,7 +84,7 @@
<td class="label"><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></td>
<td class="value">:
<xsl:value-of select="leverdatum/datum"/>
</td>
</td>
</tr>
</xsl:otherwise>
</xsl:choose>
@@ -95,7 +95,7 @@
<xsl:value-of select="voor/afdeling/omschrijving"/>
</td>
<td class="label"><xsl:value-of select="//lcl/BES/aanvraagstatus"/></td>
<td class="value">: <xsl:value-of select="status"/></td>
<td class="value">: <xsl:value-of select="status"/></td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/kostenplaats"/></td>
@@ -121,7 +121,7 @@
<xsl:value-of select="afleveradres/bezoek_plaats"/>
<br/>&#xA0;
<xsl:value-of select="afleveradres/bezoek_land"/>
</xsl:if>
</xsl:if>
</td>
<td colspan="2"/>
</tr>
@@ -130,7 +130,7 @@
<xsl:if test="bestel_opm">
<tr>
<td height="10px" colspan="4"/>
</tr>
</tr>
<tr>
<td class="label" style="vertical-align:top"><xsl:value-of select="//lcl/FAC/opmerkingen"/></td>
<td class="value" colspan="3">:
@@ -158,7 +158,7 @@
</tr>
<tr>
<td colspan="4" style="border-top:1px solid #000;"/>
</tr>
</tr>
<tr>
<td colspan="4">
<table cellpadding="1" cellspacing="0" border="0" bordercolor="#000000" frame="box" width="99%">
@@ -319,9 +319,9 @@
<td class="value" width="28%">:
<xsl:value-of select="bestelling/key"/>
</td>
</tr>
</tr>
<tr>
<td class="label">
<td class="label">
<b><xsl:value-of select="//lcl/FAC/e-mail"/></b>
</td>
<td class="value">:
@@ -332,31 +332,31 @@
</td>
<td class="value">:
<xsl:value-of select="id"/>
</td>
</td>
</tr>
<tr>
<td class="label">
<td class="label">
<b><xsl:value-of select="//lcl/FAC/telefoon"/></b>
</td>
<td class="value">:
<xsl:choose>
<xsl:when test="bestelling/aanvrager/telefoonnr">
<xsl:value-of select="bestelling/aanvrager/telefoonnr"/>
</xsl:when>
</xsl:when>
<xsl:when test="bestelling/aanvrager/mobiel!=''">
<xsl:value-of select="bestelling/aanvrager/mobiel"/>
</xsl:when>
</xsl:choose>
</xsl:choose>
</td>
<td class="label">
<td class="label">
<b><xsl:value-of select="//lcl/BES/orderdatum"/></b>
</td>
<td class="value">:
<xsl:value-of select="datum/datum"/>
</td>
</td>
</tr>
<tr>
<td class="label">
<tr>
<td class="label">
<b><xsl:value-of select="//lcl/FAC/kostenplaats"/></b>
</td>
<td class="value">:
@@ -366,17 +366,17 @@
<xsl:comment>
<td class="label">
<b><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></b>
</td>
<td class="value">
</td>
<td class="value">
<xsl:value-of select="bestelling/leverdatum/datum"/>
</td>
</xsl:comment>
</tr>
<tr>
<td class="label">
<td class="label">
<b><xsl:value-of select="//lcl/FAC/werkplek"/></b>
</td>
<td class="value">:
<td class="value">:
<xsl:value-of select="bestelling/plaats"/>
</td>
<td colspan="2"/>
@@ -416,7 +416,7 @@
<xsl:if test="bestelling/bestel_opm">
<tr>
<td height="10px" colspan="4"/>
</tr>
</tr>
<tr>
<td class="label" style="vertical-align:top"><b><xsl:value-of select="//lcl/FAC/opmerkingen"/></b></td>
<td class="value" colspan="3">:
@@ -425,18 +425,18 @@
</xsl:call-template>
</td>
</tr>
</xsl:if>
</xsl:if>
<tr>
<td colspan="4" style="height:20px"/>
</tr>
<xsl:for-each select="bestelling/kenmerk[@type!='L' and @type!='l' and @type!='Q']">
<tr>
<tr>
<td class="label" style="vertical-align:top">
<b><xsl:value-of select="@naam"/></b>
</td>
<td class="value">:
<xsl:value-of select="."/>
</td>
</td>
</tr>
</xsl:for-each>
<tr>
@@ -444,7 +444,7 @@
</tr>
<tr>
<td colspan="4" style="border-top:1px solid #000;"/>
</tr>
</tr>
<TR>
<TD colspan="4">
<TABLE cellpadding="1" cellspacing="0" border="0" bordercolor="#000000" frame="box" width="99%">
@@ -545,17 +545,17 @@
<table border="0" bordercolor="#000000" width="100%">
<tr>
<td class="caption" valign="top" colspan="4">Bevestiging afspraak MN</td>
</tr>
</tr>
<tr>
<td width="50" class="label">Geachte,</td>
</tr>
<tr><td height="10px"/></tr>
<tr>
<td colspan="4" class="label">
Hierbij bevestigen wij de afspraak die met u gemaakt is bij MN. Onderaan deze bevestiging treft u tevens de routebeschrijvingen aan.
Hierbij bevestigen wij de afspraak die met u gemaakt is bij MN. Onderaan deze bevestiging treft u tevens de routebeschrijvingen aan.
Graag tot ziens bij MN.
</td>
</tr>
</tr>
<tr><td height="10px"/></tr>
<xsl:if test="rsv_ruimte[volgnr=$min_volgnr]/contact_user/key!=ingevoerd_user/key">
<tr>
@@ -575,24 +575,24 @@
<table cellpadding="1" border="0" WIDTH="99%" bordercolor="#000000" frame="box">
<!-- rsv_ruimte -->
<xsl:for-each select="rsv_ruimte">
<xsl:sort select="van/timestamp"/>
<xsl:call-template name="rsv_ruimte_mai">
<xsl:with-param name="min_volgnr" select="$min_volgnr"/>
</xsl:call-template>
</xsl:for-each>
<xsl:sort select="van/timestamp"/>
<xsl:call-template name="rsv_ruimte_mai">
<xsl:with-param name="min_volgnr" select="$min_volgnr"/>
</xsl:call-template>
</xsl:for-each>
</table>
</td>
</tr>
<xsl:call-template name="res_endtext">
<xsl:with-param name="min_volgnr" select="$min_volgnr"/>
</xsl:call-template>
</xsl:call-template>
</xsl:when>
</xsl:choose>
</table>
</td>
<td WIDTH="30" ROWSPAN="30" ID="RECHTERMARGE"/>
</tr>
</xsl:when>
</xsl:when>
<!--- vanaf hier normale notificatie -->
<xsl:otherwise>
@@ -790,7 +790,7 @@
<xsl:otherwise>
:&#xA0;<xsl:value-of select="plaats/plaatsaanduiding"/>
</xsl:otherwise>
</xsl:choose>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
:&#xA0;<xsl:value-of select="ruimte"/>
@@ -847,7 +847,7 @@
<td colspan="6" style="text-align:left">
Dit is een automatisch gegenereerde email en u kunt hierop derhalve niet antwoorden.
</td>
</tr>
</tr>
</xsl:if>
<xsl:if test="opmerking!=''">
<tr>
@@ -1260,7 +1260,7 @@
</tr>
<tr>
<td height="10px"/>
</tr>
</tr>
</xsl:if>
<tr>
<td colspan="5" class="label">
@@ -1316,7 +1316,7 @@
</tr>
<tr>
<td width="16%"><b><xsl:value-of select="//lcl/FAC/aanvrager"/>:</b></td>
<td width="34%"><xsl:value-of select="voor/naam_full"/></td>
<td width="34%"><xsl:value-of select="voor/naam_full"/>&#xA0;[<xsl:value-of select="voor/oslogin"/>]</td>
<td width="16%"><b><xsl:value-of select="//lcl/FAC/telefoon"/>:</b></td>
<td width="34%"><xsl:if test="voor/telefoonnr=''">-</xsl:if><xsl:value-of select="voor/telefoonnr"/></td>
</tr>
@@ -1360,7 +1360,7 @@
</xsl:if>
<tr>
<td width="16%"><b><xsl:value-of select="//lcl/FAC/aanvrager"/>:</b></td>
<td width="34%"><xsl:value-of select="voor/naam_full"/></td>
<td width="34%"><xsl:value-of select="voor/naam_full"/>&#xA0;[<xsl:value-of select="voor/oslogin"/>]</td>
<td width="16%"><b><xsl:value-of select="//lcl/FAC/telefoon"/>:</b></td>
<td width="34%"><xsl:if test="voor/telefoonnr=''">-</xsl:if><xsl:value-of select="voor/telefoonnr"/> </td>
</tr>
@@ -1543,7 +1543,7 @@
<!--span class="mldbeh"><xsl:value-of select="datumtijd"/>&#xA0;-&#xA0;<xsl:value-of select="door"/> [<xsl:value-of select="code"/>]</span>&#xA0;<xsl:call-template name="linebreaks"><xsl:with-param name="string" select="actie"/></xsl:call-template-->
<span class="mldbeh"><xsl:value-of select="datumtijd"/>&#xA0;-&#xA0;<xsl:value-of select="door"/></span>&#xA0;<xsl:call-template name="linebreaks"><xsl:with-param name="string" select="actie"/></xsl:call-template>
</td>
</tr>
</tr>
</xsl:for-each>
</xsl:if>
</table>