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

FCLT#55900 Enkele telefoon-, faxnummers en emails klikbaar gemaakt, en voorkomen dat deze onclicks de beforeUnload triggeren

Browse Source 
svn path=/Website/branches/v2019.1/; revision=41659
This commit is contained in:
Koen Reefman
2019-03-19 09:38:27 +00:00
parent 5c8b14ee86
commit d68c936c20
20 changed files with 272 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/ALG/alg_show_gebouw.asp
View File

@@ -193,7 +193,7 @@ oRs.Close();
moreinfo: this_alg.readman
});
AFIELDTR('fldmailto details', L("lcl_alg_gebouw_email"), "mailto:" + bld_email, bld_email, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_alg_gebouw_email"), bld_email, { suppressEmpty: true, type: "email" });
BLOCK_END();
BLOCK_START("algLoc2", " ");

2
APPL/ALG/alg_show_locatie.asp
View File

@@ -162,7 +162,7 @@ oRs.Close();
ROFIELDTR("fld", L("lcl_prs_address_post_land"), pst_land, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_locatie_man_verantw"), loc_vw, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_locatie_man_verantw_tel"), loc_vwtel, {suppressEmpty: true});
AFIELDTR('fldmailto details', L("lcl_noti_email"), "mailto:" + loc_mail, loc_mail, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_noti_email"), loc_mail, { suppressEmpty: true, type: "email" });
if (ins_score_enabled)
ROFIELDTR("fld", L("lcl_alg_locatie_mjb_score1"), loc_score1, {suppressEmpty: true});

2
APPL/BES/bes_retour.asp
View File

@@ -318,7 +318,7 @@ user.auth_required_or_abort(this_bes.canRetourBES);
ROFIELDTR("fld", L("lcl_bes_Supplier"), oRs("prs_bedrijf_naam").value);
if (S("show_issuer_phone") & 2)
ROFIELDTR("fld", L("lcl_prs_person_phone"), oRs("prs_bedrijf_telefoon").value, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_person_phone"), oRs("prs_bedrijf_telefoon").value, { suppressEmpty: true, type: "telefoon" });
RWTEXTAREATR("remark",
"fldtxt required",

2
APPL/BES/bes_show_bestelling.asp
View File

@@ -212,7 +212,7 @@ IFRAMER_HEADER((bes_bestelling.fac_activiteit_key > 0? L("lcl_bes_frame_algemeen
});
if (S("show_issuer_phone") & 2)
ROFIELDTR ("fld", L("lcl_prs_person_phone"), bes_bestelling.prs_telefoonnr, {suppressEmpty: true});
ROFIELDTR ("fld", L("lcl_prs_person_phone"), bes_bestelling.prs_telefoonnr, { suppressEmpty: true, type: "telefoon" });
if (bes_disc_info.disc_params_for_others)
{

22
APPL/BEZ/bez_show_afspraak.asp
View File

@@ -132,23 +132,23 @@ var urlMail = "../shared/queuemail.asp?pcode=BEZMAI&defemail_key=" + bez_afspraa
IFRAMER_HEADER(L("lcl_bez_frame"), buttons);
BLOCK_START("bezAfspraak", I("fa-clock-o")+L("lcl_bez_afspraak_gegevens"), {ishtmlsafe: true});
ROFIELDTR('fld', L("lcl_vis_start_date"), toDateTimeString(bez_afspraak.bez_afspraak_datum));
ROFIELDTR("fld", L("lcl_vis_start_date"), toDateTimeString(bez_afspraak.bez_afspraak_datum));
if (toDateString(bez_afspraak.bez_afspraak_eind) == toDateString(bez_afspraak.bez_afspraak_datum))
ROFIELDTR('fld', L("lcl_vis_end_date"), toTimeString(bez_afspraak.bez_afspraak_eind));
ROFIELDTR("fld", L("lcl_vis_end_date"), toTimeString(bez_afspraak.bez_afspraak_eind));
else
ROFIELDTR('fld', L("lcl_vis_end_date"), toDateTimeString(bez_afspraak.bez_afspraak_eind));
ROFIELDTR("fld", L("lcl_vis_end_date"), toDateTimeString(bez_afspraak.bez_afspraak_eind));
if (urole=="bo" || urole=="fo")
params = {infoPointer: {Url:"appl/fac/fac_user_info.asp?prs_key=" + bez_afspraak.contact_key, Title:L("lcl_details")}};
else
params = {};
ROFIELDTR('fld', L("lcl_vis_contactperson"), bez_afspraak.aanvrager, params);
ROFIELDTR("fld", L("lcl_vis_contactperson"), bez_afspraak.aanvrager, params);
if ((urole=="bo" || urole=="fo") && bez_afspraak.gastheer_key)
params = {infoPointer: {Url:"appl/fac/fac_user_info.asp?prs_key=" + bez_afspraak.gastheer_key, Title:L("lcl_details")}};
else
params = {};
ROFIELDTR('fld', L("lcl_vis_visit"), bez_afspraak.gastheer, params);
AFIELDTR('fld details', L("lcl_phone"), "callto:" + bez_afspraak.telf_nr, bez_afspraak.telf_nr, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_vis_visit"), bez_afspraak.gastheer, params);
ROFIELDTR("fld", L("lcl_phone"), bez_afspraak.telf_nr, { suppressEmpty: true, type: "telefoon" });
var eindlevel_nr = 2;
if (S("vis_afspraak_onrgoed_uses_keys") == 1)
@@ -168,11 +168,11 @@ var urlMail = "../shared/queuemail.asp?pcode=BEZMAI&defemail_key=" + bez_afspraa
eindlevel: eindlevel_nr,
readonly: true });
if (S("vis_afspraak_onrgoed_uses_keys") != 1) {
ROFIELDTR('fld',
ROFIELDTR("fld",
(S("vis_mandatory_alg_level")=='R' ? L("lcl_room") : S("vis_mandatory_alg_level")=='V' ? L("lcl_floor") : S("vis_mandatory_alg_level")=='G' ? L("lcl_building") : "") ,
bez_afspraak.ruimte, {suppressEmpty: true});
}
ROFIELDTR('fld', L("lcl_action"), bez_afspraak.actie_omschrijving, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_action"), bez_afspraak.actie_omschrijving, {suppressEmpty: true});
ROTEXTAREATR('fldtxt', L("lcl_vis_remark"), bez_afspraak.opm, {suppressEmpty: true});
BLOCK_END();
@@ -197,7 +197,7 @@ var urlMail = "../shared/queuemail.asp?pcode=BEZMAI&defemail_key=" + bez_afspraa
}
}
ROFIELDTR('fld', L("lcl_status"), statusstr, params);
ROFIELDTR("fld", L("lcl_status"), statusstr, params);
if (bez_afspraak.res_rsv_ruimte_key > 0)
{
var ttl = bez_afspraak.res_reservering_key +"/" + bez_afspraak.res_rsv_ruimte_volgnr;
@@ -205,8 +205,8 @@ var urlMail = "../shared/queuemail.asp?pcode=BEZMAI&defemail_key=" + bez_afspraa
Title: L("lcl_reservation") + " " + ttl
}
}
ROFIELDTR('fld', L("lcl_reservation"), ttl, params);
ROFIELDTR('fld', "", bez_afspraak.res_rsv_ruimte_omschrijving, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_reservation"), ttl, params);
ROFIELDTR("fld", "", bez_afspraak.res_rsv_ruimte_omschrijving, {suppressEmpty: true});
}
BLOCK_END();

22
APPL/FAC/fac_show_adres.asp
View File

@@ -140,13 +140,13 @@ BLOCK_START("facAlg", L("lcl_fac_adres_nawblock"));
whenEmpty: L("lcl_search_generic")
});
ROFIELDTR("fld", L("lcl_prs_address_naam"), mld_adr_nm);
ROFIELDTR("fld", L("lcl_prs_address_gebouw_ruimte"), mld_adr_geb_rui, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_address_gebouw_ruimte"), mld_adr_geb_rui, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_address_bezoek_adres"), mld_adr_bez_adr);
ROFIELDTR("fld", L("lcl_prs_address_bezoek_postcode"), mld_adr_bez_pcd);
ROFIELDTR("fld", L("lcl_prs_address_bezoek_plaats"), mld_adr_bez_pla);
ROFIELDTR("fld", L("lcl_prs_address_bezoek_land"), mld_adr_bez_lnd);
ROFIELDTR("fld", L("lcl_prs_address_phone"), mld_adr_tel, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_address_email"), mld_adr_email, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_address_phone"), mld_adr_tel, { suppressEmpty: true, type: "telefoon" });
ROFIELDTR("fld", L("lcl_prs_address_email"), mld_adr_email, { suppressEmpty: true, type: "email" });
%>
<tr>
<td class="label"><label><%=L("lcl_prs_address_factuuradres")%>:</label></td>
@@ -164,17 +164,17 @@ BLOCK_START("facAlg", L("lcl_fac_adres_nawblock"));
BLOCK_END();
BLOCK_START("facBez", L("lcl_fac_adres_postblock"));
ROFIELDTR("fld", L("lcl_prs_address_post_adres"), mld_adr_pst_adr, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_address_post_postcode"), mld_adr_pst_pcd, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_address_post_plaats"), mld_adr_pst_pla, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_address_post_land"), mld_adr_pst_lnd, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_address_post_adres"), mld_adr_pst_adr, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_address_post_postcode"), mld_adr_pst_pcd, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_address_post_plaats"), mld_adr_pst_pla, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_address_post_land"), mld_adr_pst_lnd, { suppressEmpty: true });
BLOCK_END();
BLOCK_START("facCnt", L("lcl_prs_bedrijf_contactblock"));
ROFIELDTR("fld", L("lcl_prs_address_contact_person"), mld_adr_cnt_prs, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_address_contact_telefoon"), mld_adr_cnt_tel, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_address_contact_email"), mld_adr_cnt_email, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_address_contact_bureau"), mld_adr_cnt_bur, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_address_contact_person"), mld_adr_cnt_prs, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_address_contact_telefoon"), mld_adr_cnt_tel, { suppressEmpty: true, type: "telefoon" });
ROFIELDTR("fld", L("lcl_prs_address_contact_email"), mld_adr_cnt_email, { suppressEmpty: true, type: "email" });
ROFIELDTR("fld", L("lcl_prs_address_contact_bureau"), mld_adr_cnt_bur, { suppressEmpty: true });
BLOCK_END();
%>
</form>

50
APPL/FAC/fac_user_info.asp
View File

@@ -235,7 +235,7 @@ prs.checkAutorisation(prs_key);
%><span class='fa fa-pencil fa-lg button' title='<%=L("lcl_change")%>' onclick='edit_photo(this)'></span><%
}
Response.write("</td><td class='profile'><img id='photo' class='profile' src='" + safe.htmlattr(thisUser.photoinfo().photopaththumb) + "'></td></tr>");
ROFIELDTR('fld', L("lcl_prs_person_name"), thisUser.naam());
ROFIELDTR("fld", L("lcl_prs_person_name"), thisUser.naam());
// Is persoon een contactpersoon, en zo ja van welk bedrijf.
sql = "SELECT b.prs_bedrijf_key"
@@ -256,20 +256,18 @@ prs.checkAutorisation(prs_key);
};
ROFIELDTR("fld", L("lcl_prs_perslid_contactpersoon"), cnt_str, params_cnt);
}
ROFIELDTR('fld', L("lcl_prs_person_dept_name"), thisUser.afdeling().naam());
ROFIELDTR('fld', L("lcl_prs_person_function"), thisUser.prs_srtperslid(), {suppressEmpty: true});
AFIELDTR('fld details', L("lcl_prs_person_phone"), "callto:" + thisUser.prs_perslid_telefoonnr(), thisUser.prs_perslid_telefoonnr(), { suppressEmpty: true });
AFIELDTR('fld details', L("lcl_prs_person_mobile"), "callto:" + thisUser.prs_perslid_mobiel(), thisUser.prs_perslid_mobiel(), { suppressEmpty: true });
AFIELDTR('fldmailto details', L("lcl_prs_person_email"), "mailto:" + thisUser.prs_perslid_email(), thisUser.prs_perslid_email(), { suppressEmpty: true });
ROFIELDTR('fld', L("lcl_prs_person_nr"), thisUser.prs_perslid_nr(), {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_person_timezone"), thisUser.timezone(), {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_person_dept_name"), thisUser.afdeling().naam());
ROFIELDTR("fld", L("lcl_prs_person_function"), thisUser.prs_srtperslid(), { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_person_phone"), thisUser.prs_perslid_telefoonnr(), { suppressEmpty: true, type: "telefoon" });
ROFIELDTR("fld", L("lcl_prs_person_mobile"), thisUser.prs_perslid_mobiel(), { suppressEmpty: true, type: "telefoon" });
ROFIELDTR("fld", L("lcl_prs_person_email"), thisUser.prs_perslid_email(), { suppressEmpty: true, type: "email" });
ROFIELDTR("fld", L("lcl_prs_person_nr"), thisUser.prs_perslid_nr(), { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_person_timezone"), thisUser.timezone(), { suppressEmpty: true });
var algfunc = user.func_enabled2("ALG", { isOptional: true });
var anyALG = algfunc && algfunc.anyfound;
for (i = 0; i<thisUser.werkplekken().length; i++)
for (i = 0; i < thisUser.werkplekken().length; i++)
{ // order by ?
var infoPointer = null;
if (anyALG)
@@ -284,11 +282,11 @@ prs.checkAutorisation(prs_key);
title='<%=L("lcl_change")%>'
onclick='edit_werkplek(this, <%=thisUser.werkplekken()[i].prs_perslidwerkplek_key()%>)'></span>
</span></td>
<td><%ROFIELD('fldroom', null, thisUser.werkplekken()[i].prs_werkplek_aanduiding(),{infoPointer: infoPointer}); %></td>
<td><%ROFIELD("fldroom", null, thisUser.werkplekken()[i].prs_werkplek_aanduiding(), { infoPointer: infoPointer }); %></td>
</tr><%
}
else
ROFIELDTR('fldroom', (i==0 ? 'Werkplek':null), thisUser.werkplekken()[i].prs_werkplek_aanduiding(), {suppressEmpty: true, infoPointer: infoPointer});
ROFIELDTR("fldroom", (i==0 ? "Werkplek" : null), thisUser.werkplekken()[i].prs_werkplek_aanduiding(), { suppressEmpty: true, infoPointer: infoPointer });
}
BLOCK_END();
@@ -296,24 +294,24 @@ prs.checkAutorisation(prs_key);
if (itsme || iamfo)
{ // indien ik facilitair ben
BLOCK_START("prsFin", L("lcl_prs_finblock"));
ROFIELDTR('fld', L("lcl_account"), thisUser.kpn_string());
ROFIELDTR("fld", L("lcl_account"), thisUser.kpn_string());
if (thisUser.kpn_budgethouderkey() > 0)
{
budgethouderUser = new Perslid(thisUser.kpn_budgethouderkey());
selfbudgethouder = (prs_key == thisUser.kpn_budgethouderkey()); // ik hoef geen details die ik al zie
ROFIELDTR('fld', L("lcl_prs_budgethouder"), budgethouderUser.naam(),
ROFIELDTR("fld", L("lcl_prs_budgethouder"), budgethouderUser.naam(),
!selfbudgethouder
? {infoPointer: {Url:"appl/fac/fac_user_info.asp?prs_key="+thisUser.kpn_budgethouderkey(), Title:L("lcl_details")}, suppressEmpty: true}
: {suppressEmpty: true}
? { infoPointer: { Url: "appl/fac/fac_user_info.asp?prs_key="+thisUser.kpn_budgethouderkey(), Title:L("lcl_details") }, suppressEmpty: true }
: { suppressEmpty: true }
);
}
if (fac_profiel_limiet != -1)
{
ROFIELDTR('fld', L("lcl_prs_profile") , fac_profiel_omschrijving);
ROFIELDTR("fld", L("lcl_prs_profile"), fac_profiel_omschrijving);
if (fac_profiel_limiet)
ROFIELDTR('fld', L("lcl_prs_mandate_for"), fac_profiel_limiet,
{datatype: "currency", prefix: true, infoPointer: {Url:"appl/prs/kpn_mandate_search.asp?prs_key="+prs_key+"&autosearch=1", Title:L("lcl_menu_fin_mandatering")} });
ROFIELDTR("fld", L("lcl_prs_mandate_for"), fac_profiel_limiet,
{ datatype: "currency", prefix: true, infoPointer: { Url:"appl/prs/kpn_mandate_search.asp?prs_key="+prs_key+"&autosearch=1", Title:L("lcl_menu_fin_mandatering") } });
}
BLOCK_END();
}
@@ -431,8 +429,8 @@ prs.checkAutorisation(prs_key);
if (!oRs.eof)
{
BLOCK_START("prsAut", L("lcl_mgt_aut_group"));
ROFIELDTR("fld",L("lcl_prs_person_login"), thisUser.oslogin(), {suppressEmpty: true});
ROFIELDTR("fld",L("lcl_prs_person_login2"), thisUser.oslogin2(), {suppressEmpty: true});
ROFIELDTR("fld",L("lcl_prs_person_login"), thisUser.oslogin(), { suppressEmpty: true });
ROFIELDTR("fld",L("lcl_prs_person_login2"), thisUser.oslogin2(), { suppressEmpty: true });
var i= 0;
while (!oRs.eof)
{
@@ -443,11 +441,11 @@ prs.checkAutorisation(prs_key);
i++;
oRs.moveNext();
}
ROFIELDTR("fld",L("lcl_prs_person_lastlogin"), toDateTimeString(thisUser.login()), {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_person_lastlogin"), toDateTimeString(thisUser.login()), { suppressEmpty: true });
// We kunnen gedetecteerd hebben waar iemand laatst was:
if (thisUser.prs_perslid_bezetdatum() != null) {
ROFIELDTR("fld",L("lcl_prs_person_lastchecked_place"), new Locatie(thisUser.alg_locatie_key({withcurrent:true})).locatie_string());
ROFIELDTR("fld",L("lcl_prs_person_lastchecked_time"), toDateTimeString(thisUser.prs_perslid_bezetdatum()));
ROFIELDTR("fld", L("lcl_prs_person_lastchecked_place"), new Locatie(thisUser.alg_locatie_key({ withcurrent:true })).locatie_string());
ROFIELDTR("fld", L("lcl_prs_person_lastchecked_time"), toDateTimeString(thisUser.prs_perslid_bezetdatum()));
}
// klanttevredenheid
if (aantal_reacties > 0)
@@ -479,7 +477,7 @@ prs.checkAutorisation(prs_key);
while (!oRs.eof)
{
%> <tr>
<% ROFIELD("fld", oRs("ins_srtdeel_omschrijving").value, oRs("ins_deel_omschrijving").value + (oRs("ins_deel_opmerking").value? ' - ' + oRs("ins_deel_opmerking").value : ''));
<% ROFIELD("fld", oRs("ins_srtdeel_omschrijving").value, oRs("ins_deel_omschrijving").value + (oRs("ins_deel_opmerking").value? " - " + oRs("ins_deel_opmerking").value : ""));
%> </tr>
<% oRs.moveNext();
}

19
APPL/FAC/fac_user_info_phone.asp
View File

@@ -98,12 +98,11 @@ IFRAMER_HEADER("Facilitor Vinder", buttons);
}
Response.write("</td><td class='profile'><img id='photo' class='profile' src='" + safe.htmlattr(thisUser.photopath) + "'></td></tr>");
AFIELDTR('fldmailto details', L("lcl_prs_person_email"), "mailto:" + thisUser.prs_perslid_email, thisUser.prs_perslid_email, {suppressEmpty: true});
ROFIELDTR('fld', L("lcl_prs_person_dept_name"), thisUser.prs_afdeling_naam);
ROFIELDTR('fld', L("lcl_prs_person_function"), thisUser.prs_srtperslid, {suppressEmpty: true});
ROFIELDTR('fld', L("lcl_prs_person_phone"), thisUser.prs_perslid_telefoonnr, {suppressEmpty: true});
ROFIELDTR('fld', L("lcl_prs_person_mobile"), thisUser.prs_perslid_mobiel, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_person_email"), thisUser.prs_perslid_email, { suppressEmpty: true, type: "email" });
ROFIELDTR("fld", L("lcl_prs_person_dept_name"), thisUser.prs_afdeling_naam);
ROFIELDTR("fld", L("lcl_prs_person_function"), thisUser.prs_srtperslid, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_person_phone"), thisUser.prs_perslid_telefoonnr, { suppressEmpty: true, type: "telefoon" });
ROFIELDTR("fld", L("lcl_prs_person_mobile"), thisUser.prs_perslid_mobiel, { suppressEmpty: true, type: "telefoon" });
for (wp in thisUser.werkplekken) // is reeds gesorteerd op volgnr
{
@@ -118,11 +117,11 @@ IFRAMER_HEADER("Facilitor Vinder", buttons);
<span class='fa fa-edit fa-lg button' title='<%=L("lcl_change")%>' onclick='edit_werkplek(this, <%=wpi.prs_perslidwerkplek_key%>)'></span>
</span>
</td>
<td><%ROFIELD('fldroom', null, wpi.prs_werkplek_aanduiding,{ infoPointer: infoPointer }); %></td>
<td><%ROFIELD("fldroom", null, wpi.prs_werkplek_aanduiding,{ infoPointer: infoPointer }); %></td>
</tr><%
}
else
ROFIELDTR('fldroom', (wp == 0? L("lcl_prs_workplace") : null), wpi.prs_werkplek_aanduiding, {suppressEmpty: true, infoPointer: infoPointer});
ROFIELDTR("fldroom", (wp == 0? L("lcl_prs_workplace") : null), wpi.prs_werkplek_aanduiding, { suppressEmpty: true, infoPointer: infoPointer });
}
var wl = thisUser.werklocatie.alg_locatie_key? thisUser.werklocatie.aanduiding : "";
@@ -134,11 +133,11 @@ IFRAMER_HEADER("Facilitor Vinder", buttons);
<span class='fa fa-edit fa-lg button' title='<%=L("lcl_change")%>' onclick='edit_werklocatie(this, <%=user_key%>)'></span>
</span>
</td>
<td><%ROFIELD('fldworklocation', null, wl); %></td>
<td><%ROFIELD("fldworklocation", null, wl); %></td>
</tr><%
}
else
ROFIELDTR('fld', L("lcl_prs_work_location"), wl, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_work_location"), wl, { suppressEmpty: true });
// ============================= FLEXKENMERKEN =========================================
generateFlexKenmerkCode({link_key : prs_key,

12
APPL/Localscripts/FcltMgr.js
View File

@@ -998,11 +998,6 @@ var FcltMgr =
return; // Qlikview in een ander frame
}
var preventUnload = false;
$(elm_iframe.contentDocument).find("a[href^='mailto:'], a[href^='tel:'], a[href^='callto:']").on("click", function() {
preventUnload = true;
});
// Zet maar meteen een unload-event op de frame-contents
// zodat we (veel) later een spinner krijgen als het frame
// wordt vervangen
@@ -1011,11 +1006,10 @@ var FcltMgr =
* pagina's doen we een overlay
* na 2000ms: bij gewone pagina's doen we nu pas de spinner
*/
if (preventUnload)
{
preventUnload = false;
if (FcltMgr.getData("preventBeforeUnload"))
return;
}
elm_iframe.contentWindow.setTimeout(function () {
var $body = $("body", elm_iframe.contentDocument);
if (elm_iframe.contentDocument.location.href.match(/empty\.asp|empty\.html/ig))

93
APPL/Localscripts/iface.js
View File

@@ -727,47 +727,64 @@ $(function () {
// Kijk of bij de buttons de teksten niet meer passen en we dus
// terugvallen op alleen de icons
$(window).on("resize", function ()
{
$("div.buttoncontainer").each(function ()
{
$("div.buttoncontainer").each(function ()
{
var w = $(window).width();
var p = $(this).position();
var smallsize = $(this).data("smallsize");
var pheader = $(this).closest('div.fcltframeheader');
var headertop = pheader.length?pheader.position().top:0;
var w = $(window).width();
var p = $(this).position();
var smallsize = $(this).data("smallsize");
var pheader = $(this).closest("div.fcltframeheader");
var headertop = pheader.length?pheader.position().top:0;
if (p.top > headertop + 20) // shifted to next line?
{
$(this).addClass("smallbuttons")
.data("smallsize", Math.max(w, smallsize||0))
}
else
{
if (w > smallsize) // Weer groot genoeg geworden
$(this).removeClass("smallbuttons");
}
})
});
if (p.top > headertop + 20) // shifted to next line?
{
$(this).addClass("smallbuttons")
.data("smallsize", Math.max(w, smallsize||0))
}
else
{
if (w > smallsize) // Weer groot genoeg geworden
$(this).removeClass("smallbuttons");
}
})
});
$(document).on('focus active', 'input,textarea,select',function(){
var thisid = $(this).attr('id')||$(this).attr('name');
if (thisid)
{
$('label[for='+thisid+']').addClass('active');
thisid = thisid.replace(/_show$/, "");
$('label[for='+thisid+']').addClass('active');
}
});
$(document).on('blur', 'input,textarea,select',function(){
var thisid = $(this).attr('id')||$(this).attr('name');
if (thisid)
{
$('label[for='+thisid+']').removeClass('active');
thisid = thisid.replace(/_show$/, "");
$('label[for='+thisid+']').removeClass('active');
}
});
$("input.float,input.number,input.currency").blur(function() {
$(document).on("focus active", "input, textarea, select", function()
{
var thisid = $(this).attr("id") || $(this).attr("name");
if (thisid)
{
$("label[for="+thisid+"]").addClass("active");
thisid = thisid.replace(/_show$/, "");
$("label[for="+thisid+"]").addClass("active");
}
});
$(document).on("blur", "input, textarea, select", function()
{
var thisid = $(this).attr("id") || $(this).attr("name");
if (thisid)
{
$("label[for="+thisid+"]").removeClass("active");
thisid = thisid.replace(/_show$/, "");
$("label[for="+thisid+"]").removeClass("active");
}
});
// Zorg dat mailto-type links niet de spinners triggeren.
$("a[href^='mailto:'], a[href^='tel:'], a[href^='callto:']").each(function()
{
// Dit is een ongedocumenteerde interne (!) jQuery eventhandler collection
var e = $._data($(this).get(0), "events");
// Alleen er op zetten als deze er nog niet op zit
if (!e || !(e.mouseover && e.mouseout))
$(this).hover(function() { FcltMgr.setData("preventBeforeUnload", true); }, // mouseOver
function() { FcltMgr.setData("preventBeforeUnload", false); }); // mouseOut
});
$("input.float, input.number, input.currency").blur(function()
{
allowInputExpression(this);
});
});

2
APPL/MLD/mld_show_melding.asp
View File

@@ -336,7 +336,7 @@ function parentButton()
});
if (S("show_issuer_phone") & 1)
ROFIELD ("fld", L("lcl_prs_person_phone"), mld_melding.melder_telefoonnr, {suppressEmpty: true});
ROFIELDTR ("fld", L("lcl_prs_person_phone"), mld_melding.melder_telefoonnr, { suppressEmpty: true, type: "telefoon" });
// In showmode hoef ik niet twee keer dezelfde naam te tonen
// en wil ik ongeacht setting S("mld_allow_for_others") tonen als ze verschillen

12
APPL/MLD/mld_show_opdr.asp
View File

@@ -508,8 +508,8 @@ reqStatusEmptyOpdr = mld.getActieKenmerkenOpdr(reqStatusEmptyOpdr, opdr_key, {ha
L("lcl_opdr_enddate"),
showtime? toDateTimeString(mld_opdr.mld_opdr_einddatum) : toDateString(mld_opdr.mld_opdr_einddatum),
{ title: ltitle }); // Einddatum
ROFIELDTR("flddatetime", L("lcl_opdr_plandate"), mld_opdr.mld_opdr_plandatum != null ? toDateTimeString(mld_opdr.mld_opdr_plandatum):null, {suppressEmpty: true}); // Geplande datum
ROFIELDTR("flddatetime", L("lcl_opdr_plandate2"), mld_opdr.mld_opdr_plandatum2 != null ? toDateTimeString(mld_opdr.mld_opdr_plandatum2):null, {suppressEmpty: true}); // Geplande einddatum
ROFIELDTR("flddatetime", L("lcl_opdr_plandate"), mld_opdr.mld_opdr_plandatum != null ? toDateTimeString(mld_opdr.mld_opdr_plandatum):null, { suppressEmpty: true }); // Geplande datum
ROFIELDTR("flddatetime", L("lcl_opdr_plandate2"), mld_opdr.mld_opdr_plandatum2 != null ? toDateTimeString(mld_opdr.mld_opdr_plandatum2):null, { suppressEmpty: true }); // Geplande einddatum
ROTEXTAREATR('fldtxt', L("lcl_mld_inf_Opmerking"), mld_opdr.opdr_opmerking, {suppressEmpty: true, mldlink: true}); // Afhandeling
BLOCK_END();
@@ -551,7 +551,7 @@ reqStatusEmptyOpdr = mld.getActieKenmerkenOpdr(reqStatusEmptyOpdr, opdr_key, {ha
var params = { infoPointer: { Url: "appl/mld/mld_melding.asp?urole=" + urole + "&mld_key=" + mld_opdr.mld_key
}
}
ROFIELDTR("fld", L("lcl_opdr_id"), mld_opdr.mld_opdr_id, {suppressEmpty: true}); // Evt. te gebruiken factuurkenmerk
ROFIELDTR("fld", L("lcl_opdr_id"), mld_opdr.mld_opdr_id, { suppressEmpty: true }); // Evt. te gebruiken factuurkenmerk
ROFIELDTR("fld", L("lcl_call_number"), (prefix||"") + mld_opdr.mld_key, params); // Melding
if (mld_opdr.parent_key)
{
@@ -566,7 +566,7 @@ reqStatusEmptyOpdr = mld.getActieKenmerkenOpdr(reqStatusEmptyOpdr, opdr_key, {ha
moreinfo: true //We stellen: in potentie klikbaar, eventueel leidt dit tot NietGeautoriseerd later.
});
// Telefoon vd melder (AADS#16698). Externe behandelaar hebben niet altijd recht op doorklikken
ROFIELDTR("fld", L("lcl_prs_person_phone"), (caller.prs_perslid_telefoonnr() || caller.prs_perslid_mobiel()), {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_person_phone"), (caller.prs_perslid_telefoonnr() || caller.prs_perslid_mobiel()), { suppressEmpty: true, type: "telefoon" });
ROFIELDTR ("fld", L("lcl_complain"), mld_opdr.vakgroep + "/" + stdm); // Melding
// Locatie, gebouw, verdieping, ruimte
@@ -624,10 +624,10 @@ reqStatusEmptyOpdr = mld.getActieKenmerkenOpdr(reqStatusEmptyOpdr, opdr_key, {ha
// <!-- VRIJWILLIG VERZOEK FIATTERING -->
// Alleen als het vrijwillig vinkje is ingevuld.
ROCHECKBOXTR("fldmldfiat", L("lcl_mld_appr_req"), mld_opdr.opdr_handfiat, {suppressEmpty: true});
ROCHECKBOXTR("fldmldfiat", L("lcl_mld_appr_req"), mld_opdr.opdr_handfiat, { suppressEmpty: true });
if (S("mld_ord_show_ordernr") == 1) {
ROFIELDTR("fldordernr", L("lcl_mld_inf_Ordernr"), mld_opdr.mld_opdr_ordernr,{suppressEmpty: true});
ROFIELDTR("fldordernr", L("lcl_mld_inf_Ordernr"), mld_opdr.mld_opdr_ordernr,{ suppressEmpty: true });
}
if (S("mld_ordermaterial_frame") == 0 && mld_opdr.typeopdr_matchtype == 5)
{

56
APPL/PDA/bedrijf.asp
View File

@@ -61,22 +61,22 @@ var bedrijf_info = prs.prs_bedrijfinfo(bedrijf_key);
CONTENT_START();
ROFIELD("fld", L("lcl_prs_companies_name"), bedrijf_info.naam);
ROFIELD("fld", L("lcl_prs_companies_post_adres"), bedrijf_info.post_adres, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_companies_post_postcode"), bedrijf_info.post_postcode, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_companies_post_plaats"), bedrijf_info.post_plaats, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_companies_post_land"), bedrijf_info.post_land, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_companies_bezoek_adres"), bedrijf_info.bezoek_adres, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_companies_bezoek_postcode"), bedrijf_info.bezoek_postcode, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_companies_bezoek_plaats"), bedrijf_info.bezoek_plaats, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_companies_bezoek_land"), bedrijf_info.bezoek_land, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_companies_post_adres"), bedrijf_info.post_adres, { suppressEmpty: true });
ROFIELD("fld", L("lcl_prs_companies_post_postcode"), bedrijf_info.post_postcode, { suppressEmpty: true });
ROFIELD("fld", L("lcl_prs_companies_post_plaats"), bedrijf_info.post_plaats, { suppressEmpty: true });
ROFIELD("fld", L("lcl_prs_companies_post_land"), bedrijf_info.post_land, { suppressEmpty: true });
ROFIELD("fld", L("lcl_prs_companies_bezoek_adres"), bedrijf_info.bezoek_adres, { suppressEmpty: true });
ROFIELD("fld", L("lcl_prs_companies_bezoek_postcode"), bedrijf_info.bezoek_postcode, { suppressEmpty: true });
ROFIELD("fld", L("lcl_prs_companies_bezoek_plaats"), bedrijf_info.bezoek_plaats, { suppressEmpty: true });
ROFIELD("fld", L("lcl_prs_companies_bezoek_land"), bedrijf_info.bezoek_land, { suppressEmpty: true });
BLOCK_START({collapsed: true, title: L("lcl_prs_bedrijf_contactblock")});
var counter = 1;
ROFIELD("fld", L("lcl_prs_companies_telefoon"), bedrijf_info.telefoon, {suppressEmpty: true, moreinfo: "tel:"+bedrijf_info.telefoon});
ROFIELD("fld", L("lcl_prs_companies_telefoon2"), bedrijf_info.telefoon2, {suppressEmpty: true, moreinfo: "tel:"+bedrijf_info.telefoon2});
ROFIELD("fld", L("lcl_prs_companies_contact_person") + " " + counter++, bedrijf_info.contact_persoon, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_companies_email"), bedrijf_info.email, { suppressEmpty: true, moreinfo: "mailto:" + bedrijf_info.email });
ROFIELD("fld", L("lcl_prs_companies_contact_telefoon"), bedrijf_info.contact_telefoon, {suppressEmpty: true, moreinfo: "tel:"+bedrijf_info.contact_telefoon});
ROFIELD("fld", L("lcl_prs_companies_telefoon"), bedrijf_info.telefoon, { suppressEmpty: true, type: "tel" });
ROFIELD("fld", L("lcl_prs_companies_telefoon2"), bedrijf_info.telefoon2, { suppressEmpty: true, type: "tel" });
ROFIELD("fld", L("lcl_prs_companies_contact_person") + " " + counter++, bedrijf_info.contact_persoon, { suppressEmpty: true });
ROFIELD("fld", L("lcl_prs_companies_email"), bedrijf_info.email, { suppressEmpty: true, type: "email" });
ROFIELD("fld", L("lcl_prs_companies_contact_telefoon"), bedrijf_info.contact_telefoon, { suppressEmpty: true, type: "tel" });
var sql = "SELECT cp.prs_contactpersoon_naam"
+ " || NVL2 (cp.prs_contactpersoon_voorletters,"
@@ -111,11 +111,11 @@ var bedrijf_info = prs.prs_bedrijfinfo(bedrijf_key);
var oRs = Oracle.Execute(sql);
while (!oRs.EoF)
{
ROFIELD("fld", L("lcl_contact_pers") + " " + counter++, oRs("prs_contactpersoon_naam").Value, {suppressEmpty: true});
ROFIELD("fld", L("lcl_location"), oRs("alg_locatie_omschrijving").Value, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_companies_contact_tel1"), oRs("prs_contactpersoon_telefoon_1").Value, {suppressEmpty: true, moreinfo: "tel:"+oRs("prs_contactpersoon_telefoon_1").Value});
ROFIELD("fld", L("lcl_prs_companies_contact_tel2"), oRs("prs_contactpersoon_telefoon_2").Value, {suppressEmpty: true, moreinfo: "tel:"+oRs("prs_contactpersoon_telefoon_2").Value});
ROFIELD("fld", L("lcl_prs_companies_contact_email"), oRs("prs_contactpersoon_email").Value, {suppressEmpty: true, moreinfo: "mailto:"+oRs("prs_contactpersoon_email").Value});
ROFIELD("fld", L("lcl_contact_pers") + " " + counter++, oRs("prs_contactpersoon_naam").Value, { suppressEmpty: true });
ROFIELD("fld", L("lcl_location"), oRs("alg_locatie_omschrijving").Value, { suppressEmpty: true });
ROFIELD("fld", L("lcl_prs_companies_contact_tel1"), oRs("prs_contactpersoon_telefoon_1").Value, { suppressEmpty: true, type: "tel" });
ROFIELD("fld", L("lcl_prs_companies_contact_tel2"), oRs("prs_contactpersoon_telefoon_2").Value, { suppressEmpty: true, type: "tel" });
ROFIELD("fld", L("lcl_prs_companies_contact_email"), oRs("prs_contactpersoon_email").Value, { suppressEmpty: true, type: "email" });
oRs.movenext();
}
BLOCK_END();
@@ -128,9 +128,9 @@ var bedrijf_info = prs.prs_bedrijfinfo(bedrijf_key);
aoRs = Oracle.Execute(asql);
if (!aoRs.eof)
reltype_oms = aoRs(0).Value;
ROFIELD("fld", L("lcl_prs_relatietype"), reltype_oms, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_relatietype"), reltype_oms, { suppressEmpty: true });
}
ROFIELD("fld", L("lcl_prs_companies_leverancier_nr"), bedrijf_info.prs_leverancier_nr, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_companies_leverancier_nr"), bedrijf_info.prs_leverancier_nr, { suppressEmpty: true });
var relation = "";
if (bedrijf_info.leverancier == 1)
@@ -143,11 +143,11 @@ var bedrijf_info = prs.prs_bedrijfinfo(bedrijf_key);
relation += (relation == "" ? "" : "\n") + L("lcl_prs_companies_huurder");
ROFIELD("fld", L("lcl_prs_type_relation"), relation, {multi: true, suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_companies_overeenkomst_nr"), bedrijf_info.prs_overeenkomst_nr, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_companies_overeenkomst_datum"), toDateString(bedrijf_info.prs_overeenkomst_datum), {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_companies_uurloon"), bedrijf_info.uurloon, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_companies_bes_limiet"), bedrijf_info.bes_limiet, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_companies_bes_kosten"), bedrijf_info.bes_kosten, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_companies_overeenkomst_nr"), bedrijf_info.prs_overeenkomst_nr, { suppressEmpty: true });
ROFIELD("fld", L("lcl_prs_companies_overeenkomst_datum"), toDateString(bedrijf_info.prs_overeenkomst_datum), { suppressEmpty: true });
ROFIELD("fld", L("lcl_prs_companies_uurloon"), bedrijf_info.uurloon, { suppressEmpty: true });
ROFIELD("fld", L("lcl_prs_companies_bes_limiet"), bedrijf_info.bes_limiet, { suppressEmpty: true });
ROFIELD("fld", L("lcl_prs_companies_bes_kosten"), bedrijf_info.bes_kosten, { suppressEmpty: true });
ROFIELD("fld", L("lcl_prs_companies_opmerking"), bedrijf_info.opmerking, {id: "bdr_opm", multi: true, suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_companies_opmerking2"), bedrijf_info.opmerking2, {id: "bdr_opm2", multi: true, suppressEmpty: true});
if (bedrijf_info.mld_adres_key_lev) {
@@ -155,21 +155,21 @@ var bedrijf_info = prs.prs_bedrijfinfo(bedrijf_key);
asql = " SELECT mld_adres_naam FROM mld_adres WHERE mld_adres_key = " + bedrijf_info.mld_adres_key_lev;
aoRs = Oracle.Execute(asql);
if ( !aoRs.eof ) { leveradres = aoRs(0).Value; }
ROFIELD("fld", L("lcl_prs_companies_adres_lev"), leveradres, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_companies_adres_lev"), leveradres, { suppressEmpty: true });
}
if (bedrijf_info.mld_adres_key_fac) {
var factuuradres;
asql = " SELECT mld_adres_naam FROM mld_adres WHERE mld_adres_key = " + bedrijf_info.mld_adres_key_fac;
aoRs = Oracle.Execute(asql);
if ( !aoRs.eof ) { factuuradres = aoRs(0).Value; }
ROFIELD("fld", L("lcl_prs_companies_adres_fac"), factuuradres, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_companies_adres_fac"), factuuradres, { suppressEmpty: true });
}
if (bedrijf_info.fin_btwtabel_key) {
var btwtabel;
asql = "SELECT fin_btwtabel_omschrijving FROM fin_btwtabel WHERE fin_btwtabel_key = " + bedrijf_info.fin_btwtabel_key;
aoRs = Oracle.Execute(asql);
if ( !aoRs.eof ) { btwtabel = aoRs(0).Value; }
ROFIELD("fld", L("lcl_fin_btwtabel"), btwtabel, {suppressEmpty: true});
ROFIELD("fld", L("lcl_fin_btwtabel"), btwtabel, { suppressEmpty: true });
}
BLOCK_END();

34
APPL/PDA/gebouw.asp
View File

@@ -98,43 +98,43 @@ oRs.Close();
%> <div class="alg_deleted"><%=L("lcl_record_is_deleted")%></div><%
}
ROFIELD("fld", L("lcl_estate_gebouw_man_descr"), bld_descr, {suppressEmpty: true});
ROFIELD("fld", L("lcl_estate_gebouw_srtgebouw"), bld_srt , {suppressEmpty: true});
ROFIELD("fld", L("lcl_estate_gebouw_man_descr"), bld_descr, { suppressEmpty: true });
ROFIELD("fld", L("lcl_estate_gebouw_srtgebouw"), bld_srt , { suppressEmpty: true });
ROFIELD("fldmailto details", L("lcl_alg_gebouw_email"), bld_email, { suppressEmpty: true, moreinfo: "mailto:" + bld_email });
ROFIELD("fldmailto details", L("lcl_alg_gebouw_email"), bld_email, { suppressEmpty: true, type: "email" });
if (verantw > 0)
ROFIELD("fld", L("lcl_alg_verantw"), new Perslid(verantw).naam(), {suppressEmpty: true});
ROFIELD("fld", L("lcl_alg_verantw"), new Perslid(verantw).naam(), { suppressEmpty: true });
if (verantw2 > 0)
ROFIELD("fld", L("lcl_alg_verantw2"), new Perslid(verantw2).naam(), {suppressEmpty: true});
ROFIELD("fld", L("lcl_alg_verantw2"), new Perslid(verantw2).naam(), { suppressEmpty: true });
if (!tiny)
{
var calcopp = alg.calc_algm2(bld_key, onrgoedlvl);
ROFIELD("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppbruto, {suppressEmpty: true});
ROFIELD("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true});
ROFIELD("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true});
ROFIELD("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppbruto, { suppressEmpty: true });
ROFIELD("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, { suppressEmpty: true });
ROFIELD("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, { suppressEmpty: true });
ROFIELD("fld", L("lcl_estate_gebouw_man_bruto_vloeropp"), bld_opp, {suppressEmpty: true});
ROFIELD("fld", L("lcl_estate_gebouw_man_omtrek"), bld_omtrek, {suppressEmpty: true});
ROFIELD("fld", L("lcl_estate_gebouw_man_inhoud"), bld_inhoud, {suppressEmpty: true});
ROFIELD("fld", L("lcl_estate_gebouw_man_bruto_vloeropp"), bld_opp, { suppressEmpty: true });
ROFIELD("fld", L("lcl_estate_gebouw_man_omtrek"), bld_omtrek, { suppressEmpty: true });
ROFIELD("fld", L("lcl_estate_gebouw_man_inhoud"), bld_inhoud, { suppressEmpty: true });
sql = "SELECT mld_adres_naam"
+ " FROM mld_adres"
+ " WHERE mld_adres_key = " + mld_adres;
oRs = Oracle.Execute(sql);
if (!oRs.eof)
{
ROFIELD("fld", L("lcl_delivery_address"), oRs("mld_adres_naam").value, {suppressEmpty: true});
ROFIELD("fld", L("lcl_delivery_address"), oRs("mld_adres_naam").value, { suppressEmpty: true });
}
oRs.Close();
ROFIELD("fld", L("lcl_geoxcoord"), bld_x, {suppressEmpty:true});
ROFIELD("fld", L("lcl_geoycoord"), bld_y, {suppressEmpty:true});
ROFIELD("fld", L("lcl_geoxcoord"), bld_x, { suppressEmpty: true });
ROFIELD("fld", L("lcl_geoycoord"), bld_y, { suppressEmpty: true });
var fldcls = "fld";
if (vervaldatum <= new Date())
fldcls += " expired2";
ROFIELD(fldcls, L("lcl_alg_vervaldatum"), toDateString(vervaldatum), {suppressEmpty: true});
ROFIELD(fldcls, L("lcl_alg_vervaldatum"), toDateString(vervaldatum), { suppressEmpty: true });
if (bld_bez == 1)
CHB_FIELD("fldalgbez", L("lcl_estate_gebouw_bez"), true, {disabled: true});
@@ -143,8 +143,8 @@ oRs.Close();
ROFIELD("fld", L("lcl_estate_gebouw_opening_hours"), toTimeString(beginuur) + " - " + toTimeString(einduur));
else
{
ROFIELD("fld", L("lcl_estate_gebouw_beginuur"), toTimeString(beginuur), {suppressEmpty:true} );
ROFIELD("fld", L("lcl_estate_gebouw_einduur"), toTimeString(einduur), {suppressEmpty:true} );
ROFIELD("fld", L("lcl_estate_gebouw_beginuur"), toTimeString(beginuur), { suppressEmpty: true } );
ROFIELD("fld", L("lcl_estate_gebouw_einduur"), toTimeString(einduur), { suppressEmpty: true } );
}
if (werkdagen == 1)

18
APPL/PDA/iface.inc
View File

@@ -244,6 +244,24 @@ function ROFIELD(pclass, plabel, pvalue, params)
params = params||{};
if (!pvalue && (params && params.suppressEmpty))
return; // snel klaar
if (!params.moreinfo && params.type)
switch(params.type)
{
case "mail":
case "email":
case "e-mail":
case "mailto":
params.moreinfo = "mailto:" + pvalue;
break;
case "tel":
params.moreinfo = "tel:" + pvalue;
break;
case "fax":
case "callto":
case "telefoon":
params.moreinfo = "callto:" + pvalue;
break;
}
if (params.moreinfo)
params.disabled = true;
params.readonly = true;

28
APPL/PDA/locatie.asp
View File

@@ -77,15 +77,15 @@ oRs.Close();
%> <div class="alg_deleted"><%=L("lcl_record_is_deleted")%></div><%
}
ROFIELD("fld", L("lcl_prs_address_bezoek_adres"), bez_adres, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_address_bezoek_postcode"), bez_postc, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_address_bezoek_plaats"), bez_plaats, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_address_bezoek_land"), bez_land, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_address_bezoek_adres"), bez_adres, { suppressEmpty: true });
ROFIELD("fld", L("lcl_prs_address_bezoek_postcode"), bez_postc, { suppressEmpty: true });
ROFIELD("fld", L("lcl_prs_address_bezoek_plaats"), bez_plaats, { suppressEmpty: true });
ROFIELD("fld", L("lcl_prs_address_bezoek_land"), bez_land, { suppressEmpty: true });
ROFIELD("fldmailto details", L("lcl_alg_locatie_email"), loc_mail, {suppressEmpty: true, moreinfo: "mailto:" + loc_mail });
ROFIELD("fldmailto details", L("lcl_alg_locatie_email"), loc_mail, { suppressEmpty: true, type: "email" });
ROFIELD("fld", L("lcl_estate_locatie_man_verantw"), loc_vw, {suppressEmpty: true});
ROFIELD("fld", L("lcl_estate_locatie_man_verantw_tel"), loc_vwtel, {suppressEmpty: true});
ROFIELD("fld", L("lcl_estate_locatie_man_verantw"), loc_vw, { suppressEmpty: true });
ROFIELD("fld", L("lcl_estate_locatie_man_verantw_tel"), loc_vwtel, { suppressEmpty: true });
if (!tiny)
{
@@ -105,14 +105,14 @@ oRs.Close();
if (vervaldatum <= new Date())
fldcls += " expired2";
ROFIELD(fldcls, L("lcl_alg_vervaldatum"), toDateString(vervaldatum), {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_address_post_adres"), pst_adres, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_address_post_postcode"), pst_postc, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_address_post_plaats"), pst_plaats, {suppressEmpty: true});
ROFIELD("fld", L("lcl_prs_address_post_land"), pst_land, {suppressEmpty: true});
ROFIELD(fldcls, L("lcl_alg_vervaldatum"), toDateString(vervaldatum), { suppressEmpty: true });
ROFIELD("fld", L("lcl_prs_address_post_adres"), pst_adres, { suppressEmpty: true });
ROFIELD("fld", L("lcl_prs_address_post_postcode"), pst_postc, { suppressEmpty: true });
ROFIELD("fld", L("lcl_prs_address_post_plaats"), pst_plaats, { suppressEmpty: true });
ROFIELD("fld", L("lcl_prs_address_post_land"), pst_land, { suppressEmpty: true });
ROFIELD("fld", L("lcl_geoxcoord"), loc_x, {suppressEmpty: true});
ROFIELD("fld", L("lcl_geoycoord"), loc_y, {suppressEmpty: true});
ROFIELD("fld", L("lcl_geoxcoord"), loc_x, { suppressEmpty: true });
ROFIELD("fld", L("lcl_geoycoord"), loc_y, { suppressEmpty: true });
// Plus flexkenmerken
generateFlexKenmerkBlock ({

52
APPL/PRS/prs_show_bedrijf.asp
View File

@@ -97,24 +97,24 @@ if (canFOread || canBOread)
<form name=u2 onSubmit="return false;">
<% BLOCK_START("bedrNaw", L("lcl_prs_bedrijf_nawblock"));
ROFIELDTR("fld", L("lcl_prs_companies_name"), bedrijf_info.naam, hist_params);
ROFIELDTR("fld", L("lcl_prs_companies_post_adres"), bedrijf_info.post_adres, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_companies_post_postcode"), bedrijf_info.post_postcode, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_companies_post_plaats"), bedrijf_info.post_plaats, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_companies_post_land"), bedrijf_info.post_land, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_companies_bezoek_adres"), bedrijf_info.bezoek_adres, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_companies_bezoek_postcode"), bedrijf_info.bezoek_postcode, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_companies_bezoek_plaats"), bedrijf_info.bezoek_plaats, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_companies_bezoek_land"), bedrijf_info.bezoek_land, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_companies_post_adres"), bedrijf_info.post_adres, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_companies_post_postcode"), bedrijf_info.post_postcode, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_companies_post_plaats"), bedrijf_info.post_plaats, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_companies_post_land"), bedrijf_info.post_land, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_companies_bezoek_adres"), bedrijf_info.bezoek_adres, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_companies_bezoek_postcode"), bedrijf_info.bezoek_postcode, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_companies_bezoek_plaats"), bedrijf_info.bezoek_plaats, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_companies_bezoek_land"), bedrijf_info.bezoek_land, { suppressEmpty: true });
BLOCK_END();
BLOCK_START("bedrContact", L("lcl_prs_bedrijf_contactblock"));
ROFIELDTR("fld", L("lcl_prs_companies_telefoon"), bedrijf_info.telefoon, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_companies_fax"), bedrijf_info.fax, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_companies_telefoon2"), bedrijf_info.telefoon2, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_companies_contact_person"), bedrijf_info.contact_persoon, {suppressEmpty: true});
AFIELDTR('fldmailto details', L("lcl_prs_companies_email"), "mailto:" + bedrijf_info.email, bedrijf_info.email, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_companies_contact_telefoon"), bedrijf_info.contact_telefoon, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_companies_contact_fax"), bedrijf_info.contact_fax, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_companies_telefoon"), bedrijf_info.telefoon, { suppressEmpty: true, type: "telefoon" });
ROFIELDTR("fld", L("lcl_prs_companies_fax"), bedrijf_info.fax, { suppressEmpty: true, type: "fax" });
ROFIELDTR("fld", L("lcl_prs_companies_telefoon2"), bedrijf_info.telefoon2, { suppressEmpty: true, type: "telefoon" });
ROFIELDTR("fld", L("lcl_prs_companies_contact_person"), bedrijf_info.contact_persoon, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_companies_email"), bedrijf_info.email, { suppressEmpty: true, type: "email" });
ROFIELDTR("fld", L("lcl_prs_companies_contact_telefoon"), bedrijf_info.contact_telefoon, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_companies_contact_fax"), bedrijf_info.contact_fax, { suppressEmpty: true });
// Wil ik checken of dit relevant is?
var inGids = ""
if (bedrijf_info.ingids == 1)
@@ -131,9 +131,9 @@ if (canFOread || canBOread)
aoRs = Oracle.Execute(asql);
if (!aoRs.eof)
reltype_oms = aoRs(0).Value;
ROFIELDTR("fld", L("lcl_prs_relatietype"), reltype_oms, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_relatietype"), reltype_oms, { suppressEmpty: true });
}
ROFIELDTR("fld", L("lcl_prs_companies_leverancier_nr"), bedrijf_info.prs_leverancier_nr, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_companies_leverancier_nr"), bedrijf_info.prs_leverancier_nr, { suppressEmpty: true });
var show = true; //mechanisme om slechts een label bij de vier opties te laten zien.
@@ -161,8 +161,8 @@ if (canFOread || canBOread)
show = false;
}
ROFIELDTR("fld", L("lcl_prs_companies_overeenkomst_nr"), bedrijf_info.prs_overeenkomst_nr, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_companies_overeenkomst_datum"), toDateString(bedrijf_info.prs_overeenkomst_datum), {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_companies_overeenkomst_nr"), bedrijf_info.prs_overeenkomst_nr, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_companies_overeenkomst_datum"), toDateString(bedrijf_info.prs_overeenkomst_datum), { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_companies_uurloon"), bedrijf_info.uurloon, {suppressEmpty: true, datatype: "currency"});
ROFIELDTR("fld", L("lcl_prs_companies_bes_limiet"), bedrijf_info.bes_limiet, {suppressEmpty: true, datatype: "currency"});
ROFIELDTR("fld", L("lcl_prs_companies_bes_kosten"), bedrijf_info.bes_kosten, {suppressEmpty: true, datatype: "currency"});
@@ -173,21 +173,21 @@ if (canFOread || canBOread)
asql = " SELECT mld_adres_naam FROM mld_adres WHERE mld_adres_key = " + bedrijf_info.mld_adres_key_lev;
aoRs = Oracle.Execute(asql);
if ( !aoRs.eof ) { leveradres = aoRs(0).Value; }
ROFIELDTR("fld", L("lcl_prs_companies_adres_lev"), leveradres, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_companies_adres_lev"), leveradres, { suppressEmpty: true });
}
if (bedrijf_info.mld_adres_key_fac) {
var factuuradres;
asql = " SELECT mld_adres_naam FROM mld_adres WHERE mld_adres_key = " + bedrijf_info.mld_adres_key_fac;
aoRs = Oracle.Execute(asql);
if ( !aoRs.eof ) { factuuradres = aoRs(0).Value; }
ROFIELDTR("fld", L("lcl_prs_companies_adres_fac"), factuuradres, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_companies_adres_fac"), factuuradres, { suppressEmpty: true });
}
if (bedrijf_info.fin_btwtabel_key) {
var btwtabel;
asql = "SELECT fin_btwtabel_omschrijving FROM fin_btwtabel WHERE fin_btwtabel_key = " + bedrijf_info.fin_btwtabel_key;
aoRs = Oracle.Execute(asql);
if ( !aoRs.eof ) { btwtabel = aoRs(0).Value; }
ROFIELDTR("fld", L("lcl_fin_btwtabel"), btwtabel, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_fin_btwtabel"), btwtabel, { suppressEmpty: true });
}
BLOCK_END();
@@ -195,12 +195,12 @@ if (canFOread || canBOread)
if (user.checkAutorisation("WEB_PRSSYS", true) || user.checkAutorisation("WEB_PRSMGT", true))
{
BLOCK_START("bedrTechn", L("lcl_prs_bedrijf_techblock"));
ROFIELDTR("fld", L("lcl_prs_companies_image_loc"), bedrijf_info.image_loc, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_companies_details_loc"), bedrijf_info.details_loc, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_companies_xmlcatalogus_loc"), bedrijf_info.xmlcatalogus_loc, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_companies_image_loc"), bedrijf_info.image_loc, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_companies_details_loc"), bedrijf_info.details_loc, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_companies_xmlcatalogus_loc"), bedrijf_info.xmlcatalogus_loc, { suppressEmpty: true });
ROCHECKBOXTR("fldalgbez", L("lcl_prs_companies_order_confirm"), bedrijf_info.order_confirm == 1);
var uitvoertijd = (bedrijf_info.uitvoertijd != ""? Math.round(bedrijf_info.uitvoertijd * 100000) / 100000 + " " + (bedrijf_info.uitvoertijd_eenheid == 'D'? L("lcl_mld_days") : L("lcl_mld_hours")): "")
ROFIELDTR("fldshort", L("lcl_prs_uitvoertijd"), uitvoertijd, {suppressEmpty: true});
ROFIELDTR("fldshort", L("lcl_prs_uitvoertijd"), uitvoertijd, { suppressEmpty: true });
BLOCK_END();
}

22
APPL/PRS/prs_show_contactpersoon.asp
View File

@@ -148,17 +148,17 @@ BLOCK_START("prsPerslid", L("lcl_prs_basisblok"));
readonly: true,
suppressEmpty: true
});
ROFIELDTR("fld", L("lcl_prs_companies_contact_naam"), prs_naam, {suppressEmpty:true});
ROFIELDTR("fldshort", L("lcl_prs_companies_contact_tussenv"), prs_tsnvgs, {suppressEmpty:true});
ROFIELDTR("fldshort", L("lcl_prs_companies_contact_voorl"), prs_voorl, {suppressEmpty:true});
ROFIELDTR("fld", L("lcl_prs_companies_contact_voorn"), prs_vrnaam, {suppressEmpty:true});
ROFIELDTR("fld", L("lcl_prs_companies_contact_aanhef"), prs_aanh, {suppressEmpty:true});
ROFIELDTR("fldshort", L("lcl_prs_companies_contact_titel"), prs_titel, {suppressEmpty:true});
ROFIELDTR("fld", L("lcl_prs_companies_contact_functie"), prs_func, {suppressEmpty:true});
ROFIELDTR("fld", L("lcl_prs_companies_contact_tel1"), prs_tel1, {suppressEmpty:true});
ROFIELDTR("fld", L("lcl_prs_companies_contact_tel2"), prs_tel2, {suppressEmpty:true});
ROFIELDTR("fld", L("lcl_prs_companies_contact_fax1"), prs_fax, {suppressEmpty:true});
AFIELDTR('fldmailto details', L("lcl_prs_companies_contact_email"), "mailto:" + prs_email, prs_email, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_companies_contact_naam"), prs_naam, { suppressEmpty:true });
ROFIELDTR("fldshort", L("lcl_prs_companies_contact_tussenv"), prs_tsnvgs, { suppressEmpty:true });
ROFIELDTR("fldshort", L("lcl_prs_companies_contact_voorl"), prs_voorl, { suppressEmpty:true });
ROFIELDTR("fld", L("lcl_prs_companies_contact_voorn"), prs_vrnaam, { suppressEmpty:true });
ROFIELDTR("fld", L("lcl_prs_companies_contact_aanhef"), prs_aanh, { suppressEmpty:true });
ROFIELDTR("fldshort", L("lcl_prs_companies_contact_titel"), prs_titel, { suppressEmpty:true });
ROFIELDTR("fld", L("lcl_prs_companies_contact_functie"), prs_func, { suppressEmpty:true });
ROFIELDTR("fld", L("lcl_prs_companies_contact_tel1"), prs_tel1, { suppressEmpty:true, type: "telefoon" });
ROFIELDTR("fld", L("lcl_prs_companies_contact_tel2"), prs_tel2, { suppressEmpty:true, type: "telefoon" });
ROFIELDTR("fld", L("lcl_prs_companies_contact_fax1"), prs_fax, { suppressEmpty:true, type: "fax" });
ROFIELDTR("fld", L("lcl_prs_companies_contact_email"), prs_email, { suppressEmpty: true, type: "email" });
ROTEXTAREATR("fldtxt", L("lcl_prs_companies_contact_opm"), prs_opm, {id: "prs_opm", suppressEmpty: true});
ROFIELDTR("fldshort", L("lcl_prs_companies_uurloon"), prs_loon, {suppressEmpty: true, datatype: "currency"});
BLOCK_END();

6
APPL/PRS/prs_show_perslid.asp
View File

@@ -267,9 +267,9 @@ var prs_user = new Perslid(prs_key);
ROFIELDTR("fld", L("lcl_prs_person_initials"), prs_ini, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_lcl_taal"), prs_lang, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_person_timezone"), prs_tz, {suppressEmpty: true});
AFIELDTR("fld details", L("lcl_prs_person_phone"), "callto:" + prs_telnr, prs_telnr, { suppressEmpty: true });
AFIELDTR("fld details", L("lcl_prs_person_mobile"), "callto:" + prs_mobiel, prs_mobiel, { suppressEmpty: true });
AFIELDTR("fldmailto details", L("lcl_prs_person_email"), "mailto:" + prs_email, prs_email, { suppressEmpty: true });
ROFIELDTR("fld", L("lcl_prs_person_phone"), prs_telnr, { suppressEmpty: true, type: "telefoon" });
ROFIELDTR("fld", L("lcl_prs_person_mobile"), prs_mobiel, { suppressEmpty: true, type: "telefoon" });
ROFIELDTR("fld", L("lcl_prs_person_email"), prs_email, { suppressEmpty: true, type: "email" });
if (prsauthparams.writesys || xfunc.canWrite("WEB_FACMGT"))
{
ROFIELDTR("fld", L("lcl_prs_systeemadres"), systeemadres, {suppressEmpty: true});

34
APPL/Shared/iface.inc
View File

@@ -363,6 +363,25 @@ function ROFIELDTR(pclass, plabel, pvalue, params)
if ((pvalue == null || pvalue == "") && params.suppressEmpty)
return; // snel klaar
var linkType;
switch(params.type)
{
case "mail":
case "email":
case "e-mail":
case "mailto":
linkType = "mailto";
break;
case "tel":
linkType = "tel";
break;
case "fax":
case "callto":
case "telefoon":
linkType = "callto";
break;
}
if (plabel && params.translate && S("multi_language_option"))
{
var fn = "iface.translate('"+params.translate.fld+"', "+params.translate.key+", this.innerText, '"+safe.jsstring(pvalue)+"', 'input')"
@@ -371,10 +390,19 @@ function ROFIELDTR(pclass, plabel, pvalue, params)
plabel = "<span class='facmgtmultilang' onclick='"+safe.htmlattr(fn)+"'>" + plabel + "</span>";
}
if (linkType)
{
pclass += linkType + " details";
var phref = linkType + ":" + pvalue;
}
%><tr <%=params.trid?"id='"+params.trid+"' ":""%><%=params.trclass?"class='"+params.trclass+"'":""%>>
<% if (!plabel) { %><td class="label"></td><td><% } %>
<%ROFIELD(pclass, plabel, pvalue, params)%>
<% if (!plabel) { %></td><% } %>
<% if (!plabel) { %><td class="label"></td><td><% }
if (linkType)
AFIELD(pclass, plabel, phref, pvalue, params);
else
ROFIELD(pclass, plabel, pvalue, params);
if (!plabel) { %></td><% } %>
</tr><%
}