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

FCLT#56801 kenmerken aan rapporten toevoegen eenvoudiger via Toevoegen kolom

Browse Source 
svn path=/Website/trunk/; revision=60108
This commit is contained in:
Erik Groener
2023-04-20 06:45:58 +00:00
parent 2ef654eacf
commit 249b6a414e
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/FAC/fac_edit_reportcolumn.asp
View File

@@ -28,7 +28,7 @@ var rap_id = getQParamInt("rap_id");
var col_id = getQParamInt("col_id");
var autostart = getQParamInt("autostart",-1);
user.auth_required_or_abort(user.has("WEB_UDRMAN"));
user.checkAutorisation("WEB_UDRMAN");
function BREAK()
{

17
APPL/FAC/get_kenmerk_info_ajax.asp
View File

@@ -20,7 +20,7 @@ var JSON_Result = true;
<!-- #include file="../Shared/common.inc"-->
<%
user.auth_required_or_abort(user.has("WEB_UDRMAN"));
user.checkAutorisation("WEB_UDRMAN");
var module = getQParam("module", "");
var req_info = getQParam("req_info");
@@ -169,10 +169,7 @@ switch (req_info)
+ " FROM fac_usrrap_cols"
+ " WHERE fac_usrrap_cols_key = " + cols_key;
var oRs = Oracle.Execute(sql);
if (!oRs.eof)
{
var col_name = oRs("fac_usrrap_cols_column_name").Value;
}
var safe_key_col_name = oRs("fac_usrrap_cols_column_name").Value;
oRs.Close();
// Aan de hand van de module de te gebruiken tabellen bepalen.
@@ -222,10 +219,11 @@ switch (req_info)
scr = "SELECT rt." + ref_txt
+ " FROM mld_kenmerkmelding kenm"
+ " , " + ref_tab + " rt"
+ " WHERE rt." + ref_col + " = kenm.mld_kenmerkmelding_waarde"
+ " WHERE kenm.mld_kenmerkmelding_verwijder IS NULL"
+ " AND rt." + ref_col + " = kenm.mld_kenmerkmelding_waarde"
+ (ref_key ? " AND rt.fac_usrtab_key = " + ref_key : "")
+ " AND kenm.mld_kenmerk_key = " + kenm_key
+ " AND kenm.mld_melding_key = " + safe.quoted_sql(col_name);
+ " AND kenm.mld_melding_key = " + safe_key_col_name;
}
else if (data_type == "M" || data_type == "F" || data_type == "X" || data_type == "E")
{ // kenmerkwaarde verwijst naar een bestand
@@ -235,8 +233,9 @@ switch (req_info)
{ // De overige kenmerkwaarden staan direct in de tabel.
src = "SELECT kenm.mld_kenmerkmelding_waarde"
+ " FROM mld_kenmerkmelding kenm"
+ " WHERE kenm.mld_kenmerk_key = " + kenm_key
+ " AND kenm.mld_melding_key = " + col_name;
+ " WHERE kenm.mld_kenmerkmelding_verwijder IS NULL"
+ " AND kenm.mld_kenmerk_key = " + kenm_key
+ " AND kenm.mld_melding_key = " + safe_key_col_name;
}
// Conversie datatype kenmerk naar datatype rapport: