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

SMKA#57941 controle tonen FO filter ook op stdmelding niveau

Browse Source 
svn path=/Website/branches/v2019.1/; revision=42682
This commit is contained in:
Ruud Lipper
2019-05-23 12:15:37 +00:00
parent 57353255fe
commit 539ac254ee
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
APPL/MLD/mld_list.inc
View File

@@ -774,9 +774,13 @@ oRs.close();
var eEmptyRequiredFields = false;
/* Fast check to see if we have anything to do with FO-BO handling (terug- of doorzetten) */
sql = "SELECT ''"
+ " FROM mld_disc_params"
+ " WHERE mld_disc_params_directklaar > 0 AND ROWNUM = 1";
sql= "SELECT 1 FROM "
+ "(SELECT 1 FROM mld_disc_params dp, mld_discipline d "
+ "WHERE d.ins_discipline_key = dp.mld_ins_discipline_key AND mld_disc_params_directklaar>0 and d.ins_discipline_verwijder IS NULL "
+ "UNION ALL "
+ "SELECT 1 FROM mld_stdmelding "
+ "WHERE mld_stdmelding_directklaar>0 AND mld_stdmelding_verwijder IS NULL) "
+ "WHERE ROWNUM = 1";
oRs = Oracle.Execute(sql);
var hasAnyFOBOdiscs = !oRs.eof;
oRs.Close();

8
APPL/MLD/mld_search.asp
View File

@@ -254,7 +254,13 @@ var anykpn = !oRs.eof;
oRs.close();
// Fast check to see if we have anything to do with FO-BO handling (doorzetten)
sql= "SELECT 1 FROM mld_disc_params WHERE mld_disc_params_directklaar>0 AND ROWNUM = 1";
sql= "SELECT 1 FROM "
+ "(SELECT 1 FROM mld_disc_params dp, mld_discipline d "
+ "WHERE d.ins_discipline_key = dp.mld_ins_discipline_key AND mld_disc_params_directklaar>0 and d.ins_discipline_verwijder IS NULL "
+ "UNION ALL "
+ "SELECT 1 FROM mld_stdmelding "
+ "WHERE mld_stdmelding_directklaar>0 AND mld_stdmelding_verwijder IS NULL) "
+ "WHERE ROWNUM = 1";
oRs = Oracle.Execute(sql);
var anyfobodiscs = !oRs.eof;
oRs.close();

8
APPL/MLD/mld_search_list.asp
View File

@@ -245,7 +245,13 @@ else
// ** de velden van de form zijn nu allemaal bekend **
// ** nu volgt de verwerking
// Fast check to see if we have anything to do with FO-BO handling (doorzetten)
sql= "SELECT 1 FROM mld_disc_params WHERE mld_disc_params_directklaar>0 AND ROWNUM = 1";
sql= "SELECT 1 FROM "
+ "(SELECT 1 FROM mld_disc_params dp, mld_discipline d "
+ "WHERE d.ins_discipline_key = dp.mld_ins_discipline_key AND mld_disc_params_directklaar>0 and d.ins_discipline_verwijder IS NULL "
+ "UNION ALL "
+ "SELECT 1 FROM mld_stdmelding "
+ "WHERE mld_stdmelding_directklaar>0 AND mld_stdmelding_verwijder IS NULL) "
+ "WHERE ROWNUM = 1";
oRs = Oracle.Execute(sql);
var anyfobodiscs = !oRs.eof;
oRs.close();