From f4272fdfebc20c9f3b4feb75f9a30c3ab6f74c42 Mon Sep 17 00:00:00 2001
From: Erik Groener <erik.groener@aareon.nl>
Date: Wed, 29 Jun 2022 12:00:31 +0000
Subject: [PATCH] FCLT#73218 Op de standaardbon voor opdrachten komt NaN voor

svn path=/Website/trunk/; revision=56419
---
 APPL/Shared/default.xsl | 138 ++++++++++++++++++++++++++++++++++------
 1 file changed, 120 insertions(+), 18 deletions(-)

diff --git a/APPL/Shared/default.xsl b/APPL/Shared/default.xsl
index 270cb04462..41290bcf99 100644
--- a/APPL/Shared/default.xsl
+++ b/APPL/Shared/default.xsl
@@ -487,6 +487,48 @@
       </xsl:if>
   </xsl:template>
 
+  <!-- template voor het netjes tonen van getallen -->
+  <!--   gebruik in aanroep default='' als er bij geen waarde ook een lege string moet worden terug gegeven. -->
+  <xsl:template name="shownumber">
+    <xsl:param name="getal"/>
+    <xsl:param name="default" select="'0'"/>
+    <xsl:param name="format" select="''"/>
+    <xsl:choose>
+        <xsl:when test="contains($format, '@')">
+            <!-- gebruik de decimal-format -->
+            <xsl:variable name="frmt" select="substring-before($format, '@')"/>
+            <xsl:choose>
+              <xsl:when test="string(number($getal))!='NaN'">
+                <xsl:value-of select="format-number($getal, $frmt, 'european')"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:if test="string(number($default))!='NaN'">
+                  <xsl:value-of select="format-number($default, $frmt, 'european')"/>
+                </xsl:if>
+              </xsl:otherwise>
+            </xsl:choose>
+        </xsl:when>
+        <xsl:otherwise>
+            <!-- geen decimal-format gebruiken -->
+            <xsl:choose>
+              <xsl:when test="string(number($getal))!='NaN'">
+                <xsl:value-of select="format-number($getal, $format)"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:if test="string(number($default))!='NaN'">
+                  <xsl:value-of select="format-number($default, $format)"/>
+                </xsl:if>
+              </xsl:otherwise>
+            </xsl:choose>
+
+        </xsl:otherwise>
+    </xsl:choose>
+
+
+  </xsl:template>
+
+
+
    <!-- URL NAAR DE FACILITOR KTO INVULPAGINA -->
   <xsl:template name="kto_url">
     <xsl:param name="bmr"/>
@@ -749,10 +791,16 @@
                         <xsl:value-of select="aantal"/>
                       </td>
                       <td class="besresult" style="text-align:right">
-                        <xsl:value-of select="format-number(prijs, '0,00', 'european')"/>
+                        <xsl:call-template name="shownumber">
+                          <xsl:with-param name="getal" select="prijs"/>
+                          <xsl:with-param name="format" select="'0,00@EU'"/>
+                        </xsl:call-template>
                       </td>
                       <td class="besresult" style="text-align:right">
-                        <xsl:value-of select="format-number(aantal*prijs, '0,00', 'european')"/>
+                        <xsl:call-template name="shownumber">
+                          <xsl:with-param name="getal" select="aantal*prijs"/>
+                          <xsl:with-param name="format" select="'0,00@EU'"/>
+                        </xsl:call-template>
                       </td>
                     </tr>
                   </xsl:for-each>
@@ -764,7 +812,10 @@
                   <tr>
                     <td class="label" style="text-align:right;border-style:solid;border-width:0px;" colspan="5"><xsl:value-of select="//lcl/BES/transportkosten"/>:</td>
                     <td class="label" style="text-align:right;border-style:solid;border-width:0px;">
-                      <xsl:value-of select="format-number(/facilitor/bestelling/levkosten, '0,00', 'european')"/>
+                      <xsl:call-template name="shownumber">
+                        <xsl:with-param name="getal" select="/facilitor/bestelling/levkosten"/>
+                        <xsl:with-param name="format" select="'0,00@EU'"/>
+                      </xsl:call-template>
                     </td>
                   </tr>
                   </xsl:if>
@@ -772,7 +823,10 @@
                   <tr>
                     <td class="tekstkop" style="text-align:right;border-style:solid;border-width:0px;" colspan="5"><xsl:value-of select="//lcl/FAC/totaal"/>:</td>
                     <td class="tekstkop" style="text-align:right;border-style:solid;border-width:0px;">
-                      <xsl:value-of select="format-number(sum(/facilitor/bestelling/bestelitem/totaal)+ /facilitor/bestelling/levkosten, '0,00', 'european')"/>
+                      <xsl:call-template name="shownumber">
+                        <xsl:with-param name="getal" select="sum(/facilitor/bestelling/bestelitem/totaal)+ /facilitor/bestelling/levkosten"/>
+                        <xsl:with-param name="format" select="'0,00@EU'"/>
+                      </xsl:call-template>
                     </td>
                   </tr>
                 </table>
@@ -1845,7 +1899,10 @@ END:VCALENDAR
                 <b><xsl:value-of select="//lcl/MLD/uitvoertijd"/>:</b>
               </td>
               <td width="34%">
-                <xsl:value-of select="format-number(uitvoertijd, '0.##')"/>&#160;<xsl:value-of select="//lcl/MLD/uren"/>
+                <xsl:call-template name="shownumber">
+                  <xsl:with-param name="getal" select="uitvoertijd"/>
+                  <xsl:with-param name="format" select="'0.##'"/>
+                </xsl:call-template>&#160;<xsl:value-of select="//lcl/MLD/uren"/>
               </td>
             </xsl:when>
             <xsl:otherwise>
@@ -2288,21 +2345,42 @@ END:VCALENDAR
           <b><xsl:value-of select="//lcl/MLD/uren"/>:</b>
         </td>
         <td>
-          <xsl:value-of select="format-number(uren, '0,00', 'european')"/>
-          <b>&#xA0;à&#xA0;</b>&#x20AC;&#xA0;<xsl:value-of select="format-number(uurloon, '0,00', 'european')"/></td>
+          <xsl:call-template name="shownumber">
+            <xsl:with-param name="getal" select="uren"/>
+            <xsl:with-param name="format" select="'0,00@EU'"/>
+          </xsl:call-template>
+
+          <b>&#xA0;à&#xA0;</b>&#x20AC;&#xA0;<xsl:call-template name="shownumber">
+                                              <xsl:with-param name="getal" select="uurloon"/>
+                                              <xsl:with-param name="format" select="'0,00@EU'"/>
+                                            </xsl:call-template>
+        </td>
         <td style="width:2in;text-align:left">
           <xsl:if test="statusopdr_key_refiat &gt; 0">
-            (<xsl:value-of select="//lcl/MLD/was"/>&#xA0;<xsl:value-of select="format-number(uren, '0,00', 'european')"/>
-            <b>&#xA0;à&#xA0;</b>&#x20AC;&#xA0;<xsl:value-of select="format-number(uurloon, '0,00', 'european')"/>)
+            (<xsl:value-of select="//lcl/MLD/was"/>&#xA0;<xsl:call-template name="shownumber">
+                                                           <xsl:with-param name="getal" select="uren"/>
+                                                           <xsl:with-param name="format" select="'0,00@EU'"/>
+                                                         </xsl:call-template>
+            <b>&#xA0;à&#xA0;</b>&#x20AC;&#xA0;<xsl:call-template name="shownumber">
+                                                <xsl:with-param name="getal" select="uurloon"/>
+                                                <xsl:with-param name="format" select="'0,00@EU'"/>
+                                              </xsl:call-template>)
           </xsl:if>
         </td>
         <td align="right">
           <b><xsl:value-of select="//lcl/MLD/arbeid"/>:</b>
         </td>
-        <td style="width:1in;text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number($arbeid, '0,00', 'european')"/></td>
+        <td style="width:1in;text-align:right">&#x20AC;&#xA0;<xsl:call-template name="shownumber">
+                                                               <xsl:with-param name="getal" select="$arbeid"/>
+                                                               <xsl:with-param name="format" select="'0,00@EU'"/>
+                                                             </xsl:call-template>
+        </td>
         <td style="width:1in;text-align:right">
           <xsl:if test="statusopdr_key_refiat &gt; 0">
-            (<xsl:value-of select="//lcl/MLD/was"/> &#x20AC;&#xA0;<xsl:value-of select="format-number($arbeid_refiat, '0,00', 'european')"/>)
+            (<xsl:value-of select="//lcl/MLD/was"/> &#x20AC;&#xA0;<xsl:call-template name="shownumber">
+                                              <xsl:with-param name="getal" select="$arbeid_refiat"/>
+                                              <xsl:with-param name="format" select="'0,00@EU'"/>
+                                            </xsl:call-template>)
           </xsl:if>
         </td>
       </tr>
@@ -2312,10 +2390,17 @@ END:VCALENDAR
             <td align="right">
               <b><xsl:value-of select="//lcl/MLD/materiaal"/>:</b>
             </td>
-            <td style="width:1in;text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number(materiaal, '0,00', 'european')"/></td>
+            <td style="width:1in;text-align:right">&#x20AC;&#xA0;<xsl:call-template name="shownumber">
+                                                                   <xsl:with-param name="getal" select="materiaal"/>
+                                                                   <xsl:with-param name="format" select="'0,00@EU'"/>
+                                                                 </xsl:call-template>
+            </td>
             <td style="width:1in;text-align:right">
               <xsl:if test="statusopdr_key_refiat &gt; 0">
-                (<xsl:value-of select="//lcl/MLD/was"/> &#x20AC;&#xA0;<xsl:value-of select="format-number(materiaal_refiat, '0,00', 'european')"/>)
+                (<xsl:value-of select="//lcl/MLD/was"/> &#x20AC;&#xA0;<xsl:call-template name="shownumber">
+                                                                        <xsl:with-param name="getal" select="materiaal_refiat"/>
+                                                                        <xsl:with-param name="format" select="'0,00@EU'"/>
+                                                                      </xsl:call-template>)
               </xsl:if>
             </td>
           </tr>
@@ -2330,10 +2415,17 @@ END:VCALENDAR
         <td align="right">
           <b><xsl:value-of select="//lcl/MLD/correctie"/>:</b>
         </td>
-        <td style="width:1in;text-align:right">&#x20AC;&#xA0;<xsl:value-of select="format-number($correctie, '0,00', 'european')"/></td>
+        <td style="width:1in;text-align:right">&#x20AC;&#xA0;<xsl:call-template name="shownumber">
+                                                               <xsl:with-param name="getal" select="$correctie"/>
+                                                               <xsl:with-param name="format" select="'0,00@EU'"/>
+                                                             </xsl:call-template>
+        </td>
         <td style="width:1in;text-align:right">
           <xsl:if test="statusopdr_key_refiat &gt; 0">
-            (<xsl:value-of select="//lcl/MLD/was"/> &#x20AC;&#xA0;<xsl:value-of select="format-number($correctie_refiat, '0,00', 'european')"/>)
+            (<xsl:value-of select="//lcl/MLD/was"/> &#x20AC;&#xA0;<xsl:call-template name="shownumber">
+                                                                    <xsl:with-param name="getal" select="$correctie_refiat"/>
+                                                                    <xsl:with-param name="format" select="'0,00@EU'"/>
+                                                                  </xsl:call-template>)
           </xsl:if>
         </td>
       </tr>
@@ -2344,11 +2436,17 @@ END:VCALENDAR
           <b><xsl:value-of select="//lcl/FAC/totaal"/>:</b>
         </td>
         <td style="width:1in;text-align:right">
-          <b>&#x20AC;&#xA0;<xsl:value-of select="format-number(kosten, '0,00', 'european')"/></b>
+          <b>&#x20AC;&#xA0;<xsl:call-template name="shownumber">
+                             <xsl:with-param name="getal" select="kosten"/>
+                             <xsl:with-param name="format" select="'0,00@EU'"/>
+                           </xsl:call-template></b>
         </td>
         <td style="width:1in;text-align:right">
           <xsl:if test="statusopdr_key_refiat &gt; 0">
-            (<xsl:value-of select="//lcl/MLD/was"/> &#x20AC;&#xA0;<xsl:value-of select="format-number(kosten_refiat, '0,00', 'european')"/>)
+            (<xsl:value-of select="//lcl/MLD/was"/> &#x20AC;&#xA0;<xsl:call-template name="shownumber">
+                                                                    <xsl:with-param name="getal" select="kosten_refiat"/>
+                                                                    <xsl:with-param name="format" select="'0,00@EU'"/>
+                                                                  </xsl:call-template>)
           </xsl:if>
         </td>
       </tr>
@@ -2533,7 +2631,11 @@ END:VCALENDAR
                     <td>
                       <xsl:value-of select="bezetter/naam_full"/>
                     </td>
-                    <td><xsl:value-of select="../omschrijving"/>&#xA0;(<xsl:value-of select="format-number(wpopp, '###0.00')"/>m2, <xsl:value-of select="bezetting"/>%)</td>
+                    <td><xsl:value-of select="../omschrijving"/>&#xA0;(<xsl:call-template name="shownumber">
+                                                                         <xsl:with-param name="getal" select="wpopp"/>
+                                                                         <xsl:with-param name="format" select="'###0,00@EU'"/>
+                                                                       </xsl:call-template>m2, <xsl:value-of select="bezetting"/>%)
+                    </td>
                     <td>
                       <xsl:value-of select="bezetter/afdeling/naam"/>
                       <xsl:value-of select="bezetter_afdeling/naam"/>