PCHW#46427 - afhandeling gekoppelde melding nu op bon

svn path=/Website/branches/v2017.2/; revision=35836
This commit is contained in:
Dennis Hartmann
2017-10-27 12:00:39 +00:00
parent 8404555ff7
commit ce507311df

View File

@@ -432,11 +432,11 @@
<xsl:if test="plaats/@type!='R'">
<td colspan="2"/>
</xsl:if>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/datum_gereed"/>:</b>
</td>
<td align="left">
<td align="left">
<xsl:choose>
<xsl:when test="tracking/track[code='MLDAFM']">
<xsl:value-of select="tracking/track[code='MLDAFM']/datum/datum"/>&#xA0;<xsl:value-of select="tracking/track[code='MLDAFM']/datum/tijd"/>
@@ -445,7 +445,7 @@
<xsl:value-of select="datum_gepland/datum"/>&#xA0;<xsl:value-of select="datum_gepland/tijd"/>
</xsl:otherwise>
</xsl:choose>
</td>
</td>
</tr>
<xsl:if test="kenmerk[@naam='Ordernr']!=''">
<tr>
@@ -482,12 +482,57 @@
<td align="right" valign="top">
<b><xsl:value-of select="//lcl/FAC/omschrijving"/>:</b>
</td>
<td align="left" colspan="3">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="omschrijving"/>
</xsl:call-template>
</td>
</tr>
<td colspan="3">
<i>
<br/>
<xsl:if test="$srtnotificatiecode = 'MLDAFM' or $srtnotificatiecode = 'MLDMAI' or $srtnotificatiecode = ''">
<xsl:choose>
<xsl:when test="stdmelding/key = ''">
<xsl:if test="kenmerk[@naam='Volledig e-mailadres'] != ''">Het e-mailadres: <xsl:value-of select="kenmerk[@naam='Volledig e-mailadres']"/> is met een jaar verlengd.</xsl:if>
</xsl:when>
<xsl:when test="melding/key != ''">Deze melding is behandeld in melding <xsl:value-of select="melding/key"/>
</xsl:when>
</xsl:choose>
<br/><br/>
</xsl:if>
</i>
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="opmerking"/>
</xsl:call-template>
</td>
<xsl:if test="melding/key != '' and melding/opmerking != ''">
<tr>
<td><b>Afhandeling melding <xsl:value-of select="melding/key"/>:</b>
</td>
<td align="left" colspan="3">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="melding/opmerking"/>
</xsl:call-template>
</td>
</tr>
</xsl:if>
<xsl:for-each select="kenmerk[@type!='L' and @type!='l' and @type!='Q' and count(@xmlnode)=0]">
<xsl:sort select="@volgnummer" data-type="number"/>
<xsl:if test=".!=''">
@@ -562,7 +607,7 @@
</xsl:if>
</table>
</xsl:template>
<xsl:template match="rapport">
<style>
td { border-bottom: 1px solid #ccc; padding: 4px 3px 8px 3px;}
@@ -671,7 +716,7 @@ function alternate(){
<th width="44%">Onderwerp</th>
<th width="44%">Zaal</th>
</tr>
<xsl:for-each select="msxml:node-set($sorted)/data_row">
<xsl:element name="tr">
<xsl:attribute name="id">tr<xsl:value-of select="position()"/></xsl:attribute>