ASTE#37915 Added timezone into edit and show prs_perslid

svn path=/Website/trunk/; revision=33299
This commit is contained in:
2017-03-29 07:47:15 +00:00
parent 150a3d6c2a
commit 5143b214f2
3 changed files with 19 additions and 0 deletions

View File

@@ -71,6 +71,7 @@ if (prs_key > -1)
+ " prs_perslid_tussenvoegsel, "
+ " fac_profiel_key, "
+ " prs_perslid_email, "
+ " COALESCE(prs_perslid_timezone, 'Europe/Amsterdam') prs_perslid_timezone, "
+ " prs_perslid_mobiel, "
+ " prs_perslid_ingids "
+ " FROM prs_v_aanwezigperslid p, "
@@ -106,6 +107,7 @@ if (prs_key > -1)
var prs_tussen = oRsMes("prs_perslid_tussenvoegsel").value;
var fac_prkey = oRsMes("fac_profiel_key").value;
var prs_email = oRsMes("prs_perslid_email").value;
var prs_tz = oRsMes("prs_perslid_timezone").value;
var prs_mobiel = oRsMes("prs_perslid_mobiel").value;
var prs_bdrkey = oRsMes("prs_bedrijf_key").value;
var ingids = oRsMes("prs_perslid_ingids").value == 1;
@@ -235,6 +237,19 @@ if (prs_key > 0) // Fotoblokje alleen bij bestaande records
});
}
var sql = " SELECT DISTINCT (tzname), '(UTC ' || RTRIM (TZ_OFFSET (tzname), CHR (0)) || ') ' || tzname"
+ " FROM V$TIMEZONE_NAMES "
+ " GROUP BY tzname, TZ_OFFSET (tzname) "
+ " ORDER BY TO_NUMBER(SUBSTR (TZ_OFFSET (tzname), 1, 3) "
+ " || SUBSTR (TZ_OFFSET (tzname), 5, 2)) ASC";
FCLTselector("prs_tz", sql,
{ label: L("lcl_prs_person_timezone"),
initKey: prs_tz,
emptyKey: '',
emptyOption: ''
});
if (S("prs_hide_fixed_fields") == 0 )
{
useRWFIELD("prs_telnr", "fld", L("lcl_prs_person_phone"), prs_telnr, {maxlength: 15});

View File

@@ -42,6 +42,7 @@ var fields = [ { dbs: "prs_srtperslid_key", typ: "key", frm: "prs_srtkey" },
{ dbs: "prs_perslid_tussenvoegsel", typ: "varchar", frm: "prs_tussen" },
{ dbs: "fac_profiel_key", typ: "key", frm: "fac_prkey", track: L("lcl_prs_profile") , foreign: "fac_profiel"},
{ dbs: "prs_perslid_email", typ: "varchar", frm: "prs_email", track: L("lcl_prs_person_email") },
{ dbs: "prs_perslid_timezone", typ: "varchar", frm: "prs_tz", track: L("lcl_prs_person_timezone") },
{ dbs: "prs_perslid_mobiel", typ: "varchar", frm: "prs_mobiel", track: L("lcl_prs_person_mobile") } ];
if (prsauthparams.writesys || (S("prs_mgt_edit_login")?xfunc.canWrite("WEB_FACMGT"):false))

View File

@@ -52,6 +52,7 @@ var sql = "SELECT p.prs_perslid_key, "
+ " d.prs_bedrijf_key, "
+ " prs_perslid_tussenvoegsel, "
+ " prs_perslid_email, "
+ " COALESCE(prs_perslid_timezone, 'Europe/Amsterdam') prs_perslid_timezone, "
+ " prs_perslid_mobiel, "
+ " k.prs_kostenplaats_nr, "
+ S("prs_kpn_string") + " kpl, "
@@ -103,6 +104,7 @@ var prs_enddat = oRs("prs_perslid_einddatum").value!=null?new Date(oRs("prs_pers
var prs_bdrkey = oRs("prs_bedrijf_key").value;
var prs_tussen = oRs("prs_perslid_tussenvoegsel").value;
var prs_email = oRs("prs_perslid_email").value;
var prs_tz = oRs("prs_perslid_timezone").value;
var kpl_nr = oRs("prs_kostenplaats_nr").value;
var kpl = oRs("kpl").value;
var kpl_key = oRs("kpl_key").value;
@@ -258,6 +260,7 @@ var prs_user = new Perslid(prs_key);
ROFIELDTR("fld", L("lcl_prs_person_title"), prs_titel, {suppressEmpty: true});
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});
ROFIELDTR("fld", L("lcl_prs_person_phone"), prs_telnr, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_person_mobile"), prs_mobiel, {suppressEmpty: true});
AFIELDTR('fldmailto details', L("lcl_prs_person_email"), "mailto:" + prs_email, prs_email, { suppressEmpty: true });