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

FCLT#82157 Herkomst van de melding

Browse Source 
svn path=/Website/trunk/; revision=64823
This commit is contained in:
Erik Groener
2024-05-27 07:39:55 +00:00
parent 4797d70288
commit ff931c6d6d
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
APPL/API2/model_mld_meldbron.inc
View File

@@ -66,6 +66,18 @@ function model_mld_meldbron()
}
],
"defaultvalue": "0"
},
"selectable_select_fo": {
"dbs": "selectable_select_fo",
"sql": "CASE WHEN (BITAND(mld_meldbron.mld_meldbron_kiesbaar,1)=1) THEN 1 ELSE 0 END",
"label": L("mld_meldbron_kiesbaar1"),
"typ": "check0"
},
"selectable_edit_ext": {
"dbs": "selectable_exit_ext",
"sql": "CASE WHEN (BITAND(mld_meldbron.mld_meldbron_kiesbaar,2)=2) THEN 1 ELSE 0 END",
"label": L("mld_meldbron_kiesbaar2"),
"typ": "check0"
}
};

4
APPL/MGT/mld_meldbron.asp
View File

@@ -30,7 +30,9 @@ scaffolding(this_model,
"columns": [
"id",
"name",
"selectable" // needs translations
// "selectable", // bits translated to:
"selectable_select_fo",
"selectable_edit_ext"
]
},
"edit":{

11
APPL/MLD/mld_edit_melding.asp
View File

@@ -1469,12 +1469,19 @@ SUBFRAME_START();
{
// Inzicht is inmiddels dat dit geen relevante info is indien nieuwe melding.
// Echter het externnr moet wel ingevuld kunnen worden als mld_meldbron_key=5.
var sql = "SELECT COUNT(*) aantal"
+ " FROM mld_meldbron"
+ " WHERE mld_meldbron_verwijder IS NULL"
+ " AND BITAND(mld_meldbron_kiesbaar, 1) = 1";
var oRs = Oracle.Execute(sql);
var hasKiesbaarMeldbron = oRs("aantal").Value > 0;
oRs.Close();
var hasMldFlags = ((urole == "bo" || urole == "fo") && S("mld_melding_flags") > 0);
var isNieuwExtern = (lNieuweMelding && ((mld_melding.meldbron_kiesbaar & 2) == 2) && (urole == "bo" || urole == "fo") );
if (lBestaandeMelding || hasMldFlags || isNieuwExtern)
if (lBestaandeMelding || hasMldFlags || isNieuwExtern || hasKiesbaarMeldbron)
{
BLOCK_START(id, L("lcl_mld_behandeling"), {icon: "fa-clock"});
if (isNieuwExtern && fronto)
if (isNieuwExtern && fronto && hasKiesbaarMeldbron)
{
var sqlbron = "SELECT mld_meldbron_key"
+ " , " + lcl.xsqla('mld_meldbron_omschrijving', 'mld_meldbron_key')