From ff931c6d6d4e8f4e693bb7a3b791b8f0804db7c2 Mon Sep 17 00:00:00 2001 From: Erik Groener Date: Mon, 27 May 2024 07:39:55 +0000 Subject: [PATCH] FCLT#82157 Herkomst van de melding svn path=/Website/trunk/; revision=64823 --- APPL/API2/model_mld_meldbron.inc | 12 ++++++++++++ APPL/MGT/mld_meldbron.asp | 4 +++- APPL/MLD/mld_edit_melding.asp | 11 +++++++++-- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/APPL/API2/model_mld_meldbron.inc b/APPL/API2/model_mld_meldbron.inc index 61e4f7a359..69ef33731a 100644 --- a/APPL/API2/model_mld_meldbron.inc +++ b/APPL/API2/model_mld_meldbron.inc @@ -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" } }; diff --git a/APPL/MGT/mld_meldbron.asp b/APPL/MGT/mld_meldbron.asp index da852666ce..eae0568d17 100644 --- a/APPL/MGT/mld_meldbron.asp +++ b/APPL/MGT/mld_meldbron.asp @@ -30,7 +30,9 @@ scaffolding(this_model, "columns": [ "id", "name", - "selectable" // needs translations + // "selectable", // bits translated to: + "selectable_select_fo", + "selectable_edit_ext" ] }, "edit":{ diff --git a/APPL/MLD/mld_edit_melding.asp b/APPL/MLD/mld_edit_melding.asp index 924b2f3ffe..95b5cfad9a 100644 --- a/APPL/MLD/mld_edit_melding.asp +++ b/APPL/MLD/mld_edit_melding.asp @@ -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')