MNNL#51988 Labels ook op bon (gekleurd)

svn path=/Website/branches/v2017.3/; revision=38242
This commit is contained in:
Maarten van der Heide
2018-06-18 16:34:41 +00:00
parent 292ed7be59
commit feab22b024

View File

@@ -1523,12 +1523,19 @@
<td colspan="3"><xsl:call-template name="linebreaks"><xsl:with-param name="string" select="omschrijving"/></xsl:call-template></td>
</tr>
<xsl:for-each select="kenmerk[ @type!='Q' and count(@xmlnode)=0]">
<xsl:for-each select="kenmerk[@type!='Q' and count(@xmlnode)=0]">
<xsl:sort select="@volgnummer" data-type="number"/>
<xsl:if test=".!=''">
<tr>
<td><b><xsl:value-of select="@naam"/>:</b></td>
<td colspan="3"><xsl:value-of select="."/></td>
<xsl:choose>
<xsl:when test="@type='L' or @type='l'">
<td colspan="4" style="background-color:#b9c62c;"><b><xsl:value-of select="@naam"/></b></td>
</xsl:when>
<xsl:otherwise>
<td><b><xsl:value-of select="@naam"/>:</b></td>
<td colspan="3"><xsl:value-of select="."/></td>
</xsl:otherwise>
</xsl:choose>
</tr>
</xsl:if>
</xsl:for-each>
@@ -1540,27 +1547,39 @@
<xsl:sort select="omschrijving"/>
<tr>
<xsl:choose>
<xsl:when test="position()=1"><td><b><xsl:value-of select="//lcl/MLD/objecten"/>:</b></td></xsl:when>
<xsl:otherwise><td/></xsl:otherwise>
<xsl:when test="position()=1">
<td><br/><b><xsl:value-of select="//lcl/MLD/objecten"/>:</b></td>
<td><br/><xsl:value-of select="omschrijving"/></td>
</xsl:when>
<xsl:otherwise>
<td/>
<td><br/><xsl:value-of select="omschrijving"/></td>
</xsl:otherwise>
</xsl:choose>
<td><xsl:value-of select="omschrijving"/></td>
<td><xsl:comment>NADER TE DEFINIEREN</xsl:comment></td>
</tr>
</xsl:for-each>
</xsl:if>
<xsl:if test="behandelwijze=2 and not(/facilitor/opdracht)">
<xsl:if test="$mode='email' and behandelwijze=2 and not(/facilitor/opdracht)">
<xsl:for-each select="notes/note[flag=1]">
<xsl:sort select="aanmaak/timestamp" order="ascending"/>
<tr>
<xsl:choose>
<xsl:when test="position()=1"><td><b><xsl:value-of select="//lcl/MLD/behandeling"/>:</b></td></xsl:when>
<xsl:otherwise><td/></xsl:otherwise>
<xsl:when test="position()=1">
<td><br/><b><xsl:value-of select="//lcl/MLD/behandeling"/>:</b></td>
<td colspan="3">
<br/><span class="mldbeh"><xsl:value-of select="aanmaak/datum"/>&#xA0;<xsl:value-of select="aanmaak/tijd"/>&#xA0;-&#xA0;<xsl:value-of select="noteur/naam_full"/></span>&#xA0;
<xsl:call-template name="linebreaks"><xsl:with-param name="string" select="omschrijving"/></xsl:call-template>
</td>
</xsl:when>
<xsl:otherwise>
<td/>
<td colspan="3">
<span class="mldbeh"><xsl:value-of select="aanmaak/datum"/>&#xA0;<xsl:value-of select="aanmaak/tijd"/>&#xA0;-&#xA0;<xsl:value-of select="noteur/naam_full"/></span>&#xA0;
<xsl:call-template name="linebreaks"><xsl:with-param name="string" select="omschrijving"/></xsl:call-template>
</td>
</xsl:otherwise>
</xsl:choose>
<td colspan="3">
<span class="mldbeh"><xsl:value-of select="aanmaak/datum"/>&#xA0;<xsl:value-of select="aanmaak/tijd"/>&#xA0;-&#xA0;<xsl:value-of select="noteur/naam_friendly"/></span>&#xA0;
<xsl:call-template name="linebreaks"><xsl:with-param name="string" select="omschrijving"/></xsl:call-template>
</td>
</tr>
</xsl:for-each>
</xsl:if>