MDUX#53952 Notities op melding-bon (MLDNOT enkel zichtbare notities)

svn path=/Website/branches/v2018.1/; revision=39114
This commit is contained in:
Sander Schepers
2018-09-11 12:18:27 +00:00
parent d9f31b4eda
commit 02223d1be0

View File

@@ -1492,30 +1492,10 @@
</td>
</tr>
<!-- DAAN -->
<xsl:choose>
<xsl:when test="count(omschrijving) = 0">
<!-- Dan tonen we de laatste notitie die voor aanvrager melding (vinkje notitie) bedoeld is -->
<xsl:for-each select="notes/note[flag='1']">
<xsl:sort select="aanmaak/timestamp" order="descending"/>
<tr>
<xsl:choose>
<xsl:when test="position() = 1">
<td colspan="4">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="omschrijving"/>
</xsl:call-template>
</td>
</xsl:when>
</xsl:choose>
</tr>
</xsl:for-each>
</xsl:when>
<xsl:otherwise>
<!-- Dan tonen we 'gewoon' de afhandelingstekst -->
<xsl:if test="behandelwijze=2">
<xsl:for-each select="notes/note">
<xsl:when test="$srtnotificatiecode = 'MLDNOT'">
<xsl:if test="behandelwijze=2 and not(/facilitor/opdracht)">
<xsl:for-each select="notes/note[flag=1]">
<xsl:sort select="aanmaak/timestamp" order="descending"/>
<tr>
<xsl:choose>
@@ -1524,7 +1504,7 @@
<b><xsl:value-of select="//lcl/MLD/behandeling"/>:</b>
</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_friendly"/></span>&#xA0;:<br/><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_friendly"/></span>&#xA0;
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="omschrijving"/>
</xsl:call-template>
@@ -1537,13 +1517,31 @@
</tr>
</xsl:for-each>
</xsl:if>
</xsl:when>
<xsl:otherwise>
<xsl:if test="behandelwijze=2 and not(/facilitor/opdracht)">
<xsl:for-each select="notes/note">
<xsl:sort select="aanmaak/timestamp" order="descending"/>
<tr>
<!-- <td colspan="4">
<xsl:choose>
<xsl:when test="position() = 1">
<td align="right" valign="top">
<b><xsl:value-of select="//lcl/MLD/behandeling"/>:</b>
</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_friendly"/></span>&#xA0;
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="opmerking"/>
<xsl:with-param name="string" select="omschrijving"/>
</xsl:call-template>
</td> -->
</td>
</xsl:when>
<xsl:otherwise>
<td/>
</xsl:otherwise>
</xsl:choose>
</tr>
</xsl:for-each>
</xsl:if>
</xsl:otherwise>
</xsl:choose>
@@ -2060,7 +2058,7 @@
<metaInformation>
<scenarios>
<scenario default="yes" name="Scenario1" userelativepaths="yes" externalpreview="no" url="..\..\..\TEMP\MDUX_files\melding3377_20180808144930_274.xml" htmlbaseurl="" outputurl="" processortype="saxon8" useresolver="yes" profilemode="0"
<scenario default="yes" name="Scenario1" userelativepaths="yes" externalpreview="no" url="..\..\..\TEMP\MDUX_files\melding3376_20180910163302_263.xml" htmlbaseurl="" outputurl="" processortype="saxon8" useresolver="yes" profilemode="0"
profiledepth="" profilelength="" urlprofilexml="" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext="" validateoutput="no"
validator="internal" customvalidator="">
<advancedProp name="bSchemaAware" value="true"/>