From bce58f1dbe2e5c294d55b32ee97a905f359df637 Mon Sep 17 00:00:00 2001
From: Ruud Lipper <ruud.lipper@aareon.nl>
Date: Wed, 26 Oct 2016 10:09:13 +0000
Subject: [PATCH] UWVA#37570 mldfwd bon

svn path=/Website/branches/v2016.2/; revision=31224
---
 CUST/UWVA/xsl/cust.xsl | 40 +++++++++++++++-------------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/CUST/UWVA/xsl/cust.xsl b/CUST/UWVA/xsl/cust.xsl
index 5eda11566c..d9e9fdec16 100644
--- a/CUST/UWVA/xsl/cust.xsl
+++ b/CUST/UWVA/xsl/cust.xsl
@@ -1124,32 +1124,22 @@
 													</td>
 												</tr>
                         <xsl:if test="$srtnotificatiecode = 'MLDFWD' 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 align="right" valign="top" class="label">
-                                    <xsl:value-of select="//lcl/MLD/behandeling"/>
-                                  </td>
-                                </xsl:when>
-                                <xsl:otherwise>
-                                  <td/>
-                                </xsl:otherwise>
-                              </xsl:choose>
-                              <td colspan="3" class="value">
-                                <span>
-                                  <xsl:choose>
-                                    <xsl:when test="position() = 1">:&#xA0;</xsl:when>
-                                    <xsl:otherwise>&#xA0;&#xA0;</xsl:otherwise>
-                                  </xsl:choose><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:variable name="fwdtime">
+	                          <xsl:for-each select="tracking/track[@code='MLDFWD']/datum">
+	                            <xsl:sort select="timestamp" order="descending"/>
+	                            <xsl:if test="position() = 1"><xsl:value-of select="timestamp"/></xsl:if>
                           </xsl:for-each>
+                          </xsl:variable>
+                          <tr>
+                            <td align="right" valign="top" class="label">
+                              <xsl:value-of select="//lcl/MLD/behandeling"/>
+                            </td>
+                            <td colspan="3" class="value">:
+                              <xsl:call-template name="linebreaks">
+                                  <xsl:with-param name="string" select="notes/note/omschrijving[../aanmaak/timestamp=$fwdtime]"/>
+                               </xsl:call-template> 
+                            </td>
+                          </tr>
                         </xsl:if>    												
 												<xsl:if test="opmerking!=''">
 													<tr>