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

Merge 2017.2 RC2 patches

Browse Source 
svn path=/Website/trunk/; revision=35701
This commit is contained in:
Jos Groot Lipman
2017-10-16 08:06:23 +00:00
parent ba61bf8f0f 65ba5f3e19
commit 3335d5c100
27 changed files with 521 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
APPL/API/api_mldsoap.asp
View File

@@ -263,9 +263,12 @@ for (i = 0; i < meldingen.length; i++)
if (meld_oms)
fields.push({ dbs: "mld_melding_omschrijving", typ: "varchar", val: meld_oms, track: L("lcl_mld_inf_Omschrijving"), len: 4000 });
var mldUpd = buildTrackingUpdate("mld_melding", "mld_melding_key = " + mld_key, fields, { noValidateToken: true });
Oracle.Execute(mldUpd.sql);
mld.trackmeldingupdate(mld_key, L("lcl_mld_is_updatedbysoap").format(mld_key) + "\n" + mldUpd.trackarray.join("\n"));
if (fields.length>0)
{
var mldUpd = buildTrackingUpdate("mld_melding", "mld_melding_key = " + mld_key, fields, { noValidateToken: true });
Oracle.Execute(mldUpd.sql);
mld.trackmeldingupdate(mld_key, L("lcl_mld_is_updatedbysoap").format(mld_key) + "\n" + mldUpd.trackarray.join("\n"));
}
// De kenmerken.
upsertKenmerk(mldkenmerken, stdmld_key, mld_key);

13
APPL/API2/model_orders.inc
View File

@@ -87,7 +87,8 @@ function model_orders(opdr_key, params)
joinfield: "mld_opdr_key"
},
"custom_fields" : { model: new model_custom_fields(this, new model_mld_kenmerk('O', { internal: true }), { pNiveau: "O", readman: true, readuse: true }),
joinfield: "flexparentkey"
joinfield: "flexparentkey",
"enable_update": true
},
"tracking": {
model: new model_tracking(['opdracht']),
@@ -350,6 +351,12 @@ function model_orders(opdr_key, params)
var opdr_key = the_key;
if (opdr_key == -1)
abort_with_warning("PUT needs record key in url.");
if (params.custom_fields_only)
{
var mldtrack = api2.process_includes(params, this, jsondata, opdr_key);
return { key: opdr_key };
}
if (!jsondata.id) jsondata.id = opdr_key; // huidige key altijd in jsondata
//
this._pre_analyze_fields(params, jsondata);
@@ -1094,7 +1101,9 @@ function model_orders(opdr_key, params)
+ " mld_srtkenmerk t"
+ " WHERE m.mld_srtkenmerk_key = t.mld_srtkenmerk_key"
+ " AND m.mld_kenmerk_key = "; /* wordt in saveFlexkenmerken uitgebreid */
// TODO: deze saveFlexKenmerken moet via de standaard includes door model_custom_fields opgelost worden
// pas echter op: die verwacht een properyid voor elk kenmerk terwijl saveFlexKenmerken (nog) een 'id' verwacht
// In het bijzonder wordt in d:\Apps\Facilitor\Branch20172\CUST\ASLE\Appl ook nog de 'id' gezet!
var flextrack =
saveFlexKenmerken(opdr_key, { kenmerkTable: "mld_kenmerkopdr",
kenmerkParentKey : "mld_opdr_key",

28
APPL/API2/plugins/scimusers.wsc
View File

@@ -99,7 +99,7 @@ function transform_incoming(params, data)
if (enterprise["employeeNumber"] == undefined) person.employeenumber = "";
var dep_id = facilitor["orgUnit"]["id"].replace (FCLT.DEZE.customerId + "_department_", "");
var dep_id = facilitor["orgUnit"]["value"].replace (FCLT.DEZE.customerId + "_department_", "");
person["department"] = { id: dep_id };
person["function"] = { name: facilitor["title"] } // id mag achterwege blijven omdat desc_is_unique
@@ -108,11 +108,26 @@ function transform_incoming(params, data)
{
person.email = data["emails"][0].value; // type:work/primary:true opzoeken ?
}
person.phone = "";
person.mobile = "";
if (data["phoneNumbers"])
{
person.mobile = data["phoneNumbers"][0].value; // type:mobile/primary:true opzoeken ?
for (var j = 0; j < data["phoneNumbers"].length; j++)
{ if (data["phoneNumbers"][j]["type"] == 'mobile')
{
person.mobile = data["phoneNumbers"][j].value;
}
if (data["phoneNumbers"][j]["type"] == 'work')
{
person.phone = data["phoneNumbers"][j].value;
}
}
}
// TODO groepen negeren we nog
if (person.phone == undefined) person.phone = "";
if (person.mobile == undefined) person.mobile = "";
// TODO groepen negeren we
FCLT.DEZE.__Log(person);
@@ -156,6 +171,11 @@ function transform_one_person(params, person)
"value":person.mobile,
"type":"mobile",
"primary":true
},
{
"value":person.phone,
"type":"work",
"primary":false
}
],
"groups":[],
@@ -167,7 +187,7 @@ function transform_one_person(params, person)
{
"orgunit":
{
"id":FCLT.DEZE.customerId + "_department_" + String(person.department.id),
"value":FCLT.DEZE.customerId + "_department_" + String(person.department.id),
"$ref":FCLT.DEZE.HTTP.urlzelf() + "/appl/SCIM/OrgUnits/" + FCLT.DEZE.customerId + "_department_" + String(person.department.id)
},
"initials":person.initials,

2
APPL/CNT/cnt_split.asp
View File

@@ -125,7 +125,7 @@ var kosten = oRs("kosten").value;
minDate : mindate,
maxDate: maxdate,
timeField: false,
autoopen: true,
autoopen: false,
required: true
});

21
APPL/MLD/mld_edit_melding.asp
View File

@@ -1130,23 +1130,12 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
var buttons = [];
if (S("mld_edit_search_similar") && (backo || fronto))
if (S("mld_show_search_similar") && (backo || fronto))
{
var goegel = "FcltMgr.openDetail('/appl/mld/mld_search.asp?urole=" + urole + "&chkSelf=1&chkBusy=1&autosearch=1&opl=1";
if (S("mld_edit_search_similar") & 1) // Omschrijving
goegel += "&searchtekst='+escape($('#melding_omschrijving').val())+'";
if (S("mld_edit_search_similar") & 2) // Locatie
goegel += "&locatie_key='" + "+($('#locatiekey').val()||-1)+" + "'";
/* Future additions:
if (S("mld_edit_search_similar") & 3) // XXX1
goegel += "&XXX1=" + mld_melding.XXX1;
if (S("mld_edit_search_similar") & 4) // XXX2
goegel += "&XXX2=" + mld_melding.XXX2;
*/
goegel += "&disc=-1', '', '" + L("lcl_mld_similarcalls") + "') ";
var goegel = "FcltMgr.openDetail('/appl/mld/mld_search.asp?urole=" + urole + "&chkSelf=1&chkBusy=1&autosearch=1&opl=1"
+ "&searchtekst='+escape($('#melding_omschrijving').val())+'"
+ "&locatie_key='" + "+($('#locatiekey').val()||-1)+" + "'"
+ "&disc=-1', '', '" + L("lcl_mld_similarcalls") + "') ";
if (lBestaandeMelding && (this_mld.canBOwrite || this_mld.canFOwrite))
buttons.push({ icon: "lightbulb.png", title: L("lcl_mld_similarcalls"), action: goegel});

2
APPL/MLD/mld_edit_melding.js
View File

@@ -80,7 +80,7 @@ function mldDoubleCallback(data, text)
function showFaq(faq_key)
{
if (faq_key > 0)
FcltMgr.openDetail("appl/fac/fac_faq.asp?urole=fe&faq_key=" + faq_key, {reuse: true});
FcltMgr.openDetail("appl/fac/fac_faq.asp?urole=fe&faq_key=" + faq_key, L("lcl_faq_item"), {reuse: true});
}
function mld_submit_callback(json)

18
APPL/MLD/mld_show_melding.asp
View File

@@ -545,21 +545,11 @@ function parentButton()
var buttons = [];
if (S("mld_show_search_similar") && (backo || fronto))
{
var goegel = "FcltMgr.openDetail('/appl/mld/mld_search.asp?urole=" + urole + "&chkSelf=1&chkBusy=1&autosearch=1";
var goegel = "FcltMgr.openDetail('/appl/mld/mld_search.asp?urole=" + urole + "&chkSelf=1&chkBusy=1&autosearch=1"
+ "&stdm_str=" + mld_melding.stdm
+ "&gebouw_key=" + mld_melding.bld_key + "&locatie_key=" + mld_melding.loc_key
+ "', '" + L("lcl_mld_similarcalls") + "') ";
if (S("mld_show_search_similar") & 1) // Stdm
goegel += "&stdm_str=" + mld_melding.stdm;
if (S("mld_show_search_similar") & 2) // Plaats
goegel += "&gebouw_key=" + mld_melding.bld_key + "&locatie_key=" + mld_melding.loc_key
/* Future additions:
if (S("mld_show_search_similar") & 3) // XXX1
goegel += "&XXX1=" + mld_melding.XXX1;
if (S("mld_show_search_similar") & 4) // XXX2
goegel += "&XXX2=" + mld_melding.XXX2;
*/
goegel += "', '" + L("lcl_mld_similarcalls") + "') ";
buttons.push({ icon: "lightbulb.png", title: L("lcl_mld_similarcalls"), action: goegel});
}

8
APPL/MLD/mld_show_melding.js
View File

@@ -322,6 +322,12 @@ function mld_add2faq()
L("lcl_mld_addtofaq"));
}
function showFaq(faq_key)
{
if (faq_key > 0)
FcltMgr.openDetail("appl/fac/fac_faq.asp?urole=fe&faq_key=" + faq_key, L("lcl_faq_item"), {reuse: true});
}
function mld_show_kennisbank(data)
{
var $tbl = $("#mldFaq").find("table");
@@ -354,7 +360,7 @@ function mld_show_kennisbank(data)
FcltMgr.resized(window);
});
$tbl.append($newrow)
var safeanswer = $("<span>").text(data.fixed_faq[i].answer).text().replace(/\n/g, "<br>");
var safeanswer = $("<span>").text(data.fixed_faq[i].answer).text().replace(/\n/g, "<br>");
if (data.fixed_faq[i].hurl)
safeanswer += "<br><a href={0} target='_new'>{1}</a>".format(fixed_faq[i].hurl, fixed_faq[i].hlnk);
else if (data.fixed_faq[i].has_kenm)

5
APPL/PDA/attachments.js
View File

@@ -66,6 +66,11 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) {
progressEventHandler: onProgress.bind(progressSpan)
})
.done(function(result) {
if ("success" in result && !result.success)
{
FcltMgr.alert(result.message);
return;
}
addInlineAttachmentMarkup(file);
//progressSpan.progressbar( 'value', 100 ).remove();
fileSpan.find('input.token').val(result.attachment.token)

7
APPL/PDA/default.css
View File

@@ -406,11 +406,16 @@ div.ui-controlgroup-label {
font-weight: normal !important;
padding-top: 6px !important;
}
.ui-mobile label, .ui-mini {
.ui-mini {
font-size: 1em !important;
font-weight: 400 !important;
}
.ui-mobile label {
font-size: 0.9em !important;
font-weight: 400 !important;
}
/* Buttons
-----------------------------------------------------------------------------------------------------------*/
.ui-btn,

4
APPL/PDA/ins_deel.asp
View File

@@ -207,8 +207,10 @@ oRs.Close();
canInspect = (oRs(0).Value > 0);
//TODO-AUTH: mag ik deze soort (hier) inspecteren?
sql = "SELECT res_deel_key FROM res_deel "
sql = "SELECT res_deel_key FROM res_deel d, res_activiteitdiscipline rad "
+ " WHERE res_deel_verwijder IS NULL"
+ " AND rad.res_discipline_key = d.res_discipline_key"
+ " AND rad.res_discipline_key != " + S("vis_parking_key")
+ " AND res_ins_deel_key = " + ins_key;
oRs = Oracle.Execute(sql);
if (!oRs.eof) {

18
APPL/PDA/ins_list.asp
View File

@@ -84,7 +84,7 @@ else if (ins_parent_key > -1)
else
{
subject += " " + CurrentPosition
}
}
%>
<body>
<%
@@ -125,7 +125,7 @@ else
case "A" : plaats_eigenaar_icon = "<i class='fa fa-users'></i>&nbsp;"; break;
case "P" : plaats_eigenaar_icon = "<i class='fa fa-user'></i>&nbsp;"; break;
}
return "<div class='listbodykop'>" + plaats_eigenaar_icon+ safe.html(oRs("plaats_eigenaar").Value)+ "</div>";
};
function fnAside(oRs)
@@ -141,7 +141,7 @@ else
+ " , ins_srtgroep_omschrijving org_srtgroep_omschrijving"
+ " , aog.alg_gebouw_code || '-' || aog.alg_verdieping_code || '-' || aog.alg_ruimte_nr plaats_eigenaar"
+ " , id.ins_deel_key"
+ " , (SELECT MAX('R') FROM res_deel rd WHERE rd.res_deel_verwijder IS NULL AND rd.res_ins_deel_key = id.ins_deel_key) reserveerbaar"
+ " , (SELECT MAX('R') FROM res_deel rd, res_activiteitdiscipline rad WHERE rd.res_deel_verwijder IS NULL AND rd.res_discipline_key = rad.res_discipline_key AND rd.res_ins_deel_key = id.ins_deel_key AND rad.res_discipline_key != " + S("vis_parking_key") + ") reserveerbaar"
+ " , id.ins_alg_ruimte_type"
+ " FROM alg_v_onroerendgoed_gegevens aog"
+ " , ins_deel id"
@@ -376,12 +376,12 @@ else
sql = "SELECT * FROM ("
+ sqlR
+ (metWerkplekgebonden ? " UNION " + sqlW : "")
+ (metPersoonsgebonden ? " UNION " + sqlP : "")
+ (metAfdelingsgebonden ? " UNION " + sqlA : "")
+ (metTerreingebonden ? " UNION " + sqlT : "")
sql = "SELECT * FROM ("
+ sqlR
+ (metWerkplekgebonden ? " UNION " + sqlW : "")
+ (metPersoonsgebonden ? " UNION " + sqlP : "")
+ (metAfdelingsgebonden ? " UNION " + sqlA : "")
+ (metTerreingebonden ? " UNION " + sqlT : "")
+ ")"
+ (grp_sel==""
? ""

22
APPL/PDA/melding.asp
View File

@@ -511,16 +511,16 @@ if (action != "forward")
var prs_melder = new Perslid(mld_info.melder_key);
ROFIELD("fld", L("lcl_caller") , prs_melder.naam(), { moreinfo: "tel:"+(prs_melder.prs_perslid_mobiel()||prs_melder.prs_perslid_telefoonnr()) });
if (S("mld_num_prefix_mode") == 1 && mld_info.kostenpl_key > 0 && !editKostenplaats)
{
var sql = "SELECT k.prs_kostenplaats_key kpkey"
+ " , " + S("prs_kpn_string") + " kpstring"
+ " FROM prs_kostenplaats k"
+ " WHERE k.prs_kostenplaats_key = " + mld_info.kostenpl_key;
var oRs = Oracle.Execute(sql);
ROFIELD("fld", L("lcl_mld_inf_Kostenplaats"), oRs("kpstring").Value);
oRs.Close();
}
if (S("mld_num_prefix_mode") == 1 && mld_info.kostenpl_key > 0 && !editKostenplaats)
{
var sql = "SELECT k.prs_kostenplaats_key kpkey"
+ " , " + S("prs_kpn_string") + " kpstring"
+ " FROM prs_kostenplaats k"
+ " WHERE k.prs_kostenplaats_key = " + mld_info.kostenpl_key;
var oRs = Oracle.Execute(sql);
ROFIELD("fld", L("lcl_mld_inf_Kostenplaats"), oRs("kpstring").Value);
oRs.Close();
}
ROFIELD("fld", L("lcl_mld_date_time") , toDateTimeString(mld_info.melddatum));
ROFIELD("fld", L("lcl_vakgroup") , (mld_info.prefix ? mld_info.prefix+"-" : "") + mld_info.ins_discipline_omschrijving);
@@ -596,7 +596,7 @@ if (action != "forward")
{
%> <input type="hidden" name="account" id="sgAccount" value="<%=mld_info.kostenpl_key || -1 %>">
<%
}
}
if (mld_key > -1)
{

11
APPL/PDA/reservering_new.asp
View File

@@ -191,7 +191,6 @@ if (rsv_ruimte_key == -1)
}
else if (res_deel_key < 0) // Voorziening Reservering
{
if (disc_key < 0)
{ // Kies Discipline
curPage = 4;
@@ -201,17 +200,19 @@ if (rsv_ruimte_key == -1)
geb_key : bld_key,
ver_key : flr_key,
rui_key : roo_key,
select_fields : " count(*) ",
sdisc : "dis.ins_discipline_key",
select_fields : " count(*) cnt, r.res_discipline_key ",
sql_group_by : "GROUP BY r.res_discipline_key",
autfunction : autfunction,
res_tot : date_to
};
var sql_aantal = " ( " + getScopedResDeelSql(params) + ") aantal ";
var sql_aantal = getScopedResDeelSql(params);
var sql_d = "SELECT dis.ins_discipline_key, "
+ " " + lcl.xsqla('dis.ins_discipline_omschrijving','dis.ins_discipline_key')
+ ", " + sql_aantal
+ ", (SELECT SUM(cnt)"
+ " FROM (" + sql_aantal + ") aant"
+ " WHERE res_discipline_key = dis.ins_discipline_key) aantal"
+ " FROM res_v_aanwezigdiscipline dis"
+ " WHERE ins_discipline_min_level = 1"
+ " AND dis.ins_discipline_key IN("

4
APPL/PDA/ruimte.asp
View File

@@ -200,9 +200,9 @@ var subject = oRs("plaats").value;
+ " FROM prs_werkplek WHERE prs_werkplek_virtueel=0 AND prs_alg_ruimte_key = " + ruimte_key;
toRs = Oracle.Execute(tsql);
if (toRs(0).value > 0) {
BUTTON(L("lcl_mobile_werkplekken")+" (1)", {linkid: "./wp_list.asp?ruimte_key="+ruimte_key + transitParam, dataicon: "info"});
BUTTON(L("lcl_mobile_werkplekken")+" ("+ toRs(0).value +")", {linkid: "./wp_list.asp?ruimte_key="+ruimte_key + transitParam, dataicon: "info"});
}
toRs.Close();
}
CONTROLGROUP_END();
CONTENT_END();

3
APPL/PDA/ruimte_list.asp
View File

@@ -98,7 +98,8 @@
groupordercolumn = "r.alg_ruimte_nr || '-' || r.alg_ruimte_omschrijving"; // Groepeer per ruimte.
}
var sql = "SELECT COUNT(" + alg_key + ") numberInGroup"
/* de coalesce alg_key is er vanwege level V. alg_srtruimte_key is niet verplicht en dan wordt er verkeerd geteld. */
var sql = "SELECT COUNT(coalesce(" + alg_key + ", -1)) numberInGroup"
+ " , " + alg_key
+ " , " + alg_naam
+ " , " + alg_code

5
APPL/RES/res.inc
View File

@@ -2166,7 +2166,10 @@ function getScopedResDeelSql(params)
"resd.alg_verdieping_key",
"resd.alg_ruimte_key",
params.autfunction,
typeof params.sdisc == "number"? params.sdisc : '');
typeof params.sdisc == "number"? params.sdisc : '',
"", // forwrite
null, // minlevel
params.sql_group_by);
return sql1;
}

25
APPL/Shared/discxalg3d.inc
View File

@@ -26,7 +26,8 @@ function discxalg3d (
pautfunction,
pdisc,
pforwrite, // "" for unknown
minlevel)
minlevel,
psql_group_by)
{
__SafeLog('discipline_column_3d = '+pdiscipline_column_3d
+'<br>regio_column_3d = '+pregio_column_3d
@@ -37,7 +38,8 @@ function discxalg3d (
+'<br>ruimte_column_3d = '+pruimte_column_3d
+'<br>autfunction = '+pautfunction
+'<br>disc = '+pdisc
+'<br>forwrite = '+pforwrite);
+'<br>forwrite = '+pforwrite
+'<br>psql_group_by = '+psql_group_by);
__SafeLog('InputSQL: <small>' + psql + '</small>');
@@ -99,7 +101,7 @@ function discxalg3d (
if( pdisc != '') {
sqlD += " AND i.ins_discipline_key IN (" + pdisc + ")";
}
if (minlevel>0) // RES filtert extra hard
if (minlevel > 0) // RES filtert extra hard
{
sqlD += " AND i.ins_discipline_min_level = " + minlevel;
}
@@ -122,20 +124,23 @@ function discxalg3d (
continue; // Geen (vereiste) werkplek, dus voor deze discipline(s) geen rechten
}
var thisSQL = psql + " AND "+ pdiscipline_column_3d + " IN ("+ discsOfThisLevel +")";
var thisSQL = psql + " AND "+ pdiscipline_column_3d + " IN ("+ discsOfThisLevel + ")";
__Log(pautfunction+' for disciplines ' + discsOfThisLevel + ' authorized at ALG level ' + thisLevel);
if (thisLevel == -1)
{ // Done
}
else if (thisLevel== 0) { thisSQL += " AND "+ pregio_column_3d + " IN ("+rekeys+")" }
else if (thisLevel== 1) { thisSQL += " AND "+ pdistrict_column_3d + " IN ("+dkeys+")" }
else if (thisLevel== 2) { thisSQL += " AND "+ plocatie_column_3d + " IN ("+lkeys+")" }
else if (thisLevel== 3) { thisSQL += " AND "+ pgebouw_column_3d + " IN ("+gkeys+")" }
else if (thisLevel== 4) { thisSQL += " AND "+ pverdieping_column_3d + " IN ("+fkeys+")" }
else if (thisLevel== 5) { thisSQL += " AND "+ pruimte_column_3d + " IN ("+rkeys+")" }
else if (thisLevel== 0) { thisSQL += " AND " + pregio_column_3d + " IN (" + rekeys + ")" }
else if (thisLevel== 1) { thisSQL += " AND " + pdistrict_column_3d + " IN (" + dkeys + ")" }
else if (thisLevel== 2) { thisSQL += " AND " + plocatie_column_3d + " IN (" + lkeys + ")" }
else if (thisLevel== 3) { thisSQL += " AND " + pgebouw_column_3d + " IN (" + gkeys + ")" }
else if (thisLevel== 4) { thisSQL += " AND " + pverdieping_column_3d + " IN (" + fkeys + ")" }
else if (thisLevel== 5) { thisSQL += " AND " + pruimte_column_3d + " IN (" + rkeys + ")" }
else __Log("Waarschuwing: niveau nog niet ondersteund: " + thisLevel)
thisSQL += (psql_group_by
? " " + psql_group_by
: "");
allSQL.push(thisSQL);
}
oRs.close();

20
APPL/Shared/kenmerk_common.inc
View File

@@ -273,7 +273,9 @@ function listKenmerk(sql, module, key, props)
"R": "rooms"
},
"BEZ": "visitors",
"MLD": "issues",
"MLD": { "M": "issues",
"O": "orders"
},
"PRS": { "P": "persons"
},
"INS": { "I": "inspections",
@@ -283,7 +285,7 @@ function listKenmerk(sql, module, key, props)
"RES": "reservations"
}[module] // niveau
if (api2name && typeof api2name == 'object')
api2name = api2name[props.kenmerk_module || props.niveau]; // kenmerk_module voor ALG, niveau voor INS
api2name = api2name[props.kenmerk_module || props.niveau || "D"]; // kenmerk_module voor ALG, niveau voor INS
if (!api2name)
{
__DoLog(props);
@@ -906,15 +908,16 @@ function listKenmerk(sql, module, key, props)
// KENMERKTYPE F/E (File) ===================================================================
var lijst = [];
if (formobile & (ktype == 'F' || ktype == 'E' || ktype == 'M'))
// mobile doen we heel anders, tenzij het signature is. Die doen we nog old-school
if (formobile && kdim != 'xxx' && (ktype == 'F' || ktype == 'E' || ktype == 'M'))
{
var lijst = BijlagenList(module, niveau, key, kkey, otherPath); // die hebben we dan nodig
var filehtmlarr = [];
for (var i = 0; i < lijst.length; i++)
{
var href = HTTP.urlzelfnoroot() + protectQS.create(OpenFlexFile(module, niveau, key, kkey, lijst[i]));
var html = '<a class="details fldflexM"'
+ ' href=\'' + safe.jsstring(href) + '\'" target="_blank">' + safe.html(lijst[i]) + '</a>';
var html = '<a class="details fldflexM" data-role="button"'
+ ' href=\"' + safe.htmlattr(href) + '" target="_blank" data-ajax="false">' + safe.html(lijst[i]) + '</a>';
filehtmlarr.push(html);
}
var kv = filehtmlarr.join("</br>");
@@ -986,6 +989,7 @@ function listKenmerk(sql, module, key, props)
+ "&key=" + key
+ (niveau != ""? "&niveau=" + niveau : "")
+ "&kenmerk_key=" + kkey
+ "&mobile=" + (formobile ? 1 : 0)
+ (props.kenmerk_module? "&kenmerk_module=" + props.kenmerk_module : "");
// nooit if (pReadonly) url += "&reado=1";
// nooit url += "&multi=1";
@@ -1013,7 +1017,11 @@ function listKenmerk(sql, module, key, props)
saveUrl += "&kenmerk_module="+props.kenmerk_module;
};
var blg = "onBijlagen('" + safe.jsstring(protectQS.create(url)) + "'"
var func = "onBijlagen";
if (formobile)
func = "onBijlagenMobile";
var blg = func + "('" + safe.jsstring(protectQS.create(url)) + "'"
+ ",'" + (saveUrl?safe.jsstring(protectQS.create(saveUrl)):"") + "'"
+ ", false"
+ ", $('#" + fld + "')[0]"

30
CUST/ALLI/xsl/ALLI.xsl
View File

@@ -7,6 +7,34 @@
<xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
</xsl:variable>
<xsl:template match="reservering" mode="outlook">
BEGIN:VCALENDAR
VERSION:2.0
METHOD:REQUEST
BEGIN:VEVENT
UID:FCLTRES<xsl:value-of select="rsv_ruimte/key"/>
DTSTAMP:<xsl:value-of select="datum/utcdatum"/>T<xsl:value-of select="datum/utctijd"/>Z
DTSTART:<xsl:value-of select="rsv_ruimte/van/utcdatum"/>T<xsl:value-of select="rsv_ruimte/van/utctijd"/>Z
DTEND:<xsl:value-of select="rsv_ruimte/tot/utcdatum"/>T<xsl:value-of select="rsv_ruimte/tot/utctijd"/>Z
SUMMARY;ENCODING=QUOTED-PRINTABLE:<xsl:value-of select="rsv_ruimte/res_activiteit/omschrijving"/>: <xsl:choose><xsl:when test="rsv_ruimte/res_ruimte/nr"><xsl:value-of select="rsv_ruimte/omschrijving"/></xsl:when><xsl:otherwise><xsl:value-of select="rsv_ruimte/omschrijving"/>-<xsl:value-of select="rsv_ruimte/rsv_deel/res_deel/omschrijving"/></xsl:otherwise></xsl:choose>
DESCRIPTION;ENCODING=QUOTED-PRINTABLE:<xsl:value-of select="rsv_ruimte/res_activiteit/opmerking"/>
LOCATION;ENCODING=QUOTED-PRINTABLE:<xsl:value-of select="rsv_ruimte/res_ruimte/nr"/>
ORGANIZER;CN=<xsl:value-of select="rsv_ruimte/contact_user/naam_full"/>:MAILTO:reservering-noreply@facilitor.nl
<xsl:for-each select="rsv_ruimte/afspraak/bezoeker">
ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT=TENTATIVE;CN=<xsl:value-of select="naam"/>
<xsl:if test="string(bedrijf)!=''"> (<xsl:value-of select="bedrijf"/>)</xsl:if>:MAILTO:<xsl:if test="boolean(intern_user)">
<xsl:value-of select="intern_user/email"/></xsl:if></xsl:for-each>
SEQUENCE:<xsl:for-each select="rsv_ruimte/tracking/track">
<xsl:sort select="./datum/timestamp" data-type="number" order="descending"/>
<xsl:if test="position() = 1">
<xsl:value-of select="./datum/timestamp"/>
</xsl:if>
</xsl:for-each>
PRIORITY:5
END:VEVENT
END:VCALENDAR
</xsl:template>
<xsl:template match="bestelling" mode="include">
<xsl:choose>
<xsl:when test="($srtnotificatiecode = 'CUST01' or $srtnotificatiecode = 'BESREJ') and bestelitem[1]/srtdeel/srtgroep/discipline/key = 521">
@@ -1041,7 +1069,7 @@
</table>
</xsl:template>
<xsl:template match="opdracht" mode="include">

0
CUST/KFSG/export/.gitignore vendored
View File

19
CUST/KFSG/export/gen_export_daily_task.bat Normal file
View File

@@ -0,0 +1,19 @@
REM GEN_EXPORT_DAILY_TASK.BAT
REM
REM Roept scripts aan die dagelijks uitgevoerd moeten worden
REM
REM Context : roep deze file aan indien nodig, of schedule deze
REM Verseist: de randvoorwaarde voor het gebruik van gen_export
REM
REM $Revision$
REM $Id$
REM
REM (c) 2009, SG facilitor, +31 (53) 4800710, helpdesk@sgfacilitor.nl
REM
CALL ..\..\..\utils\gen_export\gen_export.bat DAILY_TASK

6
CUST/KFSG/xsl/KFSG.xsl
View File

@@ -80,7 +80,7 @@
padding-top: 2px;
padding-left: 2px;
padding-right: 2px;
background-color: #366f7b;
background-color: #fff;
}
td.resresult {
@@ -2245,7 +2245,7 @@ Beste <xsl:value-of select="voor/naam_friendly"/>,
<TABLE cellpadding="1" cellspacing="0" border="0" 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: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>
@@ -2509,7 +2509,7 @@ Beste <xsl:value-of select="voor/naam_friendly"/>,
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="GASTHEER"/><br/>
<xsl:value-of select="VOORZIENING_AANTAL"/>&#160;<xsl:value-of select="VOORZIENING_PRODUCT"/><br/>
<b><xsl:value-of select="VOORZIENING_AANTAL"/>&#160;<xsl:value-of select="VOORZIENING_PRODUCT"/></b><br/>
<xsl:value-of select="substring(VAN,9,2)"/>-<xsl:value-of select="substring(VAN,6,2)"/>-<xsl:value-of select="substring(VAN,1,4)"/>&#160;&#160;
<xsl:value-of select="substring(substring-after(VAN,'T'),1,5)"/>-<xsl:value-of select="substring(substring-after(TOT,'T'),1,5)"/><br/>
<xsl:choose>

177
CUST/MDUX/xsl/Zalsman.xsl Normal file
View File

@@ -0,0 +1,177 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method="xml" encoding="UTF-8" indent="yes"/>
<xsl:decimal-format name="european" decimal-separator="." grouping-separator=","/>
<xsl:param name="mode"/>
<xsl:template match="bestelopdracht">
<!--Facilitor custom XSL template for cXML bestelopdracht-->
<xsl:element name="cXML">
<xsl:attribute name="version">1.2.016</xsl:attribute>
<xsl:attribute name="payloadID">
<xsl:value-of select="key"/>
</xsl:attribute>
<xsl:attribute name="timestamp">
<xsl:value-of select="datum/jaar"/>-<xsl:value-of select="datum/maand"/>-<xsl:value-of select="datum/dag"/>T<xsl:value-of select="datum/tijd"/>:00+01:00</xsl:attribute>
<xsl:attribute name="xml:lang">NL</xsl:attribute>
<Header>
<From>
<xsl:element name="Credential">
<xsl:attribute name="domain">Medux</xsl:attribute>
<!--Bij Identity de Klantcode zoals door Weemen aan SORO toegekend: 4926157 -->
<Identity>Medux</Identity>
</xsl:element>
</From>
<To>
<xsl:element name="Credential">
<xsl:attribute name="domain">Zalsman</xsl:attribute>
<Identity></Identity>
</xsl:element>
</To>
<Sender>
<Credential domain="Medux">
<Identity>meduxociuser</Identity>
<SharedSecret>xxx</SharedSecret>
</Credential>
<UserAgent>Testsysteem</UserAgent>
</Sender>
</Header>
<Request>
<OrderRequest>
<xsl:element name="OrderRequestHeader">
<xsl:attribute name="type">
<xsl:call-template name="inline_punchout_catalogus"><xsl:with-param name="p_ins_discipline_key" select="bestelopdrachtitem[1]/bestelitem[1]/srtdeel/srtgroep/discipline/key"/></xsl:call-template>
</xsl:attribute>
<xsl:attribute name="orderID">
<xsl:value-of select="id"/>
</xsl:attribute>
<xsl:attribute name="orderDate">
<xsl:value-of select="datum/jaar"/>-<xsl:value-of select="datum/maand"/>-<xsl:value-of select="datum/dag"/>
</xsl:attribute>
<Total>
<Money currency="EUR">
<xsl:value-of select="format-number(sum(bestelopdrachtitem/totaal), '0.00', 'european')"/>
</Money>
</Total>
<ShipTo>
<xsl:element name="Address">
<xsl:attribute name="isoCountryCode">NL</xsl:attribute>
<xsl:attribute name="addressID">SORO</xsl:attribute>
<Name xml:lang="NL"><xsl:value-of select="afleveradres/naam"/></Name>
<PostalAddress>
<DeliverTo><xsl:value-of select="bestelling/aanvrager/naam_full"/></DeliverTo>
<Street><xsl:value-of select="afleveradres/bezoek_adres"/></Street>
<City><xsl:value-of select="afleveradres/bezoek_plaats"/></City>
<State></State>
<PostalCode><xsl:value-of select="afleveradres/bezoek_postcode"/></PostalCode>
<Country isoCountryCode="NL"></Country>
</PostalAddress>
<Email>
<xsl:value-of select="bestelling/aanvrager/email"/>
</Email>
</xsl:element>
</ShipTo>
<BillTo>
<xsl:element name="Address">
<xsl:attribute name="isoCountryCode">NL</xsl:attribute>
<xsl:attribute name="addressID">SORO</xsl:attribute>
<Name xml:lang="NL">
<xsl:value-of select="factuuradres/naam"/>
</Name>
<PostalAddress>
<Street><xsl:value-of select="factuuradres/post_adres"/></Street>
<City><xsl:value-of select="factuuradres/post_plaats"/></City>
<State></State>
<PostalCode><xsl:value-of select="factuuradres/post_postcode"/></PostalCode>
<Country isoCountryCode="NL"></Country>
</PostalAddress>
</xsl:element>
</BillTo>
<Contact>
<Name xml:lang="NL">
<xsl:value-of select="bestelling/aanvrager/naam_full"/>
</Name>
<Email>
<xsl:value-of select="bestelling/aanvrager/email"/>
</Email>
</Contact>
<Extrinsic name="kostenplaats">
<xsl:value-of select="substring-before(bestelling/kostenplaats/nr,'.')"/>
</Extrinsic>
<Extrinsic name="kostendrager">
<xsl:value-of select="substring-after(bestelling/kostenplaats/nr,'.')"/>
</Extrinsic>
<Extrinsic name="grootboekrekening">
<xsl:value-of select="bestelopdrachtitem[1]/bestelitem[1]/srtdeel/srtgroep/discipline/kostensoort/omschrijving"/>
</Extrinsic>
</xsl:element>
<xsl:for-each select="bestelopdrachtitem">
<xsl:sort select="srtdeel/omschrijving"/>
<xsl:sort select="posnr"/>
<xsl:element name="ItemOut">
<xsl:attribute name="quantity">
<xsl:value-of select="aantal"/>
</xsl:attribute>
<xsl:attribute name="lineNumber">
<xsl:value-of select="posnr"/>
</xsl:attribute>
<xsl:attribute name="requestedDeliveryDate">
<xsl:value-of select="../bestelling/leverdatum/jaar"/>-<xsl:value-of select="../bestelling/leverdatum/maand"/>-<xsl:value-of select="../bestelling/leverdatum/dag"/>
</xsl:attribute>
<ItemID>
<SupplierPartID>
<xsl:value-of select="bestelitem/srtdeel/artikel_nummer"/>
</SupplierPartID>
</ItemID>
<ItemDetail>
<UnitPrice>
<Money currency="EUR">
<xsl:value-of select="format-number(bestelitem/prijs, '0.00', 'european')"/>
</Money>
</UnitPrice>
<Description xml:lang="NL">
<xsl:value-of select="bestelitem/srtdeel/omschrijving"/>
</Description>
<UnitOfMeasure>
<xsl:value-of select="bestelitem/srtdeel/eenheid"/>
</UnitOfMeasure>
<Classification domain=""/>
</ItemDetail>
</xsl:element>
</xsl:for-each>
</OrderRequest>
</Request>
</xsl:element>
</xsl:template>
<xsl:template name="inline_punchout_catalogus">
<!-- Type attribuut bij inline catalogus = [new], bij punch out = [update] -->
<!-- Discipline key 361 = drukwerk, is interne catalogus-->
<xsl:param name="p_ins_discipline_key"/>
<xsl:choose>
<xsl:when test="$p_ins_discipline_key='361'">new</xsl:when>
<xsl:otherwise>update</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template match="facilitor">
<xsl:apply-templates select="bestelopdracht"/>
</xsl:template>
<xsl:template match="/">
<xsl:choose>
<xsl:when test="$mode='getExtension'">
<xsl:element name="format">
<xsl:element name="extension">xml</xsl:element>
</xsl:element>
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates select="facilitor"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
</xsl:stylesheet>

92
CUST/MNNL/xsl/MNNL.xsl
View File

@@ -29,23 +29,23 @@
<td width="32%" class="value" align="right">:
<xsl:value-of select="datum/datum"/>&#xA0;
<xsl:value-of select="datum/tijd"/>
</td>
</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 class="value">: <xsl:value-of select="voor/naam_full"/>&#xA0;[<xsl:value-of select="voor/oslogin"/>]</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="33%" class="value" align="right">: <xsl:value-of select="voor/naam_full"/>&#xA0;[<xsl:value-of select="voor/oslogin"/>]</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>
</td>
</tr>
</xsl:otherwise>
</xsl:choose>
@@ -64,7 +64,7 @@
<td class="label"><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></td>
<td class="value">:
<xsl:value-of select="leverdatum/datum"/>
</td>
</td>
</tr>
</xsl:when>
<xsl:when test="voor/mobiel!=''">
@@ -74,7 +74,7 @@
<td class="label"><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></td>
<td class="value">:
<xsl:value-of select="leverdatum/datum"/>
</td>
</td>
</tr>
</xsl:when>
<xsl:otherwise>
@@ -84,7 +84,7 @@
<td class="label"><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></td>
<td class="value">:
<xsl:value-of select="leverdatum/datum"/>
</td>
</td>
</tr>
</xsl:otherwise>
</xsl:choose>
@@ -95,7 +95,7 @@
<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>
<td class="value">: <xsl:value-of select="status"/></td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/kostenplaats"/></td>
@@ -121,7 +121,7 @@
<xsl:value-of select="afleveradres/bezoek_plaats"/>
<br/>&#xA0;
<xsl:value-of select="afleveradres/bezoek_land"/>
</xsl:if>
</xsl:if>
</td>
<td colspan="2"/>
</tr>
@@ -130,7 +130,7 @@
<xsl:if test="bestel_opm">
<tr>
<td height="10px" colspan="4"/>
</tr>
</tr>
<tr>
<td class="label" style="vertical-align:top"><xsl:value-of select="//lcl/FAC/opmerkingen"/></td>
<td class="value" colspan="3">:
@@ -158,7 +158,7 @@
</tr>
<tr>
<td colspan="4" style="border-top:1px solid #000;"/>
</tr>
</tr>
<tr>
<td colspan="4">
<table cellpadding="1" cellspacing="0" border="0" bordercolor="#000000" frame="box" width="99%">
@@ -319,9 +319,9 @@
<td class="value" width="28%">:
<xsl:value-of select="bestelling/key"/>
</td>
</tr>
</tr>
<tr>
<td class="label">
<td class="label">
<b><xsl:value-of select="//lcl/FAC/e-mail"/></b>
</td>
<td class="value">:
@@ -332,31 +332,31 @@
</td>
<td class="value">:
<xsl:value-of select="id"/>
</td>
</td>
</tr>
<tr>
<td class="label">
<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>
<xsl:when test="bestelling/aanvrager/mobiel!=''">
<xsl:value-of select="bestelling/aanvrager/mobiel"/>
</xsl:when>
</xsl:choose>
</xsl:choose>
</td>
<td class="label">
<td class="label">
<b><xsl:value-of select="//lcl/BES/orderdatum"/></b>
</td>
<td class="value">:
<xsl:value-of select="datum/datum"/>
</td>
</td>
</tr>
<tr>
<td class="label">
<tr>
<td class="label">
<b><xsl:value-of select="//lcl/FAC/kostenplaats"/></b>
</td>
<td class="value">:
@@ -366,17 +366,17 @@
<xsl:comment>
<td class="label">
<b><xsl:value-of select="//lcl/BES/gewenste_afleverdatum"/></b>
</td>
<td class="value">
</td>
<td class="value">
<xsl:value-of select="bestelling/leverdatum/datum"/>
</td>
</xsl:comment>
</tr>
<tr>
<td class="label">
<td class="label">
<b><xsl:value-of select="//lcl/FAC/werkplek"/></b>
</td>
<td class="value">:
<td class="value">:
<xsl:value-of select="bestelling/plaats"/>
</td>
<td colspan="2"/>
@@ -416,7 +416,7 @@
<xsl:if test="bestelling/bestel_opm">
<tr>
<td height="10px" colspan="4"/>
</tr>
</tr>
<tr>
<td class="label" style="vertical-align:top"><b><xsl:value-of select="//lcl/FAC/opmerkingen"/></b></td>
<td class="value" colspan="3">:
@@ -425,18 +425,18 @@
</xsl:call-template>
</td>
</tr>
</xsl:if>
</xsl:if>
<tr>
<td colspan="4" style="height:20px"/>
</tr>
<xsl:for-each select="bestelling/kenmerk[@type!='L' and @type!='l' and @type!='Q']">
<tr>
<tr>
<td class="label" style="vertical-align:top">
<b><xsl:value-of select="@naam"/></b>
</td>
<td class="value">:
<xsl:value-of select="."/>
</td>
</td>
</tr>
</xsl:for-each>
<tr>
@@ -444,7 +444,7 @@
</tr>
<tr>
<td colspan="4" style="border-top:1px solid #000;"/>
</tr>
</tr>
<TR>
<TD colspan="4">
<TABLE cellpadding="1" cellspacing="0" border="0" bordercolor="#000000" frame="box" width="99%">
@@ -545,17 +545,17 @@
<table border="0" bordercolor="#000000" width="100%">
<tr>
<td class="caption" valign="top" colspan="4">Bevestiging afspraak MN</td>
</tr>
</tr>
<tr>
<td width="50" class="label">Geachte,</td>
</tr>
<tr><td height="10px"/></tr>
<tr>
<td colspan="4" class="label">
Hierbij bevestigen wij de afspraak die met u gemaakt is bij MN. Onderaan deze bevestiging treft u tevens de routebeschrijvingen aan.
Hierbij bevestigen wij de afspraak die met u gemaakt is bij MN. Onderaan deze bevestiging treft u tevens de routebeschrijvingen aan.
Graag tot ziens bij MN.
</td>
</tr>
</tr>
<tr><td height="10px"/></tr>
<xsl:if test="rsv_ruimte[volgnr=$min_volgnr]/contact_user/key!=ingevoerd_user/key">
<tr>
@@ -575,24 +575,24 @@
<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_mai">
<xsl:with-param name="min_volgnr" select="$min_volgnr"/>
</xsl:call-template>
</xsl:for-each>
<xsl:sort select="van/timestamp"/>
<xsl:call-template name="rsv_ruimte_mai">
<xsl:with-param name="min_volgnr" select="$min_volgnr"/>
</xsl:call-template>
</xsl:for-each>
</table>
</td>
</tr>
<xsl:call-template name="res_endtext">
<xsl:with-param name="min_volgnr" select="$min_volgnr"/>
</xsl:call-template>
</xsl:call-template>
</xsl:when>
</xsl:choose>
</table>
</td>
<td WIDTH="30" ROWSPAN="30" ID="RECHTERMARGE"/>
</tr>
</xsl:when>
</xsl:when>
<!--- vanaf hier normale notificatie -->
<xsl:otherwise>
@@ -790,7 +790,7 @@
<xsl:otherwise>
:&#xA0;<xsl:value-of select="plaats/plaatsaanduiding"/>
</xsl:otherwise>
</xsl:choose>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
:&#xA0;<xsl:value-of select="ruimte"/>
@@ -847,7 +847,7 @@
<td colspan="6" style="text-align:left">
Dit is een automatisch gegenereerde email en u kunt hierop derhalve niet antwoorden.
</td>
</tr>
</tr>
</xsl:if>
<xsl:if test="opmerking!=''">
<tr>
@@ -1260,7 +1260,7 @@
</tr>
<tr>
<td height="10px"/>
</tr>
</tr>
</xsl:if>
<tr>
<td colspan="5" class="label">
@@ -1316,7 +1316,7 @@
</tr>
<tr>
<td width="16%"><b><xsl:value-of select="//lcl/FAC/aanvrager"/>:</b></td>
<td width="34%"><xsl:value-of select="voor/naam_full"/></td>
<td width="34%"><xsl:value-of select="voor/naam_full"/>&#xA0;[<xsl:value-of select="voor/oslogin"/>]</td>
<td width="16%"><b><xsl:value-of select="//lcl/FAC/telefoon"/>:</b></td>
<td width="34%"><xsl:if test="voor/telefoonnr=''">-</xsl:if><xsl:value-of select="voor/telefoonnr"/></td>
</tr>
@@ -1360,7 +1360,7 @@
</xsl:if>
<tr>
<td width="16%"><b><xsl:value-of select="//lcl/FAC/aanvrager"/>:</b></td>
<td width="34%"><xsl:value-of select="voor/naam_full"/></td>
<td width="34%"><xsl:value-of select="voor/naam_full"/>&#xA0;[<xsl:value-of select="voor/oslogin"/>]</td>
<td width="16%"><b><xsl:value-of select="//lcl/FAC/telefoon"/>:</b></td>
<td width="34%"><xsl:if test="voor/telefoonnr=''">-</xsl:if><xsl:value-of select="voor/telefoonnr"/> </td>
</tr>
@@ -1543,7 +1543,7 @@
<!--span class="mldbeh"><xsl:value-of select="datumtijd"/>&#xA0;-&#xA0;<xsl:value-of select="door"/> [<xsl:value-of select="code"/>]</span>&#xA0;<xsl:call-template name="linebreaks"><xsl:with-param name="string" select="actie"/></xsl:call-template-->
<span class="mldbeh"><xsl:value-of select="datumtijd"/>&#xA0;-&#xA0;<xsl:value-of select="door"/></span>&#xA0;<xsl:call-template name="linebreaks"><xsl:with-param name="string" select="actie"/></xsl:call-template>
</td>
</tr>
</tr>
</xsl:for-each>
</xsl:if>
</table>

147
CUST/NYBU/xsl/NYBU.xsl
View File

@@ -667,14 +667,14 @@
</div>
</div>
</xsl:when>
<xsl:when test="$srtnotificatiecode='CUST02'">
<br/><br/>Dear <xsl:value-of select="voor/naam_friendly"/>,<br/><br/>
<xsl:when test="$srtnotificatiecode='CUST02'">
<br/><br/>Dear <xsl:value-of select="voor/naam_friendly"/>,<br/><br/>
Hereby we confirm the receipt of your Exit Form for the Nyenrode campus. The following data has been entered into our administration: <br/><br/>
<table border="0" width="50%" cellpadding="2">
<tr>
<td> Date of ending the rental agreement:</td>
<td> <xsl:value-of select="kenmerk[@naam='Vertrekdatum']"/> </td>
<td> <xsl:value-of select="kenmerk[@naam='Vertrekdatum']"/> </td>
</tr>
<tr>
<td> E-mail address:</td>
@@ -685,26 +685,26 @@
<td> <xsl:value-of select="voor/mobiel"/> </td>
</tr>
<tr>
<td> IBAN:</td>
<td> <xsl:value-of select="voor/kenmerk[@naam='IBAN machtiging']"/> </td>
<td> IBAN:</td>
<td> <xsl:value-of select="voor/kenmerk[@naam='IBAN machtiging']"/> </td>
</tr>
<tr>
<td> Room will be checked on: </td>
<td> <xsl:value-of select="kenmerk[@naam='Datum kamercontrole']"/> at <xsl:value-of select="kenmerk[@naam='Tijd kamercontrole']"/> </td>
</tr>
</tr>
</table>
<br/><br/>You need to be present at this time to personally hand in your keys to our Services team.<br/>
When certain data is incorrect or has not reached us yet (possible blanks above) or you would like to change the date/time of the room check, please inform us as soon as possible.<br/>
When certain data is incorrect or has not reached us yet (possible blanks above) or you would like to change the date/time of the room check, please inform us as soon as possible.<br/>
Also don’t forget to submit your new address to program management. <br/>
Ten weeks after the room check you will receive a final invoice at the forwarding address. On this invoice we will calculate rent, deposit, final cleaning and damages if applicable.<br/>
Should you have any further questions, you can reach us through the contact info underneath.<br/><br/>
Kind regards,<br/>
<xsl:value-of select="melder/naam_friendly"/> <br/>
Hospitality and Services, Nyenrode Business Universiteit
</xsl:when>
</xsl:when>
<xsl:otherwise>
<table border="0" width="50%" cellpadding="2">
<tr>
@@ -776,14 +776,14 @@
<xsl:choose>
<xsl:when test="$srtnotificatiecode='MLDAFM'">
<br/>
<br/>Je hebt je pakketje opgehaald bij het Servicepoint.
<br/>Je hebt je pakketje opgehaald bij het Servicepoint.
<br/>Dit is een automatisch gegenereerd bericht om u te laten weten dat de melding wordt gesloten.
<br/>
<br/>Vriendelijke groet,
<br/>
<br/>Nyenrode Servicepoint
</xsl:when>
<xsl:otherwise>
<xsl:otherwise>
<br/>
<br/>Er ligt een pakket voor u klaar bij het Servicepoint in het de Rooij gebouw.
<br/>U kunt deze afhalen tijdens openingsuren, van maandag t/m vrijdag tussen 8.30 en 17.00 uur.
@@ -1047,7 +1047,78 @@
<xsl:with-param name="string" select="omschrijving"/>
</xsl:call-template>
</td>
<tr height="40px">
<td colspan="4">
<hr/>
</td>
</tr>
</tr>
<tr>
<xsl:if test="rsv_ruimte">
<xsl:choose>
<xsl:when test="//language='NL'">
<tr>
<td align="right" colspan="3">
<b>Hoort bij reservering <xsl:value-of select="rsv_ruimte/id"/></b>
</td>
<td/>
</tr>
<tr>
<td align="right">
<b>Datum:</b></td>
<td colspan="3">
<xsl:value-of select="rsv_ruimte/van/datum"/>
</td>
</tr>
<tr>
<td align="right">
<b>Begintijd:</b></td>
<td colspan="3">
<xsl:value-of select="rsv_ruimte/van/tijd"/>
</td>
</tr>
<tr>
<td align="right">
<b>Eindtijd:</b></td>
<td colspan="3">
<xsl:value-of select="rsv_ruimte/tot/tijd"/>
</td>
</tr>
</xsl:when>
<xsl:otherwise>
<tr>
<td align="right" colspan="3">
<b>Related to reservation <xsl:value-of select="rsv_ruimte/id"/></b>
</td>
<td/>
</tr>
<tr>
<td align="right">
<b>Date:</b></td>
<td colspan="3">
<xsl:value-of select="rsv_ruimte/van/datum"/>
</td>
</tr>
<tr>
<td align="right">
<b>Start time:</b></td>
<td colspan="3">
<xsl:value-of select="rsv_ruimte/van/tijd"/>
</td>
</tr>
<tr>
<td align="right">
<b>End time:</b></td>
<td colspan="3">
<xsl:value-of select="rsv_ruimte/tot/tijd"/>
</td>
</tr>
</xsl:otherwise>
</xsl:choose>
</xsl:if>
</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=".!=''">
@@ -1060,6 +1131,8 @@
<xsl:value-of select="."/>
</td>
</tr>
</xsl:if>
</xsl:for-each>
<!-- Melding key 146 = aanvraag extra sleutel-->
@@ -1401,7 +1474,7 @@
<xsl:when test="translate(@view, $smallcase, $uppercase)='NYBU_V_RAP_VERTREKBRIEF'">
<head>
<xsl:call-template name="printstyle"/>
<xsl:call-template name="printstyle"/>
</head>
<body>
<xsl:for-each select="rapport_data/data_row">
@@ -1426,7 +1499,7 @@
</xsl:for-each>
</body>
</xsl:when>
<xsl:when test="translate(@view, $smallcase, $uppercase)='NYBU_V_RAP_CNT_STUDENT_ALL'">
<head>
<xsl:call-template name="printstyle"/>
@@ -2196,12 +2269,12 @@
<td height="50px"/>
</tr>
</xsl:if>
<xsl:if test="$srtnotificatiecode='RESNEW'">
<xsl:choose>
<!-- Als het alleen om voorzieningen gaat wijkt de tekst wat af -->
<xsl:when test="rsv_ruimte/res_activiteit/res_srtactiviteit/omschrijving = 'Voorzieningen' ">
<xsl:choose>
<!-- Als het alleen om voorzieningen gaat wijkt de tekst wat af -->
<xsl:when test="rsv_ruimte/res_activiteit/res_srtactiviteit/omschrijving = 'Voorzieningen' ">
<tr>
<td colspan="4">
<p>Beste <xsl:value-of select="rsv_ruimte/contact_user/voornaam"/>&#xA0;<xsl:value-of select="rsv_ruimte[volgnr=1]/contact_user/naam"/>,</p>
@@ -2216,16 +2289,16 @@
<td height="50px"/>
</tr>
</xsl:when>
<xsl:otherwise>
<tr>
<td colspan="4">
<p>Beste <xsl:value-of select="rsv_ruimte/contact_user/voornaam"/>&#xA0;<xsl:value-of select="rsv_ruimte[volgnr=1]/contact_user/naam"/>,</p>
<p>Hartelijk dank voor de zaalreservering op <xsl:value-of select="rsv_ruimte/van/datum"/>.</p>
<p> U ontvangt 4 weken voor aanvang een bevestiging van de definitieve ruimte. </p>
<p>Mocht u vragen hebben omtrent uw reservering, neemt u dan contact op met onze Servicedesk via servicedesk@nyenrode.nl of telefoonnummer 0346-291234.</p>
<p>Met vriendelijke groet,</p>
@@ -2239,20 +2312,20 @@
</xsl:otherwise>
</xsl:choose>
</xsl:if>
<xsl:if test="$srtnotificatiecode='RESBEV'">
<tr>
<td colspan="4">
<p>Beste <xsl:value-of select="rsv_ruimte/contact_user/voornaam"/>&#xA0;<xsl:value-of select="rsv_ruimte[volgnr=1]/contact_user/naam"/>,</p>
<p>U heeft een reservering geplaatst op <xsl:value-of select="rsv_ruimte/van/datum"/>.</p>
<p> Wij hebben de volgende ruimte definitief voor u gereserveerd: </p>
<p> <b> <xsl:value-of select="rsv_ruimte/res_ruimte/nr"/> </b> </p>
<p> Vergeet u niet uw reservering te controleren en eventuele cateringwensen en voorzieningen kenbaar te maken in Facilitor? </p>
<p>Mocht u vragen hebben omtrent uw reservering, neemt u dan contact op met onze Servicedesk via servicedesk@nyenrode.nl of telefoonnummer 0346-291234.</p>
<p>Met vriendelijke groet,</p>
@@ -2264,14 +2337,14 @@
<td height="50px"/>
</tr>
</xsl:if>
<xsl:if test="$srtnotificatiecode='RESDEL'">
<tr>
<td colspan="4">
<p>Beste <xsl:value-of select="rsv_ruimte/contact_user/voornaam"/>&#xA0;<xsl:value-of select="rsv_ruimte[volgnr=1]/contact_user/naam"/>,</p>
<p>Uw reservering op <xsl:value-of select="rsv_ruimte/van/datum"/> is geannuleerd.</p>
<p>Mocht u vragen hebben omtrent uw reservering, neemt u dan contact op met onze Servicedesk via servicedesk@nyenrode.nl of telefoonnummer 0346-291234.</p>
<p>Met vriendelijke groet,</p>
@@ -2283,7 +2356,7 @@
<td height="50px"/>
</tr>
</xsl:if>
<xsl:if test="$srtnotificatiecode='CUST01'">
<tr>
<td colspan="4">
@@ -2418,7 +2491,7 @@
<td>
<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/kenmerk[@naam='Referentie klant']"/>
</td>
<td colspan="8"/>
<td colspan="8"/>
</tr>
<tr>
<td>Factuuradres</td>
@@ -2435,7 +2508,7 @@
<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/kenmerk[@naam='Company']/bedrijf/post_land"/>
</strong>
</td>
<td colspan="8"/>
<td colspan="8"/>
</tr>
<tr>
<td>Begindatum</td>
@@ -2450,14 +2523,14 @@
<xsl:text>&#xA0;</xsl:text>
<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/van/jaar"/>
</td>
<td colspan="8"/>
<td colspan="8"/>
</tr>
<tr>
<td>Aantal personen</td>
<td>
<xsl:value-of select="rsv_ruimte[volgnr=$min_volgnr]/bezoekers"/>
</td>
<td colspan="8"/>
<td colspan="8"/>
</tr>
<tr>
<td>Programma</td>
@@ -2466,7 +2539,7 @@
<xsl:with-param name="string" select="rsv_ruimte[volgnr=$min_volgnr]/kenmerk[@naam='Programmatijden']"/>
</xsl:call-template>
</td>
<td colspan="8"/>
<td colspan="8"/>
</tr>
<tr>
<td colspan="10" height="30" style="border-top:1px solid #000;"/>

2
CUST/YKPN/xsl/strukton.xsl
View File

@@ -28,7 +28,7 @@
<xsl:element name="TypeCode">
<xsl:choose>
<xsl:when test="opdrachttype/omschrijving='Uitvoering melding'">2</xsl:when>
<xsl:when test="opdrachttype/omschrijving='Uitvoering opdracht'">5</xsl:when>
<xsl:when test="opdrachttype/omschrijving='Uitvoering opdracht'">2</xsl:when>
<xsl:when test="opdrachttype/omschrijving='Uitvoering offerte'">5</xsl:when>
<xsl:otherwise>3</xsl:otherwise>
</xsl:choose>