DJIN#37776 Aanpassing prints, e-mails en e-mailnotificaties

svn path=/Website/branches/v2016.2/; revision=32753
This commit is contained in:
Maarten van der Heide
2017-02-08 15:42:13 +00:00
parent df01b0990e
commit 708366e48c

View File

@@ -814,6 +814,23 @@
</td>
</tr>
</xsl:when>
<xsl:when test="$srtnotificatiecode='MLDNOT'">
<tr>
<td colspan="4" style="font-size:16pt;padding-top:20px;padding-bottom:20px">
<b>Notitie bij melding (nummer <xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/>)</b>
</td>
</tr>
<tr>
<td colspan='4'>Beste<xsl:text> </xsl:text>
<xsl:choose>
<xsl:when test="melder/geslacht='0'">mevrouw</xsl:when>
<xsl:when test="melder/geslacht='1'">mijnheer</xsl:when>
<xsl:otherwise>mijnheer/mevrouw</xsl:otherwise>
</xsl:choose><xsl:text> </xsl:text><xsl:value-of select="voor/naam"/>,
<br/><br/>Er is een notitie voor u geplaatst bij onderstaande melding.
</td>
</tr>
</xsl:when>
<xsl:otherwise/>
</xsl:choose>
<tr>
@@ -832,6 +849,22 @@
<xsl:attribute name="cellpadding">2</xsl:attribute>
<xsl:attribute name="cellspacing">2</xsl:attribute>
<tr><td colspan="4"><hr style="color:#000;height:1px;"/></td></tr>
<xsl:if test="$srtnotificatiecode='MLDMAI'">
<!--tr>
<td width="16%"><b>Notitie:</b></td>
<td colspan="3"><xsl:value-of select="$notdat"/><br/><xsl:call-template name="linebreaks"><xsl:with-param name="string" select="$notoms"/></xsl:call-template></td>
</tr-->
<xsl:for-each select="notes/note">
<xsl:sort select="aanmaak/timestamp" order="descending"/>
<xsl:if test="position()=1">
<tr>
<td width="16%"><b>Notitie:</b></td>
<td colspan="3"><xsl:value-of select="aanmaak/datum"/>&#xA0;<xsl:value-of select="aanmaak/tijd"/><br/><xsl:call-template name="linebreaks"><xsl:with-param name="string" select="omschrijving"/></xsl:call-template></td>
</tr>
</xsl:if>
</xsl:for-each>
<tr><td colspan="4"><hr style="color:#000;height:1px;"/></td></tr>
</xsl:if>
<tr>
<td width="16%"><b>Melder:</b></td>
<td width="34%"><xsl:value-of select="voor/naam_full"/></td>
@@ -938,6 +971,22 @@
</tr>
</xsl:if>
<tr><td colspan="4"><hr style="color:#000;height:1px;"/></td></tr>
<xsl:if test="$srtnotificatiecode='MLDNOB' or $srtnotificatiecode='MLDNOT'">
<!--tr>
<td><b>Notitie:</b></td>
<td colspan="3"><xsl:value-of select="$notdat"/><br/><xsl:call-template name="linebreaks"><xsl:with-param name="string" select="$notoms"/></xsl:call-template></td>
</tr-->
<xsl:for-each select="notes/note[flag=1]">
<xsl:sort select="aanmaak/timestamp" order="descending"/>
<xsl:if test="position()=1">
<tr>
<td><b>Notitie:</b></td>
<td colspan="3"><xsl:value-of select="aanmaak/datum"/>&#xA0;<xsl:value-of select="aanmaak/tijd"/><br/><xsl:call-template name="linebreaks"><xsl:with-param name="string" select="omschrijving"/></xsl:call-template></td>
</tr>
</xsl:if>
</xsl:for-each>
<tr><td colspan="4"><hr style="color:#000;height:1px;"/></td></tr>
</xsl:if>
</xsl:element>
<!-- Einde informatieblok -->