admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDUX#53952 Aanpassing voor tonen laatste notitie bij melding-notificaties.

Browse Source 
svn path=/Website/branches/v2018.1/; revision=38664
This commit is contained in:
Sander Schepers
2018-07-27 09:35:17 +00:00
parent 6686fcfd6f
commit 535f5ea802
1 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
CUST/MDUX/xsl/MDUX.xsl
View File

@@ -7,14 +7,11 @@
</xsl:variable>
<xsl:template name="opdr_endtext">
<tr>
<td colspan="5" style="text-align:left; font-size:9px" class="tekst">REAGEER A.U.B. NIET OP DEZE MAIL, DIT IS EEN NO-REPLY E-MAILADRES. VOOR VRAGEN KAN ER CONTACT WORDEN GEZOCHT MET FACILITAIRE ZAKEN, VIA FACILITAIR@MEDUX.NL.</td>
</tr>
</xsl:template>
<xsl:template match="opdracht" mode="include">
<xsl:choose>
<!-- "opdrachten bij melding "Incidentele bestelling (key=1)" -->
@@ -36,7 +33,6 @@
</xsl:choose>
</xsl:template>
<xsl:template match="opdracht" mode="include_inkooporder">
<table border="0" width="100%" cellpadding="2">
<xsl:if test="extra_key">
@@ -281,7 +277,6 @@
</table>
</xsl:template>
<xsl:template match="opdracht" mode="include_uitvoeringsopdracht">
<xsl:variable name="techadres_uitv_opdr"><xsl:value-of select="uitvoerende/bedrijf/bedrijfadres[type='O' and typeopdr='81']/key"/></xsl:variable>
@@ -1217,7 +1212,6 @@
</TABLE>
</xsl:template>
<xsl:template match="melding" mode="include">
<table border="0" width="100%" cellpadding="2">
<tr>
@@ -1491,7 +1485,7 @@
</tr>
<xsl:choose>
<xsl:when test="count(opmerking) = 0">
<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"/>
@@ -1511,25 +1505,25 @@
<xsl:otherwise>
<!-- Dan tonen we 'gewoon' de afhandelingstekst -->
<xsl:if test="behandelwijze=2">
<xsl:for-each select="notes/note[flag=1]">
<xsl:sort select="aanmaak/timestamp" order="ascending"/>
<xsl:for-each select="notes/note[flag='1']">
<xsl:sort select="aanmaak/timestamp" order="descending"/>
<tr>
<xsl:choose>
<xsl:when test="position() = 1">
<td align="right" valign="top">
<b><xsl:value-of select="//lcl/MLD/behandeling"/>:</b>
</td>
</xsl:when>
<xsl:otherwise>
<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;
<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:call-template name="linebreaks">
<xsl:with-param name="string" select="omschrijving"/>
</xsl:call-template>
</td>
</xsl:when>
<xsl:otherwise>
<td/>
</xsl:otherwise>
</xsl:choose>
</tr>
</xsl:for-each>
</xsl:if>
@@ -1555,7 +1549,6 @@
</table>
</xsl:template>
<xsl:template match="contract" mode="proforma_huur">
<table border="0" cellpadding="1">
<tr>
@@ -1664,7 +1657,6 @@
</table>
</xsl:template>
<xsl:template match="contract" mode="definitief_huur">
<table border="0" cellpadding="1">
<tr>
@@ -1809,8 +1801,6 @@
</xsl:choose>
</xsl:template>
<xsl:template match="rapport">
<xsl:choose>
<!-- <xsl:when test="@view = 'mdux_v_ins_qrc'">
@@ -1949,7 +1939,6 @@
</xsl:choose>
</xsl:template>
<xsl:template name="qrc_ins_new_page">
<xsl:param name="p_page"/>
<xsl:param name="p_rows"/>
@@ -2061,7 +2050,7 @@
<metaInformation>
<scenarios>
<scenario default="yes" name="Scenario1" userelativepaths="yes" externalpreview="no" url="..\..\..\TEMP\MDUX_files\bestelopdr17518_20180716121641_391.xml" htmlbaseurl="" outputurl="" processortype="saxon8" useresolver="yes" profilemode="0"
<scenario default="yes" name="Scenario1" userelativepaths="yes" externalpreview="no" url="..\..\..\TEMP\MDUX_files\melding3309_20180727113138_426.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"/>