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

Merge 2017.1 Gold D changes

Browse Source 
svn path=/Website/trunk/; revision=34620
This commit is contained in:
Jos Groot Lipman
2017-07-13 18:48:29 +00:00
parent f659ad45b0 b9af2c3d8c
commit d67cbdc6c3
17 changed files with 149 additions and 1422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/API2/api2.inc
View File

@@ -410,6 +410,8 @@ api2 = {
operand = " LIKE ";
if (field.typ == "varchar" || field.typ == "memo" || field.typ == "html")
{
if (field.islcl)
dbs = 'lcl.l({0}, 1)'.format(dbs);
dbs = "UPPER("+dbs+")";
safe_val = safe_val.toUpperCase();
}

12
CUST/HAYG/xsl/api_opdr.xsl → APPL/MARX/F_PutOpdrachtFCLT.xsl
View File

@@ -19,11 +19,11 @@
<soap:Body>
<facilitor>
<xsl:element name="opdracht">
<xsl:attribute name="key">IBA<xsl:value-of select="@key"/></xsl:attribute>
<xsl:attribute name="key"><xsl:value-of select="@key"/></xsl:attribute>
<xsl:attribute name="type"><xsl:value-of select="@type"/></xsl:attribute>
<returncode><xsl:value-of select="returncode"/></returncode>
<returntekst><xsl:value-of select="returntekst"/></returntekst>
<datum><xsl:value-of select="datum"/></datum>
<datum><xsl:value-of select="datum"/></datum>
</xsl:element>
</facilitor>
</soap:Body>
@@ -38,9 +38,9 @@
<xsl:element name="{local-name()}">
<!-- process attributes -->
<xsl:for-each select="@*">
<!-- remove attribute prefix and 'IBA' from key-attribute! -->
<!-- remove attribute prefix and any alfanumeric character 'abcd...xyz' from key-attribute! -->
<xsl:attribute name="{local-name()}">
<xsl:choose><xsl:when test="local-name()='key'"><xsl:value-of select="translate(., 'IBA', '')"/></xsl:when><xsl:otherwise><xsl:value-of select="."/></xsl:otherwise></xsl:choose>
<xsl:choose><xsl:when test="local-name()='key'"><xsl:value-of select="translate(., 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', '')"/></xsl:when><xsl:otherwise><xsl:value-of select="."/></xsl:otherwise></xsl:choose>
</xsl:attribute>
</xsl:for-each>
<xsl:apply-templates/>
@@ -79,9 +79,9 @@
<xsl:element name="{local-name()}">
<!-- process attributes -->
<xsl:for-each select="@*">
<!-- remove attribute prefix and 'IBA' from key-attribute! -->
<!-- remove attribute prefix and any alfanumeric character 'abcd...xyz' from key-attribute! -->
<xsl:attribute name="{local-name()}">
<xsl:choose><xsl:when test="local-name()='key'"><xsl:value-of select="translate(., 'IBA', '')"/></xsl:when><xsl:otherwise><xsl:value-of select="."/></xsl:otherwise></xsl:choose>
<xsl:choose><xsl:when test="local-name()='key'"><xsl:value-of select="translate(., 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', '')"/></xsl:when><xsl:otherwise><xsl:value-of select="."/></xsl:otherwise></xsl:choose>
</xsl:attribute>
</xsl:for-each>
<xsl:apply-templates/>

2
APPL/SCF/scaffolding_edit.inc
View File

@@ -397,7 +397,7 @@ function scaffolding_edit(model, scf_params)
var i = 0;
BLOCK_START(col_id, model.record_title);
if (multi)
Response.Write("<thead><tr><th class='multi_cb'>" + L("lcl_change") + "</th></tr>");
Response.Write("<thead><tr><th class='multi_cb'>" + L("lcl_change") + "</th></tr></thead>");
var multiadd = scf_params.incsetting && scf_params.incsetting.multiadd; // Dan kunnen we meerdere toevoegen
while (i < col_1_length)

2
APPL/Shared/default.inc
View File

@@ -9,7 +9,7 @@
Note: Sinds 5.2.2 zitten de settings in de database
*/
var FCLTVersion="2017.1c";
var FCLTVersion="2017.1d";
var FCLTMinDatabaseSchema="31";
var custpath = rooturl + "/cust/" + customerId; // path to customer files

BIN
CUST/HAYG/Oracle.udl
View File

Binary file not shown.

BIN
CUST/HAYG/banner.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

12
CUST/HAYG/cust.css
View File

@@ -1,12 +0,0 @@
/*
* $Revision$
* $Modtime: 6-10-10 12:23 $
*
*
*/
#srtdeel_opmerking
{
color:red;
}

4
CUST/HAYG/tasks/gen_notify.bat
View File

@@ -1,4 +0,0 @@
@echo off
REM Moet gescheduled worden (normaliter 1 keer per uur) om door de applicatiebeheerder
REM ingeregelde notificaties te genereren.
cscript ..\..\..\utils\gen_notify\gen_notify.js ../oracle.udl HAYG

1
CUST/HAYG/tasks/putOrders.bat
View File

@@ -1 +0,0 @@
call ..\..\..\utils\putOrders\putOrders.bat

BIN
CUST/HAYG/tmpl_logo.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.7 KiB

242
CUST/HAYG/xsl/bloemen.xsl
View File

@@ -1,242 +0,0 @@
<?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:variable name="Rev">
<!-- Revision van deze cust.xsl -->
<xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
</xsl:variable>
<xsl:template match="bestelopdracht" mode="include">
<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
<TR>
<TD WIDTH="40" ROWSPAN="30" ID="LINKERMARGE"></TD>
<TD>
<!-- Bestelopdracht -->
<table border="0" bordercolor="#ffffff" width="100%">
<tr>
<td colspan="5" class="caption" style="text-align:center">
<b><xsl:value-of select="//lcl/BES/inkooporder"/>&#xA0;<u><xsl:value-of select="id"/></u></b>
</td>
</tr>
<tr>
<td colspan="5" style="height:30"/>
</tr>
<tr>
<td colspan="2" style="width:47%">
<b><xsl:value-of select="//lcl/BES/factuur_aan"/>:</b>
</td>
<td style="width:6%"></td>
<td colspan="2" style="width:47%">
<b><xsl:value-of select="//lcl/BES/leverancier"/>:</b>
</td>
</tr>
<tr>
<td colspan="2">
<xsl:value-of select="factuuradres/naam"/>
<br/>
<xsl:value-of select="factuuradres/post_adres"/>
<br/>
<xsl:value-of select="factuuradres/post_postcode"/>&#xA0;
<xsl:value-of select="factuuradres/post_plaats"/>
<br/>
<xsl:value-of select="factuuradres/post_land"/>
</td>
<td/>
<td colspan="2">
<xsl:value-of select="bedrijf/naam"/>
<br/>
<xsl:value-of select="bedrijf/post_adres"/>
<br/>
<xsl:value-of select="bedrijf/post_postcode"/>&#xA0;
<xsl:value-of select="bedrijf/post_plaats"/>
<br/>
<xsl:value-of select="bedrijf/post_land"/>
</td>
</tr>
<tr>
<td colspan="5" style="height:20"/>
</tr>
<tr>
<td colspan="2">
<b><xsl:value-of select="//lcl/FAC/contactgegevens"/>:</b>
</td>
<td/>
<td colspan="2">
<b/>
</td>
</tr>
<tr>
<td colspan="2" style="vertical-align:top">
<b><xsl:value-of select="//lcl/BES/besteller"/>: </b>
<xsl:value-of select="bestelling/aanvrager/naam_full"/>
<br/>
<b><xsl:value-of select="//lcl/FAC/e-mail"/>: </b>
<xsl:value-of select="bestelling/aanvrager/email"/>
<br/>
<b><xsl:value-of select="//lcl/FAC/telefoon"/>: </b>
<xsl:value-of select="bestelling/aanvrager/telefoonnr"/>
<br/>
<b><xsl:value-of select="//lcl/FAC/kostenplaats"/>: </b>
<xsl:value-of select="bestelling/kostenplaats/nr"/>
<br/>
<b><xsl:value-of select="//lcl/FAC/werkplek"/>: </b>
<xsl:value-of select="bestelling/plaats"/>
<br/>
<br/>
<b><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/>: </b>
<xsl:value-of select="bestelling/leverdatum/datum"/>
</td>
<td/>
<td colspan="2" style="vertical-align:top">
<b><xsl:value-of select="//lcl/BES/aanvraagnummers"/>: </b>
<xsl:value-of select="bestelling/key"/>
<br/>
<b><xsl:value-of select="//lcl/BES/opdrachtnummer"/>: </b>
<xsl:value-of select="id"/>
<br/>
<b><xsl:value-of select="//lcl/BES/orderdatum"/>: </b>
<xsl:value-of select="datum/datum"/>
</td>
</tr>
<tr>
<td colspan="5" style="height:20"/>
</tr>
<tr>
<td colspan="2">
<b><xsl:value-of select="//lcl/BES/afleveradres"/>:</b>
</td>
<td/>
<td colspan="2">
<b/>
</td>
</tr>
<tr>
<xsl:choose>
<!-- "extern afleveradres, en anders intern (HAYG) kantoor afleveradres -->
<xsl:when test="bestelling/kenmerk[@key=10] != ''">
<!-- straat + huisnummer is ingevuld, dus extern -->
<xsl:apply-templates select="." mode="extern_adres"/>
</xsl:when>
<!-- "alle andere mld-opdrachten" -->
<xsl:otherwise>
<xsl:apply-templates select="." mode="intern_adres"/>
</xsl:otherwise>
</xsl:choose>
<td/>
<td colspan="2" style="vertical-align:top">
<!-- de externe afleveradressen zijn flexprops (key 5, 8, ,9 10) en die worden hier overgeslagen.-->
<xsl:for-each select="bestelling/kenmerk[@type!='L' and @type!='l' and @type!='Q' and @key!=5 and @key!=8 and @key!=9 and @key!=10]">
<b>
<xsl:value-of select="@naam"/>: </b>
<xsl:value-of select="."/>
<br/>
</xsl:for-each>&#xA0;</td>
</tr>
<tr>
<td colspan="5" style="height:20"/>
</tr>
<TR>
<TD colspan="5">
<TABLE cellpadding="0" cellspacing="0" border="1" bordercolor="#303030" width="100%">
<tr>
<th style="width:20"><xsl:value-of select="//lcl/BES/regel"/></th>
<th style="width:20"><xsl:value-of select="//lcl/BES/artikelnr"/></th>
<th style="width:200"><xsl:value-of select="//lcl/FAC/omschrijving"/></th>
<th style="width:20"><xsl:value-of select="//lcl/FAC/eenheid"/></th>
<th style="width:20; text-align:right"><xsl:value-of select="//lcl/FAC/aantal"/></th>
<th style="width:20; text-align:right"><xsl:value-of select="//lcl/FAC/prijs"/></th>
<th style="width:20; text-align:right"><xsl:value-of select="//lcl/FAC/totaal"/></th>
</tr>
<xsl:for-each select="bestelopdrachtitem">
<xsl:sort select="srtdeel/omschrijving"/>
<xsl:sort select="posnr" data-type="number"/>
<tr>
<td class="result">
<xsl:value-of select="posnr"/>
</td>
<td class="result">
<xsl:value-of select="bestelitem/srtdeel/artikel_nummer"/>
</td>
<td class="result">
<xsl:value-of select="bestelitem/srtdeel/omschrijving"/>&#xA0;
<xsl:for-each select="bestelitem/kenmerk">
<br/>
<xsl:value-of select="@naam"/>: <xsl:value-of select="."/></xsl:for-each>
</td>
<td class="result">
<xsl:value-of select="bestelitem/srtdeel/eenheid"/>
</td>
<td class="result" style="text-align:right">
<xsl:value-of select="aantal"/>
</td>
<td class="result" style="text-align:right">
<xsl:value-of select="format-number(prijs, '0,00', 'european')"/>
</td>
<td class="result" style="text-align:right">
<xsl:value-of select="format-number(totaal, '0,00', 'european')"/>
</td>
</tr>
</xsl:for-each>
<tr>
<td colspan="6"/>
<td style="text-align:right">
<b>
<xsl:value-of select="format-number(sum(bestelopdrachtitem/totaal), '0,00', 'european')"/>
</b>
</td>
</tr>
</TABLE>
</TD>
</TR>
<tr>
<td colspan="5" style="height:40"/>
</tr>
<tr>
<td colspan="5" style="text-align:center; font-size:9px">Op leveringen die gedaan zijn op basis van dit formulier zijn de algemene inkoopvoorwaarden van HayGroup van toepassing. Indien sprake is van een mantelovereenkomst geschiedt deze order onder de bepalingen uit de mantelovereenkomst. Facturen zonder vermelding van het opdrachtnummer (<xsl:value-of select="id"/>)<xsl:value-of select="//lcl/BES/order_disclaimer2"/></td>
</tr>
</table>
</TD>
<TD WIDTH="30" ROWSPAN="30" ID="RECHTERMARGE"/>
</TR>
</TABLE>
</xsl:template>
<xsl:template match="bestelopdracht" mode="intern_adres">
<td colspan="2" style="vertical-align:top">
<xsl:comment>Bestemd voor</xsl:comment>
<xsl:value-of select="bestelling/kenmerk[@key=5]"/>
<br/>
<xsl:value-of select="afleveradres/naam"/>
<br/>
<xsl:value-of select="afleveradres/bezoek_adres"/>
<br/>
<xsl:value-of select="afleveradres/bezoek_postcode"/>&#xA0;
<xsl:value-of select="afleveradres/bezoek_plaats"/>
<br/>
<xsl:value-of select="afleveradres/bezoek_land"/>
</td>
</xsl:template>
<xsl:template match="bestelopdracht" mode="extern_adres">
<td colspan="2" style="vertical-align:top">
<xsl:comment>Bestemd voor</xsl:comment>
<xsl:value-of select="bestelling/kenmerk[@key=5]"/>
<br/>
<xsl:comment>Straat+huisnr</xsl:comment>
<xsl:value-of select="bestelling/kenmerk[@key=10]"/>
<br/>
<xsl:comment>Postcode+Plaats</xsl:comment>
<xsl:value-of select="bestelling/kenmerk[@key=9]"/>&#xA0;<xsl:value-of select="bestelling/kenmerk[@key=8]"/>
</td>
</xsl:template>
</xsl:stylesheet>

706
CUST/HAYG/xsl/cust.xsl
View File

@@ -1,706 +0,0 @@
<?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:variable name="Rev">
<!-- Revision van deze cust.xsl -->
<xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
</xsl:variable>
<xsl:template match="bestelopdracht" mode="include">
<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
<TR>
<TD WIDTH="40" ROWSPAN="30" ID="LINKERMARGE"></TD>
<TD>
<!-- Bestelopdracht -->
<table border="0" bordercolor="#ffffff" width="100%">
<tr>
<td colspan="5" class="caption" style="text-align:center">
<b><xsl:value-of select="//lcl/BES/inkooporder"/></b>
</td>
</tr>
<tr>
<td colspan="5" style="height:30"/>
</tr>
<tr>
<td colspan="2" style="width:47%">
<b><xsl:value-of select="//lcl/BES/factuur_aan"/>:</b>
</td>
<td style="width:6%"></td>
<td colspan="2" style="width:47%">
<b><xsl:value-of select="//lcl/BES/leverancier"/>:</b>
</td>
</tr>
<tr>
<td colspan="2">
<xsl:value-of select="factuuradres/naam"/>
<br/>
<xsl:value-of select="factuuradres/post_adres"/>
<br/>
<xsl:value-of select="factuuradres/post_postcode"/>&#xA0;
<xsl:value-of select="factuuradres/post_plaats"/>
<br/>
<xsl:value-of select="factuuradres/post_land"/>
</td>
<td/>
<td colspan="2">
<xsl:value-of select="bedrijf/naam"/>
<br/>
<xsl:value-of select="bedrijf/post_adres"/>
<br/>
<xsl:value-of select="bedrijf/post_postcode"/>&#xA0;
<xsl:value-of select="bedrijf/post_plaats"/>
<br/>
<xsl:value-of select="bedrijf/post_land"/>
</td>
</tr>
<tr>
<td colspan="5" style="height:20"/>
</tr>
<tr>
<td colspan="2">
<b><xsl:value-of select="//lcl/FAC/contactgegevens"/>:</b>
</td>
<td/>
<td colspan="2">
<b/>
</td>
</tr>
<tr>
<td colspan="2" style="vertical-align:top">
<b><xsl:value-of select="//lcl/BES/besteller"/>: </b>
<xsl:value-of select="bestelling/aanvrager/naam_full"/>
<br/>
<b><xsl:value-of select="//lcl/FAC/e-mail"/>: </b>
<xsl:value-of select="bestelling/aanvrager/email"/>
<br/>
<b><xsl:value-of select="//lcl/FAC/telefoon"/>: </b>
<xsl:value-of select="bestelling/aanvrager/telefoonnr"/>
<br/>
<b><xsl:value-of select="//lcl/FAC/kostenplaats"/>: </b>
<xsl:value-of select="bestelling/kostenplaats/nr"/>
<br/>
<b><xsl:value-of select="//lcl/FAC/werkplek"/>: </b>
<xsl:value-of select="bestelling/plaats"/>
<br/>
<br/>
<b><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/>: </b>
<xsl:value-of select="bestelling/leverdatum/datum"/>
</td>
<td/>
<td colspan="2" style="vertical-align:top">
<b><xsl:value-of select="//lcl/BES/aanvraagnummers"/>: </b>
<xsl:value-of select="bestelling/key"/>
<br/>
<b><xsl:value-of select="//lcl/BES/opdrachtnummer"/>: </b>
<xsl:value-of select="id"/>
<br/>
<b><xsl:value-of select="//lcl/BES/orderdatum"/>: </b>
<xsl:value-of select="datum/datum"/>
<br/>
<xsl:comment><b><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/>: </b><xsl:value-of select="bestelling/leverdatum/datum"/></xsl:comment>
</td>
</tr>
<tr>
<td colspan="5" style="height:20"/>
</tr>
<tr>
<td colspan="2">
<b><xsl:value-of select="//lcl/BES/afleveradres"/>:</b>
</td>
<td/>
<td colspan="2">
<b/>
</td>
</tr>
<tr>
<td colspan="2" style="vertical-align:top">
<xsl:value-of select="afleveradres/naam"/>
<br/>
<xsl:value-of select="afleveradres/bezoek_adres"/>
<br/>
<xsl:value-of select="afleveradres/bezoek_postcode"/>&#xA0;
<xsl:value-of select="afleveradres/bezoek_plaats"/>
<br/>
<xsl:value-of select="afleveradres/bezoek_land"/>
</td>
<td/>
<td colspan="2" style="vertical-align:top">
<xsl:for-each select="bestelling/kenmerk[@type!='L' and @type!='l' and @type!='Q']">
<b>
<xsl:value-of select="@naam"/>: </b>
<xsl:value-of select="."/>
<br/>
</xsl:for-each>&#xA0;</td>
</tr>
<tr>
<td colspan="5" style="height:20"/>
</tr>
<TR>
<TD colspan="5">
<TABLE cellpadding="0" cellspacing="0" border="1" bordercolor="#303030" width="100%">
<tr>
<th style="width:20"><xsl:value-of select="//lcl/BES/regel"/></th>
<th style="width:20"><xsl:value-of select="//lcl/BES/artikelnr"/></th>
<th style="width:200"><xsl:value-of select="//lcl/FAC/omschrijving"/></th>
<th style="width:20"><xsl:value-of select="//lcl/FAC/eenheid"/></th>
<th style="width:20; text-align:right"><xsl:value-of select="//lcl/FAC/aantal"/></th>
<th style="width:20; text-align:right"><xsl:value-of select="//lcl/FAC/prijs"/></th>
<th style="width:20; text-align:right"><xsl:value-of select="//lcl/FAC/totaal"/></th>
</tr>
<xsl:for-each select="bestelopdrachtitem">
<xsl:sort select="srtdeel/omschrijving"/>
<xsl:sort select="posnr" data-type="number"/>
<tr>
<td class="result">
<xsl:value-of select="posnr"/>
</td>
<td class="result">
<xsl:value-of select="bestelitem/srtdeel/artikel_nummer"/>
</td>
<td class="result">
<xsl:value-of select="bestelitem/srtdeel/omschrijving"/>&#xA0;
<xsl:for-each select="bestelitem/kenmerk">
<br/>
<xsl:value-of select="@naam"/>: <xsl:value-of select="."/></xsl:for-each>
</td>
<td class="result">
<xsl:value-of select="bestelitem/srtdeel/eenheid"/>
</td>
<td class="result" style="text-align:right">
<xsl:value-of select="aantal"/>
</td>
<td class="result" style="text-align:right">
<xsl:value-of select="format-number(prijs, '0,00', 'european')"/>
</td>
<td class="result" style="text-align:right">
<xsl:value-of select="format-number(totaal, '0,00', 'european')"/>
</td>
</tr>
</xsl:for-each>
<tr>
<td colspan="6"/>
<td style="text-align:right">
<b>
<xsl:value-of select="format-number(sum(bestelopdrachtitem/totaal), '0,00', 'european')"/>
</b>
</td>
</tr>
</TABLE>
</TD>
</TR>
<tr>
<td colspan="5" style="height:40"/>
</tr>
<tr>
<td colspan="5" style="text-align:center; font-size:9px"><xsl:value-of select="//lcl/BES/order_disclaimer1"/>(<xsl:value-of select="id"/>)<xsl:value-of select="//lcl/BES/order_disclaimer2"/></td>
</tr>
</table>
</TD>
<TD WIDTH="30" ROWSPAN="30" ID="RECHTERMARGE"/>
</TR>
</TABLE>
</xsl:template>
<xsl:template match="melding" mode="include">
<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"/></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/e-mail"/>:</b>
</td>
<td align="left">
<xsl:value-of select="voor/email"/>
</td>
</tr>
<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"/>.<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 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>
<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/melddatum"/>:</b>
</td>
<td align="left">
<xsl:value-of select="gemeld/datum"/>&#xA0;
<xsl:value-of select="gemeld/tijd"/>
</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/ordernr"/>:</b>
</td>
<td align="left">
<xsl:value-of select="kenmerk[@naam='Ordernr']"/>
</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="uitvoertijd"/>&#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/status"/>:</b>
</td>
<td align="left">
<xsl:value-of select="status"/>
</td>
</tr>
<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">
<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: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="melding/stdmelding/discipline/srtdiscipline/prefix"/>
<xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/></b>
</td>
</tr>
<tr>
<xsl:choose>
<xsl:when test="melding/aflever_adres/naam != ''">
<td width="25%"><b><u>Afleveradres</u></b></td>
</xsl:when>
<xsl:otherwise>
<td width="25%"/>
</xsl:otherwise>
</xsl:choose>
<xsl:choose>
<xsl:when test="factuuradres/naam != ''">
<td width="25%"><b><u>Factuuradres</u></b></td>
</xsl:when>
<xsl:otherwise>
<td width="25%"/>
</xsl:otherwise>
</xsl:choose>
<td width="25%" align="right">
<b><xsl:value-of select="//lcl/FAC/bedrijf"/>:</b>
</td>
<td width="25%">
<xsl:value-of select="uitvoerende/bedrijf/naam"/>
</td>
</tr>
<tr>
<td>
<xsl:value-of select="melding/aflever_adres/naam"/>
</td>
<td>
<xsl:value-of select="factuuradres/naam"/>
</td>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/contactpersoon"/>:</b>
</td>
<td>
<xsl:value-of select="contactpersoon/naam_full"/>
</td>
</tr>
<tr>
<td>
<xsl:value-of select="melding/aflever_adres/bezoek_adres"/>
</td>
<td>
<xsl:value-of select="factuuradres/post_adres"/>
</td>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/telefoon"/>:</b>
</td>
<td>
<xsl:value-of select="contactpersoon/telefoon1"/>
</td>
</tr>
<tr>
<td>
<xsl:value-of select="melding/aflever_adres/bezoek_postcode"/>&#160;&#160;<xsl:value-of select="melding/aflever_adres/bezoek_plaats"/>
</td>
<td>
<xsl:value-of select="factuuradres/post_postcode"/>&#160;&#160;<xsl:value-of select="factuuradres/post_plaats"/>
</td>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/adres"/>:</b>
</td>
<td>
<xsl:value-of select="uitvoerende/bedrijf/post_adres"/>
</td>
</tr>
<tr>
<td colspan="2"/>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/plaats"/>:</b>
</td>
<td>
<xsl:value-of select="uitvoerende/bedrijf/post_plaats"/>
</td>
</tr>
<tr>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/contactpersoon"/>:</b>
</td>
<td align="left">
<xsl:value-of select="backoffice_contact/naam_full"/>
</td>
<td colspan="2"/>
</tr>
<tr>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/telefoon"/>:</b>
</td>
<td align="left">
<xsl:value-of select="backoffice_contact/telefoonnr"/>
</td>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/kostenplaats"/>:</b>
</td>
<td align="left">
<xsl:value-of select="kostenplaats/nr"/>
</td>
</tr>
<xsl:if test="melding/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="melding/kenmerk[@naam='Ordernr']"/>
</td>
</tr>
</xsl:if>
<tr>
<td colspan="2"/>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/datum_gereed"/>:</b>
</td>
<td align="left">
<xsl:value-of select="datumgereed/datum"/>
</td>
</tr>
<tr>
<td colspan="2"/>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/status"/>:</b>
</td>
<td align="left">
<xsl:value-of select="status"/>
</td>
</tr>
<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>
<tr>
<td colspan="4">
<hr/>
</td>
</tr>
<tr>
<td colspan="4" align="center">
<table width="100%" style="background-color:#EEEEEE;border: 1px solid blue">
<tr>
<td>
<xsl:apply-templates select="melding" mode="include"/>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td colspan="4" height="30px" valign="center">
<hr/>
</td>
</tr>
<xsl:variable name="arbeid" select="uren*uurloon"/>
<tr>
<td align="right">
<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>
<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>
</tr>
<tr>
<td colspan="2"/>
<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>
</tr>
<xsl:variable name="correctie0" select="$arbeid + materiaal"/>
<xsl:variable name="correctie" select="kosten - $correctie0"/>
<xsl:if test="$correctie!=0">
<tr>
<td colspan="2"/>
<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>
</tr>
</xsl:if>
<tr>
<td colspan="2"/>
<td align="right">
<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>
</td>
</tr>
</table>
</xsl:template>
</xsl:stylesheet>

438
CUST/HAYG/xsl/rijnja.xsl
View File

@@ -1,438 +0,0 @@
<?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:template match="melding" mode="IBA">
<table border="0" width="100%" cellpadding="2">
<tr>
<td colspan="2" class="caption" style="padding-top:20px;padding-bottom:20px">
<b>Aanvraag&#160;<xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/></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>
<tr>
<td align="right" width="16%">
<b>Aanvrager:</b>
</td>
<td align="left" width="34%">
<xsl:value-of select="melder/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="melder/telefoonnr=''">-</xsl:if>
<xsl:value-of select="melder/telefoonnr"/>
</td>
</tr>
<tr>
<td align="right">
<b>Datum:</b>
</td>
<td align="left">
<xsl:value-of select="gemeld/datum"/>&#xA0;
<xsl:value-of select="gemeld/tijd"/>u
</td>
<td align="right">
<b>Planning/Afleverdatum:</b>
</td>
<td align="left">
<xsl:value-of select="datum_gepland/datum"/>&#xA0;
<xsl:value-of select="datum_gepland/tijd"/>u
</td>
</tr>
<tr height="10px">
<td colspan="4">
<hr/>
</td>
</tr>
<tr>
<td align="right">
<b>Categorie:</b>
</td>
<td align="left" colspan="3">>
<xsl:value-of select="discipline/omschrijving"/>&#160;<xsl:value-of select="stdmelding/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>
<tr height="10px">
<td colspan="4">
<hr/>
</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="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>
<tr height="10px">
<td colspan="4">
<hr/>
</td>
</tr>
<tr>
<td align="right" valign="top">
<b>Afleveradres:</b>
</td>
<td align="right" valign="top">
<b><xsl:value-of select="aflever_adres/naam"/></b><br/>
<xsl:value-of select="aflever_adres/bezoek_adres"/><br/>
<xsl:value-of select="aflever_adres/bezoek_postcode"/>&#160;&#160;<xsl:value-of select="aflever_adres/bezoek_plaats"/>
</td>
<td align="right" valign="top">
<b>Factuuradres:</b>
</td>
<td align="right" valign="top">
<b><xsl:value-of select="../factuuradres/naam"/></b><br/>
<xsl:value-of select="../factuuradres/post_adres"/><br/>
<xsl:value-of select="../factuuradres/post_postcode"/>&#160;&#160;<xsl:value-of select="aflever_adres/post_plaats"/>
</td>
</tr>
</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="melding/stdmelding/discipline/srtdiscipline/prefix"/>
<xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/></b>
</td>
</tr>
<tr>
<xsl:choose>
<xsl:when test="melding/aflever_adres/naam != ''">
<td width="25%"><b><u>Afleveradres</u></b></td>
</xsl:when>
<xsl:otherwise>
<td width="25%"/>
</xsl:otherwise>
</xsl:choose>
<xsl:choose>
<xsl:when test="factuuradres/naam != ''">
<td width="25%"><b><u>Factuuradres</u></b></td>
</xsl:when>
<xsl:otherwise>
<td width="25%"/>
</xsl:otherwise>
</xsl:choose>
<td width="25%" align="right">
<b><xsl:value-of select="//lcl/FAC/bedrijf"/>:</b>
</td>
<td width="25%">
<xsl:value-of select="uitvoerende/bedrijf/naam"/>
</td>
</tr>
<tr>
<td>
<xsl:value-of select="melding/aflever_adres/naam"/>
</td>
<td>
<xsl:value-of select="factuuradres/naam"/>
</td>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/contactpersoon"/>:</b>
</td>
<td>
<xsl:value-of select="contactpersoon/naam_full"/>
</td>
</tr>
<tr>
<td>
<xsl:value-of select="melding/aflever_adres/bezoek_adres"/>
</td>
<td>
<xsl:value-of select="factuuradres/post_adres"/>
</td>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/telefoon"/>:</b>
</td>
<td>
<xsl:value-of select="contactpersoon/telefoon1"/>
</td>
</tr>
<tr>
<td>
<xsl:value-of select="melding/aflever_adres/bezoek_postcode"/>&#160;&#160;<xsl:value-of select="melding/aflever_adres/bezoek_plaats"/>
</td>
<td>
<xsl:value-of select="factuuradres/post_postcode"/>&#160;&#160;<xsl:value-of select="factuuradres/post_plaats"/>
</td>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/adres"/>:</b>
</td>
<td>
<xsl:value-of select="uitvoerende/bedrijf/post_adres"/>
</td>
</tr>
<tr>
<td colspan="2"/>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/plaats"/>:</b>
</td>
<td>
<xsl:value-of select="uitvoerende/bedrijf/post_plaats"/>
</td>
</tr>
<tr>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/contactpersoon"/>:</b>
</td>
<td align="left">
<xsl:value-of select="backoffice_contact/naam_full"/>
</td>
<td colspan="2"/>
</tr>
<tr>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/telefoon"/>:</b>
</td>
<td align="left">
<xsl:value-of select="backoffice_contact/telefoonnr"/>
</td>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/kostenplaats"/>:</b>
</td>
<td align="left">
<xsl:value-of select="kostenplaats/nr"/>
</td>
</tr>
<xsl:if test="melding/kenmerk[@naam='Projectnummer']!=''">
<tr>
<td colspan="2"/>
<td align="right">
<b>Projectnummer:</b>
</td>
<td align="left">
<xsl:value-of select="melding/kenmerk[@naam='Projectnummer']"/>
</td>
</tr>
</xsl:if>
<tr>
<td colspan="2"/>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/datum_gereed"/>:</b>
</td>
<td align="left">
<xsl:value-of select="datumgereed/datum"/>
</td>
</tr>
<tr>
<td colspan="2"/>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/status"/>:</b>
</td>
<td align="left">
<xsl:value-of select="status"/>
</td>
</tr>
<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>
<tr>
<td colspan="4">
<hr/>
</td>
</tr>
<tr>
<td colspan="4" align="center">
<table width="100%" style="background-color:#EEEEEE;border: 1px solid blue">
<tr>
<td>
<xsl:apply-templates select="melding" mode="IBA"/>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td colspan="4" height="30px" valign="center">
<hr/>
</td>
</tr>
<xsl:variable name="arbeid" select="uren*uurloon"/>
<tr>
<td align="right">
<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>
<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>
</tr>
<tr>
<td colspan="2"/>
<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>
</tr>
<xsl:variable name="correctie0" select="$arbeid + materiaal"/>
<xsl:variable name="correctie" select="kosten - $correctie0"/>
<xsl:if test="$correctie!=0">
<tr>
<td colspan="2"/>
<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>
</tr>
</xsl:if>
<tr>
<td colspan="2"/>
<td align="right">
<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>
</td>
</tr>
</table>
<table border="0" width="100%">
<tr style="line-height:0; border:0; font-size:0px">
<div id="cxml" style="display:none">
<span id="hiddenfields">yes</span>
<span id="order_ID"><xsl:value-of select="melding/stdmelding/discipline/srtdiscipline/prefix"/><xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/></span>
<xsl:choose>
<xsl:when test="melding/aflever_adres/key = 161">
<span id="ShipTo_Name"></span>
<span id="ShipTo_Address"></span>
<span id="ShipTo_PostalCode"></span>
<span id="ShipTo_City"></span>
</xsl:when>
<xsl:otherwise>
<span id="ShipTo_Name"><xsl:value-of select="melding/aflever_adres/naam"/></span>
<span id="ShipTo_Address"><xsl:value-of select="melding/aflever_adres/bezoek_adres"/></span>
<span id="ShipTo_PostalCode"><xsl:value-of select="melding/aflever_adres/bezoek_postcode"/></span>
<span id="ShipTo_City"><xsl:value-of select="melding/aflever_adres/bezoek_plaats"/></span>
</xsl:otherwise>
</xsl:choose>
<span id="BillTo_Name"><xsl:value-of select="factuuradres/naam"/></span>
<span id="BillTo_Address"><xsl:value-of select="factuuradres/post_adres"/></span>
<span id="BillTo_PostalCode"><xsl:value-of select="factuuradres/post_postcode"/></span>
<span id="BillTo_City"><xsl:value-of select="factuuradres/post_plaats"/></span>
<span id="requestedDeliveryDate"><xsl:value-of select="melding/datum_gepland/datum"/></span>
<span id="Extinsic_ContactPerson"><xsl:value-of select="backoffice_contact/naam_full"/></span>
<span id="Extinsic_Projectnr"><xsl:value-of select="melding/kenmerk[@naam='Projectnummer']"/></span>
</div>
</tr>
</table>
</xsl:template>
<xsl:template match="opdracht" mode="full">
<xsl:choose>
<xsl:when test="$mode='summary'"></xsl:when>
<xsl:otherwise>
<html>
<xsl:comment>================================ OPDRACHTEN ==============================</xsl:comment>
<xsl:comment>FACILITOR default XSL template for opdracht</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:template>
</xsl:stylesheet>

4
CUST/KFNS/xsl/cust.xsl
View File

@@ -191,7 +191,7 @@
3551 EJ Utrecht<br/>
DCNS-DSD 14<br/>
06-83649789<br/>
dcns@nsstations.nl
dcns@ns.nl
</td>
</tr>
<tr><td colspan="4"><br/><hr/></td></tr>
@@ -299,7 +299,7 @@
3551 EJ Utrecht<br/>
DCNS-DSD 14<br/>
06-83649789<br/>
dcns@nsstations.nl
dcns@ns.nl
</td>
</tr>
<tr><td colspan="4"><br/><hr/></td></tr>

18
CUST/HAYG/sso/SSO.asp → CUST/PCHA/SSO/SSOprodPCHA.asp
View File

@@ -1,23 +1,29 @@
<%@language="VBScript"%>
<%
'*******************************************************************
'Script: HAYG.ASP
'Script: SSOprodPCHA.asp
'
' $Revision$
' $Id$
'
'Doel: SSO bewerkstelligen voor ASP providers - deel 1 van 2
'Auteur: Thorwald Beeris
'*******************************************************************
'* declare *********************************************************
Dim strGUID, strCTID, strUserName, strKey, strASPUrl, strSharedKey
Dim strEncryptedCode, strControlEncryptedCode
'* variables *******************************************************
strASPUrl = "https://hayg.facilitor.nl/?sso=1" 'HTTPS URL adres van ASP
strSharedKey = "CbBYEMLFORDtkrKHfAFmtLedFXhqisuM" 'Sharedkey - Should be the same at target side
strASPUrl = "https://pcha.facilitor.nl?sso=1" 'HTTPS URL adres van ASP
strSharedKey = "zF1V04ErlDCpbcA39opf0SEWyrF49fBf" 'Sharedkey - Should be the same at target side
'*******************************************************************
response.Buffer=true
Dim proto, zelf
If Request.ServerVariables("SERVER_PORT") = 443 Then
proto = "https://"
Else
proto = "http://"
End If
zelf = proto & Request.ServerVariables("HTTP_HOST") & Request.ServerVariables("SCRIPT_NAME")
%>
<HTML>
<HEAD>
@@ -31,7 +37,7 @@ function fnSubmit() {
<BODY LANGUAGE="javascript" onload="return fnSubmit()">
Een moment aub.
<form action='<%=strASPUrl%>' method="post" name="form" ID="Form1">
<input type="hidden" name="returnurl" value="<%="http://" & Request.ServerVariables("HTTP_HOST") & Request.ServerVariables("SCRIPT_NAME")%>" ID="Hidden1">
<input type="hidden" name="returnurl" value="<%=zelf%>" ID="Hidden1">
<%
'* request action = requestid ***************************************
strGUID = Request.form("guid")
@@ -76,7 +82,7 @@ else
'* crypt Controlkey *********************************************
'First coding phase
strKey = mid(strSharedKey & strCTID,1,Len(strCTID))
strControlEncryptedCode = EnCrypt("http://" & Request.ServerVariables("HTTP_HOST") & Request.ServerVariables("SCRIPT_NAME"))
strControlEncryptedCode = EnCrypt(zelf)
'Second coding phase
strKey = mid(strCTID,1,Len(strControlEncryptedCode))
strControlEncryptedCode = EnCrypt(strControlEncryptedCode)

120
CUST/PCHW/SSO/SSOprodPCHW.asp Normal file
View File

@@ -0,0 +1,120 @@
<%@language="VBScript"%>
<%
'*******************************************************************
'Script: SSOprodPCHW.asp
'
' $Revision$
' $Id$
'
'Doel: SSO bewerkstelligen voor ASP providers - deel 1 van 2
'*******************************************************************
'* declare *********************************************************
Dim strGUID, strCTID, strUserName, strKey, strASPUrl, strSharedKey
Dim strEncryptedCode, strControlEncryptedCode
'* variables *******************************************************
strASPUrl = "https://pchw.facilitor.nl?sso=1" 'HTTPS URL adres van ASP
strSharedKey = "09A9e0kKjhPhQLMgF3cn7LL3RT-IMlwn" 'Sharedkey - Should be the same at target side
'*******************************************************************
response.Buffer=true
Dim proto, zelf
If Request.ServerVariables("SERVER_PORT") = 443 Then
proto = "https://"
Else
proto = "http://"
End If
zelf = proto & Request.ServerVariables("HTTP_HOST") & Request.ServerVariables("SCRIPT_NAME")
%>
<HTML>
<HEAD>
<SCRIPT LANGUAGE="JavaScript">
function fnSubmit() {
window.document.form.submit();
return;
}
</SCRIPT>
</HEAD>
<BODY LANGUAGE="javascript" onload="return fnSubmit()">
Een moment aub.
<form action='<%=strASPUrl%>' method="post" name="form" ID="Form1">
<input type="hidden" name="returnurl" value="<%=zelf%>" ID="Hidden1">
<%
'* request action = requestid ***************************************
strGUID = Request.form("guid")
strCTID = Request.form("ctid")
if strGUID = "" or strCTID = "" then
'* first flow: requestid ****************************************
%>
<input type="hidden" name="action" value="requestid" ID="Hidden2">
<input type="hidden" name="jumpTo" value="<%=Request.Querystring("jumpTo")%>" ID="jumpTo">
<%
else
'* second flow: create code *************************************
strUserName = Request.ServerVariables("LOGON_USER")
if strUserName = "" then
strUserName = Request.ServerVariables("REMOTE_USER")
if strUserName = "" then
strUserName = Request.ServerVariables("HTTP_USER")
if strUserName = "" then
strUserName = Request.ServerVariables("HTTP_LOGIN")
if strUserName = "" then
'Forse user to authenticate
response.Clear
response.Status = 401
response.Flush
response.End
end if
end if
end if
end if
' * Strip domain name
Do While instr(strUserName, "\")>0
strUserName = Mid(strUserName, instr(strUserName, "\") + 1)
Loop
'* crypt ********************************************************
'First coding phase
strKey = mid(strSharedKey & strGUID,1,Len(strUserName))
strEncryptedCode = EnCrypt(strUserName)
'Second coding phase
strKey = mid(strGUID,1,Len(strEncryptedCode))
strEncryptedCode = EnCrypt(strEncryptedCode)
'* crypt Controlkey *********************************************
'First coding phase
strKey = mid(strSharedKey & strCTID,1,Len(strCTID))
strControlEncryptedCode = EnCrypt(zelf)
'Second coding phase
strKey = mid(strCTID,1,Len(strControlEncryptedCode))
strControlEncryptedCode = EnCrypt(strControlEncryptedCode)
%>
<input type="hidden" name="action" value="processcode" ID="Hidden3">
<input type="hidden" name="code" value="<%=ConvertToAsc(strEncryptedCode)%>" ID="Hidden4">
<input type="hidden" name="ctcode" value="<%=ConvertToAsc(strControlEncryptedCode)%>" ID="Hidden5">
<input type="hidden" name="ltcode" value="<%=len(strUserName)%>" ID="Hidden6">
<%
end if
'* Functions ********************************************************
Function EnCrypt(strCryptThis)
Dim strChar, iKeyChar, iStringChar, i
for i = 1 to Len(strCryptThis)
iKeyChar = Asc(mid(strKey,i,1))
iStringChar = Asc(mid(strCryptThis,i,1))
iCryptChar = iKeyChar Xor iStringChar
strEncrypted = strEncrypted & Chr(iCryptChar)
next
EnCrypt = strEncrypted
End Function
Function ConvertToAsc(strAsc)
Dim iCount
Dim strTemp
ConvertToAsc = ""
for iCount = 1 to len(strAsc)
strTemp = (asc(mid(strAsc,iCount,1)))
ConvertToAsc = ConvertToAsc & len(strTemp) & strTemp
next
End Function
'*********************************************************************
%>
</form>
</BODY>
</HTML>

8
CUST/UWVA/NaarWorldmeeting.asp
View File

@@ -19,13 +19,14 @@ var xmlUrl = "https://services.worldmeetings.com/api/v1.0/Order"
var xmlResp;
var xmlhttp = new ActiveXObject("WinHTTP.WinHTTPRequest.5.1");
var requestContext = getQParam('context', 'MEETINGS');
user.checkAutorisation("WEB_USER24"); // UWVA#31893: Doorlinken naar Worldmeetings alleen met USER24-rechten!
//SXH_PROXY_SET_PROXY = 2
//xmlhttp.setProxy(SXH_PROXY_SET_PROXY, "127.0.0.1:8888"); // Voor debugging met Fiddler
xmlhttp.open("POST", xmlUrl, false);
xmlhttp.SetCredentials("UwvFacilitor","mUSeTu33je8eGEWe", 0);
xmlhttp.SetCredentials("UWV2017","Te7eramuTrEqAwaT", 0);
xmlhttp.setRequestHeader("Content-Type", "text/xml; charset=utf-8")
// Zonder de ns: twee keer krijg ik
@@ -45,11 +46,12 @@ var req = "<ns:createRequestRequestMessage xmlns:ns=\"http://services.worldmeeti
+ " <gender>" + (user.prs_perslid_geslacht()?"M":"F") + "</gender>"
+ " <externalIdentifier>"+ String(user_key) +"</externalIdentifier>"
+ " <communicationDetails>"
+ " <emailAddress>servicecenterfb@uwv.nl</emailAddress>"
+ " <emailAddress>" + safe.html(user.prs_perslid_email()) + "</emailAddress>"
+ " <telephoneNumber>" + safe.html(user.prs_perslid_telefoonnr()) + "</telephoneNumber>"
+ (user.prs_perslid_mobiel()?"<mobilePhoneNumber>" + safe.html(user.prs_perslid_mobiel()) + "</mobilePhoneNumber>":"")
+ " </communicationDetails>"
+ " </personalDetails>"
+ " <requestContext>MEETINGS</requestContext>"
+ " <requestContext>{0}</requestContext>".format(safe.html(requestContext))
+ "</ns:createRequestRequestMessage>";
var msg = "<?xml version=\"1.0\" encoding=\"utf-8\"?>"