diff --git a/APPL/MLD/load_kenmerk.asp b/APPL/MLD/load_kenmerk.asp index 92690c984d..39766b1be9 100644 --- a/APPL/MLD/load_kenmerk.asp +++ b/APPL/MLD/load_kenmerk.asp @@ -41,7 +41,7 @@ generateFlexKenmerkBlock({ stdm_arr : getQParamIntArray("stdm_str", []), // copy : (getQParamInt("opdr_copy", 0) == 1), opdr_status : getQParamInt("opdr_status", -1), noprepostfn : getQParamInt("noprepostfn", 0) == 1, - onlyverplicht : getQParamInt("onlyverplicht", 0) == 1, + forward : getQParamInt("forward", 0) == 1, advanced : getQParamInt("advanced", 0) == 1, // Geavanceerd prs_key : getQParamInt("prs_key", -1) // Perslid key, wordt alleen gebruikt als geldt (!kenmerk_search && !multiMode) }); diff --git a/APPL/MLD/mld_flexkenmerk.inc b/APPL/MLD/mld_flexkenmerk.inc index c92866254f..0a8149c9ee 100644 --- a/APPL/MLD/mld_flexkenmerk.inc +++ b/APPL/MLD/mld_flexkenmerk.inc @@ -49,7 +49,7 @@ function generateFlexKenmerkBlock(params) var opdr_status = (params.opdr_status? params.opdr_status : -1); var advanced = (params.advanced? params.advanced : false); // Geavanceerd var prs_key = (params.prs_key? params.prs_key : -1); // Perslid key - var onlyverplicht = params.onlyverplicht; + var forward = params.forward; // opdrman true betekent: user mag opdracht flexkenmerken > 900 zien/editen var authparamsORDSUP = user.checkAutorisation("WEB_ORDSUP", true); @@ -174,47 +174,9 @@ function generateFlexKenmerkBlock(params) + (copy ? " AND t.mld_srtkenmerk_kenmerktype NOT IN ('E', 'F', 'M')" // Bij kopieren melding niet de flexbestanden kopieren. : "") - + (onlyverplicht // Alleen verplichte velden tonen i.v.m. doorsturen melding. - ? "AND k.mld_kenmerk_key IN (SELECT mk.mld_kenmerk_key" - + " FROM mld_kenmerk mk" - + " , mld_srtkenmerk sk" - + " , mld_stdmelding s" - + " , mld_discipline d" - + " , (SELECT mko.mld_kenmerk_key" - + " , mko.mld_srtkenmerk_key" - + " , sk.mld_srtkenmerk_kenmerktype" - + " , sk.mld_srtkenmerk_nmax" - + " FROM mld_kenmerkmelding mkm" - + " , mld_kenmerk mko" - + " , mld_srtkenmerk sk" - + " , mld_stdmelding so" - + " , mld_discipline do" - + " WHERE mkm.mld_kenmerk_key = mko.mld_kenmerk_key" - + " AND mko.mld_srtkenmerk_key = sk.mld_srtkenmerk_key" - + " AND so.mld_ins_discipline_key = do.ins_discipline_key" - + " AND ((mko.mld_stdmelding_key = so.mld_stdmelding_key AND mko.mld_kenmerk_niveau = 'S')" - + " OR (mko.mld_stdmelding_key = so.mld_ins_discipline_key AND mko.mld_kenmerk_niveau = 'D')" - + " OR (mko.mld_stdmelding_key = do.ins_srtdiscipline_key AND mko.mld_kenmerk_niveau = 'T'))" - + " AND mkm.mld_melding_key = " + mld_key - + " AND so.mld_stdmelding_key = " + old_stdm + ") kenm_old" - + " WHERE s.mld_ins_discipline_key = d.ins_discipline_key" - + " AND mk.mld_srtkenmerk_key = sk.mld_srtkenmerk_key" - + " AND sk.mld_srtkenmerk_kenmerktype NOT IN ('F', 'E', 'M')" - + " AND ((mk.mld_stdmelding_key = s.mld_stdmelding_key AND mk.mld_kenmerk_niveau = 'S')" - + " OR (mk.mld_stdmelding_key = s.mld_ins_discipline_key AND mk.mld_kenmerk_niveau = 'D')" - + " OR (mk.mld_stdmelding_key = d.ins_srtdiscipline_key AND mk.mld_kenmerk_niveau = 'T'))" - + " AND mk.mld_srtkenmerk_key = kenm_old.mld_srtkenmerk_key(+)" - + " AND s.mld_stdmelding_key = " + stdm_arr - + " AND mk.mld_kenmerk_verwijder IS NULL" - // Verplichte kenmerken tonen die niet zijn ingevuld. - // Verplichte checkboxen altijd tonen als wordt doorgestuurd naar een andere melding (stdmelding). Daarvan weet je niet of ze al zijn ingevuld. - + " AND mk.mld_kenmerk_verplicht = 1" - + (old_stdm != stdm_arr - ? " AND (kenm_old.mld_kenmerk_key IS NULL" - + " OR (kenm_old.mld_srtkenmerk_kenmerktype = 'N' AND kenm_old.mld_srtkenmerk_nmax = 1)))" - : " AND kenm_old.mld_kenmerk_key IS NULL)") + + (forward // Alle velden, behalve die met bestanden, tonen i.v.m. doorsturen melding. + ? " AND t.mld_srtkenmerk_kenmerktype NOT IN ('F', 'E', 'M')" : ""); - } // 3) Aanmaken opdracht else if (newOpdracht) diff --git a/APPL/MLD/mld_forward.asp b/APPL/MLD/mld_forward.asp index ec19ca961e..58b70e8466 100644 --- a/APPL/MLD/mld_forward.asp +++ b/APPL/MLD/mld_forward.asp @@ -138,7 +138,7 @@ FCLTHeader.Requires({ plugins: ["jQuery", "kenmerk"], + (!canFlexChange? "&reado=1" : "") + "&prs_key=" + user_key + "&act_key=-1" - + "&onlyverplicht=1"; + + "&forward=1"; $("#mldFlexList").load(s, function () { FcltMgr.resized () }); }