HSLE#39713 - dag van de week op catering bon

svn path=/Website/branches/v2017.1/; revision=34458
This commit is contained in:
Dennis Hartmann
2017-06-28 11:29:40 +00:00
parent 47e70792cc
commit 0ad84488b4

View File

@@ -20,6 +20,7 @@
</xsl:element>
</xsl:template>
<xsl:template match="melding" mode="include">
<table border="0" width="100%" cellpadding="2">
<tr>
@@ -1876,6 +1877,13 @@
<xsl:if test="dirtlevel!='0'">
<span class="fatal"><xsl:value-of select="//lcl/RES/ongeldig"/></span>&#xA0;
</xsl:if>
<xsl:call-template name="date-format">
<xsl:with-param name="yyyy" select="van/jaar"/>
<xsl:with-param name="mm" select="van/maand"/>
<xsl:with-param name="dd" select="van/dag"/>
</xsl:call-template>&#xA0;
<xsl:value-of select="van/datum"/>
<xsl:if test="string(van/datum)!=string(tot/datum)">
&#xA0;-&#xA0;<xsl:value-of select="tot/datum"/>
@@ -2664,10 +2672,52 @@
</td>
</xsl:if>
</xsl:for-each>
</tr>
</xsl:template>
<!-- Datum naar dag van de week -->
<xsl:template name="date-format">
<xsl:param name="yyyy"/>
<xsl:param name="mm"/>
<xsl:param name="dd"/>
<xsl:variable name="Y">
<xsl:choose>
<xsl:when test="$mm &lt; 3"><xsl:value-of select="$yyyy - 1"/></xsl:when>
<xsl:otherwise><xsl:value-of select="$yyyy + 0"/></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="y" select="$Y mod 100"/>
<xsl:variable name="c" select="floor($Y div 100)"/>
<xsl:variable name="d" select="$dd+0"/>
<xsl:variable name="m">
<xsl:choose>
<xsl:when test="$mm &lt; 3"><xsl:value-of select="$mm + 12"/></xsl:when>
<xsl:otherwise><xsl:value-of select="$mm + 0"/></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="w" select="($d + floor(($m + 1) * 2.6) + $y + floor($y div 4) + floor($c div 4) - $c * 2 - 1) mod 7"/>
<xsl:variable name="www">
<xsl:choose>
<xsl:when test="$w = 0">Zondag</xsl:when>
<xsl:when test="$w = 1">Maandag</xsl:when>
<xsl:when test="$w = 2">Dinsdag</xsl:when>
<xsl:when test="$w = 3">Woensdag</xsl:when>
<xsl:when test="$w = 4">Donderdag</xsl:when>
<xsl:when test="$w = 5">Vrijdag</xsl:when>
<xsl:when test="$w = 6">Zaterdag</xsl:when>
</xsl:choose>
</xsl:variable>
</tr>
<xsl:value-of select="$www"/>
</xsl:template>
<!-- EIND dag van de week -->
<xsl:template match="reservering" mode="include">
<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
<TR>
@@ -2703,7 +2753,8 @@
<xsl:if test="string(rsv_ruimte[volgnr=$min_volgnr]/omschrijving)!=''">&#xA0;-&#xA0;<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/omschrijving"/></xsl:if>&#xA0;</td>
</tr>
<tr>
<td class="tekstkop" colspan="4" style="text-decoration:underline">Contactgegevens:</td>
<td class="tekstkop" colspan="4" style="text-decoration:underline">Contactgegevens:
</td>
</tr>
<tr>
<td width="13%" class="label"><xsl:value-of select="//lcl/FAC/aanvrager"/></td>
@@ -2736,6 +2787,7 @@
</tr>
<xsl:if test="$srtnotificatiecode='RESDEL'">
<tr>
<td width="20%" class="label"><xsl:value-of select="//lcl/RES/begintijd"/></td>
<td width="80%" colspan="3" class="value">: <xsl:value-of select="rsv_ruimte/van/datum"/>&#xA0;<xsl:value-of select="rsv_ruimte/van/tijd"/></td>
</tr>