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,60 +1492,58 @@
</td> </td>
</tr> </tr>
<!-- DAAN --> <!-- DAAN -->
<xsl:choose>
<xsl:when test="$srtnotificatiecode = 'MLDNOT'">
<xsl:choose> <xsl:if test="behandelwijze=2 and not(/facilitor/opdracht)">
<xsl:when test="count(omschrijving) = 0"> <xsl:for-each select="notes/note[flag=1]">
<!-- Dan tonen we de laatste notitie die voor aanvrager melding (vinkje notitie) bedoeld is --> <xsl:sort select="aanmaak/timestamp" order="descending"/>
<xsl:for-each select="notes/note[flag='1']"> <tr>
<xsl:sort select="aanmaak/timestamp" order="descending"/> <xsl:choose>
<tr> <xsl:when test="position() = 1">
<xsl:choose> <td align="right" valign="top">
<xsl:when test="position() = 1"> <b><xsl:value-of select="//lcl/MLD/behandeling"/>:</b>
<td colspan="4"> </td>
<xsl:call-template name="linebreaks"> <td colspan="3">
<xsl:with-param name="string" select="omschrijving"/> <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> <xsl:call-template name="linebreaks">
</td> <xsl:with-param name="string" select="omschrijving"/>
</xsl:when> </xsl:call-template>
</xsl:choose> </td>
</tr> </xsl:when>
</xsl:for-each> <xsl:otherwise>
</xsl:when> <td/>
<xsl:otherwise> </xsl:otherwise>
<!-- Dan tonen we 'gewoon' de afhandelingstekst --> </xsl:choose>
<xsl:if test="behandelwijze=2"> </tr>
<xsl:for-each select="notes/note"> </xsl:for-each>
<xsl:sort select="aanmaak/timestamp" order="descending"/> </xsl:if>
<tr> </xsl:when>
<xsl:choose> <xsl:otherwise>
<xsl:when test="position() = 1"> <xsl:if test="behandelwijze=2 and not(/facilitor/opdracht)">
<td align="right" valign="top"> <xsl:for-each select="notes/note">
<b><xsl:value-of select="//lcl/MLD/behandeling"/>:</b> <xsl:sort select="aanmaak/timestamp" order="descending"/>
</td> <tr>
<td colspan="3"> <xsl:choose>
<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/> <xsl:when test="position() = 1">
<xsl:call-template name="linebreaks"> <td align="right" valign="top">
<xsl:with-param name="string" select="omschrijving"/> <b><xsl:value-of select="//lcl/MLD/behandeling"/>:</b>
</xsl:call-template> </td>
</td> <td colspan="3">
</xsl:when> <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:otherwise> <xsl:call-template name="linebreaks">
<td/> <xsl:with-param name="string" select="omschrijving"/>
</xsl:otherwise> </xsl:call-template>
</xsl:choose> </td>
</tr> </xsl:when>
</xsl:for-each> <xsl:otherwise>
</xsl:if> <td/>
<tr> </xsl:otherwise>
<!-- <td colspan="4"> </xsl:choose>
<xsl:call-template name="linebreaks"> </tr>
<xsl:with-param name="string" select="opmerking"/> </xsl:for-each>
</xsl:call-template> </xsl:if>
</td> --> </xsl:otherwise>
</tr> </xsl:choose>
</xsl:otherwise>
</xsl:choose>
<tr> <tr>
<td colspan="4" align="right" valign="top"> <td colspan="4" align="right" valign="top">
@@ -2060,7 +2058,7 @@
<metaInformation> <metaInformation>
<scenarios> <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" profiledepth="" profilelength="" urlprofilexml="" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext="" validateoutput="no"
validator="internal" customvalidator=""> validator="internal" customvalidator="">
<advancedProp name="bSchemaAware" value="true"/> <advancedProp name="bSchemaAware" value="true"/>