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

Merge 2016.1 patches

Browse Source 
svn path=/Website/trunk/; revision=29941
This commit is contained in:
Jos Groot Lipman
2016-07-04 12:13:22 +00:00
parent 2e67e5836f 6b475aaa49
commit f4f9271370
24 changed files with 353 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/FAC/fac_report.asp
View File

@@ -195,7 +195,7 @@ function fac_usrrap_list_graph (model, scf_params)
graphAxes = { url: null
, xas: { naam: model.fields[scf_params.list.columns[0]].label}
, yas: []
, zas: { naam: ((xxx_params.filter.scf_pivot==1 && xxx_columns) ? model.fields[xxx_columns[2]].label : null)}
, zas: { naam: ((xxx_params.filter.scf_pivot==1 && xxx_columns && xxx_columns[2]) ? model.fields[xxx_columns[2]].label : null)}
};
for (var c=1; c < scf_params.list.columns.length; c++)

3
APPL/Shared/Login.inc
View File

@@ -413,7 +413,8 @@ function setpassword(prs_key, wachtwoord)
var workfactor = S("prs_password_hash_factor");
var is_hash = pbkdf2(wachtwoord, passsalt, workfactor);
var sql = "UPDATE prs_perslid"
+ " SET prs_perslid_salt = " + safe.quoted_sql(passsalt)
+ " SET prs_perslid_wachtwoord_exp = NULL" // Niet meer expired. Ooit: SYSDATE + fac.getsetting ('prs_password_expiration') als die is gevuld
+ " , prs_perslid_salt = " + safe.quoted_sql(passsalt)
+ " , prs_perslid_wachtwoord_hash = " + safe.quoted_sql('1${0}${1}'.format(workfactor, is_hash))
+ " WHERE prs_perslid_key = " + prs_key;
Oracle.Execute(sql);

2
APPL/Shared/default.inc
View File

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

BIN
CUST/AAES/Essent_mob.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

4
CUST/AAES/cust.css
View File

@@ -7,9 +7,9 @@
#headerblok
{
background: url(Essent.gif) no-repeat;
background: url(rwe_logo.jpg) no-repeat;
background-color: #FFFFFF;
background-position: -10px -2px;
background-position: 20px;
color: #000002;
}

BIN
CUST/AAES/essent_groot.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
CUST/AAES/rwe_groot.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
CUST/AAES/rwe_logo.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

8
CUST/AAES/xsl/cust_settings.xsl
View File

@@ -4,10 +4,10 @@
<xsl:variable name="logo_file">../../cust/aaxx/aafm_banner.gif</xsl:variable>
<xsl:template name="customer">ESSENT </xsl:template>
<xsl:template name="customer_code">ESSENT</xsl:template>
<xsl:template name="customer_email">facilitydeskessent@aa-fm.com</xsl:template>
<xsl:template name="invoice_email">invoices.essent@aa-fm.com</xsl:template>
<xsl:template name="customer">RWE </xsl:template>
<xsl:template name="customer_code">RWE</xsl:template>
<xsl:template name="customer_email">servicedeskrwe@aa-fm.com</xsl:template>
<xsl:template name="invoice_email">invoices.rwe@aa-fm.com</xsl:template>
<xsl:template name="servicedesk_telefoon">+31 (0) 040 2332880</xsl:template>
<xsl:template name="opdracht_qr_bookmark"></xsl:template>

7
CUST/AKZA/export/gen_export_task_monthly.bat Normal file
View File

@@ -0,0 +1,7 @@
REM GEN_EXPORT_task_monthly.BAT
REM $Id$
REM
REM (c) 2016, Facilitor B.V., +31 (53) 4800700, helpdesk@facilitor.nl
REM
CALL ..\..\..\utils\gen_export\gen_export.bat TASK_MONTHLY

0
CUST/ARFR/xsl/.gitignore vendored
View File

29
CUST/ARFR/xsl/cust.xsl Normal file
View File

@@ -0,0 +1,29 @@
<?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="deel" mode="full">
<xsl:choose>
<xsl:when test="$srtnotificatiecode='INSMAI'">
<p>
S'il vous plaît entrer dans FACILITOR le kilométrage actuel pour votre voiture
<xsl:element name="a">
<xsl:attribute name="href">
https://<xsl:value-of select="$FacilitorRoot"/>/?u=uLLUddmzegerdfEK&amp;k=<xsl:value-of select="key"/>
</xsl:attribute>
ici
</xsl:element>.
</p>
</xsl:when>
<xsl:otherwise>
<xsl:apply-imports/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
</xsl:stylesheet>

2
CUST/ASDL/afmelden_locatie.asp
View File

@@ -38,7 +38,7 @@ var locatie_key = getQParamInt("locatie_key", -1);
if (locatie_key != -1)
{
PAGE_START();
HEADER({title: "Locatie ingevuld", back:0, home:1});
HEADER({title: "Locatie afgemeld", back:0, home:1});
CONTENT_START();
var sql =
" SELECT DISTINCT ins_deel_key, ins_srtcontrole_key, p.prs_perslid_key, ins_deelsrtcontrole_key "

BIN
CUST/MARX/oracle.udl Normal file
View File

Binary file not shown.

9
CUST/MARX/xsl/A_GetOpdrachten.xsl
View File

@@ -12,10 +12,10 @@
<xsl:apply-templates select="s:Envelope/s:Body"/>
</xsl:template>
<xsl:template match="s:Body">exec_code;ax_supplier_id;mld_melding_externnr;mld_melding_omschrijving;prs_afdeling_externnr;mld_opdr_opzichter;mld_melding_cust_name;mld_melding_cust_straat;mld_melding_cust_huisnr;mld_melding_cust_huisnr2;mld_melding_cust_postcode;mld_melding_cust_plaats;mld_melding_cust_telefoonnr;mld_melding_cust_mobielnr;mld_melding_cust_object_omschr;mld_melding_memo;mld_opdr_externnr;mld_opdr_ordernr;mld_opdr_datumbegin;mld_opdr_datum_plan;mld_opdr_einddatum;mld_opdr_mat_linenr;mld_opdr_mat_naam;mld_opdr_mat_eenheidcode;mld_opdr_mat_eenheid;mld_opdr_mat_prijs;mld_opdr_mat_aantal;mld_opdr_mat_btwperc;mld_opdr_mat_totaal
<xsl:for-each select="descendant::*/b:SupplierTaskSpec">1;<xsl:value-of select="b:vendAccountNum"/>;<xsl:value-of select="b:requestId"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:description"/></xsl:call-template>;<xsl:value-of select="b:companyId"/>;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custName"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custStreet"/></xsl:call-template>;;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custZipCode"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custCity"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custPhone"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custMobilePhone"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:objectDescription"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="substring(b:memo,1,3000)"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:purchId"/></xsl:call-template>;<xsl:value-of select="b:taskId"/>;<xsl:value-of select="b:registrationDate"/>;<xsl:call-template name="mld_opdr_plandatum"><xsl:with-param name="p_task_status" select="b:taskStatus"/><xsl:with-param name="p_plan_datum" select="b:startDateTime"/></xsl:call-template>;<xsl:value-of select="b:deadlineDate"/>;;;;;;;;
2;<xsl:value-of select="b:vendAccountNum"/>;<xsl:value-of select="b:requestId"/>;;<xsl:value-of select="b:companyId"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:supervisorName"/></xsl:call-template>;;;;;;;;;;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:purchId"/></xsl:call-template>;<xsl:value-of select="b:taskId"/>;;;;;;;;;;;&#10;</xsl:for-each>
<xsl:for-each select="descendant::*/b:SupplierTaskSpec/b:SupplierPurchLines/b:SupplierPurchLine">3;<xsl:value-of select="../../b:vendAccountNum"/>;<xsl:value-of select="../../b:requestId"/>;;<xsl:value-of select="../../b:companyId"/>;;;;;;;;;;;;<xsl:value-of select="../../b:purchId"/>;<xsl:value-of select="../../b:taskId"/>;;;;<xsl:call-template name="Materiaal_regel"><xsl:with-param name="p_linenr" select="b:lineNum"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:name"/></xsl:call-template>;<xsl:call-template name="Materiaal_eenheidSidB"><xsl:with-param name="p_unit" select="b:purchUnitGS1"/></xsl:call-template>;<xsl:value-of select="b:purchUnit"/>;<xsl:value-of select="b:purchPrice"/>;<xsl:value-of select="b:qtyOrdered"/>;<xsl:call-template name="Mareon_btwperc"><xsl:with-param name="p_btwperc" select="b:taxItemGroup"/></xsl:call-template>;<xsl:value-of select="b:lineAmount"/>;&#10;</xsl:for-each>
<xsl:template match="s:Body">exec_code;ax_supplier_id;mld_melding_externnr;mld_melding_omschrijving;prs_afdeling_externnr;mld_opdr_opzichter;mld_melding_cust_name;mld_melding_cust_straat;mld_melding_cust_huisnr;mld_melding_cust_huisnr2;mld_melding_cust_postcode;mld_melding_cust_plaats;mld_melding_cust_telefoonnr;mld_melding_cust_mobielnr;mld_melding_cust_object_omschr;complexnummer;pandnummer;VGEnummer;mld_melding_memo;mld_opdr_externnr;mld_opdr_ordernr;mld_opdr_datumbegin;mld_opdr_datum_plan;mld_opdr_einddatum;mld_opdr_mat_linenr;mld_opdr_mat_naam;mld_opdr_mat_eenheidcode;mld_opdr_mat_eenheid;mld_opdr_mat_prijs;mld_opdr_mat_aantal;mld_opdr_mat_btwperc;mld_opdr_mat_totaal
<xsl:for-each select="descendant::*/b:SupplierTaskSpec">1;<xsl:value-of select="b:vendAccountNum"/>;<xsl:value-of select="b:requestId"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:description"/></xsl:call-template>;<xsl:value-of select="b:companyId"/>;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custName"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custStreet"/></xsl:call-template>;;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custZipCode"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custCity"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custPhone"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custMobilePhone"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:objectDescription"/></xsl:call-template>;;;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="substring(b:memo,1,3000)"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:purchId"/></xsl:call-template>;<xsl:value-of select="b:taskId"/>;<xsl:value-of select="b:registrationDate"/>;<xsl:call-template name="mld_opdr_plandatum"><xsl:with-param name="p_task_status" select="b:taskStatus"/><xsl:with-param name="p_plan_datum" select="b:startDateTime"/></xsl:call-template>;<xsl:value-of select="b:deadlineDate"/>;;;;;;;;
2;<xsl:value-of select="b:vendAccountNum"/>;<xsl:value-of select="b:requestId"/>;;<xsl:value-of select="b:companyId"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:supervisorName"/></xsl:call-template>;;;;;;;;;;;<xsl:value-of select="b:objectId"/>;;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:purchId"/></xsl:call-template>;<xsl:value-of select="b:taskId"/>;;;;;;;;;;;&#10;</xsl:for-each>
<xsl:for-each select="descendant::*/b:SupplierTaskSpec/b:SupplierPurchLines/b:SupplierPurchLine">3;<xsl:value-of select="../../b:vendAccountNum"/>;<xsl:value-of select="../../b:requestId"/>;;<xsl:value-of select="../../b:companyId"/>;;;;;;;;;;;;;;;<xsl:value-of select="../../b:purchId"/>;<xsl:value-of select="../../b:taskId"/>;;;;<xsl:call-template name="Materiaal_regel"><xsl:with-param name="p_linenr" select="b:lineNum"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:name"/></xsl:call-template>;<xsl:call-template name="Materiaal_eenheidSidB"><xsl:with-param name="p_unit" select="b:purchUnitGS1"/></xsl:call-template>;<xsl:value-of select="b:purchUnit"/>;<xsl:value-of select="b:purchPrice"/>;<xsl:value-of select="b:qtyOrdered"/>;<xsl:call-template name="Mareon_btwperc"><xsl:with-param name="p_btwperc" select="b:taxItemGroup"/></xsl:call-template>;<xsl:value-of select="b:lineAmount"/>;&#10;</xsl:for-each>
</xsl:template>
@@ -99,5 +99,6 @@
<xsl:otherwise></xsl:otherwise>
</xsl:choose>
</xsl:template>
</xsl:stylesheet>

4
CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB.xsl
View File

@@ -101,9 +101,9 @@
<!-- SIDB - Uniek nummer ter identificatie van een woningcorporatie complex. Optioneel, C(17) -->
<!-- <ComplexNumber></ComplexNumber> -->
<!-- SIDB - Uniek nummer ter identificatie van een pand. Optioneel, C(17) -->
<!-- <PremisesNumber></PremisesNumber> -->
<PremisesNumber><xsl:value-of select="kenmerk[@key='15']"/></PremisesNumber>
<!-- SIDB - Uniek nummer ter identificatie van een vastgoedeenheid. Optioneel, C(17) -->
<!-- <RealEstateUnitNumber></RealEstateUnitNumber>-->
<RealEstateUnitNumber><xsl:value-of select="kenmerk[@key='16']"/></RealEstateUnitNumber>
<!-- SIDB - Tekstveld met straatnaam en huisnummer van het adres van de lokatie. Mandatory, C(35) -->
<!-- Melding kenmerk key 2 is adres, deze is vervangen door kenmerken straatnaam (key 9) en huisnr (key 10) -->
<StreetAndNumber><xsl:value-of select="melding/kenmerk[@key='9']"/><xsl:text> </xsl:text><xsl:value-of select="melding/kenmerk[@key='10']"/></StreetAndNumber>

6
CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB_INSBOU001_nov2015.xsl
View File

@@ -13,7 +13,7 @@
<xsl:template match="opdracht">
<!-- SIDB Onderhoudsopdracht 'insbou' Variant 'Basismodel010' versie 001 (releasedatum 11-2015) -->
<MaintenanceInstruction>
<MaintenanceInstruction xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.gs1.nl/onderhoudsopdracht/insbou/001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.gs1.nl/onderhoudsopdracht/insbou/001 Onderhoudsopdracht_insbou001.xsd">
<!-- SIDB description - Nummer ter identificatie van een bericht. Mandatory, (C17) -->
<!-- Voorbeeldformaat: MAR24/1@dd-mm-jjjj hh:mm:ss -->
<MessageNumber><xsl:value-of select="melding/stdmelding/discipline/srtdiscipline/prefix"/><xsl:value-of select="melding/key"/>/<xsl:value-of select="bedrijfopdr_volgnr"/>@<xsl:value-of select="//header/dateTime"/></MessageNumber>
@@ -101,9 +101,9 @@
<!-- SIDB - Uniek nummer ter identificatie van een woningcorporatie complex. Optioneel, C(17) -->
<!-- <ComplexNumber></ComplexNumber> -->
<!-- SIDB - Uniek nummer ter identificatie van een pand. Optioneel, C(17) -->
<!-- <PremisesNumber></PremisesNumber> -->
<PremisesNumber><xsl:value-of select="kenmerk[@key='15']"/></PremisesNumber>
<!-- SIDB - Uniek nummer ter identificatie van een vastgoedeenheid. Optioneel, C(17) -->
<!-- <RealEstateUnitNumber></RealEstateUnitNumber>-->
<RealEstateUnitNumber><xsl:value-of select="kenmerk[@key='16']"/></RealEstateUnitNumber>
<!-- SIDB - Tekstvelden met straatnaam en huisnummer van het adres van de lokatie. Mandatory, C(35) -->
<!-- Melding kenmerk key 9 is straatnaam -->
<Street><xsl:value-of select="melding/kenmerk[@key='9']"/></Street>

14
CUST/MARX/xsl/T_GetOpdrachten.xsl
View File

@@ -10,8 +10,8 @@
<xsl:apply-templates select="soap:Envelope/soap:Body"/>
</xsl:template>
<xsl:template match="soap:Body">ax_supplier_id;mld_melding_externnr;mld_melding_omschrijving;prs_afdeling_externnr;mld_opdr_opzichter;mld_melding_cust_name;mld_melding_cust_straat;mld_melding_cust_huisnr;mld_melding_cust_huisnr2;mld_melding_cust_postcode;mld_melding_cust_plaats;mld_melding_cust_telefoonnr;mld_melding_cust_mobielnr;mld_melding_cust_object_omschr;mld_melding_memo;mld_opdr_externnr;mld_opdr_ordernr;mld_opdr_datumbegin;mld_opdr_datum_plan;mld_opdr_einddatum
<xsl:for-each select="descendant::*/Bon"><xsl:value-of select="CrediteurNummer"/>;<xsl:value-of select="BonNummer"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="BonOmschrijving"/></xsl:call-template>;1;<xsl:call-template name="Tobias_SkipGeen"><xsl:with-param name="p_str" select="OpzichterNaam"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="HuurderNaam"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="StraatNaam"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="HuisNummer"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="Toevoegsel"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="Postcode"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="Woonplaats"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="Telefoon"/></xsl:call-template>;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="xxx_objectDescription"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="xxx_memo"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="concat(BonNummer,'.',BonVolgNummer)"/></xsl:call-template>;<xsl:value-of select="BonId"/>;<xsl:value-of select="substring(BonDatumOpdracht,1,10)"/>;;<xsl:call-template name="Tobias_UitersteDatumGereed"><xsl:with-param name="p_datum" select="substring(UitersteDatumGereed,1,10)"/></xsl:call-template>;&#10;</xsl:for-each>
<xsl:template match="soap:Body">ax_supplier_id;mld_melding_externnr;mld_melding_omschrijving;prs_afdeling_externnr;mld_opdr_opzichter;mld_melding_cust_name;mld_melding_cust_straat;mld_melding_cust_huisnr;mld_melding_cust_huisnr2;mld_melding_cust_postcode;mld_melding_cust_plaats;mld_melding_cust_telefoonnr;mld_melding_cust_mobielnr;mld_melding_cust_object_omschr;complexnummer;pandnummer;VGEnummer;mld_melding_memo;mld_opdr_externnr;mld_opdr_ordernr;mld_opdr_datumbegin;mld_opdr_datum_plan;mld_opdr_einddatum
<xsl:for-each select="descendant::*/Bon"><xsl:value-of select="CrediteurNummer"/>;<xsl:value-of select="BonNummer"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="BonOmschrijving"/></xsl:call-template>;1;<xsl:call-template name="Tobias_SkipGeen"><xsl:with-param name="p_str" select="OpzichterNaam"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="HuurderNaam"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="StraatNaam"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="HuisNummer"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="Toevoegsel"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="Postcode"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="Woonplaats"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="Telefoon"/></xsl:call-template>;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="xxx_objectDescription"/></xsl:call-template>;;<xsl:value-of select="ToeNummer"/>;<xsl:call-template name="VGEnummer"><xsl:with-param name="p_str1" select="ClusterKode"/><xsl:with-param name="p_str2" select="PerceelNummerToe"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="xxx_memo"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="concat(BonNummer,'.',BonVolgNummer)"/></xsl:call-template>;<xsl:value-of select="BonId"/>;<xsl:value-of select="substring(BonDatumOpdracht,1,10)"/>;;<xsl:call-template name="Tobias_UitersteDatumGereed"><xsl:with-param name="p_datum" select="substring(UitersteDatumGereed,1,10)"/></xsl:call-template>;&#10;</xsl:for-each>
</xsl:template>
<xsl:template name="vrije_tekst">
@@ -58,4 +58,14 @@
</xsl:choose>
</xsl:template>
<xsl:template name="VGEnummer">
<xsl:param name="p_str1"/>
<xsl:param name="p_str2"/>
<xsl:choose>
<xsl:when test="$p_str1 != '0' and $p_str1 != ''"><xsl:value-of select="$p_str1"/></xsl:when>
<xsl:when test="$p_str2 != '0' and $p_str2 != ''"><xsl:value-of select="$p_str2"/></xsl:when>
<xsl:otherwise></xsl:otherwise>
</xsl:choose>
</xsl:template>
</xsl:stylesheet>

17
CUST/MARX/xsl/mareon.xsl
View File

@@ -225,6 +225,21 @@
</td>
</tr>
<tr>
<td align="right">
<b>Pandnummer:</b>
</td>
<td>
<xsl:value-of select="kenmerk[@key='15']"/>
</td>
<td align="right">
<b>VGE nummer:</b>
</td>
<td>
<xsl:value-of select="kenmerk[@key='16']"/>
</td>
</tr>
<tr>
<td align="right">
<b>Opzichter:</b>
@@ -233,6 +248,8 @@
<xsl:value-of select="kenmerk[@key=13]"/>
</td>
</tr>
<tr>
<td align="right" valign="top">

2
CUST/RENK/xsl/cust.xsl
View File

@@ -920,7 +920,7 @@ Naar aanleiding van uw <xsl:value-of select="SOORTVERZOEK"/> verzoek van <span c
Namens hen,<br/>
<br/><br/><br/>
ir. J.A.M. (Jojanneke) van der Molen-Balk<br/>
Hoofd Ruimtelijke Ontwikkeling en Milieu
Hoofd Vastgoed
</td>
<td style="font-size:9pt;font-family:Verdana;">&#xA0;</td>
</tr>

2
CUST/UWVA/xsl/cust.xsl
View File

@@ -529,7 +529,7 @@
De melding is als volgt omschreven:<br/><xsl:value-of select="omschrijving"/><br/><br/><br/>
Wil je reageren op deze omschrijving, neem dan telefonisch contact met ons op.<br/><br/>
Wij streven ernaar de melding zo spoedig mogelijk af te handelen en zullen je tijdens de afhandeling van jouw melding op de hoogte houden.<br/>
Onderaan deze mail vindt je de status van je melding.<br/><br/>
Onderaan deze mail vind je de status van je melding.<br/><br/>
Wij streven ernaar jouw melding naar tevredenheid af te handelen.<br/><br/><br/>
Hoogachtend,<br/>
Service Center Facilitair Bedrijf<br/><br/><br/>

242
CUST/VENR/xsl/cust.xsl
View File

@@ -1196,6 +1196,248 @@
</html>
</xsl:if>
</xsl:template>
<xsl:template name="res_begintext">
<xsl:variable name="totcalc">
<xsl:value-of select="number(substring(rsv_ruimte/tot/tijd,1,2))"/><xsl:value-of select="number(substring(rsv_ruimte/tot/tijd,4,5))"/>
</xsl:variable>
<tr>
<td colspan="4" class="tekst">
<xsl:if test="$totcalc &gt; 1800">
<b><xsl:value-of select="rsv_ruimte/kenmerk[@key=81]"/></b>
</xsl:if>
</td>
</tr>
</xsl:template>
<xsl:template name="rsv_ruimte">
<xsl:param name="min_volgnr"/>
<tr>
<xsl:choose>
<xsl:when test="res_ruimte!=''">
<td class="tekstkop" colspan="10" frame="box"><u>
<xsl:if test="dirtlevel!='0'">
<span class="fatal"><xsl:value-of select="//lcl/RES/ongeldig"/></span>&#xA0;
</xsl:if>
<xsl:value-of select="van/datum"/>&#xA0;
<xsl:value-of select="//lcl/RES/deelreservering"/>&#xA0;<xsl:value-of select="../key"/>&#xA0;/<xsl:value-of select="volgnr"/>&#xA0;
<xsl:if test="string(res_activiteit/omschrijving)!=''">(<xsl:value-of select="res_activiteit/omschrijving"/>)&#xA0;</xsl:if>
<xsl:value-of select="res_ruimte/plaats/regio/district/locatie/omschrijving"/></u>
</td>
</xsl:when>
<!-- "roomservice" -->
<xsl:otherwise>
<td class="tekstkop" colspan="10" frame="box" style="border-style:solid;border-width:0px;"><u>
<xsl:if test="dirtlevel!='0'">
<span class="fatal"><xsl:value-of select="//lcl/RES/ongeldig"/></span>&#xA0;
</xsl:if>
<xsl:value-of select="van/datum"/>
<xsl:if test="string(van/datum)!=string(tot/datum)">
&#xA0;-&#xA0;<xsl:value-of select="tot/datum"/>
</xsl:if>&#xA0;
<xsl:value-of select="//lcl/RES/deelreservering"/>&#xA0;<xsl:value-of select="../key"/>&#xA0;/<xsl:value-of select="volgnr"/>&#xA0;
<xsl:value-of select="plaats/plaatsaanduiding"/></u>
</td>
</xsl:otherwise>
</xsl:choose>
</tr>
<xsl:if test="string(omschrijving)!=string(//reservering/rsv_ruimte[volgnr=$min_volgnr]/omschrijving)">
<tr>
<td class="label" frame="box" style="border-style:solid;border-width:0px;"><xsl:value-of select="//lcl/FAC/omschrijving"/></td>
<td class="value" colspan="9" frame="box" style="border-style:solid;border-width:0px;">
: <xsl:value-of select="omschrijving"/>
</td>
</tr>
</xsl:if>
<xsl:if test="string(contact_user/naam_full)!=string(//reservering/rsv_ruimte[volgnr=$min_volgnr]/contact_user/naam_full)">
<tr>
<td class="label" frame="box" style="border-style:solid;border-width:0px;"><xsl:value-of select="//lcl/FAC/aanvrager"/></td>
<td class="value" colspan="9" frame="box" style="border-style:solid;border-width:0px;">
: <xsl:value-of select="contact_user/naam_full"/>/ <xsl:value-of select="contact_user/werkplek/plaats/regio/district/locatie/omschrijving"/></td>
</tr>
</xsl:if>
<tr>
<td class="label"><xsl:value-of select="//lcl/RES/status"/></td>
<td class="value" colspan="5">: <xsl:value-of select="status_fo"/>
</td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/RES/gastheer_vrouw"/></td>
<td class="value" colspan="5">: <xsl:value-of select="host_user/naam_full"/></td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/kostenplaats"/></td>
<td class="value" colspan="5">: <xsl:value-of select="kostenplaats/nr"/>&#xA0;
<xsl:value-of select="kostenplaats/omschrijving"/>
</td>
</tr>
<xsl:if test="string(opmerking)!=''">
<tr>
<td class="label" frame="box" style="border-style:solid;border-width:0px;"> <xsl:value-of select="//lcl/FAC/opmerking"/></td>
<td class="value" colspan="9" frame="box" style="border-style:solid;border-width:0px;">
: <xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="opmerking"/>
</xsl:call-template>
</td>
</tr>
</xsl:if>
<tr>
<td colspan="10" style="border-top:1px solid #000;"/>
</tr>
<tr>
<th class="resth" width="24%" align="left"><xsl:value-of select="//lcl/FAC/omschrijving"/></th>
<th class="resth" width="14%" align="left"><xsl:value-of select="//lcl/RES/aantal"/></th>
<!--<th width="80">Datum</th>-->
<th class="resth" width="14%" style="text-align:right"><xsl:value-of select="//lcl/RES/begintijd"/></th>
<th class="resth" width="14%" style="text-align:right"><xsl:value-of select="//lcl/RES/eindtijd"/></th>
<th class="resth" width="16%" align="center"><xsl:value-of select="//lcl/RES/opstelling"/></th>
<th class="resth" width="17%" style="text-align:right"><xsl:value-of select="//lcl/RES/prijs"/></th>
</tr>
<xsl:if test="res_ruimte!=''">
<tr>
<td width="24%" class="resresult" style="text-align:left;"><xsl:if test="dirtlevel!='0'"><span class="fatal"><xsl:value-of select="//lcl/RES/ongeldig"/></span>&#xA0;</xsl:if>
<xsl:value-of select="res_ruimte/nr"/>
<br/>(max. <xsl:value-of select="res_ruimte/bezoekers"/>&#xA0;<xsl:value-of select="//lcl/FAC/personen"/>)</td>
<td width="14%" class="resresult" style="text-align:left">
<xsl:value-of select="bezoekers"/>&#xA0;<xsl:value-of select="//lcl/FAC/personen"/></td>
<!--<td class="result" style="text-align:right">
<xsl:value-of select="van/datum"/>
</td>-->
<td width="14%" class="resresult" style="text-align:right">
<xsl:value-of select="van/tijd"/>
</td>
<td width="14%" class="resresult" style="text-align:right">
<xsl:value-of select="tot/tijd"/>
</td>
<td width="16%" class="resresult" style="text-align:center">
<xsl:value-of select="res_ruimte/opstelling"/>
</td>
<td width="17%" class="resresult" style="text-align:right">
<xsl:call-template name="europrijs">
<xsl:with-param name="prijs" select="prijs"/>
</xsl:call-template>
</td>
</tr>
</xsl:if>
<!-- rsv_deel-lijst gesorteerd op van-tijd -->
<xsl:for-each select="rsv_deel">
<xsl:sort select="van/tijd"/>
<tr>
<td class="resresult"><xsl:if test="dirtlevel!='0'"><span class="fatal"><xsl:value-of select="//lcl/RES/ongeldig"/></span>&#xA0;</xsl:if>
<xsl:value-of select="res_deel/deel/omschrijving"/>
</td>
<td class="resresult">
<xsl:value-of select="aantal"/>
</td>
<!--<td class="result" style="text-align:right">
<xsl:value-of select="van/datum"/>
</td>-->
<td class="resresult" style="text-align:right">
<xsl:value-of select="van/tijd"/>
</td>
<td class="resresult" style="text-align:right">
<xsl:value-of select="tot/tijd"/>
</td>
<td></td>
<td class="resresult" style="text-align:right">
<xsl:call-template name="europrijs">
<xsl:with-param name="prijs" select="prijs"/>
</xsl:call-template>
</td>
</tr>
</xsl:for-each>
<!-- rsv_artikel-lijst gesorteerd op van-tijd -->
<xsl:for-each select="rsv_artikel">
<xsl:sort select="levering/tijd"/>
<tr>
<td class="resresult">
<xsl:value-of select="res_artikel/omschrijving"/>
</td>
<td class="resresult">
<xsl:value-of select="aantal"/>
</td>
<!--<td class="result" style="text-align:right">
<xsl:value-of select="levering/datum"/>
</td>-->
<td class="resresult" style="text-align:right">
<xsl:value-of select="levering/tijd"/>
</td>
<td></td>
<td></td>
<td class="resresult" style="text-align:right">
<xsl:call-template name="europrijs">
<xsl:with-param name="prijs" select="prijs"/>
</xsl:call-template>
</td>
</tr>
</xsl:for-each>
<!-- totaal per deelreservering -->
<tr height="1">
<td colspan="10" style="border-top:1px solid #000;"/>
</tr>
<tr>
<td class="tekst" colspan="4" style="border-style:solid;border-width:0px;"></td>
<td class="tekst" colspan="2" style="text-align:right;border-style:solid;border-width:0px;"><b>
<xsl:call-template name="europrijs">
<xsl:with-param name="prijs" select="sum(prijs[string(number(.))!='NaN'])+sum(rsv_deel/prijs[string(number(.))!='NaN'])+sum(rsv_artikel/prijs[string(number(.))!='NaN'])"/>
</xsl:call-template></b>
</td>
</tr>
<!-- afspraak-lijst gesorteerd op naam -->
<xsl:for-each select="afspraak/bezoeker">
<xsl:sort select="naam"/>
<xsl:choose>
<xsl:when test="position() = 1">
<tr>
<td class="tekst" style="border-style:solid;border-width:0px;">
<br/><xsl:value-of select="//lcl/BEZ/bezoekers"/></td>
</tr>
<tr>
<th><xsl:value-of select="//lcl/FAC/naam"/></th>
<th colspan="3"><xsl:value-of select="//lcl/FAC/bedrijf"/></th>
<th colspan="4"><xsl:value-of select="//lcl/BEZ/parkeerplaats"/></th>
</tr>
</xsl:when>
</xsl:choose>
<tr>
<td class="result">
<xsl:value-of select="naam"/>
</td>
<td class="result" colspan="3">
<xsl:value-of select="bedrijf"/>
</td>
<td class="result" colspan="4">
<xsl:value-of select="deel/omschrijving"/>
</td>
</tr>
</xsl:for-each>
<!-- kenmerk -->
<xsl:if test="kenmerk">
<tr>
<td colspan="5">
<table>
<xsl:for-each select="kenmerk[count(@xmlnode)=0]">
<xsl:sort select="@volgnummer" data-type="number"/>
<xsl:if test="(@type!='L' and @type!='l' and @type!='Q')">
<xsl:if test=".!=''">
<tr>
<td class="label">
<xsl:value-of select="@naam"/></td>
<td class="value">
: <xsl:value-of select="."/>
</td>
</tr>
</xsl:if>
</xsl:if>
</xsl:for-each>
</table>
</td>
</tr>
</xsl:if>
</xsl:template>
</xsl:stylesheet>
<!-- Stylus Studio meta-information - (c) 2004-2007. Progress Software Corporation. All rights reserved.
<metaInformation>

17
UTILS/Exchange/exchange.js
View File

@@ -123,6 +123,20 @@ if (calItems.length == 0)
WScript.Echo("No calitems, no need to update syncstate");
WScript.Quit(1);
}
// Stukje robuustheid
// Eerst alle *andere* sync_*.xml bestanden verwijderen om te voorkomen dat
// per ongeluk de verkeerde syncstate in onze ruimte terecht komt
try
{
fso.DeleteFile(config.xmlfolder + "Sync_*.xml");
// Als hierboven geen files gevonden zijn komen we in de exception
// en niet in onderstaande echo.
WScript.Echo("Oude syncfile is verwijderd.");
}
catch(e)
{
// Neem aan dat gelukkig geen files zijn gevonden
}
__Log2File("Sync_" + room_id + ".xml", xmlDoc.xml); // moet straks gesynced
WScript.Echo("Fetching " + calItems.length + " calendar items");
for (var i = 0; i < calItems.length; i++)
@@ -177,6 +191,9 @@ for (var i = 0; i < calItems.length; i++)
}
}
}
// Eerst alle *andere* sync_*.xml bestanden verwijderen om te voorkomen dat
// per ongeluk de verkeerde syncstate in onze ruimte terecht komt
__Log2File("Sync_" + room_id + ".xml", xmlDoc.xml); // moet straks gesynced
function getCalenderItem(filter, fname)
{

9
UTILS/Exchange/exchange_all.js
View File

@@ -65,9 +65,12 @@ while (!oRs.Eof)
+ oRs("res_ruimte_extern_id").Value + '" "' + syncstate + '"'
+ ' >>' + logfile + ' 2>>&1';
fbat.WriteLine(line);
var line = 'IF NOT ERRORLEVEL 1 Cscript /NoLogo ..\\..\\..\\utils\\gen_import\\gen_import.wsf '
+ customerId + ' ' + sync_app_key + ' ' + oRs("res_ruimte_key").Value + ' >>' + logfile + ' 2>>&1';
fbat.WriteLine(line + "\n");
if (import_app_key != "EXCHFULL") // De full calender heeft geen syncstate in zich
{
var line = 'IF NOT ERRORLEVEL 1 Cscript /NoLogo ..\\..\\..\\utils\\gen_import\\gen_import.wsf '
+ customerId + ' ' + sync_app_key + ' ' + oRs("res_ruimte_key").Value + ' >>' + logfile + ' 2>>&1';
fbat.WriteLine(line + "\n");
}
oRs.MoveNext();
}