diff --git a/APPL/API/api_mldsoap.asp b/APPL/API/api_mldsoap.asp index c15df5cc89..899e7dc9fd 100644 --- a/APPL/API/api_mldsoap.asp +++ b/APPL/API/api_mldsoap.asp @@ -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); diff --git a/APPL/API2/model_orders.inc b/APPL/API2/model_orders.inc index 22759a5878..d39b992082 100644 --- a/APPL/API2/model_orders.inc +++ b/APPL/API2/model_orders.inc @@ -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", diff --git a/APPL/API2/plugins/scimusers.wsc b/APPL/API2/plugins/scimusers.wsc index 74b3dc74e9..2686f104af 100644 --- a/APPL/API2/plugins/scimusers.wsc +++ b/APPL/API2/plugins/scimusers.wsc @@ -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, diff --git a/APPL/CNT/cnt_split.asp b/APPL/CNT/cnt_split.asp index ccb064842a..fa20bc6db8 100644 --- a/APPL/CNT/cnt_split.asp +++ b/APPL/CNT/cnt_split.asp @@ -125,7 +125,7 @@ var kosten = oRs("kosten").value; minDate : mindate, maxDate: maxdate, timeField: false, - autoopen: true, + autoopen: false, required: true }); diff --git a/APPL/MLD/mld_edit_melding.asp b/APPL/MLD/mld_edit_melding.asp index 7073ef0e31..1a993de1dc 100644 --- a/APPL/MLD/mld_edit_melding.asp +++ b/APPL/MLD/mld_edit_melding.asp @@ -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}); diff --git a/APPL/MLD/mld_edit_melding.js b/APPL/MLD/mld_edit_melding.js index 799bd57c16..f3c5eda059 100644 --- a/APPL/MLD/mld_edit_melding.js +++ b/APPL/MLD/mld_edit_melding.js @@ -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) diff --git a/APPL/MLD/mld_show_melding.asp b/APPL/MLD/mld_show_melding.asp index 4695a5d4af..fef918f384 100644 --- a/APPL/MLD/mld_show_melding.asp +++ b/APPL/MLD/mld_show_melding.asp @@ -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}); } diff --git a/APPL/MLD/mld_show_melding.js b/APPL/MLD/mld_show_melding.js index 9e67c374ee..2f44a4cfd8 100644 --- a/APPL/MLD/mld_show_melding.js +++ b/APPL/MLD/mld_show_melding.js @@ -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 = $("").text(data.fixed_faq[i].answer).text().replace(/\n/g, "
"); + var safeanswer = $("").text(data.fixed_faq[i].answer).text().replace(/\n/g, "
"); if (data.fixed_faq[i].hurl) safeanswer += "
{1}".format(fixed_faq[i].hurl, fixed_faq[i].hlnk); else if (data.fixed_faq[i].has_kenm) diff --git a/APPL/PDA/attachments.js b/APPL/PDA/attachments.js index 0911207d98..c8bc7c0b92 100644 --- a/APPL/PDA/attachments.js +++ b/APPL/PDA/attachments.js @@ -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) diff --git a/APPL/PDA/default.css b/APPL/PDA/default.css index 025fc8e4e5..910631bd32 100644 --- a/APPL/PDA/default.css +++ b/APPL/PDA/default.css @@ -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, diff --git a/APPL/PDA/ins_deel.asp b/APPL/PDA/ins_deel.asp index 9fb7b8ee51..01355a8dab 100644 --- a/APPL/PDA/ins_deel.asp +++ b/APPL/PDA/ins_deel.asp @@ -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) { diff --git a/APPL/PDA/ins_list.asp b/APPL/PDA/ins_list.asp index ea7246fde2..0fd723a35e 100644 --- a/APPL/PDA/ins_list.asp +++ b/APPL/PDA/ins_list.asp @@ -84,7 +84,7 @@ else if (ins_parent_key > -1) else { subject += " " + CurrentPosition -} +} %> <% @@ -125,7 +125,7 @@ else case "A" : plaats_eigenaar_icon = " "; break; case "P" : plaats_eigenaar_icon = " "; break; } - + return "
" + plaats_eigenaar_icon+ safe.html(oRs("plaats_eigenaar").Value)+ "
"; }; 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=="" ? "" diff --git a/APPL/PDA/melding.asp b/APPL/PDA/melding.asp index 458aeff99f..677a974d9e 100644 --- a/APPL/PDA/melding.asp +++ b/APPL/PDA/melding.asp @@ -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") { %> <% - } + } if (mld_key > -1) { diff --git a/APPL/PDA/reservering_new.asp b/APPL/PDA/reservering_new.asp index 64fb34238a..d93fe2ddc0 100644 --- a/APPL/PDA/reservering_new.asp +++ b/APPL/PDA/reservering_new.asp @@ -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(" diff --git a/APPL/PDA/ruimte.asp b/APPL/PDA/ruimte.asp index d46bac4482..0ed6cfbbef 100644 --- a/APPL/PDA/ruimte.asp +++ b/APPL/PDA/ruimte.asp @@ -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(); diff --git a/APPL/PDA/ruimte_list.asp b/APPL/PDA/ruimte_list.asp index b02d275517..c97cd01950 100644 --- a/APPL/PDA/ruimte_list.asp +++ b/APPL/PDA/ruimte_list.asp @@ -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 diff --git a/APPL/RES/res.inc b/APPL/RES/res.inc index f00d944200..97d8455086 100644 --- a/APPL/RES/res.inc +++ b/APPL/RES/res.inc @@ -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; } diff --git a/APPL/Shared/discxalg3d.inc b/APPL/Shared/discxalg3d.inc index 41544f8561..a215691373 100644 --- a/APPL/Shared/discxalg3d.inc +++ b/APPL/Shared/discxalg3d.inc @@ -26,7 +26,8 @@ function discxalg3d ( pautfunction, pdisc, pforwrite, // "" for unknown - minlevel) + minlevel, + psql_group_by) { __SafeLog('discipline_column_3d = '+pdiscipline_column_3d +'
regio_column_3d = '+pregio_column_3d @@ -37,7 +38,8 @@ function discxalg3d ( +'
ruimte_column_3d = '+pruimte_column_3d +'
autfunction = '+pautfunction +'
disc = '+pdisc - +'
forwrite = '+pforwrite); + +'
forwrite = '+pforwrite + +'
psql_group_by = '+psql_group_by); __SafeLog('InputSQL: ' + psql + ''); @@ -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(); diff --git a/APPL/Shared/kenmerk_common.inc b/APPL/Shared/kenmerk_common.inc index f2d50dc79c..00f9925258 100644 --- a/APPL/Shared/kenmerk_common.inc +++ b/APPL/Shared/kenmerk_common.inc @@ -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 = '' + safe.html(lijst[i]) + ''; + var html = '' + safe.html(lijst[i]) + ''; filehtmlarr.push(html); } var kv = filehtmlarr.join("
"); @@ -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]" diff --git a/CUST/ALLI/xsl/ALLI.xsl b/CUST/ALLI/xsl/ALLI.xsl index 96051e7e5b..8fa7f1fefa 100644 --- a/CUST/ALLI/xsl/ALLI.xsl +++ b/CUST/ALLI/xsl/ALLI.xsl @@ -7,6 +7,34 @@ + +BEGIN:VCALENDAR +VERSION:2.0 +METHOD:REQUEST +BEGIN:VEVENT +UID:FCLTRES +DTSTAMP:TZ +DTSTART:TZ +DTEND:TZ +SUMMARY;ENCODING=QUOTED-PRINTABLE:: - +DESCRIPTION;ENCODING=QUOTED-PRINTABLE: +LOCATION;ENCODING=QUOTED-PRINTABLE: +ORGANIZER;CN=:MAILTO:reservering-noreply@facilitor.nl + +ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT=TENTATIVE;CN= + ():MAILTO: + +SEQUENCE: + + + + + +PRIORITY:5 +END:VEVENT +END:VCALENDAR + + @@ -1041,7 +1069,7 @@ - + diff --git a/CUST/KFSG/export/.gitignore b/CUST/KFSG/export/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/CUST/KFSG/export/gen_export_daily_task.bat b/CUST/KFSG/export/gen_export_daily_task.bat new file mode 100644 index 0000000000..2447426975 --- /dev/null +++ b/CUST/KFSG/export/gen_export_daily_task.bat @@ -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 + + + + diff --git a/CUST/KFSG/xsl/KFSG.xsl b/CUST/KFSG/xsl/KFSG.xsl index 14fe195c4d..004dcc9653 100644 --- a/CUST/KFSG/xsl/KFSG.xsl +++ b/CUST/KFSG/xsl/KFSG.xsl @@ -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 , - + @@ -2509,7 +2509,7 @@ Beste ,
-  
+  
--   -
diff --git a/CUST/MDUX/xsl/Zalsman.xsl b/CUST/MDUX/xsl/Zalsman.xsl new file mode 100644 index 0000000000..8c288db87b --- /dev/null +++ b/CUST/MDUX/xsl/Zalsman.xsl @@ -0,0 +1,177 @@ + + + + + + + + + + + + 1.2.016 + + + + + --T:00+01:00 + NL +
+ + + Medux + + Medux + + + + + Zalsman + + + + + + meduxociuser + xxx + + Testsysteem + +
+ + + + + + + + + + + -- + + + + + + + + + NL + SORO + + + + + + + + + + + + + + + + + NL + SORO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + new + update + + + + + + + + + + + + xml + + + + + + + + + + \ No newline at end of file diff --git a/CUST/MNNL/xsl/MNNL.xsl b/CUST/MNNL/xsl/MNNL.xsl index 1eae457696..aafd44ac40 100644 --- a/CUST/MNNL/xsl/MNNL.xsl +++ b/CUST/MNNL/xsl/MNNL.xsl @@ -29,23 +29,23 @@ + - + - + + @@ -64,7 +64,7 @@ + @@ -74,7 +74,7 @@ + @@ -84,7 +84,7 @@ + @@ -95,7 +95,7 @@ - + @@ -121,7 +121,7 @@
  - + @@ -130,7 +130,7 @@ + + - + @@ -790,7 +790,7 @@ :  - + :  @@ -847,7 +847,7 @@ - + @@ -1260,7 +1260,7 @@ + - + @@ -1360,7 +1360,7 @@ - + @@ -1543,7 +1543,7 @@  -   - +
:   -
: :  []
: :  [] :   -
: -
: -
: -
: :
-
: @@ -158,7 +158,7 @@
-
@@ -319,9 +319,9 @@ - + - + - - + - - + - + - - + - + - + + @@ -444,7 +444,7 @@ + - +
:
+ : @@ -332,31 +332,31 @@ : -
+ : - + - + + : -
+
: @@ -366,17 +366,17 @@ - +
+ : + : @@ -416,7 +416,7 @@
-
: @@ -425,18 +425,18 @@
: -
-
@@ -545,17 +545,17 @@
- + - + @@ -575,24 +575,24 @@
Bevestiging afspraak MN
Geachte,
- 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.
- - - - - + + + + +
Dit is een automatisch gegenereerde email en u kunt hierop derhalve niet antwoorden.
-
@@ -1316,7 +1316,7 @@
: [] : -
: [] : -
diff --git a/CUST/NYBU/xsl/NYBU.xsl b/CUST/NYBU/xsl/NYBU.xsl index c374dbc4f5..263c6261f1 100644 --- a/CUST/NYBU/xsl/NYBU.xsl +++ b/CUST/NYBU/xsl/NYBU.xsl @@ -667,14 +667,14 @@ - - -

Dear ,

+ + +

Dear ,

Hereby we confirm the receipt of your Exit Form for the Nyenrode campus. The following data has been entered into our administration:

- + @@ -685,26 +685,26 @@ - - + + - +
Date of ending the rental agreement:
E-mail address:
IBAN: IBAN:
Room will be checked on: at
- +

You need to be present at this time to personally hand in your keys to our Services team.
- - 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.
+ + 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.
Also don’t forget to submit your new address to program management.
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.
Should you have any further questions, you can reach us through the contact info underneath.

Kind regards,

Hospitality and Services, Nyenrode Business Universiteit - - + + @@ -776,14 +776,14 @@
-
Je hebt je pakketje opgehaald bij het Servicepoint. +
Je hebt je pakketje opgehaald bij het Servicepoint.
Dit is een automatisch gegenereerd bericht om u te laten weten dat de melding wordt gesloten.

Vriendelijke groet,

Nyenrode Servicepoint - +

Er ligt een pakket voor u klaar bij het Servicepoint in het de Rooij gebouw.
U kunt deze afhalen tijdens openingsuren, van maandag t/m vrijdag tussen 8.30 en 17.00 uur. @@ -1047,7 +1047,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1060,6 +1131,8 @@ + + @@ -1401,7 +1474,7 @@ - + @@ -1426,7 +1499,7 @@ - + @@ -2196,12 +2269,12 @@ - + - - - - + + + + - + - + - + - @@ -2435,7 +2508,7 @@ - @@ -2450,14 +2523,14 @@   - - @@ -2466,7 +2539,7 @@ -
+
+
+ Hoort bij reservering + +
+ Datum: + +
+ Begintijd: + +
+ Eindtijd: + +
+ Related to reservation + +
+ Date: + +
+ Start time: + +
+ End time: + +

Beste  ,

@@ -2216,16 +2289,16 @@

Beste  ,

Hartelijk dank voor de zaalreservering op .

- +

U ontvangt 4 weken voor aanvang een bevestiging van de definitieve ruimte.

- +

Mocht u vragen hebben omtrent uw reservering, neemt u dan contact op met onze Servicedesk via servicedesk@nyenrode.nl of telefoonnummer 0346-291234.

Met vriendelijke groet,

@@ -2239,20 +2312,20 @@ - +

Beste  ,

U heeft een reservering geplaatst op .

- +

Wij hebben de volgende ruimte definitief voor u gereserveerd:

- +

- +

Vergeet u niet uw reservering te controleren en eventuele cateringwensen en voorzieningen kenbaar te maken in Facilitor?

- +

Mocht u vragen hebben omtrent uw reservering, neemt u dan contact op met onze Servicedesk via servicedesk@nyenrode.nl of telefoonnummer 0346-291234.

Met vriendelijke groet,

@@ -2264,14 +2337,14 @@

Beste  ,

Uw reservering op is geannuleerd.

- +

Mocht u vragen hebben omtrent uw reservering, neemt u dan contact op met onze Servicedesk via servicedesk@nyenrode.nl of telefoonnummer 0346-291234.

Met vriendelijke groet,

@@ -2283,7 +2356,7 @@
@@ -2418,7 +2491,7 @@ +
Factuuradres +
Begindatum +
Aantal personen +
Programma +
diff --git a/CUST/YKPN/xsl/strukton.xsl b/CUST/YKPN/xsl/strukton.xsl index e4e02f2b3b..bade653976 100644 --- a/CUST/YKPN/xsl/strukton.xsl +++ b/CUST/YKPN/xsl/strukton.xsl @@ -28,7 +28,7 @@ 2 - 5 + 2 5 3