Merge Release 2017.2 Gold D

svn path=/Website/trunk/; revision=36548
This commit is contained in:
Jos Groot Lipman
2018-01-10 16:53:44 +00:00
10 changed files with 795 additions and 10 deletions

View File

@@ -321,6 +321,8 @@ api2 = {
var safe_val = 0;
else
var safe_val = parseInt(filterval, 10);
if (field.invert)
safe_val = (safe_val==1?0:1);
if (isNaN(safe_val))
{
return ["0=1"]; // niets gevonden

View File

@@ -44,6 +44,7 @@ function model_alg_srtgebouw()
"dbs": "alg_srtgebouw_passief",
"label": L("alg_srtgebouw_passief"),
"typ": "check",
"invert": true,
"multiedit": true
}
};

View File

@@ -21,14 +21,15 @@ __Logging = 0; // Is te laat...
var sql = getFParam("sql", getQParam("sql", ""));
// Als er exact <20><>n SELECT, FROM en WHERE is doen we een beetje formatting
if ((sql.match(/SELECT/ig) || []).length == 1 &&
if ( sql.indexOf("\n") == -1 &&
(sql.match(/SELECT/ig) || []).length == 1 &&
(sql.match(/FROM/ig) || []).length == 1 &&
(sql.match(/WHERE/ig) || []).length == 1)
{
sql = sql.replace(/[a-z] FROM/i, "\nFROM");
sql = sql.replace(/[a-z] WHERE/i, "\nWHERE");
sql = sql.replace(/[a-z] ORDER BY/i, "\nORDER BY");
sql = sql.replace(/[a-z] GROUP BY/i, "\nGROUP BY");
sql = sql.replace(/ FROM/i, "\nFROM");
sql = sql.replace(/ WHERE/i, "\nWHERE");
sql = sql.replace(/ ORDER BY/i, "\nORDER BY");
sql = sql.replace(/ GROUP BY/i, "\nGROUP BY");
sql = sql.replace(/ AND/ig, "\n AND");
sql = sql.replace(/ , /ig, ", ");
}

View File

@@ -656,8 +656,9 @@ function mld_list (pautfunction, params)
function fncolNote(oRs)
{
if (oRs("notitie").Value != null)
return (outputmode == 0 ? I("fa-comment"): oRs("notitie").Value);
else return "";
return (outputmode == 0? I("fa-comment"): Server.HTMLEncode(oRs("notitie").Value)); // Hier geen safe.html omdat we voor Excel de <br> naar \n vertaling niet kunnen hebben.
else return ""; // Met <br> krijg je een nieuwe rij in excel
// Zie ook ResultsetTable.formatValue (kunnen we die niet eens gaan inzetten :-)
}
function fncolObject(oRs)

View File

@@ -0,0 +1,117 @@
<?xml version="1.0" encoding="utf-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" version="1.0">
<xsl:import href="./F_SIDB_common.xsl"/>
<xsl:import href="./F_SIDB_005.xsl"/>
<xsl:output method="xml" indent="yes" encoding="utf-8"/>
<xsl:decimal-format name="european" decimal-separator="," grouping-separator="."/>
<xsl:param name="mode"/>
<xsl:variable name="Rev">
<!-- Revision -->
<xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
</xsl:variable>
<xsl:template match="SOAPEnvelope">
<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns="https://www.ketenstandaard.nl/WS/MessageService/3.0" xmlns:ns="https://www.ketenstandaard.nl/WS/MessageService/3.0" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
<soap:Header>
<ns:CustomInfo>
<IsTestMessage>false</IsTestMessage>
<!--Optional:-->
<LanguageCode>NL</LanguageCode>
<IsContentCompressed>false</IsContentCompressed>
<ApplicationId>Mareon</ApplicationId>
<VersionId><xsl:apply-templates select="etim/header/etim_VersionId"/></VersionId>
<RelationId>Mareon</RelationId>
</ns:CustomInfo>
<wsse:Security>
<wsse:UsernameToken>
<wsse:Username><xsl:apply-templates select="etim/header/etim_UserId"/></wsse:Username>
<wsse:Password><xsl:apply-templates select="etim/header/etim_Password"/></wsse:Password>
</wsse:UsernameToken>
</wsse:Security>
</soap:Header>
<soap:Body>
<ns:Message>
<MsgProperties>
<MsgId><xsl:apply-templates select="etim/header/etim_MsgId"/></MsgId>
<MsgDateTime><xsl:apply-templates select="etim/header/etim_MsgDateTime"/></MsgDateTime>
<MsgFormat>SALES</MsgFormat>
<MsgVersion>005</MsgVersion>
<MsgType>MTNINS</MsgType>
</MsgProperties>
<MsgContent>
<!--You may enter ANY elements at this point-->
<xsl:apply-templates select="etim"/>
</MsgContent>
</ns:Message>
</soap:Body>
</soap:Envelope>
</xsl:template>
<xsl:template match="etim">
<xsl:for-each select="*">
<xsl:if test="name() = 'MaintenanceInstruction'">
<xsl:copy-of select="."/>
</xsl:if>
</xsl:for-each>
</xsl:template>
<!-- Uitpakken SOAP envelope -->
<xsl:template match="soap:Envelope">
<soapResult>
<xsl:copy-of select="soap:Body/node()"/>
</soapResult>
</xsl:template>
<!-- Decoderen XML response -->
<xsl:template match="soapResult">
<Result>
<xsl:choose>
<xsl:when test="PostMessageResponse/PostMessageResult = 'true'"></xsl:when>
<xsl:otherwise>
Foutmelding: <xsl:value-of select="PostMessageResponse/Message"/>
</xsl:otherwise>
</xsl:choose>
</Result>
</xsl:template>
<xsl:template match="facilitor">
<xsl:apply-templates select="opdracht"/>
</xsl:template>
<xsl:template match="/">
<xsl:choose>
<xsl:when test="$mode='getExtension'">
<xsl:element name="format">
<xsl:element name="extension">cxml</xsl:element>
</xsl:element>
</xsl:when>
<xsl:otherwise>
<!-- door SendFile.cls gebruikt voor maken 'bon' (XML die via SOAP verstuurd wordt) -->
<xsl:apply-templates select="facilitor"/>
<!-- door SendSOAP.cls gebruikt voor inpakken van 'bon' in SOAP envelope
SOAPEnvelope is een harde tag die in PutOrders gedefinieerd wordt. -->
<xsl:apply-templates select="SOAPEnvelope"/>
<!-- door SendSOAP.cls gebruikt voor uitpakken van response uit SOAP envelope -->
<xsl:apply-templates select="soap:Envelope"/>
<!-- door SendSOAP.cls gebruikt voor uitpakken van de inhoud uit het bericht -->
<xsl:apply-templates select="soapResult"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
</xsl:stylesheet>

View File

@@ -0,0 +1,119 @@
<?xml version="1.0" encoding="utf-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" version="1.0">
<xsl:import href="./F_SIDB_common.xsl"/>
<xsl:import href="./F_SIDB_005.xsl"/>
<xsl:output method="xml" indent="yes" encoding="utf-8"/>
<xsl:decimal-format name="european" decimal-separator="," grouping-separator="."/>
<xsl:param name="mode"/>
<xsl:variable name="Rev">
<!-- Revision -->
<xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
</xsl:variable>
<xsl:template match="SOAPEnvelope">
<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns="https://www.ketenstandaard.nl/WS/MessageService/3.0" xmlns:ns="https://www.ketenstandaard.nl/WS/MessageService/3.0" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
<soap:Header>
<ns:CustomInfo>
<IsTestMessage>false</IsTestMessage>
<!--Optional:-->
<LanguageCode>NL</LanguageCode>
<IsContentCompressed>false</IsContentCompressed>
<ApplicationId>Mareon</ApplicationId>
<VersionId><xsl:apply-templates select="etim/header/etim_VersionId"/></VersionId>
<RelationId>Mareon</RelationId>
</ns:CustomInfo>
<wsse:Security>
<wsse:UsernameToken>
<wsse:Username><xsl:apply-templates select="etim/header/etim_UserId"/></wsse:Username>
<wsse:Password><xsl:apply-templates select="etim/header/etim_Password"/></wsse:Password>
</wsse:UsernameToken>
</wsse:Security>
</soap:Header>
<soap:Body>
<ns:Message>
<MsgProperties>
<MsgId><xsl:apply-templates select="etim/header/etim_MsgId"/></MsgId>
<MsgDateTime><xsl:apply-templates select="etim/header/etim_MsgDateTime"/></MsgDateTime>
<MsgFormat>SALES</MsgFormat>
<MsgVersion>005</MsgVersion>
<MsgType>MTNINS</MsgType>
</MsgProperties>
<MsgContent>
<!--You may enter ANY elements at this point-->
<xsl:text disable-output-escaping="yes">&lt;![CDATA[</xsl:text>
<xsl:apply-templates select="etim"/>
<xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
</MsgContent>
</ns:Message>
</soap:Body>
</soap:Envelope>
</xsl:template>
<xsl:template match="etim">
<xsl:for-each select="*">
<xsl:if test="name() = 'MaintenanceInstruction'">
<xsl:copy-of select="."/>
</xsl:if>
</xsl:for-each>
</xsl:template>
<!-- Uitpakken SOAP envelope -->
<xsl:template match="soap:Envelope">
<soapResult>
<xsl:copy-of select="soap:Body/node()"/>
</soapResult>
</xsl:template>
<!-- Decoderen XML response -->
<xsl:template match="soapResult">
<Result>
<xsl:choose>
<xsl:when test="PostMessageResponse/PostMessageResult = 'true'"></xsl:when>
<xsl:otherwise>
Foutmelding: <xsl:value-of select="PostMessageResponse/Message"/>
</xsl:otherwise>
</xsl:choose>
</Result>
</xsl:template>
<xsl:template match="facilitor">
<xsl:apply-templates select="opdracht"/>
</xsl:template>
<xsl:template match="/">
<xsl:choose>
<xsl:when test="$mode='getExtension'">
<xsl:element name="format">
<xsl:element name="extension">cxml</xsl:element>
</xsl:element>
</xsl:when>
<xsl:otherwise>
<!-- door SendFile.cls gebruikt voor maken 'bon' (XML die via SOAP verstuurd wordt) -->
<xsl:apply-templates select="facilitor"/>
<!-- door SendSOAP.cls gebruikt voor inpakken van 'bon' in SOAP envelope
SOAPEnvelope is een harde tag die in PutOrders gedefinieerd wordt. -->
<xsl:apply-templates select="SOAPEnvelope"/>
<!-- door SendSOAP.cls gebruikt voor uitpakken van response uit SOAP envelope -->
<xsl:apply-templates select="soap:Envelope"/>
<!-- door SendSOAP.cls gebruikt voor uitpakken van de inhoud uit het bericht -->
<xsl:apply-templates select="soapResult"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
</xsl:stylesheet>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:msxml="urn:schemas-microsoft-com:xslt" version="1.0">
<xsl:output method="xml" indent="yes" encoding="utf-8"/>
<xsl:decimal-format name="european" decimal-separator="," grouping-separator="."/>
@@ -90,6 +90,137 @@
</xsl:if>
</xsl:template>
<!-- Parse XML-String to XML-object -->
<xsl:template name="parseXml">
<xsl:param name="text"/>
<xsl:param name="default_namespace"/>
<xsl:choose>
<xsl:when test="contains($text, '&gt;')">
<xsl:variable name="topLevelTag">
<xsl:call-template name="getTopLevelTag">
<xsl:with-param name="text" select="$text"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="openingTag">
<xsl:value-of select="$topLevelTag"/>
</xsl:variable>
<xsl:variable name="tagName">
<xsl:call-template name="getTopLevelTagName">
<xsl:with-param name="text" select="$text"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="closingTag">
<xsl:value-of select="concat('&lt;/',$tagName,'&gt;')"/>
</xsl:variable>
<xsl:variable name="firstNode">
<xsl:if test="not(contains($topLevelTag,'/&gt;'))">
<xsl:value-of select="substring-before(substring-after($text,$openingTag),$closingTag)"/>
</xsl:if>
</xsl:variable>
<xsl:variable name="afterFirstNode">
<xsl:choose>
<xsl:when test="not(contains($topLevelTag,'/&gt;'))">
<xsl:value-of select="substring-after($text,concat($firstNode,$closingTag))"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="substring-after($text,$topLevelTag)"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:element name="{$tagName}" namespace="{$default_namespace}">
<xsl:call-template name="createAttributes">
<xsl:with-param name="text" select="$topLevelTag"/>
</xsl:call-template>
<xsl:call-template name="parseXml">
<xsl:with-param name="text" select="$firstNode"/>
<xsl:with-param name="default_namespace" select="$default_namespace"/>
</xsl:call-template>
</xsl:element>
<xsl:call-template name="parseXml">
<xsl:with-param name="text" select="$afterFirstNode"/>
<xsl:with-param name="default_namespace" select="$default_namespace"/>
</xsl:call-template>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$text"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="getTopLevelTagName">
<xsl:param name="text"/>
<xsl:choose>
<xsl:when test="contains($text, '&gt;')">
<xsl:variable name="tagWithAttributesWithoutEnd">
<xsl:value-of select="substring-before($text, '&gt;')"/>
</xsl:variable>
<xsl:variable name="tagWithAttributesWithoutBegining">
<xsl:value-of select="substring-after($tagWithAttributesWithoutEnd, '&lt;')"/>
</xsl:variable>
<xsl:variable name="tagName">
<xsl:choose>
<xsl:when test="contains($tagWithAttributesWithoutBegining,' ')">
<xsl:value-of
select="substring-before($tagWithAttributesWithoutBegining, ' ')"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$tagWithAttributesWithoutBegining"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:value-of select="$tagName"/>
</xsl:when>
</xsl:choose>
</xsl:template>
<xsl:template name="getTopLevelTag">
<xsl:param name="text"/>
<xsl:choose>
<xsl:when test="contains($text, '&gt;')">
<xsl:variable name="tagWithAttributesWithoutEnd">
<xsl:value-of select="substring-before($text, '&gt;')"/>
</xsl:variable>
<xsl:value-of select="concat($tagWithAttributesWithoutEnd,'&gt;')"/>
</xsl:when>
</xsl:choose>
</xsl:template>
<xsl:template name="createAttributes">
<xsl:param name="text"/>
<xsl:choose>
<xsl:when test="contains($text, '=&quot;')">
<xsl:variable name="attributeName">
<xsl:value-of select="substring-before(substring-after($text,' '),'=&quot;')"/>
</xsl:variable>
<xsl:message>
<xsl:value-of select="$text"/>
</xsl:message>
<xsl:variable name="attributeValue">
<xsl:value-of select="substring-before(substring-after($text,concat($attributeName,'=&quot;')),'&quot;')"/>
</xsl:variable>
<xsl:choose>
<xsl:when test="contains($attributeName, 'xmlns')">
<xsl:variable name="ns_prefix"><xsl:value-of select="substring-after($attributeName,'xmlns:')"/></xsl:variable>
<xsl:choose>
<xsl:when test="$ns_prefix != ''">
<xsl:variable name="dummy"><xsl:element name="{$ns_prefix}:dummy" namespace="{$attributeValue}"/></xsl:variable>
<xsl:copy-of select="msxml:node-set($dummy)//namespace::*"/>
</xsl:when>
</xsl:choose>
</xsl:when>
<xsl:when test="contains($attributeName, 'noNamespaceSchemaLocation')">
<xsl:variable name="ns_prefix"><xsl:value-of select="substring-before($attributeName,':noNamespaceSchemaLocation')"/></xsl:variable>
</xsl:when>
<xsl:otherwise>
<xsl:attribute name="{$attributeName}"><xsl:value-of select="$attributeValue"/></xsl:attribute>
</xsl:otherwise>
</xsl:choose>
<xsl:call-template name="createAttributes">
<xsl:with-param name="text" select="substring-after($text,concat($attributeName,'=&quot;',$attributeValue,'&quot;'))"/>
</xsl:call-template>
</xsl:when>
</xsl:choose>
</xsl:template>

View File

@@ -638,6 +638,95 @@
</TABLE>
</xsl:template>
<xsl:template match="bezoeker" mode="full">
<xsl:choose>
<xsl:when test="$mode='summary'"></xsl:when>
<xsl:otherwise>
<xsl:choose>
<xsl:when test="$srtnotificatiecode = 'BEZBAD'">
<xsl:apply-templates select="." mode="badge"/>
</xsl:when>
<xsl:otherwise>
<html>
<xsl:comment>================================ BEZOEKER ==============================</xsl:comment>
<xsl:comment>FACILITOR default XSL template for bezoeker</xsl:comment>
<xsl:call-template name="htmlhead"/>
<xsl:element name="body">
<xsl:if test="$mode!='email'">
<xsl:attribute name="onload">window.print();</xsl:attribute>
</xsl:if>
<xsl:call-template name="pageheader"/>
<xsl:apply-templates select="." mode="include"/>
<xsl:call-template name="pagefooter"/>
</xsl:element>
</html>
</xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template match="bezoeker" mode="badge">
<html>
<xsl:call-template name="htmlhead"/>
<style>@page { size: auto; /* auto is the initial value */
margin: 0mm 0mm 0mm 5mm;
}
html,body {
padding:0; margin:0;
border: none;
width:89mm; height:41mm;
position: absolute;
}
</style>
<xsl:element name="body">
<xsl:if test="$mode!='email'">
<xsl:attribute name="onload">window.print();</xsl:attribute>
</xsl:if>
<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="300px">
<tr>
<td colspan="4" style="text-align:left;">
<xsl:element name="img">
<xsl:attribute name="width">300px</xsl:attribute>
<xsl:attribute name="src">../../cust/<xsl:value-of select="//header/custId"/>/xsl/nid.png</xsl:attribute>
</xsl:element>
</td>
<tr>
<td>&#xA0;</td>
<td style="height: 1px"><hr color="#000000"/></td>
</tr>
</tr>
<tr>
<td style="text-align:right; font-size:12px; font-weight: normal;">Visitor:&#xA0;&#xA0;</td>
<td style="text-align:left; font-size:12px; font-weight: bold;"><xsl:value-of select="naam"/></td>
</tr>
<tr>
<td style="height: 1px"></td>
</tr>
<tr>
<td style="text-align:right; font-size:12px; font-weight: normal;">Company:&#xA0;&#xA0;</td>
<td style="text-align:left; font-size:12px; font-weight: bold;"><xsl:value-of select="bedrijf"/></td>
</tr>
<tr>
<td style="height: 1px"></td>
</tr>
<tr>
<td style="text-align:right; font-size:12px; font-weight: normal;">Host:&#xA0;&#xA0;</td>
<td style="text-align:left; font-size:12px; font-weight: bold;"><xsl:value-of select="afspraak/host_user/naam_full"/></td>
</tr>
<tr>
<td style="height: 5px"></td>
</tr>
<tr>
<td/>
<td style="text-align:left; font-size:20px; color:#000000;font-weight: bold; normal;">
Guest / Visitor
</td>
</tr>
</TABLE>
</xsl:element>
</html>
</xsl:template>
<xsl:template match="key">
</xsl:template>

BIN
CUST/NMPC/xsl/nid.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 94 KiB

View File

@@ -2,7 +2,7 @@
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:msxml="urn:schemas-microsoft-com:xslt">
<xsl:import href="../../../appl/shared/default.xsl"/>
<xsl:variable name="Xsrtnotificatiecode">CUST03</xsl:variable>
<xsl:variable name="Xsrtnotificatiecode">MLDBEH</xsl:variable>
<!-- ****************************************************************************************************************** -->
<!-- Hier komen de USER-rapportage functies -->
@@ -300,6 +300,330 @@
</td>
</tr>
</xsl:when>
<xsl:when test="$srtnotificatiecode='MLDNOT'">
<tr>
<td colspan="4" class="tekst" style="padding-top:30px; font:Verdana ;">
Beste <xsl:value-of select="melder/naam_friendly"/>,
<br/>
<br/>
Er is een notitie geplaatst bij uw melding:
<br/>
<br/>
<b> <u> <xsl:value-of select="//lcl/MLD/melding"/>&#160;
<xsl:value-of select="key"/>
<xsl:if test="onderwerp != ''">&#160;<xsl:value-of select="onderwerp"/>
</xsl:if> </u> </b>
<br/>
<br/>
</td>
</tr>
<tr>
<td colspan="4" class="tekst" style="padding-top:20px;">
<br/>
<br/>
Met vriendelijke groet,
<br/>
Receptie WZU Veluwe <br/>
Locatie <xsl:value-of select="plaats/regio/district/locatie/gebouw/naam"/>
<br/>
<br/>
</td>
</tr>
</xsl:when>
<xsl:otherwise>
<table border="0" width="100%" cellpadding="2">
<tr>
<td colspan="2" class="caption" style="padding-top:20px;padding-bottom:20px">
<b>
<xsl:value-of select="//lcl/MLD/melding"/>&#160;<xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/>
<xsl:if test="onderwerp != ''">:&#160;<xsl:value-of select="onderwerp"/></xsl:if>
</b>
</td>
<td colspan="2" class="caption" style="padding-top:20px;padding-bottom:20px">
<xsl:if test="spoed&lt;3">
<b><xsl:value-of select="//lcl/MLD/spoed"/></b>
</xsl:if>
</td>
</tr>
<xsl:if test="not(//opdracht/extra_key) and extra_key">
<xsl:variable name="mx_key"><xsl:value-of select="extra_key"/></xsl:variable>
<tr>
<td align="right" valign="top" style="padding-top:10px;">
<b><xsl:value-of select="//lcl/FAC/bericht"/>:</b>
</td>
<td colspan="3" style="padding-top:10px;">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="notes/note[key=$mx_key]/omschrijving"/>
</xsl:call-template>
</td>
</tr>
<tr>
<td colspan="4" style="padding-bottom:20px;">
<hr/>
</td>
</tr>
</xsl:if>
<tr>
<td align="right" width="16%">
<b><xsl:value-of select="//lcl/FAC/aanvrager"/>:</b>
</td>
<td align="left" width="34%">
<xsl:value-of select="voor/naam_full"/>
</td>
<td align="right" width="16%">
<b><xsl:value-of select="//lcl/FAC/telefoon"/>:</b>
</td>
<td align="left" width="34%">
<xsl:if test="voor/telefoonnr=''">-</xsl:if>
<xsl:value-of select="voor/telefoonnr"/>
</td>
</tr>
<xsl:if test="string(voor/naam_full)!=string(voor/naam_full)">
<tr>
<td align="right" width="16%"><b><xsl:value-of select="//lcl/MLD/meldingvoor"/>:</b></td>
<td align="left" width="34%"><xsl:value-of select="voor/naam_full"/></td>
</tr>
</xsl:if>
<tr>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/locatie"/>:</b>
</td>
<td align="left">
<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/code"/>&#xA0;
<xsl:if test="voor/werkplek/plaats/regio/district/locatie/omschrijving!=''">(<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/omschrijving"/>)</xsl:if>
</td>
<td align="right" valign="top">
<b><xsl:value-of select="//lcl/FAC/afdeling"/>:</b>
</td>
<td align="left">
<xsl:value-of select="voor/afdeling/omschrijving"/>
</td>
</tr>
<xsl:if test="voor/werkplek/plaats/regio/district/locatie/gebouw/code!=''">
<tr>
<td align="right" valign="top">
<b><xsl:value-of select="//lcl/FAC/werkplek"/>:</b>
</td>
<td align="left">
<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/code"/>-<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/naam"/><br/>
<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/code"/>&#xA0;<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/ruimte/nr"/>&#xA0;
<xsl:if test="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving!=''">(<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving"/>)</xsl:if>
</td>
<td colspan="2"/>
</tr>
</xsl:if>
<tr height="40px">
<td colspan="4">
<hr/>
</td>
</tr>
<tr>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/locatie"/>:</b>
</td>
<td align="left">
<xsl:value-of select="plaats/regio/district/locatie/code"/>&#xA0;
<xsl:if test="plaats/regio/district/locatie/omschrijving!=''">(<xsl:value-of select="plaats/regio/district/locatie/omschrijving"/>)</xsl:if>
</td>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/status"/>:</b>
</td>
<td align="left">
<xsl:value-of select="status"/>
</td>
</tr>
<tr>
<xsl:choose>
<xsl:when test="plaats/@type='T'">
<td align="right">
<b><xsl:value-of select="//lcl/FAC/terrein"/>:</b>
</td>
<td align="left">
<xsl:value-of select="plaats/regio/district/locatie/terrein/code"/>-<xsl:value-of select="plaats/regio/district/locatie/terrein/naam"/></td>
</xsl:when>
<xsl:otherwise>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/gebouw"/>:</b>
</td>
<td align="left">
<xsl:value-of select="plaats/regio/district/locatie/gebouw/code"/>-<xsl:value-of select="plaats/regio/district/locatie/gebouw/naam"/></td>
</xsl:otherwise>
</xsl:choose>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/melddatum"/>:</b>
</td>
<td align="left">
<xsl:value-of select="gemeld/datum"/>&#xA0;
<xsl:value-of select="gemeld/tijd"/>
</td>
</tr>
<tr>
<xsl:if test="plaats/@type='T' or plaats/@type='G'">
<td colspan="2"/>
</xsl:if>
<xsl:if test="plaats/@type!='T' and plaats/@type!='G'">
<td align="right">
<b><xsl:value-of select="//lcl/FAC/bouwlaag"/>:</b>
</td>
<td align="left">
<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/code"/>&#xA0;
<xsl:if test="plaats/regio/district/locatie/gebouw/verdieping/omschrijving!=''">(<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/omschrijving"/>)</xsl:if>
</td>
</xsl:if>
<xsl:choose>
<xsl:when test="uitvoertijd[@eenheid='U']">
<td width="16%" align="right">
<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"/>
</td>
</xsl:when>
<xsl:otherwise>
<td width="16%" align="right">
<b><xsl:value-of select="//lcl/MLD/uitvoertijd"/>:</b>
</td>
<td width="34%">
<xsl:value-of select="uitvoertijd"/>&#160;<xsl:value-of select="//lcl/FAC/dagen"/>
</td>
</xsl:otherwise>
</xsl:choose>
</tr>
<tr>
<xsl:if test="plaats/@type='R'">
<td align="right" valign="top">
<b><xsl:value-of select="//lcl/FAC/ruimte"/>:</b>
</td>
<td align="left">
<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/ruimte/nr"/>&#xA0;
<xsl:if test="plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving!=''">(<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving"/>)</xsl:if>
</td>
</xsl:if>
<xsl:if test="plaats/@type!='R'">
<td colspan="2"/>
</xsl:if>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/datum_gereed"/>:</b>
</td>
<td align="left">
<xsl:value-of select="datum_gepland/datum"/>&#xA0;<xsl:value-of select="datum_gepland/tijd"/>
</td>
</tr>
<xsl:if test="kenmerk[@naam='Ordernr']!=''">
<tr>
<td colspan="2"/>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/ordernr"/>:</b>
</td>
<td align="left">
<xsl:value-of select="kenmerk[@naam='Ordernr']"/>
</td>
</tr>
</xsl:if>
<tr height="30px">
<td colspan="4"/>
</tr>
<tr>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/stdmelding"/>:</b>
</td>
<td align="left">
<xsl:if test="stdmelding/omschrijving=''">-</xsl:if>
<xsl:value-of select="stdmelding/omschrijving"/>
</td>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/vakgroep"/>:</b>
</td>
<td align="left">
<xsl:if test="discipline/omschrijving=''">-</xsl:if>
<xsl:value-of select="discipline/omschrijving"/>
</td>
</tr>
<xsl:comment>als we binnen een opdracht zijn, tonen we de meldingtekst niet</xsl:comment>
<tr>
<td align="right" valign="top">
<b><xsl:value-of select="//lcl/FAC/omschrijving"/>:</b>
</td>
<td align="left" colspan="3">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="omschrijving"/>
</xsl:call-template>
</td>
</tr>
<xsl:for-each select="kenmerk[@type!='L' and @type!='l' and @type!='Q' and count(@xmlnode)=0]">
<xsl:sort select="@volgnummer" data-type="number"/>
<xsl:if test=".!=''">
<tr>
<td align="right">
<b>
<xsl:value-of select="@naam"/>:</b>
</td>
<td colspan="3">
<xsl:value-of select="."/>
</td>
</tr>
</xsl:if>
</xsl:for-each>
<xsl:if test="count(deel)&gt;0">
<xsl:for-each select="deel">
<xsl:sort select="omschrijving"/>
<tr>
<xsl:choose>
<xsl:when test="position()=1">
<td align="right" valign="top">
<b><xsl:value-of select="//lcl/MLD/objecten"/>:</b>
</td>
</xsl:when>
<xsl:otherwise>
<td/>
</xsl:otherwise>
</xsl:choose>
<td align="left" valign="top">
<xsl:value-of select="omschrijving"/>
</td>
<td colspan="2" valign="top">
<xsl:comment>NADER TE DEFINIEREN</xsl:comment>
</td>
</tr>
</xsl:for-each>
</xsl:if>
<xsl:if test="behandelwijze=2 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">
<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;
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="omschrijving"/>
</xsl:call-template>
</td>
</tr>
</xsl:for-each>
</xsl:if>
<xsl:if test="opmerking!=''">
<tr>
<td align="right" valign="top">
<b><xsl:value-of select="//lcl/MLD/afhandeling"/>:</b>
</td>
<td colspan="3">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="opmerking"/>
</xsl:call-template>
</td>
</tr>
</xsl:if>
</table>
</xsl:otherwise>
</xsl:choose>
</table>
</xsl:template>