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

Merge 2016.3 Gold C patches

Browse Source 
svn path=/Website/trunk/; revision=32871
This commit is contained in:
Jos Groot Lipman
2017-02-20 08:29:59 +00:00
parent ddcfa8234d f977c1d19e
commit 615b5a11cb
27 changed files with 1333 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/ALG/alg_srtruimte.asp
View File

@@ -171,7 +171,7 @@ else if (srtruimte_key > 0 && mode == "delete")
function alg_delete()
{
FcltMgr.confirm("<%=safe.jsstring(L("lcl_R_U_sure "))%>",
FcltMgr.confirm("<%=safe.jsstring(L("lcl_R_U_sure"))%>",
function() {
window.location.href = "alg_srtruimte.asp?mode=delete&alg_srtruimte_key=<%=srtruimte_key%>";
});

35
APPL/API2/model_reportcolumns.inc
View File

@@ -122,7 +122,7 @@ function model_reportcolumns(usrrap_key, params)
rowClass: this.fnrowClass
};
this.hook_pre_edit = function (obj)
this.hook_pre_edit = function (obj, fld)
{
this.fields.filter.LOV = api2.filterLOV(L("lcl_rap_filterLOV"), "A,E,R"); // De meesten mogen L(ike) niet
if ((obj.datatype && !obj.expression) || !user.has("WEB_FACTAB"))
@@ -165,7 +165,9 @@ function model_reportcolumns(usrrap_key, params)
this.fields.name.insertonly = false;
// Een zelf toegevoegd veld mag ook verwijderd worden.
if (obj.expression)
this.REST_DELETE = this._REST_DELETE;
{
this.REST_DELETE = generic_REST_DELETE(this);
}
}
};
@@ -173,7 +175,23 @@ function model_reportcolumns(usrrap_key, params)
{
if (obj.id == -1)
this.fields.expression.readonly = false;
}
};
this.hook_pre_delete = function (params, columns_key)
{
var sql = "SELECT 1"
+ " FROM fac_usrrap_cols"
+ " WHERE fac_usrrap_cols_expression IS NOT NULL"
+ " AND fac_usrrap_cols_key = " + columns_key;
var oRs = Oracle.Execute(sql, true);
if (oRs.eof)
abort_with_warning(L("lcl_cnt_Del_Fails_Auth"));
oRs.Close();
user.checkAutorisation("WEB_FACTAB");
this.REST_DELETE = generic_REST_DELETE(this);
};
// Maakt de default fac_usrrap_cols records aan aan de hand van de view of werk ze bij
this._view2columns = function (usrrap_key, lastrefresh, oldcols)
@@ -361,7 +379,7 @@ function model_reportcolumns(usrrap_key, params)
+ " SET fac_usrrap_col_refresh = SYSDATE"
+ " WHERE fac_usrrap_key = " + usrrap_key;
Oracle.Execute(sql);
},
}
this.REST_GET = function _GET(params)
{
@@ -382,7 +400,8 @@ function model_reportcolumns(usrrap_key, params)
}
return json;
};
}
this.REST_PUT = function (params, jsondata, the_key) /* update columns */
{
var valid_char = /^[_0-9a-zA-Z]+$/; // Alleen deze tekens zijn geldig!
@@ -403,7 +422,8 @@ function model_reportcolumns(usrrap_key, params)
abort_with_warning(err.friendlyMsg);
return { key: the_key };
};
}
this._REST_PUT = this.REST_PUT; // Interne is er altijd
// Only internally used by report_clone and _view2columns
@@ -429,9 +449,6 @@ function model_reportcolumns(usrrap_key, params)
return { key: col_key, warning: "" };
}
this._REST_DELETE = generic_REST_DELETE(this);
if (rap_key > 0)
{
// var rap_data = model_reportsx(rap_key); te veel recursie

3
APPL/FAC/fac_current_tab_save.asp
View File

@@ -51,6 +51,7 @@ function cleanurl(purl)
}
autoopenurl = cleanurl(autoopenurl);
autoopenttl = autoopenttl.replace(/^\s+|\s+$/gm,'');
result = { success: true};
var sql = "SELECT fac_menu_key"
@@ -59,7 +60,7 @@ var sql = "SELECT fac_menu_key"
+ " , fac_menu_filter"
+ " FROM fac_menu"
+ " WHERE fac_menu_altgroep = " + (taboption == "T" ? "5" : "6")
+ " AND fac_menu_altlabel = " + safe.quoted_sql(autoopenttl)
+ " AND TRIM(fac_menu_altlabel) = " + safe.quoted_sql(autoopenttl)
+ " AND prs_perslid_key = " + user_key;
var oRs = Oracle.Execute(sql);
if (!oRs.eof)

2
APPL/FAC/fac_verify_data.asp
View File

@@ -207,7 +207,7 @@ checker("Controle: queries die geen records mogen opleveren",
var noResults = [{ msg: "FAC_VERSION is niet goed gevuld",
sql: "SELECT * FROM fac_version"
+ " WHERE fac_version_cust IS NULL"
+ " OR fac_version_custnr IS NULL"
// Deprecated + " OR fac_version_custnr IS NULL"
// Deprecated + " OR fac_version_otap IS NULL"
+ " OR fac_version_lang IS NULL"
},

23
APPL/FIN/fin_list.inc
View File

@@ -70,6 +70,7 @@ function fin_list (params)
var authparamsFINUSE = user.checkAutorisation("WEB_FINUSE", true);
var authparamsFINFOF = user.checkAutorisation("WEB_FINFOF", true);
var authparamsFINBOF = user.checkAutorisation("WEB_FINBOF", true);
var authparamsFINBOFFOF = user.checkAutorisation(["WEB_FINBOF", "WEB_FINFOF"], true);
var authparamsFINGOE = user.checkAutorisation("WEB_FINGOE", true);
user.auth_required_or_abort(authparamsFINUSE || authparamsFINFOF || authparamsFINBOF || user.isBudgethouder());
@@ -173,9 +174,9 @@ function fin_list (params)
+ " , bb.bestelopdr_geleverd";
// merk op: als budgethouder==user_key dan wordt bes_fiat_write later genegeerd.
if (!authparamsFINBOF)
if (!authparamsFINBOFFOF)
sql += ", 0 bes_fiat_write"
else if (authparamsFINBOF.ALGwritelevel == -1)
else if (authparamsFINBOFFOF.ALGwritelevel == -1)
sql += ", 1 bes_fiat_write"
else sql +=
", COALESCE((SELECT 1"
@@ -184,37 +185,37 @@ function fin_list (params)
+ " AND m.alg_locatie_key IN (SELECT alg_locatie_key"
+ " FROM fac_v_my_locations"
+ " WHERE prs_perslid_key IN (" + prsKeys + ")"
+ " AND niveau = " + authparamsFINBOF.ALGwritelevel + ")),"
+ " AND niveau = " + authparamsFINBOFFOF.ALGwritelevel + ")),"
+ " 0) bes_fiat_write";
if (!authparamsFINBOF)
if (!authparamsFINBOFFOF)
sql += ", 0 mld_fiat_write"
else if (authparamsFINBOF.ALGwritelevel == -1)
else if (authparamsFINBOFFOF.ALGwritelevel == -1)
sql += ", 1 mld_fiat_write"
else sql +=
", (SELECT CASE WHEN onrg.alg_type = 'R'"
else
sql += ", (SELECT CASE WHEN onrg.alg_type = 'R'"
+ " AND m.mld_alg_onroerendgoed_keys IN (SELECT alg_ruimte_key"
+ " FROM fac_v_my_rooms"
+ " WHERE prs_perslid_key IN (" + prsKeys + ")"
+ " AND niveau = " + authparamsFINBOF.ALGwritelevel + ")"
+ " AND niveau = " + authparamsFINBOFFOF.ALGwritelevel + ")"
+ " THEN 1"
+ " WHEN onrg.alg_type = 'V'"
+ " AND m.mld_alg_onroerendgoed_keys IN (SELECT alg_verdieping_key"
+ " FROM fac_v_my_floors"
+ " WHERE prs_perslid_key IN (" + prsKeys + ")"
+ " AND niveau = " + authparamsFINBOF.ALGwritelevel + ")"
+ " AND niveau = " + authparamsFINBOFFOF.ALGwritelevel + ")"
+ " THEN 1"
+ " WHEN onrg.alg_type = 'G'"
+ " AND m.mld_alg_onroerendgoed_keys IN (SELECT alg_gebouw_key"
+ " FROM fac_v_my_buildings"
+ " WHERE prs_perslid_key IN (" + prsKeys + ")"
+ " AND niveau = " + authparamsFINBOF.ALGwritelevel + ")"
+ " AND niveau = " + authparamsFINBOFFOF.ALGwritelevel + ")"
+ " THEN 1"
+ " WHEN m.mld_alg_onroerendgoed_keys IS NULL"
+ " AND m.mld_alg_locatie_key IN (SELECT alg_locatie_key"
+ " FROM fac_v_my_locations"
+ " WHERE prs_perslid_key IN (" + prsKeys + ")"
+ " AND niveau = " + authparamsFINBOF.ALGwritelevel + ")"
+ " AND niveau = " + authparamsFINBOFFOF.ALGwritelevel + ")"
+ " THEN 1"
+ " ELSE 0"
+ " END"

2
APPL/IMP/imp_shared.js
View File

@@ -404,7 +404,7 @@ function impProcessStream(import_key, params)
// De laatste 10 laten we altijd compleet staan, evenals alles van de laatste week
var sql = "DELETE fac_import fi1"
+ " WHERE fi1.fac_import_app_key = " + import_app_key
+ " AND fac_import_datum_verwerkt < SYSDATE - 1" // Laatste week blijft. TIJDELIJK: Hardcoded laatste dag
+ " AND fac_import_datum_verwerkt < SYSDATE - 1/24" // Laatste week blijft. TIJDELIJK: Hardcoded laatste uur
+ " AND fac_import_key < (SELECT MIN(fac_import_key)"
+ " FROM ( SELECT fac_import_key"
+ " FROM fac_import fi2"

8
APPL/INS/ins_search.asp
View File

@@ -99,6 +99,7 @@ var authparams = user.checkAutorisation(autfunction);
<script type="text/javascript">
var urole = "<%=urole%>";
var alg_startlevel = <%=alg_startlevel%>;
<% if (autosearch) { %>
$(document).ready(function() { doSubmit(); });
@@ -424,7 +425,12 @@ var authparams = user.checkAutorisation(autfunction);
ruimtekey: room_key,
werkplekkey: wpl_key, // indien eindlevel 5 is, dan wordt deze parameter niet gebruikt
terrein: true,
onLocChange: "UnSelectOwner()",
onRegChange: alg_startlevel==0? "UnSelectOwner()" : false,
onDisChange: alg_startlevel==1? "UnSelectOwner()" : false,
onLocChange: alg_startlevel==2? "UnSelectOwner()" : false,
onGebChange: alg_startlevel==3? "UnSelectOwner()" : false,
onVerChange: alg_startlevel==4? "UnSelectOwner()" : false,
onRuiChange: alg_startlevel==5? "UnSelectOwner()" : false,
escalateOnChUp: true, // ook onLocChange als je gebouw wijzigt
startlevel: alg_startlevel,
eindlevel: alg_endlevel, // ruimte/werkplek

13
APPL/INS/ins_search.js
View File

@@ -62,10 +62,15 @@ function checkLentOut(id)
function UnSelectPos()
{
sgLoc.setValue(-1, ""); // zou dat niet al voldoende moeten zijn?
sgBld.setValue(-1, "");
sgFlr.setValue(-1, "");
sgRoom.setValue(-1, "");
switch (alg_startlevel)
{
case 0: sgReg.setValue(-1, ""); // zou dat niet al voldoende moeten zijn?
case 1: sgDis.setValue(-1, "");
case 2: sgLoc.setValue(-1, "");
case 3: sgBld.setValue(-1, "");
case 4: sgFlr.setValue(-1, "");
case 5: sgFlr.setValue(-1, "");
}
}
function UnSelectOwner()

2
APPL/INS/ins_srtdeel_search_list.asp
View File

@@ -105,7 +105,7 @@ var transitParam = buildTransitParam(["disc_key", "srtgroep_key"]);
rst.addColumn(new Column({caption: L("lcl_descr"), content: "ins_srtdeel_omschrijving"}));
rst.addColumn(new Column({caption: L("lcl_discipline"), content: "ins_discipline_omschrijving"}));
rst.addColumn(new Column({caption: L("lcl_obj_group"), content: "ins_srtgroep_omschrijving"}));
rst.addColumn(new Column({caption: L("lcl_ins_srtdeel_count"), content: "aantal"}));
rst.addColumn(new Column({caption: L("lcl_ins_srtdeel_count"), content: "aantal", datatype: "number"}));
rst.addColumn(new Column({caption: L("lcl_ins_vervaldatum"), content: "ins_srtdeel_vervaldatum"}));
// Acties

3
APPL/MLD/mld.inc
View File

@@ -3751,7 +3751,8 @@ mld = {setmeldingstatus:
{
var rwparams = { datatype: "button",
html: "title='" + L("lcl_mld_objects_select") + "' onclick='" + params.onclickobj + "'" + (params.disableobjects? " disabled" : ""),
endicon: "fa-hand-pointer-o fa-inverse hasIcon"
endicon: "fa-hand-pointer-o fa-inverse hasIcon",
iconClick: "inherit"
}
RWFIELDTR("r_objs_button", "button", L("lcl_mld_objects"), L("lcl_mld_objects") + "(" + params.aantalobj + ")", rwparams);
}

2
APPL/SCF/scaffolding_delete.inc
View File

@@ -18,6 +18,8 @@ function scaffolding_delete(model, scf_params)
var key = getQParamInt( "id" );
var params = { };
if ("hook_pre_delete" in model)
model.hook_pre_delete(params, key);
var xxx_array = model.REST_DELETE(params, key);
var warning = xxx_array.warning;

10
APPL/Shared/iface.inc
View File

@@ -395,7 +395,15 @@ function RWFIELD(pname, pclass, plabel, pvalue, params)
<%}
if (params.endicon)
{
%><i class='fa <%=params.endicon%> endicon'></i>
var iconClick = "";
if (params.iconClick)
{
if (params.iconClick == "inherit" && params.datatype == "button")
iconClick = " onClick='this.previousSibling.click()'";
else
iconClick = " onClick='" + safe.htmlattr(params.iconClick) + "'";
}
%><i class='fa <%=params.endicon%> endicon'<%=iconClick%>></i>
<%}
if (plabel) { %>
</td><%

2
APPL/Shared/kenmerk_common.inc
View File

@@ -149,7 +149,7 @@ function BijlagenButton(pModule, pNiveau, pKey, tmpfolder, pKenmerk_key,
res += " onClick='" + safe.htmlattr(blg) + "'"
+ (!pReadonly ? " onChange='checkKenmerk(this, false,\"M\",0,0,0,0)'" : "")
res += ">";
res+="<i class='fa fa-folder-open fa-fw hasIcon bijlage'></i>";
res += "<i class='fa fa-folder-open fa-fw hasIcon bijlage' onClick='this.previousSibling.click()'></i>";
}
}
return {html: res, count: lijst.length};

16
APPL/Shared/touch.css
View File

@@ -156,7 +156,7 @@ div#touchmenu li a {
#tProfFAC ul li.mi, #tPersFAC ul li.mi, #tMgtFAC ul li.mi {
font-size: 1.1em;
}
.fcltframeheader, .fcltframefooter {
.fcltframeheader, .fcltframefooter, .besartbtns {
min-height: 3em;
line-height: 3em;
}
@@ -196,6 +196,10 @@ input {
padding: 5px 1px 5px 4px;
}
input.secsearc {
padding: 5px 1px 5px 4px;
}
input.button {
padding: 4px 9px 4px 10px;
font-size: 1.1em;
@@ -267,4 +271,12 @@ div.time-holder table.times td.time {
}
#mod_prs_pwdchange {width:500px;}
i.dateklikker {top: 0;}
i.dateklikker {top: 0;}
#buttons input, input.button {
-webkit-appearance: none;
}
.flddate {
width: 115px;
}

221
CUST/AADO/xsl/cust.xsl
View File

@@ -8,227 +8,6 @@
<xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
</xsl:variable>
<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" style="border-style:solid;border-width:0px;">
<br/><xsl:value-of select="van/datum"/>&#xA0;<xsl:if test="dirtlevel!='0'"><span class="fatal"><xsl:value-of select="//lcl/RES/ongeldig"/></span>&#xA0;</xsl:if><xsl:value-of select="//lcl/RES/deelreservering"/> &#160; <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"/>-<xsl:value-of select="res_ruimte/plaats/regio/district/locatie/gebouw/naam"/>(<xsl:value-of select="res_ruimte/plaats/regio/district/locatie/gebouw/code"/>)
</td>
</xsl:when>
<!-- "roomservice" -->
<xsl:otherwise>
<td class="tekstkop" colspan="10" frame="box" style="border-style:solid;border-width:0px;">
<br/><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:if test="dirtlevel!='0'"><span class="fatal"><xsl:value-of select="//lcl/RES/ongeldig"/></span>&#xA0;</xsl:if><xsl:value-of select="//lcl/RES/deelreservering"/> &#160;<xsl:value-of select="volgnr"/>&#xA0;
<xsl:value-of select="plaats/regio/district/locatie/omschrijving"/> -
<xsl:value-of select="plaats/regio/district/locatie/gebouw/naam"/>(<xsl:value-of select="plaats/regio/district/locatie/gebouw/code"/>) -
<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/omschrijving"/> -
<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/ruimte/nr"/>
</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(opmerking)!=string(//reservering/rsv_ruimte[volgnr=$min_volgnr]/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>
<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>
<xsl:if test="string(host_user/naam_full)!=string(//reservering/rsv_ruimte[volgnr=$min_volgnr]/host_user/naam_full)">
<tr>
<td class="label" frame="box" style="border-style:solid;border-width:0px;">- <xsl:value-of select="//lcl/RES/gastheer_vrouw"/>:</td>
<td class="value" colspan="9" frame="box" style="border-style:solid;border-width:0px;">
<xsl:value-of select="host_user/naam_full"/>
</td>
</tr>
</xsl:if>
<xsl:if test="string(kostenplaats/nr)!=string(//reservering/rsv_ruimte[volgnr=$min_volgnr]/kostenplaats/nr)">
<tr>
<td class="label" frame="box" style="border-style:solid;border-width:0px;">- <xsl:value-of select="//lcl/FAC/kostenplaats"/>:</td>
<td class="value" colspan="9" frame="box" style="border-style:solid;border-width:0px;">
<xsl:value-of select="kostenplaats/nr"/>&#xA0;<xsl:value-of select="kostenplaats/omschrijving"/></td>
</tr>
</xsl:if>
<tr>
<th><xsl:value-of select="//lcl/FAC/omschrijving"/></th>
<th><xsl:value-of select="//lcl/RES/aantal"/></th>
<th style="text-align:right"><xsl:value-of select="//lcl/RES/prijs"/></th>
<!--<th width="80">Datum</th>-->
<th style="text-align:right"><xsl:value-of select="//lcl/RES/begintijd"/></th>
<th style="text-align:right"><xsl:value-of select="//lcl/RES/eindtijd"/></th>
<th><xsl:value-of select="//lcl/RES/status"/></th>
<th><xsl:value-of select="//lcl/RES/opstelling"/></th>
</tr>
<xsl:if test="res_ruimte!=''">
<tr>
<td class="result" style="text-align:left" width="35%"><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"/> <xsl:value-of select="//lcl/FAC/personen"/>)
<xsl:if test="res_ruimte/omschrijving!=''">
<br/><br/><xsl:value-of select="res_ruimte/omschrijving"/>
</xsl:if>
</td>
<td class="result" 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:call-template name="europrijs">
<xsl:with-param name="prijs" select="prijs"/>
</xsl:call-template>
</td>
<!--<td class="result" style="text-align:right">
<xsl:value-of select="van/datum"/>
</td>-->
<td class="result" style="text-align:right">
<xsl:value-of select="van/tijd"/>
</td>
<td class="result" style="text-align:right">
<xsl:value-of select="tot/tijd"/>
</td>
<td class="result" style="text-align:left">
<xsl:value-of select="status_fo"/>
</td>
<td class="result" style="text-align:left">
<xsl:value-of select="res_ruimte/opstelling"/>
</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="result"><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="result">
<xsl:value-of select="aantal"/>
</td>
<td class="result" style="text-align:right">
<xsl:call-template name="europrijs">
<xsl:with-param name="prijs" select="prijs"/>
</xsl:call-template>
</td>
<!--<td class="result" style="text-align:right">
<xsl:value-of select="van/datum"/>
</td>-->
<td class="result" style="text-align:right">
<xsl:value-of select="van/tijd"/>
</td>
<td class="result" style="text-align:right">
<xsl:value-of select="tot/tijd"/>
</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="result">
<xsl:value-of select="res_artikel/omschrijving"/>
</td>
<td class="result">
<xsl:value-of select="aantal"/>
</td>
<td class="result" style="text-align:right">
<xsl:call-template name="europrijs">
<xsl:with-param name="prijs" select="prijs"/>
</xsl:call-template>
</td>
<!--<td class="result" style="text-align:right">
<xsl:value-of select="levering/datum"/>
</td>-->
<td class="result" style="text-align:right">
<xsl:value-of select="levering/tijd"/>
</td>
</tr>
</xsl:for-each>
<!-- totaal per deelreservering -->
<tr>
<td class="tekst" colspan="2" style="border-style:solid;border-width:0px;"><xsl:value-of select="//lcl/RES/totaal_deelreservering"/></td>
<td class="tekst" style="text-align:right;border-style:solid;border-width:0px;">
<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>
</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[@type!='L' and @type!='l' and @type!='Q' and count(@xmlnode)=0]">
<xsl:sort select="@volgnummer" data-type="number"/>
<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:for-each>
</table>
</td>
</tr>
<tr height="20px">
<td class="tekst" colspan="2" style="border-style:solid;border-width:0px;"></td>
</tr>
</xsl:if>
</xsl:template>
<xsl:template match="perslid" mode="full">
<xsl:choose>
<xsl:when test="$mode='summary'"></xsl:when>

433
CUST/AADO/xsl/reservering.xsl Normal file
View File

@@ -0,0 +1,433 @@
<?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="./cust.xsl"/>
<xsl:template name="res_begintext">
<tr>
<td colspan="2" class="tekst">&#xA0;</td>
</tr>
</xsl:template>
<xsl:template name="res_endtext">
<tr>
<td colspan="2" class="tekst">&#xA0;</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" style="border-style:solid;border-width:0px;">
<br/><xsl:value-of select="van/datum"/>&#xA0;<xsl:if test="dirtlevel!='0'"><span class="fatal"><xsl:value-of select="//lcl/RES/ongeldig"/></span>&#xA0;</xsl:if><xsl:value-of select="//lcl/RES/deelreservering"/> &#160; <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"/>-<xsl:value-of select="res_ruimte/plaats/regio/district/locatie/gebouw/naam"/>(<xsl:value-of select="res_ruimte/plaats/regio/district/locatie/gebouw/code"/>)
</td>
</xsl:when>
<!-- "roomservice" -->
<xsl:otherwise>
<td class="tekstkop" colspan="10" frame="box" style="border-style:solid;border-width:0px;">
<br/><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:if test="dirtlevel!='0'"><span class="fatal"><xsl:value-of select="//lcl/RES/ongeldig"/></span>&#xA0;</xsl:if><xsl:value-of select="//lcl/RES/deelreservering"/> &#160;<xsl:value-of select="volgnr"/>&#xA0;
<xsl:value-of select="plaats/regio/district/locatie/omschrijving"/> -
<xsl:value-of select="plaats/regio/district/locatie/gebouw/naam"/>(<xsl:value-of select="plaats/regio/district/locatie/gebouw/code"/>) -
<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/omschrijving"/> -
<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/ruimte/nr"/>
</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(opmerking)!=string(//reservering/rsv_ruimte[volgnr=$min_volgnr]/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>
<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>
<xsl:if test="string(host_user/naam_full)!=string(//reservering/rsv_ruimte[volgnr=$min_volgnr]/host_user/naam_full)">
<tr>
<td class="label" frame="box" style="border-style:solid;border-width:0px;">- <xsl:value-of select="//lcl/RES/gastheer_vrouw"/>:</td>
<td class="value" colspan="9" frame="box" style="border-style:solid;border-width:0px;">
<xsl:value-of select="host_user/naam_full"/>
</td>
</tr>
</xsl:if>
<xsl:if test="string(kostenplaats/nr)!=string(//reservering/rsv_ruimte[volgnr=$min_volgnr]/kostenplaats/nr)">
<tr>
<td class="label" frame="box" style="border-style:solid;border-width:0px;">- <xsl:value-of select="//lcl/FAC/kostenplaats"/>:</td>
<td class="value" colspan="9" frame="box" style="border-style:solid;border-width:0px;">
<xsl:value-of select="kostenplaats/nr"/>&#xA0;<xsl:value-of select="kostenplaats/omschrijving"/></td>
</tr>
</xsl:if>
<tr>
<th><xsl:value-of select="//lcl/FAC/omschrijving"/></th>
<th><xsl:value-of select="//lcl/RES/aantal"/></th>
<th style="text-align:right"><xsl:value-of select="//lcl/RES/prijs"/></th>
<!--<th width="80">Datum</th>-->
<th style="text-align:right"><xsl:value-of select="//lcl/RES/begintijd"/></th>
<th style="text-align:right"><xsl:value-of select="//lcl/RES/eindtijd"/></th>
<th><xsl:value-of select="//lcl/RES/status"/></th>
<th><xsl:value-of select="//lcl/RES/opstelling"/></th>
</tr>
<xsl:if test="res_ruimte!=''">
<tr>
<td class="result" style="text-align:left" width="35%"><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"/> <xsl:value-of select="//lcl/FAC/personen"/>)
<xsl:if test="res_ruimte/omschrijving!=''">
<br/><br/><xsl:value-of select="res_ruimte/omschrijving"/>
</xsl:if>
</td>
<td class="result" 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:call-template name="europrijs">
<xsl:with-param name="prijs" select="prijs"/>
</xsl:call-template>
</td>
<!--<td class="result" style="text-align:right">
<xsl:value-of select="van/datum"/>
</td>-->
<td class="result" style="text-align:right">
<xsl:value-of select="van/tijd"/>
</td>
<td class="result" style="text-align:right">
<xsl:value-of select="tot/tijd"/>
</td>
<td class="result" style="text-align:left">
<xsl:value-of select="status_fo"/>
</td>
<td class="result" style="text-align:left">
<xsl:value-of select="res_ruimte/opstelling"/>
</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="result"><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="result">
<xsl:value-of select="aantal"/>
</td>
<td class="result" style="text-align:right">
<xsl:call-template name="europrijs">
<xsl:with-param name="prijs" select="prijs"/>
</xsl:call-template>
</td>
<!--<td class="result" style="text-align:right">
<xsl:value-of select="van/datum"/>
</td>-->
<td class="result" style="text-align:right">
<xsl:value-of select="van/tijd"/>
</td>
<td class="result" style="text-align:right">
<xsl:value-of select="tot/tijd"/>
</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="result">
<xsl:value-of select="res_artikel/omschrijving"/>
</td>
<td class="result">
<xsl:value-of select="aantal"/>
</td>
<td class="result" style="text-align:right">
<xsl:call-template name="europrijs">
<xsl:with-param name="prijs" select="prijs"/>
</xsl:call-template>
</td>
<!--<td class="result" style="text-align:right">
<xsl:value-of select="levering/datum"/>
</td>-->
<td class="result" style="text-align:right">
<xsl:value-of select="levering/tijd"/>
</td>
</tr>
</xsl:for-each>
<!-- totaal per deelreservering -->
<tr>
<td class="tekst" colspan="2" style="border-style:solid;border-width:0px;"><xsl:value-of select="//lcl/RES/totaal_deelreservering"/></td>
<td class="tekst" style="text-align:right;border-style:solid;border-width:0px;">
<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>
</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[@type!='L' and @type!='l' and @type!='Q' and count(@xmlnode)=0]">
<xsl:sort select="@volgnummer" data-type="number"/>
<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:for-each>
</table>
</td>
</tr>
<tr height="20px">
<td class="tekst" colspan="2" style="border-style:solid;border-width:0px;"></td>
</tr>
</xsl:if>
</xsl:template>
<xsl:template match="reservering" mode="include">
<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
<TR>
<TD WIDTH="40" ROWSPAN="30" ID="LINKERMARGE"/>
<TD>
<xsl:choose>
<xsl:when test="$srtnotificatiecode='RESDEL' and verwijder">
<table>
<tr>
<td height="20"/>
</tr>
<tr>
<td class="caption" style="color: red"><xsl:value-of select="//lcl/RES/annulering"/></td>
</tr>
</table>
</xsl:when>
</xsl:choose>
<!-- Bevestiging reservering -->
<!-- Ook tonen voor verwijderde reserveringen -->
<!-- De algemene gegevens van de deelreservering met het laagste volgnummer worden gebruikt als referentie gegevens! -->
<xsl:variable name="min_volgnr">
<xsl:value-of select="//reservering/rsv_ruimte/volgnr[not(. &gt; //reservering/rsv_ruimte/volgnr)]"/>
</xsl:variable>
<table border="0" bordercolor="#000000" width="100%">
<tr>
<td class="caption" valign="top" colspan="4">
<xsl:choose>
<xsl:when test="@content='complete'"><xsl:value-of select="//lcl/RES/reservering"/>&#xA0;<xsl:value-of select="key"/></xsl:when>
<xsl:otherwise><xsl:value-of select="//lcl/RES/deelreservering"/>&#xA0;<xsl:value-of select="key"/> /<xsl:value-of select="$min_volgnr"/></xsl:otherwise>
</xsl:choose>
<xsl:if test="string(rsv_ruimte[volgnr=$min_volgnr]/omschrijving)!=''">&#xA0;-&#xA0;<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/omschrijving"/></xsl:if>&#xA0;</td>
</tr>
<tr>
<td class="tekstkop" colspan="4" style="text-decoration:underline">Contactgegevens:</td>
</tr>
<tr>
<td width="13%" class="label"><xsl:value-of select="//lcl/FAC/aanvrager"/></td>
<td width="37%" class="value">: <xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/contact_user/naam_full"/></td>
<td width="13%" class="label"><xsl:value-of select="//lcl/FAC/afdeling"/></td>
<td width="37%" class="value">: <xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/contact_user/afdeling/omschrijving"/></td>
</tr>
<tr>
<td width="13%" class="label"><xsl:value-of select="//lcl/FAC/telefoon"/></td>
<td width="37%" class="value">: <xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/contact_user/telefoonnr"/></td>
<xsl:if test="string(rsv_ruimte[volgnr=$min_volgnr]/contact_user/werkplek/plaats/regio/district/locatie/omschrijving)!=''">
<td width="13%" class="label"><xsl:value-of select="//lcl/FAC/locatie"/></td>
<td width="37%" class="value">: <xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/contact_user/werkplek/plaats/regio/district/locatie/omschrijving"/></td>
</xsl:if>
</tr>
<tr>
<td width="15%" class="label"><xsl:value-of select="//lcl/FAC/e-mail"/></td>
<td colspan="3" class="value">: <xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/contact_user/email"/></td>
</tr>
<xsl:if test="$srtnotificatiecode='RESDEL'">
<tr>
<td width="20%" class="label"><xsl:value-of select="//lcl/RES/begintijd"/></td>
<td width="80%" colspan="3" class="value">: <xsl:value-of select="rsv_ruimte/van/datum"/>&#xA0;<xsl:value-of select="rsv_ruimte/van/tijd"/></td>
</tr>
</xsl:if>
<tr>
<td height="25px"/>
</tr>
<xsl:if test="rsv_ruimte[volgnr=$min_volgnr]/contact_user/key!=ingevoerd_user/key">
<tr>
<td width="20%" class="label"><xsl:value-of select="//lcl/RES/behandeld_door"/></td>
<td width="80%" class="value">: <xsl:value-of select="ingevoerd_user/naam_full"/></td>
</tr>
<tr>
<td height="30px"/>
</tr>
</xsl:if>
<tr>
<td colspan="2" class="tekst">
<xsl:choose>
<xsl:when test="$srtnotificatiecode='RESNEW'"/>
<xsl:when test="$srtnotificatiecode='RESDEL'"><xsl:value-of select="//lcl/RES/reservering_vervallen"/></xsl:when>
<xsl:otherwise>
<xsl:call-template name="res_begintext"/>
</xsl:otherwise>
</xsl:choose>
</td>
</tr>
<xsl:choose>
<xsl:when test="$srtnotificatiecode!='RESDEL'">
<tr>
<td height="10px"/>
</tr>
<tr>
<td colspan="4">
<table cellpadding="1" border="0" WIDTH="99%" bordercolor="#000000" frame="box">
<!-- rsv_ruimte -->
<xsl:for-each select="rsv_ruimte">
<xsl:sort select="van/timestamp"/>
<xsl:call-template name="rsv_ruimte">
<xsl:with-param name="min_volgnr" select="$min_volgnr"/>
</xsl:call-template>
</xsl:for-each>
<!-- totaal reservering -->
<xsl:if test="@content='complete'">
<tr>
<td colspan="9" height="15px" style="border-bottom:1px solid #000;"/>
</tr>
<tr>
<td class="tekstkop" align="right" colspan="5" style="border-width:0px;"><xsl:value-of select="//lcl/RES/totaalprijs_reservering"/>:</td>
<td class="tekstkop" colspan="2" style="text-align:right;border-width:0px;">
<xsl:call-template name="europrijs">
<xsl:with-param name="prijs" select="sum(rsv_ruimte/prijs[string(number(.))!='NaN'])+sum(rsv_ruimte/rsv_deel/prijs[string(number(.))!='NaN'])+sum(rsv_ruimte/rsv_artikel/prijs[string(number(.))!='NaN'])"/>
</xsl:call-template>
</td>
</tr>
</xsl:if>
</table>
</td>
</tr>
<xsl:call-template name="res_endtext">
<xsl:with-param name="min_volgnr" select="$min_volgnr"/>
</xsl:call-template>
</xsl:when>
</xsl:choose>
</table>
<!-- Bevestiging reservering -->
</TD>
<TD WIDTH="30" ROWSPAN="30" ID="RECHTERMARGE"/>
</TR>
</TABLE>
</xsl:template>
<xsl:template match="reservering" mode="full">
<xsl:choose>
<xsl:when test="$mode='summary'"></xsl:when>
<xsl:otherwise>
<xsl:choose>
<xsl:when test="$srtnotificatiecode = 'OUTLOOK'">
<xsl:apply-templates select="." mode="outlook"/>
</xsl:when>
<xsl:otherwise>
<html>
<xsl:comment>================================ RESERVERINGEN ==============================</xsl:comment>
<xsl:comment>FACILITOR default XSL template for reservering</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:choose>
<xsl:when test="$srtnotificatiecode = 'RESKTO'">
<xsl:apply-templates select="." mode="kto"/>
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates select="." mode="include"/>
</xsl:otherwise>
</xsl:choose>
<xsl:call-template name="pagefooter"/>
</xsl:element>
</html>
</xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
</xsl:stylesheet>

4
CUST/AAXX/import/Strukton/GetStruktonStatus.js
View File

@@ -56,9 +56,7 @@ function GetStruktonStatus()
{ // Geldigheid XML wordt gecontroleerd door GEN_IMPORT
WScript.Echo("Gelukt, status = " + objXMLHTTP.status);
responseText = "" + objXMLHTTP.responseText;
//WScript.Echo("resultaat = " + resultaat.indexOf("<ErrorLog><Note>Geen items gevonden</Note></ErrorLog>"));
//if resultaat.substr("<ErrorLog><Note>Geen items gevonden</Note></ErrorLog>")
if (responseText.indexOf("<ErrorLog><Note>Geen items gevonden</Note></ErrorLog>") == -1) {
if (responseText.indexOf("<ErrorLog><Note>Resultaatset bevat geen records</Note></ErrorLog>") == -1) {
dataReceived = true;
oStream = new ActiveXObject("ADODB.Stream");
oStream.Open();

8
CUST/AKZA/custfunctions.wsc
View File

@@ -56,7 +56,7 @@ bez_postsave = function (bezkeyArr, pResult)
for (var i = 0; i < bezkeyArr.length; i++)
{
// prs_kenmerk Veiligheids-DVD 1442
// prs_kenmerk Poortinstructie 1442
// prs_kenmerk Cursusdatum 1462
var sql = "SELECT TO_CHAR( ADD_MONTHS( fac.safe_to_date(dvd.prs_kenmerklink_waarde,'DD-MM-YYYY'), 12), 'DD-MM-YYYY') dvd_verloopdatum,"
+ " DECODE(dvd.prs_kenmerklink_waarde,"
@@ -93,15 +93,15 @@ bez_postsave = function (bezkeyArr, pResult)
if (dvd_verlopen < 0)
{
__Log("Geldigheid veiligheids-DVD bezoeker " + bezkeyArr[i] + " verlopen op "+dvd_verloopdatum+". Opmerking bijwerken.");
txt_sql = "LET OP: Veiligheids-DVD verlopen op "+dvd_verloopdatum+"!";
__Log("Geldigheid poortinstructie bezoeker " + bezkeyArr[i] + " verlopen op "+dvd_verloopdatum+". Opmerking bijwerken.");
txt_sql = "LET OP: Poortinstructie verlopen op "+dvd_verloopdatum+"!";
}
if (lsr_verlopen < 0)
{
__Log("Geldigheid Life-saving rules bezoeker " + bezkeyArr[i] + " verlopen op "+lsr_verloopdatum+". Opmerking bijwerken.");
if (txt_sql != "") {
// Opmerking is max 50 karakters, dus dan maar iets korts laten zien.
txt_sql = "LET OP: Veiligheids-DVD en LSR verlopen!";
txt_sql = "LET OP: Poortinstructie en LSR verlopen!";
} else {
txt_sql = "LET OP: Life-saving rules verlopen op "+lsr_verloopdatum+"!";
}

1
CUST/CSUN/xsl/kpmg.xsl
View File

@@ -26,6 +26,7 @@
<stdmelding>41</stdmelding>
<locatiecode>ONBEKEND</locatiecode>
<omschrijving>
Werkbon/Opdracht nr. klant: <xsl:value-of select="@key"/>
Melder: <xsl:value-of select="melder"/>
Telefoonnummer: <xsl:value-of select="telefoonnummer"/>
Emailadres: <xsl:value-of select="emaildadres"/>

308
CUST/GVBA/xsl/cust.xsl
View File

@@ -76,6 +76,314 @@ www.gvb.nl<br/><br/><br/>
</xsl:choose>
</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"/>
<xsl:if test="onderwerp != ''">:&#160;<xsl:value-of select="onderwerp"/></xsl:if>
</b>
</td>
<td colspan="2" class="caption" style="padding-top:20px;padding-bottom:20px">
<xsl:if test="spoed&lt;3">
<b><xsl:value-of select="//lcl/MLD/spoed"/></b>
</xsl:if>
</td>
</tr>
<xsl:if test="not(//opdracht/extra_key) and extra_key">
<xsl:variable name="mx_key"><xsl:value-of select="extra_key"/></xsl:variable>
<tr>
<td align="right" valign="top" style="padding-top:10px;">
<b><xsl:value-of select="//lcl/FAC/bericht"/>:</b>
</td>
<td colspan="3" style="padding-top:10px;">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="notes/note[key=$mx_key]/omschrijving"/>
</xsl:call-template>
</td>
</tr>
<tr>
<td colspan="4" style="padding-bottom:20px;">
<hr/>
</td>
</tr>
</xsl:if>
<tr>
<td align="right" width="16%">
<b><xsl:value-of select="//lcl/FAC/aanvrager"/>:</b>
</td>
<td align="left" width="34%">
<xsl:value-of select="voor/naam_full"/>
</td>
<td align="right" width="16%">
<b><xsl:value-of select="//lcl/FAC/telefoon"/>:</b>
</td>
<td align="left" width="34%">
<xsl:if test="voor/telefoonnr=''">-</xsl:if>
<xsl:value-of select="voor/telefoonnr"/>
</td>
</tr>
<xsl:if test="string(voor/naam_full)!=string(voor/naam_full)">
<tr>
<td align="right" width="16%"><b><xsl:value-of select="//lcl/MLD/meldingvoor"/>:</b></td>
<td align="left" width="34%"><xsl:value-of select="voor/naam_full"/></td>
</tr>
</xsl:if>
<tr>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/locatie"/>:</b>
</td>
<td align="left">
<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/code"/>&#xA0;
<xsl:if test="voor/werkplek/plaats/regio/district/locatie/omschrijving!=''">(<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/omschrijving"/>)</xsl:if>
</td>
<td align="right" valign="top">
<b><xsl:value-of select="//lcl/FAC/afdeling"/>:</b>
</td>
<td align="left">
<xsl:value-of select="voor/afdeling/omschrijving"/>
</td>
</tr>
<xsl:if test="voor/werkplek/plaats/regio/district/locatie/gebouw/code!=''">
<tr>
<td align="right" valign="top">
<b><xsl:value-of select="//lcl/FAC/werkplek"/>:</b>
</td>
<td align="left">
<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/code"/>-<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/naam"/><br/>
<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/code"/>&#xA0;<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/ruimte/nr"/>&#xA0;
<xsl:if test="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving!=''">(<xsl:value-of select="voor/werkplek/plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving"/>)</xsl:if>
</td>
<td colspan="2"/>
</tr>
</xsl:if>
<tr height="40px">
<td colspan="4">
<hr/>
</td>
</tr>
<tr>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/locatie"/>:</b>
</td>
<td align="left">
<xsl:value-of select="plaats/regio/district/locatie/code"/>&#xA0;
<xsl:if test="plaats/regio/district/locatie/omschrijving!=''">(<xsl:value-of select="plaats/regio/district/locatie/omschrijving"/>)</xsl:if>
</td>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/status"/>:</b>
</td>
<td align="left">
<xsl:value-of select="status"/>
</td>
</tr>
<xsl:if test="plaats/regio/district/locatie/gebouw/kenmerk[@naam='Adres']">
<tr>
<td align="right">
<b>Adres:</b>
</td>
<td align="left">
<xsl:value-of select="plaats/regio/district/locatie/gebouw/kenmerk[@naam='Adres']"/>&#xA0;<xsl:value-of select="plaats/regio/district/locatie/gebouw/kenmerk[@naam='Huisnummer']"/><br/>
<xsl:value-of select="plaats/regio/district/locatie/gebouw/kenmerk[@naam='Postcode']"/>&#xA0;&#xA0;<xsl:value-of select="plaats/regio/district/locatie/gebouw/kenmerk[@naam='Plaats']"/><xsl:if test="plaats/regio/district/locatie/gebouw/kenmerk[@naam='Stadsdeel']">&#xA0;<xsl:value-of select="plaats/regio/district/locatie/gebouw/kenmerk[@naam='Stadsdeel']"/></xsl:if>
</td>
<td/>
<td/>
</tr>
</xsl:if>
<tr>
<xsl:choose>
<xsl:when test="plaats/@type='T'">
<td align="right">
<b><xsl:value-of select="//lcl/FAC/terrein"/>:</b>
</td>
<td align="left">
<xsl:value-of select="plaats/regio/district/locatie/terrein/code"/>-<xsl:value-of select="plaats/regio/district/locatie/terrein/naam"/></td>
</xsl:when>
<xsl:otherwise>
<td align="right">
<b><xsl:value-of select="//lcl/FAC/gebouw"/>:</b>
</td>
<td align="left">
<xsl:value-of select="plaats/regio/district/locatie/gebouw/code"/>-<xsl:value-of select="plaats/regio/district/locatie/gebouw/naam"/></td>
</xsl:otherwise>
</xsl:choose>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/melddatum"/>:</b>
</td>
<td align="left">
<xsl:value-of select="gemeld/datum"/>&#xA0;
<xsl:value-of select="gemeld/tijd"/>
</td>
</tr>
<tr>
<xsl:if test="plaats/@type='T' or plaats/@type='G'">
<td colspan="2"/>
</xsl:if>
<xsl:if test="plaats/@type!='T' and plaats/@type!='G'">
<td align="right">
<b><xsl:value-of select="//lcl/FAC/bouwlaag"/>:</b>
</td>
<td align="left">
<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/code"/>&#xA0;
<xsl:if test="plaats/regio/district/locatie/gebouw/verdieping/omschrijving!=''">(<xsl:value-of select="plaats/regio/district/locatie/gebouw/verdieping/omschrijving"/>)</xsl:if>
</td>
</xsl:if>
<xsl:choose>
<xsl:when test="uitvoertijd[@eenheid='U']">
<td width="16%" align="right">
<b><xsl:value-of select="//lcl/MLD/uitvoertijd"/>:</b>
</td>
<td width="34%">
<xsl:value-of select="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/datum_gereed"/>:</b>
</td>
<td align="left">
<xsl:value-of select="datum_gepland/datum"/>&#xA0;<xsl:value-of select="datum_gepland/tijd"/>
</td>
</tr>
<xsl:if test="kenmerk[@naam='Ordernr']!=''">
<tr>
<td colspan="2"/>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/ordernr"/>:</b>
</td>
<td align="left">
<xsl:value-of select="kenmerk[@naam='Ordernr']"/>
</td>
</tr>
</xsl:if>
<tr height="30px">
<td colspan="4"/>
</tr>
<tr>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/stdmelding"/>:</b>
</td>
<td align="left">
<xsl:if test="stdmelding/omschrijving=''">-</xsl:if>
<xsl:value-of select="stdmelding/omschrijving"/>
</td>
<td align="right">
<b><xsl:value-of select="//lcl/MLD/vakgroep"/>:</b>
</td>
<td align="left">
<xsl:if test="discipline/omschrijving=''">-</xsl:if>
<xsl:value-of select="discipline/omschrijving"/>
</td>
</tr>
<xsl:comment>als we binnen een opdracht zijn, tonen we de meldingtekst niet</xsl:comment>
<tr>
<td align="right" valign="top">
<b><xsl:value-of select="//lcl/FAC/omschrijving"/>:</b>
</td>
<td align="left" colspan="3">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="omschrijving"/>
</xsl:call-template>
</td>
</tr>
<xsl:for-each select="kenmerk[@type!='L' and @type!='l' and @type!='Q' and count(@xmlnode)=0]">
<xsl:sort select="@volgnummer" data-type="number"/>
<xsl:if test=".!=''">
<tr>
<td align="right">
<b>
<xsl:value-of select="@naam"/>:</b>
</td>
<td colspan="3">
<xsl:value-of select="."/>
</td>
</tr>
</xsl:if>
</xsl:for-each>
<xsl:if test="count(deel)&gt;0">
<xsl:for-each select="deel">
<xsl:sort select="omschrijving"/>
<tr>
<xsl:choose>
<xsl:when test="position()=1">
<td align="right" valign="top">
<b><xsl:value-of select="//lcl/MLD/objecten"/>:</b>
</td>
</xsl:when>
<xsl:otherwise>
<td/>
</xsl:otherwise>
</xsl:choose>
<td align="left" valign="top">
<xsl:value-of select="omschrijving"/>
</td>
<td colspan="2" valign="top">
<xsl:comment>NADER TE DEFINIEREN</xsl:comment>
</td>
</tr>
</xsl:for-each>
</xsl:if>
<xsl:if test="behandelwijze=2 and not(/facilitor/opdracht)">
<xsl:for-each select="notes/note[flag=1]">
<xsl:sort select="aanmaak/timestamp" order="ascending"/>
<tr>
<xsl:choose>
<xsl:when test="position() = 1">
<td align="right" valign="top">
<b><xsl:value-of select="//lcl/MLD/behandeling"/>:</b>
</td>
</xsl:when>
<xsl:otherwise>
<td/>
</xsl:otherwise>
</xsl:choose>
<td colspan="3">
<span class="mldbeh"><xsl:value-of select="aanmaak/datum"/>&#xA0;<xsl:value-of select="aanmaak/tijd"/>&#xA0;-&#xA0;<xsl:value-of select="noteur/naam_friendly"/></span>&#xA0;
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="omschrijving"/>
</xsl:call-template>
</td>
</tr>
</xsl:for-each>
</xsl:if>
<xsl:if test="opmerking!=''">
<tr>
<td align="right" valign="top">
<b><xsl:value-of select="//lcl/MLD/afhandeling"/>:</b>
</td>
<td colspan="3">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="opmerking"/>
</xsl:call-template>
</td>
</tr>
</xsl:if>
</table>
</xsl:template>
<xsl:template match="opdracht" mode="include">
<table border="0" width="100%" cellpadding="2">

473
CUST/IVET/xsl/cust.xsl
View File

@@ -1784,5 +1784,478 @@ Servicepoint
</tr>
</table>
</xsl:template>
<xsl:template match="bestelling" mode="include">
<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
<TR>
<TD WIDTH="40" ROWSPAN="30" ID="LINKERMARGE"></TD>
<TD>
<table border="0" width="100%" bordercolor="#000000" CELLPADDING="2">
<tr>
<td align="left" width="100%" class="caption" colspan="4"><xsl:value-of select="//lcl/BES/bestelaanvraag"/>&#xA0;<xsl:value-of select="key"/>
<xsl:if test="ismutatie=1"> (WIJZIGING)</xsl:if>
<xsl:if test="isretour=1"> (RETOUR)</xsl:if>
</td>
</tr>
<xsl:choose>
<xsl:when test="string(aanvrager/naam_full)!=string(voor/naam_full)">
<tr>
<td width="13%" class="label" align="left"><xsl:value-of select="//lcl/FAC/aanvrager"/></td>
<td width="33%" class="value" align="right">: <xsl:value-of select="aanvrager/naam_full"/></td>
<td width="20%" class="label" align="left"><xsl:value-of select="//lcl/BES/aanvraagdatum"/></td>
<td width="32%" class="value" align="right">:
<xsl:value-of select="datum/datum"/>&#xA0;
<xsl:value-of select="datum/tijd"/>
</td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/BES/bestelvoor"/></td>
<td class="value">: <xsl:value-of select="voor/naam_full"/></td>
<td colspan="2"/>
</tr>
</xsl:when>
<xsl:otherwise>
<tr>
<td width="13%" class="label" align="left"><xsl:value-of select="//lcl/FAC/aanvrager"/></td>
<td width="33%" class="value" align="right">: <xsl:value-of select="voor/naam_full"/></td>
<td width="20%" class="label" align="left"><xsl:value-of select="//lcl/BES/aanvraagdatum"/></td>
<td width="32%" class="value" align="right">:
<xsl:value-of select="datum/datum"/>&#xA0;
<xsl:value-of select="datum/tijd"/>
</td>
</tr>
</xsl:otherwise>
</xsl:choose>
<xsl:if test="string(voor/email)!=''">
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/e-mail"/></td>
<td class="value">: <xsl:value-of select="voor/email"/></td>
<td colspan="2"/>
</tr>
</xsl:if>
<xsl:choose>
<xsl:when test="voor/telefoonnr!=''">
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/telefoon"/></td>
<td class="value">: <xsl:value-of select="voor/telefoonnr"/></td>
<td class="label"><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></td>
<td class="value">:
<xsl:value-of select="leverdatum/datum"/>
</td>
</tr>
</xsl:when>
<xsl:when test="voor/mobiel!=''">
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/telefoon"/></td>
<td class="value">: <xsl:value-of select="voor/mobiel"/></td>
<td class="label"><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></td>
<td class="value">:
<xsl:value-of select="leverdatum/datum"/>
</td>
</tr>
</xsl:when>
<xsl:otherwise>
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/telefoon"/></td>
<td class="value">: -</td>
<td class="label"><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></td>
<td class="value">:
<xsl:value-of select="leverdatum/datum"/>
</td>
</tr>
</xsl:otherwise>
</xsl:choose>
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/afdeling"/></td>
<td class="value">:
<xsl:if test="voor/afdeling/omschrijving=''">-</xsl:if>
<xsl:value-of select="voor/afdeling/omschrijving"/>
</td>
<td class="label"><xsl:value-of select="//lcl/BES/aanvraagstatus"/></td>
<td class="value">: <xsl:value-of select="status"/></td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/kostenplaats"/></td>
<td class="value">:
<xsl:if test="kostenplaats/nr=''">-</xsl:if>
<xsl:value-of select="kostenplaats/nr"/>
</td>
<td colspan="2"/>
</tr>
<tr>
<td class="label" style="vertical-align:top"><xsl:value-of select="//lcl/BES/afleveradres"/></td>
<td class="value">:
<xsl:value-of select="afleveradres/naam"/>
<xsl:if test="afleveradres/bezoek_adres">
<br/>&#xA0;
<xsl:value-of select="afleveradres/bezoek_adres"/>
<br/>&#xA0;
<xsl:value-of select="afleveradres/bezoek_postcode"/>&#xA0;
<xsl:value-of select="afleveradres/bezoek_plaats"/>
<br/>&#xA0;
<xsl:value-of select="afleveradres/bezoek_land"/>
</xsl:if>
</td>
<td colspan="2"/>
</tr>
<xsl:if test="bestel_opm">
<tr>
<td height="10px" colspan="4"/>
</tr>
<tr>
<td class="label" style="vertical-align:top"><xsl:value-of select="//lcl/FAC/opmerkingen"/></td>
<td class="value" colspan="3">:
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="bestel_opm"/>
</xsl:call-template>
</td>
</tr>
</xsl:if>
<tr>
<td height="20px"/>
</tr>
<xsl:for-each select="kenmerk[count(@xmlnode)=0]">
<xsl:if test="(@type!='L' and @type!='l' and @type!='Q')">
<tr>
<td class="label">
<xsl:value-of select="@naam"/>
</td>
<td class="value" colspan="3">: <xsl:value-of select="."/></td>
</tr>
</xsl:if>
</xsl:for-each>
<tr>
<td height="20px"/>
</tr>
<tr>
<td colspan="4" style="border-top:0px solid #000;"/>
</tr>
<tr>
<td colspan="4">
<table cellpadding="1" cellspacing="0" border="1" bordercolor="#000000" frame="box" width="99%">
<tr>
<th class="besth" style="text-align:left"><xsl:value-of select="//lcl/BES/artikelnr"/></th>
<th class="besth"><xsl:value-of select="//lcl/FAC/omschrijving"/></th>
<th class="besth"><xsl:value-of select="//lcl/FAC/opmerkingen"/></th>
<th class="besth" style="text-align:right"><xsl:value-of select="//lcl/FAC/aantal"/></th>
<th class="besth" style="text-align:right"><xsl:value-of select="//lcl/FAC/prijs"/></th>
<th class="besth" style="text-align:right"><xsl:value-of select="//lcl/FAC/totaal"/></th>
</tr>
<xsl:for-each select="bestelitem">
<tr>
<td class="besresult" style="text-align:left">
&#xA0;<xsl:value-of select="srtdeel/artikel_nummer"/>
</td>
<td class="besresult" style="text-align:left">
<xsl:value-of select="srtdeel/omschrijving"/>
</td>
<td class="besresult">
<xsl:for-each select="kenmerk[count(@xmlnode)=0]">
<xsl:if test="(@type!='L' and @type!='l' and @type!='Q')">
<xsl:value-of select="@naam"/>:
<xsl:value-of select="."/>
<br/>
</xsl:if>
</xsl:for-each>&#xA0;</td>
<td class="besresult" style="text-align:right">
<xsl:value-of select="aantal"/>
</td>
<td class="besresult" style="text-align:right">
<xsl:value-of select="format-number(prijs, '0,00', 'european')"/>
</td>
<td class="besresult" style="text-align:right">
<xsl:value-of select="format-number(aantal*prijs, '0,00', 'european')"/>
</td>
</tr>
</xsl:for-each>
<tr>
<td height="20px" colspan="6" style="border:none;"/>
</tr>
<xsl:if test="/facilitor/bestelling/levkosten != '0'">
<tr>
<td class="label" style="text-align:right;border-style:solid;border-width:0px;" colspan="5"><xsl:value-of select="//lcl/BES/transportkosten"/>:</td>
<td class="label" style="text-align:right;border-style:solid;border-width:0px;">
<xsl:value-of select="format-number(/facilitor/bestelling/levkosten, '0,00', 'european')"/>
</td>
</tr>
</xsl:if>
<tr>
<td class="tekstkop" style="text-align:right;border-style:solid;border-width:0px;" colspan="5"><xsl:value-of select="//lcl/FAC/totaal"/>:</td>
<td class="tekstkop" style="text-align:right;border-style:solid;border-width:0px;">
<xsl:value-of select="format-number(sum(/facilitor/bestelling/bestelitem/totaal)+ /facilitor/bestelling/levkosten, '0,00', 'european')"/>
</td>
</tr>
</table>
</td>
</tr>
</table>
</TD>
<TD WIDTH="30" ROWSPAN="30" ID="RECHTERMARGE"/>
</TR>
</TABLE>
</xsl:template>
<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="4" class="caption" style="text-align:center">
<b><xsl:value-of select="//lcl/BES/inkooporder"/></b>
</td>
</tr>
<tr>
<td colspan="4" style="height:30px"/>
</tr>
<tr>
<td colspan="2" class="label" style="width:50%">
<b><xsl:value-of select="//lcl/BES/factuur_aan"/>:</b>
</td>
<td class="label" colspan="2" style="width:50%">
<b><xsl:value-of select="//lcl/BES/leverancier"/>:</b>
</td>
</tr>
<tr>
<td colspan="2" class="value">
<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 colspan="2" class="value">
<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="4" style="height:20px"/>
</tr>
<tr>
<td colspan="2" class="label">
<b><xsl:value-of select="//lcl/FAC/contactgegevens"/>:</b>
</td>
<td/>
<td colspan="2">
<b/>
</td>
</tr>
<tr>
<td style="vertical-align:top" class="label" width="20%">
<b><xsl:value-of select="//lcl/BES/besteller"/></b>
</td>
<td class="value" width="30%">:
<xsl:value-of select="bestelling/aanvrager/naam_full"/>
</td>
<td class="label" width="22%">
<b><xsl:value-of select="//lcl/BES/aanvraagnummers"/></b>
</td>
<td class="value" width="28%">:
<xsl:value-of select="bestelling/key"/>
</td>
</tr>
<tr>
<td class="label">
<b><xsl:value-of select="//lcl/FAC/e-mail"/></b>
</td>
<td class="value">:
<xsl:value-of select="bestelling/aanvrager/email"/>
</td>
<td class="label">
<b><xsl:value-of select="//lcl/BES/opdrachtnummer"/></b>
</td>
<td class="value">:
<xsl:value-of select="id"/>
</td>
</tr>
<tr>
<td class="label">
<b><xsl:value-of select="//lcl/FAC/telefoon"/></b>
</td>
<td class="value">:
<xsl:choose>
<xsl:when test="bestelling/aanvrager/telefoonnr">
<xsl:value-of select="bestelling/aanvrager/telefoonnr"/>
</xsl:when>
<xsl:when test="bestelling/aanvrager/mobiel!=''">
<xsl:value-of select="bestelling/aanvrager/mobiel"/>
</xsl:when>
</xsl:choose>
</td>
<td class="label">
<b><xsl:value-of select="//lcl/BES/orderdatum"/></b>
</td>
<td class="value">:
<xsl:value-of select="datum/datum"/>
</td>
</tr>
<tr>
<td class="label">
<b><xsl:value-of select="//lcl/FAC/kostenplaats"/></b>
</td>
<td class="value">:
<xsl:value-of select="bestelling/kostenplaats/nr"/>
</td>
<td colspan="2"/>
<xsl:comment>
<td class="label">
<b><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></b>
</td>
<td class="value">
<xsl:value-of select="bestelling/leverdatum/datum"/>
</td>
</xsl:comment>
</tr>
<tr>
<td class="label">
<b><xsl:value-of select="//lcl/FAC/werkplek"/></b>
</td>
<td class="value">:
<xsl:value-of select="bestelling/plaats"/>
</td>
<td colspan="2"/>
</tr>
<tr>
<td colspan="4" style="height:20px"/>
</tr>
<tr>
<td colspan="2" class="label">
<b><xsl:value-of select="//lcl/BES/afleveradres"/>:</b>
</td>
<td colspan="2">
<b/>
</td>
</tr>
<tr>
<td colspan="2" style="vertical-align:top" class="value">
<xsl:value-of select="afleveradres/naam"/>
<xsl:if test="afleveradres/bezoek_adres">
<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"/>
</xsl:if>
</td>
<td colspan="2"/>
</tr>
<xsl:if test="bestelling/bestel_opm">
<tr>
<td height="10px" colspan="4"/>
</tr>
<tr>
<td class="label" style="vertical-align:top"><b><xsl:value-of select="//lcl/FAC/opmerkingen"/></b></td>
<td class="value" colspan="3">:
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="bestelling/bestel_opm"/>
</xsl:call-template>
</td>
</tr>
</xsl:if>
<tr>
<td colspan="4" style="height:20px"/>
</tr>
<tr>
<xsl:for-each select="bestelling/kenmerk[@type!='L' and @type!='l' and @type!='Q']">
<td class="label" style="vertical-align:top">
<b><xsl:value-of select="@naam"/></b>
</td>
<td class="value">:
<xsl:value-of select="."/>
</td>
</xsl:for-each>
</tr>
<tr>
<td colspan="4" style="height:20px"/>
</tr>
<tr>
<td colspan="4" style="border-top:0px solid #000;"/>
</tr>
<TR>
<TD colspan="7">
<TABLE cellpadding="1" cellspacing="1" border="1" bordercolor="#000000" frame="box" width="99%">
<tr>
<th class="besth" style="width:9%; text-align:left"><xsl:value-of select="//lcl/BES/regel"/></th>
<th class="besth" style="width:13%; text-align:left"><xsl:value-of select="//lcl/BES/artikelnr"/></th>
<th class="besth" style="width:36%"><xsl:value-of select="//lcl/FAC/omschrijving"/></th>
<th class="besth" style="width:11%; text-align:left"><xsl:value-of select="//lcl/FAC/eenheid"/></th>
<th class="besth" style="width:9%; text-align:right"><xsl:value-of select="//lcl/FAC/aantal"/></th>
<th class="besth" style="width:11%; text-align:right"><xsl:value-of select="//lcl/FAC/prijs"/></th>
<th class="besth" style="width:11%; 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="besresult">
<xsl:value-of select="posnr"/>
</td>
<td class="besresult">
<xsl:value-of select="bestelitem/srtdeel/artikel_nummer"/>
</td>
<td class="besresult">
<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="besresult">
<xsl:value-of select="bestelitem/srtdeel/eenheid"/>
</td>
<td class="besresult" style="text-align:right">
<xsl:value-of select="aantal"/>
</td>
<td class="besresult" style="text-align:right">
<xsl:value-of select="format-number(prijs, '0,00', 'european')"/>
</td>
<td class="besresult" style="text-align:right">
<xsl:value-of select="format-number(totaal, '0,00', 'european')"/>
</td>
</tr>
</xsl:for-each>
<tr>
<td height="20px" style="border:none;"/>
</tr>
<tr>
<td height="20px" colspan="6" style="border:none;"/>
<td style="text-align:right; border:none;">
<b>
<xsl:value-of select="format-number(sum(bestelopdrachtitem/totaal), '0,00', 'european')"/>
</b>
</td>
</tr>
</TABLE>
</TD>
</TR>
<tr>
<td colspan="4" style="height:40px"/>
</tr>
<tr>
<td colspan="4" 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:stylesheet>

19
CUST/KFHT/xsl/cust.xsl
View File

@@ -607,10 +607,10 @@ De Algemene Inkoopvoorwaarden van HTCE Site Management BV worden tevens op eerst
<xsl:otherwise>
<table border="0" width="100%" cellpadding="2" cellspacing="2">
<tr>
<td colspan="2" class="caption" style="padding-top:20px;padding-bottom:20px">
<td class="caption" style="padding-top:20px;padding-bottom:20px">
<b>Werkvergunning <xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:choose><xsl:when test="workflowstep!=''"><xsl:value-of select="melding/key"/></xsl:when><xsl:otherwise><xsl:value-of select="key"/></xsl:otherwise></xsl:choose></b>
</td>
<td colspan="2" class="caption" style="text-align:right;padding-top:20px;padding-bottom:20px;">
<td class="caption" style="text-align:right;padding-top:20px;padding-bottom:20px;">
<xsl:choose>
<!--Startmelding-->
<xsl:when test="stdmelding/key='301' or stdmelding/key='305' or stdmelding/key='308' or stdmelding/key='311' or stdmelding/key='314' or stdmelding/key='317' or stdmelding/key='320' or stdmelding/key='326' or stdmelding/key='329' or stdmelding/key='332' or stdmelding/key='335' or stdmelding/key='338' or stdmelding/key='341'">
@@ -642,13 +642,16 @@ De Algemene Inkoopvoorwaarden van HTCE Site Management BV worden tevens op eerst
</xsl:choose>
</td>
</tr>
<xsl:if test="not(//opdracht/extra_key) and extra_key">
<tr>
<td width="18%"><br/><xsl:value-of select="notes/note[key=$mx_key]/noteur/naam_friendly"/>:</td>
<td colspan="3"><br/><xsl:call-template name="linebreaks"><xsl:with-param name="string" select="notes/note[key=$mx_key]/omschrijving"/></xsl:call-template><br/></td>
</tr>
</xsl:if>
</table>
<xsl:if test="not(//opdracht/extra_key) and extra_key">
<xsl:variable name="mx_key"><xsl:value-of select="extra_key"/></xsl:variable>
<table border="0" width="100%" cellpadding="2" cellspacing="2">
<tr>
<td width="18%" style="padding-bottom:20px"><xsl:value-of select="notes/note[key=$mx_key]/noteur/naam_friendly"/>:</td>
<td style="padding-bottom:20px"><xsl:call-template name="linebreaks"><xsl:with-param name="string" select="notes/note[key=$mx_key]/omschrijving"/></xsl:call-template></td>
</tr>
</table>
</xsl:if>
<table border="1" style="width:100%;border-collapse:collapse;" cellpadding="2" cellspacing="2">
<tr>
<td width="18%"><b><xsl:value-of select="//lcl/FAC/aanvrager"/>:</b></td>

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

@@ -450,9 +450,9 @@
<xsl:param name="p_prs_bedrijf_bankreknr"/>
<xsl:param name="p_prs_bedrijf_bankreknr2"/>
<xsl:choose>
<xsl:when test="$p_fin_factuur_bankreknr != ''"><xsl:value-of select="$p_fin_factuur_bankreknr"/></xsl:when>
<xsl:when test="$p_prs_bedrijf_bankreknr != ''"><xsl:value-of select="$p_prs_bedrijf_bankreknr"/></xsl:when>
<xsl:otherwise><xsl:value-of select="$p_prs_bedrijf_bankreknr2"/></xsl:otherwise>
<xsl:when test="$p_fin_factuur_bankreknr != ''"><xsl:value-of select="translate($p_fin_factuur_bankreknr,' ','')"/></xsl:when>
<xsl:when test="$p_prs_bedrijf_bankreknr != ''"><xsl:value-of select="translate($p_prs_bedrijf_bankreknr,' ','')"/></xsl:when>
<xsl:otherwise><xsl:value-of select="translate($p_prs_bedrijf_bankreknr2,' ','')"/></xsl:otherwise>
</xsl:choose>
</xsl:template>

45
CUST/PNBR/cust.css
View File

@@ -7,53 +7,14 @@
/* Titelbalk */
#headerblok {
background: url(banner.jpg) no-repeat;
background-color: #213503;
color: #ffffff
background-color: #213503
}
#editbody .fcltblock {
background-color:#FAFAFA;
}
#editbody .fcltblockhead {
background-color:#D0D0D0;
.headerToggle i, .headerToggle:hover i {
color: #fff;
}
#mywelcometitle strong{
color: #ffffff;
}
.unready TD {
font-weight: normal;
}
div.fcltframeheader {
background-color: #fbfbfb;
background-image: none;
color: #DD0000;
}
th {
color: #ffffff;
background-color: #DD0000;
}
#mywelcome , #myactions{
background-color: #999999;
}
/* menu */
div#PersFAC ul li span.menukop, div#ProfFAC ul li span.menukop {
color: #DD0000;
}
/* Tabbladen */
#facforum .ui-state-default a:link {color: #000000;
}
span.notetoggler, span.rsTruncmore {
font-weight: bold;

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

@@ -6981,30 +6981,16 @@ Met <xsl:element name="a"><xsl:attribute name="href">http://<xsl:value-of select
<td width="20%" class="label">E-mail adres</td>
<td width="80%" class="value">:&#xA0;<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/contact_user/email"/></td>
</tr>
<!--Op mail/bon naar iMotions (videobutler@imotions.nl) geen Locatie/Afdeling!-->
<xsl:if test="$srtnotificatiecode!='CUST24'">
<tr>
<td width="20%" class="label">Locatie</td>
<td width="80%" class="value">:&#xA0;<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/contact_user/werkplek[myvolgnr=$min_wpnr]/plaats/regio/district/locatie/omschrijving"/></td>
</tr>
<tr>
<td width="20%" class="label">Afdeling</td>
<td width="80%" class="value">:&#xA0;<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/contact_user/afdeling/omschrijving"/></td>
</tr>
</xsl:if>
<tr>
<td width="20%" class="label">Gastheer/-vrouw</td>
<td width="80%" class="value">:&#xA0;<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/host_user/naam_friendly"/></td>
</tr>
<!--Op mail/bon naar iMotions (videobutler@imotions.nl) geen Kostenplaats!-->
<xsl:if test="$srtnotificatiecode!='CUST24'">
<tr>
<td width="20%" class="label">Kostenplaats</td>
<td width="80%" class="value">:&#xA0;<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/kostenplaats/nr"/>
<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/kostenplaats/omschrijving"/>
</td>
</tr>
</xsl:if>
<tr>
<td width="20%" class="label">Kostenplaats</td>
<td width="80%" class="value">:&#xA0;<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/kostenplaats/nr"/>
<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/kostenplaats/omschrijving"/>
</td>
</tr>
<tr><td height="30px"/></tr>
<xsl:if test="rsv_ruimte[volgnr=$min_volgnr]/contact_user/key!=ingevoerd_user/key">
<tr>
@@ -7020,22 +7006,6 @@ Met <xsl:element name="a"><xsl:attribute name="href">http://<xsl:value-of select
<tr>
<td colspan="2" class="tekst">
<xsl:choose>
<!--Op mail/bon naar iMotions (videobutler@imotions.nl) een tracking-alinea!-->
<xsl:when test="$srtnotificatiecode='CUST24'">
<table border="0" style="width:100%;border-collapse:collapse;" cellpadding="0" cellspacing="0">
<tr><td colspan="4" class="tekst">De volgende acties hebben vandaag plaatsgevonden:</td></tr>
<xsl:for-each select="rsv_ruimte/tracking/track">
<xsl:sort select="datum/timestamp" data-type="number" order="descending"/>
<xsl:if test="datum/datum=substring(//header/dateTime,1,10)">
<xsl:choose>
<xsl:when test="@code='RESNEW'"><tr><td><xsl:value-of select="datum/datum"/></td><td><xsl:value-of select="datum/tijd"/></td><td>Reservering is geregistreerd</td><td><xsl:value-of select="user/naam_full"/></td></tr></xsl:when>
<xsl:when test="@code='RESUPD'"><tr><td><xsl:value-of select="datum/datum"/></td><td><xsl:value-of select="datum/tijd"/></td><td>Reservering is gewijzigd<br/><xsl:value-of select="omschrijving"/></td><td><xsl:value-of select="user/naam_full"/></td></tr></xsl:when>
<xsl:when test="@code='RESDEL'"><tr><td><xsl:value-of select="datum/datum"/></td><td><xsl:value-of select="datum/tijd"/></td><td>Reservering is verwijderd</td><td><xsl:value-of select="user/naam_full"/></td></tr></xsl:when>
</xsl:choose>
</xsl:if>
</xsl:for-each>
</table>
</xsl:when>
<xsl:when test="$srtnotificatiecode='RESNEW'"/>
<xsl:when test="$srtnotificatiecode='RESDEL'">DE RESERVERING IS VERVALLEN</xsl:when>
<xsl:otherwise><xsl:call-template name="res_begintext"/></xsl:otherwise>

2
UTILS/PutOrders/puo_notifications.js
View File

@@ -286,7 +286,7 @@ function notificationMail(rec, p_notificationXSL, params)
, strResult
, { attachFileName: "Facilitor.html"
, attachFolder: attach_folder
, attachSubFolder: attach_kenmerk
, attachSubFolder: attach_kenmerk_folder
, attachments: []
}
);

2
UTILS/PutOrders/puo_sendhttp.js
View File

@@ -45,7 +45,7 @@ function submitHTTP( p_connect
{
params.headers["Content-Type"] = "text/xml; charset=utf-8";
params.data = p_textstream;
LogString2File(2, "HTTPrequest", params.data);
LogStream2File(2, "HTTPrequest", params.data);
}
var XMLhttp = doHTTP(p_connect.CurrentAddress, params);
// Bij status buiten de 200 range is er al een exception geweest