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

FCLT#55657 Alleen code opmaak veranderd, geen functionele aanpassingen

Browse Source 
svn path=/Website/trunk/; revision=41469
This commit is contained in:
Koen Reefman
2019-03-11 15:20:00 +00:00
parent 043499377f
commit b0407a4d7f
1 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
APPL/Shared/kenmerk_common.inc
View File

@@ -30,48 +30,54 @@ var addPreview = false;
var previewId = 0;
// read the kenmerk_key in case of <kenmerk> with ref=code or value
function getKenmerkKeyByRef(kenmerkdomein_key, kenmerk_ref, kenmerk_waarde) {
function getKenmerkKeyByRef(kenmerkdomein_key, kenmerk_ref, kenmerk_waarde)
{
var kenmerk_key = parseInt(kenmerk_waarde, 10);
var fac_omschr_code;
var udf_omschr_code;
var ksql = "SELECT fac_kenmerkdomein_objectnaam, fac_kenmerkdomein_kolomnaam, fac_kenmerkdomein_kolomtxt, fac_kenmerkdomein_verval, fac_usrtab_key" +
" FROM fac_kenmerkdomein" +
" WHERE fac_kenmerkdomein_key = " + kenmerkdomein_key +
" AND fac_kenmerkdomein_verwijder IS NULL";
var ksql = "SELECT fac_kenmerkdomein_objectnaam, fac_kenmerkdomein_kolomnaam, fac_kenmerkdomein_kolomtxt, fac_kenmerkdomein_verval, fac_usrtab_key"
+ " FROM fac_kenmerkdomein"
+ " WHERE fac_kenmerkdomein_key = " + kenmerkdomein_key
+ " AND fac_kenmerkdomein_verwijder IS NULL";
var oRs_kd = Oracle.Execute(ksql);
if (!oRs_kd.eof) {
switch (kenmerk_ref) {
if (!oRs_kd.eof)
{
switch (kenmerk_ref)
{
case "value":
fac_omschr_code = " AND UPPER(fac_usrdata_omschr)=" + safe.quoted_sql_upper(kenmerk_waarde);
udf_omschr_code = " WHERE UPPER(" + oRs_kd("fac_kenmerkdomein_kolomtxt").value + ") = " + safe.quoted_sql_upper(kenmerk_waarde);
fac_omschr_code = " AND UPPER(fac_usrdata_omschr) = " + safe.quoted_sql_upper(kenmerk_waarde);
break;
case "code":
fac_omschr_code = " AND UPPER(fac_usrdata_code)=" + safe.quoted_sql_upper(kenmerk_waarde);
udf_omschr_code = " WHERE UPPER(" + oRs_kd("fac_kenmerkdomein_objectnaam").value + "_CODE) = " + safe.quoted_sql_upper(kenmerk_waarde);
fac_omschr_code = " AND UPPER(fac_usrdata_code) = " + safe.quoted_sql_upper(kenmerk_waarde);
break;
default:
oRs_kd.Close();
return kenmerk_key;
}
var kenmerkdomein_verval = oRs_kd("fac_kenmerkdomein_verval").Value;
if (oRs_kd("fac_kenmerkdomein_objectnaam").Value == "FAC_USRDATA" && oRs_kd("fac_usrtab_key").Value) {
ksql = "SELECT fac_usrdata_key" +
" FROM fac_usrdata" +
" WHERE fac_usrtab_key=" + oRs_kd("fac_usrtab_key").Value +
fac_omschr_code +
" AND (fac_usrdata_vervaldatum IS NULL OR fac_usrdata_vervaldatum > SYSDATE)" +
" AND fac_usrdata_verwijder IS NULL";
} else {
ksql = "SELECT " + oRs_kd("fac_kenmerkdomein_kolomnaam").Value + " fac_usrdata_key" +
" FROM " + oRs_kd("fac_kenmerkdomein_objectnaam").Value +
udf_omschr_code +
(kenmerkdomein_verval != null ? " AND ( " + kenmerkdomein_verval + " IS NULL OR " + kenmerkdomein_verval + " > SYSDATE)" : "");
if (oRs_kd("fac_kenmerkdomein_objectnaam").Value == "FAC_USRDATA" && oRs_kd("fac_usrtab_key").Value)
{
ksql = "SELECT fac_usrdata_key"
+ " FROM fac_usrdata"
+ " WHERE fac_usrtab_key = " + oRs_kd("fac_usrtab_key").Value
+ fac_omschr_code
+ " AND (fac_usrdata_vervaldatum IS NULL OR fac_usrdata_vervaldatum > SYSDATE)"
+ " AND fac_usrdata_verwijder IS NULL";
}
else
{
ksql = "SELECT " + oRs_kd("fac_kenmerkdomein_kolomnaam").Value + " fac_usrdata_key"
+ " FROM " + oRs_kd("fac_kenmerkdomein_objectnaam").Value
+ udf_omschr_code
+ (kenmerkdomein_verval != null ? " AND ( " + kenmerkdomein_verval + " IS NULL OR " + kenmerkdomein_verval + " > SYSDATE)" : "");
}
}
var oRs_ud = Oracle.Execute(ksql);
if (!oRs_ud.eof) {
if (!oRs_ud.eof)
kenmerk_key = String(oRs_ud("fac_usrdata_key").Value);
}
oRs_ud.Close();
oRs_kd.Close();
return kenmerk_key;