Merge 2016.2 patches

svn path=/Website/trunk/; revision=32281
This commit is contained in:
Jos Groot Lipman
2017-01-09 16:04:44 +00:00
18 changed files with 3335 additions and 2854 deletions

View File

@@ -45,6 +45,10 @@ Locatie: <xsl:value-of select="melding/plaats/regio/district/locatie/code"/>
</xsl:if>
</xsl:for-each>
</omschrijving>
<xsl:element name="kenmerk">
<xsl:attribute name="naam">Refnr. aanvrager</xsl:attribute>
<xsl:value-of select="melding/discipline/srtdiscipline/prefix"/><xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/>
</xsl:element>
<!--Alleen M-kenmerk bij MELDING kan worden doorgezet-->
<!--Naam-attribuut = naam van M-kenmerk aan BLCC-kant-->
<xsl:element name="kenmerk">

View File

@@ -2202,7 +2202,11 @@ p.MsoNormal {
<tr><td>Parking space:</td><td>
<xsl:choose>
<xsl:when test="plaats/regio/district/locatie/code='SSCA'">
Parking space is available.
Parking space is available. Please
<xsl:element name="a">
<xsl:attribute name="href">https://www.artfoundation.akzonobel.com/route_arnhem</xsl:attribute>
<xsl:attribute name="title">AkzoNobel website - mobility options</xsl:attribute>click here</xsl:element>
for travel information.
</xsl:when>
<xsl:when test="$nrOfpark=0">
No parking space is available, please

Binary file not shown.

Before

Width:  |  Height:  |  Size: 808 B

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

@@ -1,40 +1,114 @@
<?xml version="1.0" encoding="utf-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:import href="../../../appl/shared/default.xsl"/>
<xsl:variable name="Rev">
<!-- Revision van deze cust.xsl -->
<xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
</xsl:variable>
<xsl:import href="../../../appl/shared/default.xsl"/>
<xsl:variable name="Rev">
<!-- Revision van deze cust.xsl -->
<xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
</xsl:variable>
<xsl:variable name="xsrtnotificatiecode">MLDNEW</xsl:variable>
<xsl:template name="pageheader">
<table border="0" width="100%">
<xsl:choose>
<xsl:when test="$srtnotificatiecode = 'MLDNEW' or $srtnotificatiecode = 'MLDAFM'">
<tr>
<td>Beste <xsl:value-of select="//facilitor/melding/melder/naam_friendly"/>,<br/><br/>
<xsl:choose>
<xsl:when test="$srtnotificatiecode = 'MLDNEW'">Hartelijk dank voor uw melding /vraag<xsl:if test="//facilitor/melding/onderwerp != ''"> aangaande <xsl:value-of select="//facilitor/melding/onderwerp"/></xsl:if>, wij hebben uw melding in goede orde ontvangen en gaan het oppakken. U ontvangt op korte termijn een bericht met meer informatie of wanneer de melding of vraag afgehandeld is.<br/><br/></xsl:when>
<xsl:otherwise>Wij willen u hierbij informeren dat de melding met nummer <xsl:value-of select="//facilitor/melding/discipline/srtdiscipline/prefix"/><xsl:value-of select="//facilitor/melding/key"/> is opgelost en afgehandeld.<br/><br/></xsl:otherwise>
</xsl:choose>Mocht u nog verdere informatie wensen, dan vernemen wij dat graag.<br/><br/>
Met vriendelijke groet,<br/><br/>
<b>S</b>ervice <b>M</b>eld <b>P</b>unt<br/><br/>
<br/>Facilitaire Zaken<br/>
GVB Exploitatie B.V.</td>
</tr>
<tr>
<td>
<br/>
<br/>
<xsl:choose>
<xsl:when test="$mode='email'">
<img src="cid:tmpl_logo.gif"/>
</xsl:when>
<xsl:otherwise>
<xsl:element name="img">
<xsl:attribute name="src">../../cust/<xsl:value-of select="//header/custId"/>/tmpl_logo.gif</xsl:attribute>
</xsl:element>
</xsl:otherwise>
</xsl:choose>
<br/>
<br/>
</td>
</tr>
<tr>
<td>Telefoonnummer: 020-460 6040<br/>
Bezoekadres: Arlandaweg 106, 1043 HP Amsterdam<br/>
Postadres: Postbus 2131, 1000 CC Amsterdam<br/>
www.gvb.nl<br/><br/><br/>
<i>Meldinggegevens:</i>
</td>
</tr>
</xsl:when>
<xsl:otherwise>
<tr>
<td width="34%" bordercolor="#FFFFFF" align="center">
<xsl:choose>
<xsl:when test="$mode='email'">
<img src="cid:tmpl_logo.gif"/>
</xsl:when>
<xsl:otherwise>
<xsl:element name="img">
<xsl:attribute name="src">../../cust/<xsl:value-of select="//header/custId"/>/tmpl_logo.gif</xsl:attribute>
</xsl:element>
</xsl:otherwise>
</xsl:choose>
</td>
<td width="33%"></td>
<td width="33%" align="right" valign="bottom" style="text-align:right">
<b>
<xsl:value-of select="//lcl/FAC/printdatum"/>:&#xA0;</b>
<xsl:value-of select="//header/dateTime"/>
</td>
</tr>
</xsl:otherwise>
</xsl:choose>
</table>
</xsl:template>
<xsl:template match="opdracht" mode="include">
<table border="0" width="100%" cellpadding="2">
<tr>
<td colspan="4" class="caption" style="padding-top:20px;padding-bottom:20px">
<b>
<xsl:value-of select="opdrachttype/omschrijving"/>&#160;
<xsl:value-of select="opdrachttype/omschrijving"/>&#xA0;
<xsl:value-of select="melding/discipline/srtdiscipline/prefix"/>
<xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/></b>
<xsl:if test="geprint = 1">(kopie)</xsl:if>
</td>
</tr>
<xsl:if test="extra_key">
<xsl:variable name="ox_key"><xsl:value-of select="extra_key"/></xsl:variable>
<tr>
<td align="right" valign="top" style="padding-top:15px;padding-bottom:10px;">
<b><xsl:value-of select="//lcl/FAC/bericht"/>:</b>
</td>
<td colspan="3" style="padding-top:15px;padding-bottom:10px;">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="notes/note[key=$ox_key]/omschrijving"/>
</xsl:call-template>
</td>
</tr>
<tr>
<td colspan="4" style="padding-bottom:15px;">
<hr/>
</td>
</tr>
</xsl:if>
<xsl:if test="extra_key">
<xsl:variable name="ox_key">
<xsl:value-of select="extra_key"/>
</xsl:variable>
<tr>
<td align="right" valign="top" style="padding-top:15px;padding-bottom:10px;">
<b>
<xsl:value-of select="//lcl/FAC/bericht"/>:</b>
</td>
<td colspan="3" style="padding-top:15px;padding-bottom:10px;">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="notes/note[key=$ox_key]/omschrijving"/>
</xsl:call-template>
</td>
</tr>
<tr>
<td colspan="4" style="padding-bottom:15px;">
<hr/>
</td>
</tr>
</xsl:if>
<tr>
<td width="16%"/>
<td width="34%"/>
@@ -215,10 +289,5 @@
</tr>
</table>
</xsl:template>
</xsl:stylesheet>
<!-- Stylus Studio meta-information - (c) 2004-2006. Progress Software Corporation. All rights reserved.
<metaInformation>
<scenarios ><scenario default="yes" name="Scenario1" userelativepaths="yes" externalpreview="no" url="..\..\..\reportsCache\CONNopdracht4038.xml" htmlbaseurl="" outputurl="" processortype="internal" useresolver="yes" profilemode="0" profiledepth="" profilelength="" urlprofilexml="" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext="" validateoutput="no" validator="internal" customvalidator=""/></scenarios><MapperMetaTag><MapperInfo srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/><MapperBlockPosition></MapperBlockPosition><TemplateContext></TemplateContext><MapperFilter side="source"></MapperFilter></MapperMetaTag>
</metaInformation>
-->
<!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. -->

View File

@@ -464,16 +464,6 @@
</tr>
</xsl:if>
</table>
<p>Klik
<xsl:element name="a">
<xsl:attribute name="href">https://<xsl:value-of select="$FacilitorRoot"/>/cust/hcas/saml/?<xsl:value-of select="//bookmarks/melding"/>
<xsl:value-of select="key"/>
</xsl:attribute>
hier</xsl:element>
om deze melding te openen in het Facilitair Meldpunt.</p>
</td>
</tr>
</table>

File diff suppressed because it is too large Load Diff

View File

@@ -24,6 +24,16 @@
border: 0;
}
table.monitor td {
border: 1px solid grey;
border-collapse: collapse;
}
table.monitor th {
border: 1px solid white;
border-collapse: collapse;
}
table.details {
background-color: #366f7b;
}
@@ -3277,6 +3287,69 @@ Wij verzoeken u de met de uitvoeringsdatum en de werkzaamheden gespecificeerde f
</xsl:choose>
</table>
</xsl:if>
<xsl:if test="@view='KFNS_V_RAP_KOSTEN_MONITOR'">
<!-- vind de eerste kostensoort om daar op te filteren en zo
alle distinct gebouwen in een for-each te krijgen -->
<xsl:variable name="kostensoort">
<xsl:for-each select="rapport_data/data_row">
<xsl:if test="position()=1">
<xsl:value-of select="PRS_KOSTENSOORT_OMS"/>
</xsl:if>
</xsl:for-each>
</xsl:variable>
<!-- De lijst met alle records -->
<xsl:variable name="sorted">
<xsl:for-each select="rapport_data/data_row">
<xsl:sort select="ALG_GEBOUW_CODE"/>
<xsl:sort select="VOLGORDE"/>
<xsl:copy-of select="."/>
</xsl:for-each>
</xsl:variable>
<!-- Lijst met alleen de distinct gebouwen van de kostensoort
die we gevonden hebben hierboven -->
<xsl:variable name="distinct">
<xsl:for-each select="rapport_data/data_row">
<xsl:sort select="ALG_GEBOUW_CODE"/>
<xsl:if test="PRS_KOSTENSOORT_OMS = $kostensoort">
<xsl:copy-of select="."/>
</xsl:if>
</xsl:for-each>
</xsl:variable>
<table class="monitor">
<xsl:for-each select="msxml:node-set($distinct)/data_row">
<xsl:variable name="gebouw">
<xsl:value-of select="ALG_GEBOUW_CODE"/>
</xsl:variable>
<xsl:if test="position() = 1">
<th>Gebouw</th>
<xsl:for-each select="msxml:node-set($sorted)/data_row[ALG_GEBOUW_CODE=$gebouw]">
<th>
<xsl:value-of select="PRS_KOSTENSOORT_OMS"/>
</th>
</xsl:for-each>
</xsl:if>
<tr>
<td>
<xsl:value-of select="ALG_GEBOUW_CODE"/>
</td>
<xsl:for-each select="msxml:node-set($sorted)/data_row[ALG_GEBOUW_CODE=$gebouw]">
<td style="text-align: right">
<xsl:if test="format-number(BEDRAG, '###.###.##0,00', 'european') != 'NaN'">
<xsl:value-of select="format-number(BEDRAG, '###.###.##0,00', 'european')"/>
</xsl:if>
</td>
</xsl:for-each>
</tr>
</xsl:for-each>
</table>
</xsl:if>
</body>
</html>
</xsl:template>

View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:msxml="urn:schemas-microsoft-com:xslt" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" version="1.0">
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:msxml="urn:schemas-microsoft-com:xslt" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
xmlns:sales005="http://www.ketenstandaard.nl/onderhoudstatus/SALES/005" version="1.0">
<xsl:output method="xml" indent="yes" encoding="utf-8"/>
<xsl:decimal-format name="european" decimal-separator="." grouping-separator=","/>
<xsl:param name="mode"/>
@@ -71,6 +72,24 @@
</facilitor>
</xsl:template>
<xsl:template match="sales005:MaintenanceStatus">
<facilitor>
<xsl:element name="opdracht">
<xsl:attribute name="key"><xsl:value-of select="translate(sales005:InstructionData/sales005:InstructionNumber, 'MAR', '')"/></xsl:attribute>
<xsl:attribute name="type">update</xsl:attribute>
<status><xsl:apply-templates select="sales005:InstructionData/sales005:Status"/></status>
<!-- Plandatum en tijd van opdracht -->
<!-- In INSBOU001 Release nov-2015 hiervoor node AppointmentDateTimeInformation gebruiken, daarvoor node CompletionDateTimeInformation -->
<plandatum><xsl:value-of select="sales005:InstructionData/sales005:AppointmentDateTimeInformation/sales005:RequiredDeliveryDate"/><xsl:text> </xsl:text><xsl:value-of select="sales005:InstructionData/sales005:AppointmentDateTimeInformation/sales005:RequiredDeliveryTime"/></plandatum>
<!-- Afwijkende gereeddatum (<> SYSDATE) kan via mut_datum, de werking is wel afhankelijk van -->
<xsl:if test="sales005:InstructionData/sales005:Status = 'GER'">
<mut_datum><xsl:apply-templates select="sales005:InstructionData/sales005:DateReady"/></mut_datum>
</xsl:if>
<opmerking><xsl:apply-templates select="sales005:InstructionData/sales005:StatusDescription"/></opmerking>
</xsl:element>
</facilitor>
</xsl:template>
<xsl:template match="Status">
<!-- In SidB zijn de volgende statussen mogelijk: -->
<!-- CODE OMSCHRIJVING -->
@@ -88,6 +107,23 @@
<!-- FSN#31934: Mareon kan niet goed overweg als ACC vaker dan 1x wordt gestuurd, NB: ACC is geen (optionele) expliciete statuscode voor accepteren door de leverancier. -->
</xsl:choose>
</xsl:template>
<xsl:template match="sales005:Status">
<!-- In SidB zijn de volgende statussen mogelijk: -->
<!-- CODE OMSCHRIJVING -->
<!-- AFM Afwachten, mail gestuurd -->
<!-- AFR Afwachten, reactie opzichter -->
<!-- AFW Afwachten in verband met weer -->
<!-- ANN Opdracht geannuleerd -->
<!-- BBT Bewoner belt terug -->
<!-- GER Gereedmelding -->
<!-- VER Verlenging -->
<xsl:choose>
<xsl:when test=".='GER'">ORDAFM</xsl:when>
<xsl:when test=".='ANN'">ORDCAN</xsl:when>
<xsl:when test=".='ACC'">ORDACP</xsl:when>
<!-- FSN#31934: Mareon kan niet goed overweg als ACC vaker dan 1x wordt gestuurd, NB: ACC is geen (optionele) expliciete statuscode voor accepteren door de leverancier. -->
</xsl:choose>
</xsl:template>
<xsl:template match="StatusDescription">
<xsl:value-of select="."/>
@@ -96,6 +132,13 @@
<xsl:value-of select="."/>
</xsl:for-each>
</xsl:template>
<xsl:template match="sales005:StatusDescription">
<xsl:value-of select="."/>
<xsl:text>&#10;</xsl:text>
<xsl:for-each select="../sales005:FreeText">
<xsl:value-of select="."/>
</xsl:for-each>
</xsl:template>
<xsl:template match="DateReady">
<!-- Formaat DateReady is niet eenduidig volgens SidB specs, kan zijn CCYYMMDD of YYYY-MM-DD -->
@@ -105,7 +148,14 @@
<xsl:variable name="l_afmeld_datum" select="translate(.,'-','')"/>
<xsl:value-of select="substring($l_afmeld_datum,1,4)"/>-<xsl:value-of select="substring($l_afmeld_datum,5,2)"/>-<xsl:value-of select="substring($l_afmeld_datum,7,2)"/>
</xsl:template>
<xsl:template match="sales005:DateReady">
<!-- Formaat DateReady is niet eenduidig volgens SidB specs, kan zijn CCYYMMDD of YYYY-MM-DD -->
<!-- Vanwege deze onduidelijkheid gewoon maar beide formaten ondersteunen ... -->
<!-- ... door eerst eventuele streepjes - te verwijderen, daarna gewoon weer toevoegen, dan is het formaat altijd YYYY-MM-DD -->
<!-- Eerst streepjes weg, dus altijd formaat YYYYMMDD -->
<xsl:variable name="l_afmeld_datum" select="translate(.,'-','')"/>
<xsl:value-of select="substring($l_afmeld_datum,1,4)"/>-<xsl:value-of select="substring($l_afmeld_datum,5,2)"/>-<xsl:value-of select="substring($l_afmeld_datum,7,2)"/>
</xsl:template>
<!--xsl:template match="soap:Body">
<xsl:apply-templates select="facilitor"/>
</xsl:template>
@@ -124,7 +174,7 @@
<xsl:apply-templates select="facilitor"/>
</xsl:when>
<xsl:when test="substring-before(name(),concat(':', local-name()))='' and local-name()='MaintenanceStatus'">
<xsl:apply-templates select="MaintenanceStatus"/>
<xsl:apply-templates select="sales005:MaintenanceStatus"/>
</xsl:when>
<!--xsl:when test="local-name()='Envelope'">
<xsl:apply-templates select="soap:Envelope"/>

View File

@@ -25,12 +25,8 @@
// __DoLog("uname: " + uname);
Response.Write("SAML user detected as: " + uname);
var sql = "SELECT prs_perslid_oslogin"
+ " FROM prs_perslid pp"
+ " , prs_kenmerklink pkl"
+ " WHERE pp.prs_perslid_key = pkl.prs_link_key"
+ " AND pkl.prs_kenmerklink_niveau = 'P'"
+ " AND pkl.prs_kenmerk_key = 1000" // IID
+ " AND pkl.prs_kenmerklink_waarde = " + safe.quoted_sql(uname)
+ " FROM prs_perslid"
+ " WHERE prs_perslid_email = " + safe.quoted_sql(uname)
var oRs = Oracle.Execute(sql);
if (!oRs.Eof)
{

View File

@@ -6,6 +6,18 @@
<xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
</xsl:variable>
<xsl:template match="melding" mode="include">
<xsl:apply-imports />
<br/>
<p>Om direct naar je melding te gaan klik
<xsl:element name="a">
<xsl:attribute name="href">https://<xsl:value-of select="$FacilitorRoot"/>?<xsl:value-of select="//bookmarks/melding"/><xsl:value-of select="key"/>&amp;sso=1
</xsl:attribute>
hier</xsl:element>
</p>
</xsl:template>
<xsl:template name="qrc_ins_new_page">
<xsl:param name="p_page"/>
<xsl:param name="p_rows"/>

View File

@@ -0,0 +1,20 @@
REM GEN_EXPORT_DAILY_TASK.BAT
REM
REM SGGR
REM
REM Vult de tabel sggr_autorit_registratie met de log van de
REM uitleenregistratie
REM
REM Context : roep deze file aan indien nodig, of schedule deze
REM Verseist: de randvoorwaarde voor het gebruik van gen_export
REM
REM $Revision$
REM $Id$
REM
REM (c) 2009, SG facilitor, +31 (53) 4800710, helpdesk@sgfacilitor.nl
REM
CALL ..\..\..\utils\gen_export\gen_export.bat DAILY_TASK

153
CUST/SGGR/xsl/rapport.xsl Normal file
View File

@@ -0,0 +1,153 @@
<?xml version="1.0" encoding="utf-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:msxml="urn:schemas-microsoft-com:xslt" version="1.0">
<xsl:import href="../../../appl/shared/default.xsl"/>
<xsl:template match="rapport">
<xsl:if test="@view='sggr_v_rap_auto_registratie' or @view='SGGR_V_RAP_AUTO_REGISTRATIE'">
<html>
<head>
<style>tdx {
font-family: Verdana;
padding: 3px;
font-size: 12pt;
font-weight: normal;
color: #DE0072;
}</style>
</head>
<xsl:variable name="distinct">
<xsl:for-each select="rapport_data/data_row">
<xsl:sort select="AUTO"/>
<xsl:copy-of select="."/>
</xsl:for-each>
</xsl:variable>
<xsl:variable name="sorted">
<xsl:for-each select="rapport_data/data_row">
<xsl:sort select="AUTO"/>
<xsl:sort select="TIMESTAMP"/>
<xsl:copy-of select="."/>
</xsl:for-each>
</xsl:variable>
<body>
<xsl:for-each select="msxml:node-set($distinct)/data_row">
<xsl:variable name="auto">
<xsl:value-of select="AUTO"/>
</xsl:variable>
<xsl:variable name="prev_auto">
<xsl:choose>
<xsl:when test="position()=1">Quqelequ</xsl:when>
<xsl:otherwise>
<xsl:value-of select="preceding-sibling::data_row[1]/AUTO"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:if test="$prev_auto != $auto">
<xsl:if test="position() != 1">
<div style="page-break-before:always">&#xA0;</div>
</xsl:if>
<table width="100%" class="DefResultsetTable" border="1" cellpadding="0" cellspacing="0">
<xsl:for-each select="msxml:node-set($sorted)/data_row[AUTO=$auto]">
<xsl:if test="position() = 1">
<xsl:variable name="km_start">
<xsl:value-of select="km_uitgifte"/>
</xsl:variable>
<tr>
<th class="DefResultsetHeading" colspan="11" style="text-align:center">Aareon Nederland B.V. - Emmen </th>
</tr>
<tr>
<th class="DefResultsetHeading" colspan="1" style="text-align:left">Bestuurdersoverzicht <xsl:value-of select="AUTO"/></th> -
<th class="DefResultsetHeading" colspan="10" style="text-align:center"></th>
</tr>
<th class="DefResultsetHeading" colspan="11" style="text-align:center"> </th>
<tr>
</tr>
<tr>
<th class="DefResultsetHeading" style="text-align:left">Naam bestuurder</th>
<th class="DefResultsetHeading" style="text-align:left">Uitgifte datum</th>
<th class="DefResultsetHeading" style="text-align:left">Tijdstip uitgifte</th>
<th class="DefResultsetHeading" style="text-align:left">Inlever datum</th>
<th class="DefResultsetHeading" style="text-align:left">Tijdstip ingeleverd</th>
<th class="DefResultsetHeading" style="text-align:left">Reden</th>
<th class="DefResultsetHeading" style="text-align:left">Van</th>
<th class="DefResultsetHeading" style="text-align:left">Naar</th>
<th class="DefResultsetHeading" style="text-align:left">KM uit</th>
<th class="DefResultsetHeading" style="text-align:left">KM in</th>
<th class="DefResultsetHeading" style="text-align:left">KM gereden</th>
</tr>
</xsl:if>
<tr>
<td class="DRR" style="text-align:left">
<xsl:value-of select="BESTUURDER"/>
<xsl:if test="$mode != 'excel'">&#xA0;</xsl:if>
</td>
<td class="DRR" style="text-align:left">
<xsl:value-of select="UITGIFTE_DATUM"/>
<xsl:if test="$mode != 'excel'">&#xA0;</xsl:if>
</td>
<td class="DRR" style="text-align:left">
<xsl:value-of select="UITGIFTE_TIJD"/>
<xsl:if test="$mode != 'excel'">&#xA0;</xsl:if>
</td>
<td class="DRR" style="text-align:left">
<xsl:value-of select="INNAME_DATUM"/>
<xsl:if test="$mode != 'excel'">&#xA0;</xsl:if>
</td>
<td class="DRR" style="text-align:left">
<xsl:value-of select="INNAME_TIJD"/>
<xsl:if test="$mode != 'excel'">&#xA0;</xsl:if>
</td>
<td class="DRR" style="text-align:left">
<xsl:value-of select="REDEN"/>
<xsl:if test="$mode != 'excel'">&#xA0;</xsl:if>
</td>
<td class="DRR" style="text-align:left">
<xsl:value-of select="VAN"/>
<xsl:if test="$mode != 'excel'">&#xA0;</xsl:if>
</td>
<td class="DRR" style="text-align:left">
<xsl:value-of select="NAAR"/>
<xsl:if test="$mode != 'excel'">&#xA0;</xsl:if>
</td>
<td class="DRR" style="text-align:left">
<xsl:value-of select="KM_UITGIFTE"/>
<xsl:if test="$mode != 'excel'">&#xA0;</xsl:if>
</td>
<td class="DRR" style="text-align:left">
<xsl:value-of select="KM_INNAME"/>
<xsl:if test="$mode != 'excel'">&#xA0;</xsl:if>
</td>
<td class="DRR" style="text-align:right">
<xsl:value-of select="KM_VERSCHIL"/>
<xsl:if test="$mode != 'excel'">&#xA0;</xsl:if>
</td>
</tr>
</xsl:for-each>
<xsl:variable name="km">
<values>
<xsl:for-each select="msxml:node-set($sorted)/data_row[AUTO=$auto]//child::KM_VERSCHIL">
<value><xsl:value-of select="."/></value>
</xsl:for-each>
</values>
</xsl:variable>
<tr>
<td colspan="10"></td>
<td class="DRR" style="text-align:right">
<xsl:value-of select="sum(msxml:node-set($km)/values/value)"/>
<xsl:if test="$mode != 'excel'">&#xA0;</xsl:if>
</td>
</tr>
</table>
</xsl:if>
</xsl:for-each>
</body>
</html>
</xsl:if>
</xsl:template>
</xsl:stylesheet>

View File

@@ -54,6 +54,10 @@
<xsl:element name="Address">
<xsl:attribute name="addressID">
<xsl:choose>
<xsl:when test="bestelling/kostenplaats/nr = '8010'">14010046</xsl:when>
<xsl:when test="bestelling/kostenplaats/nr = '0000'">14010141</xsl:when>
<xsl:when test="bestelling/kostenplaats/nr = '6661'">14000749</xsl:when>
<xsl:when test="bestelling/kostenplaats/nr = '6663'">14005949</xsl:when>
<xsl:when test="bestelling/voor/afdeling/kenmerk[@key=1000] != ''">
<xsl:value-of select="bestelling/voor/afdeling/kenmerk[@key=1000]"/>
</xsl:when>

View File

@@ -517,7 +517,17 @@
</tr>
<tr>
<td class="tekst" style="width:2%;"></td>
<td class="tekst">De offerte dient in Nederlandse taal te worden opgesteld en digitaal aangeleverd te worden bij Kien Facility Management per e-mail aan <xsl:choose><xsl:when test="melding/plaats/regio/district/locatie/key='2'"><a href="mailto:facilitydeskhtce@kien-fm.nl"><nobr>facilitydeskhtce@kien-fm.nl</nobr></a></xsl:when><xsl:otherwise><a href="mailto:facilitydesk@kien-fm.nl"><nobr>facilitydesk@kien-fm.nl</nobr></a></xsl:otherwise></xsl:choose> onder vermelding van opdrachtnummer <xsl:value-of select="melding/discipline/srtdiscipline/prefix"/><xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/>.</td>
<td class="tekst">De offerte dient in Nederlandse taal te worden opgesteld en digitaal aangeleverd te worden bij Kien Facility Management per e-mail aan <xsl:choose>
<xsl:when test="melding/plaats/regio/district/locatie/key='2'">
<a href="mailto:facilitydeskhtce@kien-fm.nl"><nobr>facilitydeskhtce@kien-fm.nl</nobr></a>
</xsl:when>
<xsl:when test="melding/plaats/regio/district/locatie/key='1141'">
<a href="mailto:LBRfacilitydesk@lyondellbasell.com"><nobr>LBRfacilitydesk@lyondellbasell.com</nobr></a>
</xsl:when>
<xsl:otherwise>
<a href="mailto:facilitydesk@kien-fm.nl"><nobr>facilitydesk@kien-fm.nl</nobr></a>
</xsl:otherwise>
</xsl:choose> onder vermelding van opdrachtnummer <xsl:value-of select="melding/discipline/srtdiscipline/prefix"/><xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/>.</td>
</tr>
<tr>
<td class="tekst" style="width:2%;"></td>
@@ -559,8 +569,8 @@
<td class="tekst" style="width:18%;">Email:</td>
<td class="tekst" style="width:82%;">
<xsl:choose>
<xsl:when test="melding/plaats/regio/district/locatie/key='2'"><a href="mailto:facilitydeskhtce@kien-fm.nl">facilitydeskhtce@kien-fm.nl</a>
</xsl:when>
<xsl:when test="melding/plaats/regio/district/locatie/key='2'"><a href="mailto:facilitydeskhtce@kien-fm.nl">facilitydeskhtce@kien-fm.nl</a></xsl:when>
<xsl:when test="melding/plaats/regio/district/locatie/key='1141'"><a href="mailto:LBRfacilitydesk@lyondellbasell.com">LBRfacilitydesk@lyondellbasell.com</a></xsl:when>
<xsl:otherwise><a href="mailto:facilitydesk@kien-fm.nl">facilitydesk@kien-fm.nl</a>
</xsl:otherwise>
</xsl:choose>
@@ -570,10 +580,9 @@
<td class="tekst" style="width:18%;">Telefoon:</td>
<td class="tekst" style="width:82%;">
<xsl:choose>
<xsl:when test="melding/plaats/regio/district/locatie/key='2'">040-2305600
</xsl:when>
<xsl:otherwise>088-5577676
</xsl:otherwise>
<xsl:when test="melding/plaats/regio/district/locatie/key='2'">040-2305600</xsl:when>
<xsl:when test="melding/plaats/regio/district/locatie/key='1141'">010-2755501</xsl:when>
<xsl:otherwise>088-5577676</xsl:otherwise>
</xsl:choose><br/>
</td>
</tr>
@@ -587,7 +596,26 @@
<tr>
<td colspan="4" class="tekst">
<b>Bovenvermelde opdracht is reeds aan u verstrekt en betreft dus <u>géén</u> nieuwe opdracht. Wij sturen u deze herinnering in verband met de overgang naar ons nieuwe facilitair management informatie systeem.
Bij vragen over deze reminder gelieve contact op te nemen met de Service Support desk via <xsl:choose><xsl:when test="melding/plaats/regio/district/locatie/key='2'"><a href="mailto:servicedeskhtce@vbt-fm.nl"><nobr>servicedeskhtce@vbt-fm.nl</nobr></a></xsl:when><xsl:otherwise><a href="mailto:storing@vbt-fm.nl"><nobr>storing@vbt-fm.nl</nobr></a></xsl:otherwise></xsl:choose> of <xsl:choose><xsl:when test="melding/plaats/regio/district/locatie/key='2'"><nobr>040-230 5600</nobr></xsl:when><xsl:otherwise><nobr>040-851 6900</nobr></xsl:otherwise></xsl:choose>.
Bij vragen over deze reminder gelieve contact op te nemen met de Service Support desk via <xsl:choose>
<xsl:when test="melding/plaats/regio/district/locatie/key='2'">
<a href="mailto:servicedeskhtce@vbt-fm.nl"><nobr>servicedeskhtce@vbt-fm.nl</nobr></a>
</xsl:when>
<xsl:when test="melding/plaats/regio/district/locatie/key='1141'">
<a href="mailto:LBRfacilitydesk@lyondellbasell.com"><nobr>LBRfacilitydesk@lyondellbasell.com</nobr></a>
</xsl:when>
<xsl:otherwise>
<a href="mailto:storing@vbt-fm.nl"><nobr>storing@vbt-fm.nl</nobr></a>
</xsl:otherwise></xsl:choose> of <xsl:choose>
<xsl:when test="melding/plaats/regio/district/locatie/key='2'">
<nobr>040-230 5600</nobr>
</xsl:when>
<xsl:when test="melding/plaats/regio/district/locatie/key='1141'">
<nobr>010-275 5501</nobr>
</xsl:when>
<xsl:otherwise>
<nobr>040-851 6900</nobr>
</xsl:otherwise>
</xsl:choose>.
<br/><br/>Gelieve de status van de melding (inplannen/uitvoeren/gereed) terugkoppelen aan Kien Facility management.
<xsl:if test="melding/plaats/regio/district/kenmerk[@key='1040'] != ''"><br/><br/>De betalingstermijn is <xsl:value-of select="melding/plaats/regio/district/kenmerk[@key='1040']"/>.</xsl:if>
</b>

View File

@@ -28,8 +28,8 @@ function GetStruktonStatus()
+" </soapenv:Body>"
+"</soapenv:Envelope>";
WScript.Echo("Bericht = " + XMLReq);
WScript.Echo("Login = " + username);
//WScript.Echo("Wachtwoord = " + password);
WScript.Echo("Login = " + uname);
//WScript.Echo("Wachtwoord = " + pword);
var objXMLHTTP = new ActiveXObject("MSXML2.ServerXMLHTTP.6.0")
/* objXMLHTTP.open("POST",
@@ -87,9 +87,7 @@ Oracle.Open(udlstr);
// Als de koppeling er een tijdje uit gelegen heeft kan dit problemen opleveren.
// Daarom wordt het interval maximaal 4 uur.
var sql = "ALTER SESSION SET nls_territory='AMERICA'";
Oracle.Execute(sql)
fac.safe_to_date (kl.prs_kenmerklink_waarde, 'yyyy-mm-dd hh24:mi:ss')
Oracle.Execute(sql);
sql = "SELECT b.prs_bedrijf_naam, "
+ " ba.prs_bedrijfadres_url, "

View File

@@ -20,24 +20,16 @@
</xsl:variable>
<xsl:variable name="ordernr">
<xsl:choose>
<xsl:when test="substring(Invoice/Fields/Field[@Name='OrderNummer'], 1, 1)!='C'">
<xsl:value-of select="substring-before(Invoice/Fields/Field[@Name='OrderNummer'], '.')"/>/<xsl:value-of select="substring-after(Invoice/Fields/Field[@Name='OrderNummer'], '.')"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="Invoice/Fields/Field[@Name='OrderNummer']"/>
</xsl:otherwise>
<xsl:when test="substring(Invoice/Fields/Field[@Name='OrderNummer'], 1, 1)!='C'"><xsl:value-of select="translate(Invoice/Fields/Field[@Name='OrderNummer'], '.', '/')"/></xsl:when>
<xsl:otherwise><xsl:value-of select="Invoice/Fields/Field[@Name='OrderNummer']"/></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="kostprijs">
<xsl:choose>
<xsl:when test="Invoice/Fields/Field[@Name='NettoBedrag']!=''">
<xsl:choose>
<xsl:when test="substring(Invoice/Fields/Field[@Name='Debet/Credit'],1,6)='Credit'">
<xsl:value-of select="format-number(0 - number(Invoice/Fields/Field[@Name='NettoBedrag']), '0.00')"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="Invoice/Fields/Field[@Name='NettoBedrag']"/>
</xsl:otherwise>
<xsl:when test="substring(Invoice/Fields/Field[@Name='Debet/Credit'],1,6)='Credit'"><xsl:value-of select="format-number(0 - number(Invoice/Fields/Field[@Name='NettoBedrag']), '0.00')"/></xsl:when>
<xsl:otherwise><xsl:value-of select="Invoice/Fields/Field[@Name='NettoBedrag']"/></xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>0</xsl:otherwise>
@@ -50,40 +42,28 @@
<xsl:choose>
<xsl:when test="Invoice/Fields/Field[@Name='BTWBedrag']!=''">
<xsl:choose>
<xsl:when test="substring(Invoice/Fields/Field[@Name='Debet/Credit'],1,6)='Credit'">
<xsl:value-of select="format-number(0 - number(Invoice/Fields/Field[@Name='BTWBedrag']), '0.00')"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="Invoice/Fields/Field[@Name='BTWBedrag']"/>
</xsl:otherwise>
<xsl:when test="substring(Invoice/Fields/Field[@Name='Debet/Credit'],1,6)='Credit'"><xsl:value-of select="format-number(0 - number(Invoice/Fields/Field[@Name='BTWBedrag']), '0.00')"/></xsl:when>
<xsl:otherwise><xsl:value-of select="Invoice/Fields/Field[@Name='BTWBedrag']"/></xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>0</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="vrachtkosten">
<xsl:choose>
<xsl:when test="Invoice/Fields/Field[@Name='VrachtKosten']!=''">
<xsl:value-of select="Invoice/Fields/Field[@Name='VrachtKosten']"/>
</xsl:when>
<xsl:otherwise>0</xsl:otherwise>
</xsl:choose>
<xsl:value-of select="Invoice/Fields/Field[@Name='VrachtKosten']"/>
</xsl:variable>
<xsl:variable name="ref">
<xsl:value-of select="Invoice/Fields/Field[@Name='Referentie']"/>
</xsl:variable>
<xsl:choose>
<!--Verzamelfactuur-->
<xsl:when test="count(Invoice/Tables/Table[@Type='LineItem']/TableRow)&gt;0">
<xsl:for-each select="Invoice/Tables/Table[@Type='LineItem']/TableRow">
<xsl:variable name="li_ordernr">
<xsl:choose>
<xsl:when test="substring(Field[@Name='LI_OrderNummer'], 1, 1)!='C'">
<xsl:value-of select="substring-before(Field[@Name='LI_OrderNummer'], '.')"/>/<xsl:value-of select="substring-after(Field[@Name='LI_OrderNummer'], '.')"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="Field[@Name='LI_OrderNummer']"/>
</xsl:otherwise>
<xsl:when test="substring(Field[@Name='LI_OrderNummer'], 1, 1)!='C'"><xsl:value-of select="translate(Field[@Name='LI_OrderNummer'], '.', '/')"/></xsl:when>
<xsl:otherwise><xsl:value-of select="Field[@Name='LI_OrderNummer']"/></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="li_kostprijs">
@@ -97,7 +77,17 @@
</xsl:when>
<!--Enkelv. factuur-->
<xsl:otherwise>
<xsl:value-of select="$levnr"/>;<xsl:value-of select="$factnr"/>;<xsl:value-of select="$factdat"/>;<xsl:value-of select="$ordernr"/>;;;<xsl:value-of select="$ref"/>;;<xsl:value-of select="number($kostprijs)+$vrachtkosten"/>;<xsl:value-of select="$btwbedrag"/>;<xsl:value-of select="$btwpct"/>;;;<xsl:value-of select="$levnaam"/> (<xsl:value-of select="$levnr"/>);;;;;;;<xsl:value-of select="$new_line"/>
<xsl:choose>
<!--Met vrachtkosten, dan zonder BTWBedrag!-->
<xsl:when test="$vrachtkosten!=''">
<xsl:value-of select="$levnr"/>;<xsl:value-of select="$factnr"/>;<xsl:value-of select="$factdat"/>;<xsl:value-of select="$ordernr"/>;;;<xsl:value-of select="$ref"/>;;<xsl:value-of select="$kostprijs"/>;;<xsl:value-of select="$btwpct"/>;;;<xsl:value-of select="$levnaam"/> (<xsl:value-of select="$levnr"/>);;;;;;;<xsl:value-of select="$new_line"/>
<xsl:value-of select="$levnr"/>;<xsl:value-of select="$factnr"/>;<xsl:value-of select="$factdat"/>;<xsl:value-of select="$ordernr"/>;;;Additionele kosten (vracht);;<xsl:value-of select="$vrachtkosten"/>;;<xsl:value-of select="$btwpct"/>;;;<xsl:value-of select="$levnaam"/> (<xsl:value-of select="$levnr"/>);;;;;;;<xsl:value-of select="$new_line"/>
</xsl:when>
<!--Zonder vrachtkosten, dan met BTWBedrag!-->
<xsl:otherwise>
<xsl:value-of select="$levnr"/>;<xsl:value-of select="$factnr"/>;<xsl:value-of select="$factdat"/>;<xsl:value-of select="$ordernr"/>;;;<xsl:value-of select="$ref"/>;;<xsl:value-of select="$kostprijs"/>;<xsl:value-of select="$btwbedrag"/>;<xsl:value-of select="$btwpct"/>;;;<xsl:value-of select="$levnaam"/> (<xsl:value-of select="$levnr"/>);;;;;;;<xsl:value-of select="$new_line"/>
</xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>

View File

@@ -32,14 +32,15 @@
<xsl:when test="opdrachttype/key='281'">2</xsl:when>
<!--282=Offerteaanvraag-->
<xsl:when test="opdrachttype/key='282'">3</xsl:when>
<!--Bij correcte inrichting 5=Werkopdracht/283=Offerteopdracht hier enige mogelijkheid!-->
<!--xsl:otherwise>
<!--283=Offerteopdracht-->
<xsl:when test="opdrachttype/key='283'">5</xsl:when>
<!--Bij correcte inrichting 5=Werkopdracht hier enige mogelijkheid!-->
<xsl:otherwise>
<xsl:choose>
<xsl:when test="melding/discipline/srtdiscipline/prefix='S'">2</xsl:when>
<xsl:otherwise>5</xsl:otherwise>
</xsl:choose>
</xsl:otherwise-->
<xsl:otherwise>5</xsl:otherwise>
</xsl:otherwise>
</xsl:choose>
</xsl:element>
<xsl:element name="RequestedProcessingPeriod">
@@ -119,13 +120,34 @@
<xsl:value-of select="melding/plaats/regio/district/locatie/gebouw/kenmerk[@key=1000]"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="plaatsaanduiding">
<xsl:choose>
<xsl:when test="melding/plaats/@type='L'">
<xsl:value-of select="melding/plaats/regio/district/locatie/code"/>
</xsl:when>
<xsl:when test="melding/plaats/@type='T'">
<xsl:value-of select="melding/plaats/regio/district/locatie/terrein/code"/>
</xsl:when>
<xsl:when test="melding/plaats/@type='G'">
<xsl:value-of select="melding/plaats/regio/district/locatie/gebouw/code"/>
</xsl:when>
<xsl:when test="melding/plaats/@type='V'">
<xsl:value-of select="melding/plaats/regio/district/locatie/gebouw/code"/>-<xsl:value-of select="melding/plaats/regio/district/locatie/gebouw/verdieping/code"/>
</xsl:when>
<xsl:when test="melding/plaats/@type='R'">
<xsl:value-of select="melding/plaats/regio/district/locatie/gebouw/code"/>-<xsl:value-of select="melding/plaats/regio/district/locatie/gebouw/verdieping/code"/>-<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/ruimte/nr"/>
</xsl:when>
<xsl:otherwise/>
</xsl:choose>
</xsl:variable>
<xsl:element name="ServiceLocation">
<xsl:element name="LocationID">
<xsl:value-of select="$struktoncode"/>
</xsl:element>
<xsl:element name="Location">
<xsl:value-of select="melding/plaats/plaatsaanduiding"/>
<!--xsl:value-of select="melding/plaats/plaatsaanduiding"/-->
<xsl:value-of select="$plaatsaanduiding"/>
</xsl:element>
<xsl:element name="Address">
<xsl:element name="StreetName">

View File

@@ -816,14 +816,20 @@ if you have any questions about your call, please contact the WTC Servicepoint v
</tr>
<xsl:choose>
<xsl:when test="discipline/key='741'">
<xsl:for-each select="kenmerk[@type!='Q']">
<xsl:for-each select="kenmerk[@type!='Q' and @volgnummer!='-1']">
<xsl:sort select="@volgnummer" data-type="number"/>
<xsl:choose>
<xsl:when test="@type!='L' and @volgnummer&lt;10">
<tr>
<td><b><xsl:value-of select="@naam"/>:</b></td>
<td colspan="3"><xsl:value-of select="."/></td>
</tr>
<xsl:when test="@type!='L' and (@volgnummer&lt;10 or substring(@naam, 1, 1)='>')">
<tr>
<td colspan="4">
<table border="0" style="width:100%;border-collapse:collapse;">
<tr>
<td width="42%"><b><xsl:value-of select="@naam"/>:</b></td>
<td><xsl:value-of select="."/></td>
</tr>
</table>
</td>
</tr>
</xsl:when>
<xsl:when test="@type!='L' and @volgnummer&gt;9">
<tr>
@@ -1443,7 +1449,7 @@ if you have any questions about your call, please contact the WTC Servicepoint v
<tr>
<th style="vertical-align:top;">MAAND</th>
<th style="vertical-align:top;">OPDR</th>
<th style="vertical-align:top;">MAATSCHAP</th>
<th style="vertical-align:top;">COMPLEX</th>
<th style="vertical-align:top;">KSOORT</th>
<th style="vertical-align:top;">KSOORT_OMS</th>
<th style="text-align:center;vertical-align:top;">G_T</th>
@@ -1631,7 +1637,7 @@ if you have any questions about your call, please contact the WTC Servicepoint v
<tr>
<th style="vertical-align:top;">MAAND</th>
<th style="vertical-align:top;">OPDR</th>
<th style="vertical-align:top;">MAATSCHAP</th>
<th style="vertical-align:top;">COMPLEX</th>
<th style="vertical-align:top;">KSOORT</th>
<th style="vertical-align:top;">KSOORT_OMS</th>
<th style="text-align:center;vertical-align:top;">G_T</th>