From 89808b7b54d481e7ce560d7e34d89149207b8572 Mon Sep 17 00:00:00 2001 From: Alex Tiehuis Date: Tue, 12 Mar 2019 09:51:28 +0000 Subject: [PATCH] FCLT#56893 aiai doorsturen melding svn path=/Website/trunk/; revision=41498 --- APPL/Shared/Suggest/disciplineFilter.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/APPL/Shared/Suggest/disciplineFilter.inc b/APPL/Shared/Suggest/disciplineFilter.inc index dd9b5f06b4..0f2d4168b9 100644 --- a/APPL/Shared/Suggest/disciplineFilter.inc +++ b/APPL/Shared/Suggest/disciplineFilter.inc @@ -99,8 +99,8 @@ function getFiltClauseDiscipline(pfiltcode, params) break; case "VDK": // Niet vervallen, binnen keten. Alleen de vakgroepen die gewijzigd mogen worden mag je zien if (lfiltClause.from.indexOf("mld_disc_params dp") == -1) { lfiltClause.from += ", mld_disc_params dp"; } - lfiltClause.where += " AND dp.mld_ins_discipline_key = td.ins_discipline_key" - + " AND dp.mld_disc_params_keten = 1"; + if (lfiltClause.where.indexOf("AND dp.mld_ins_discipline_key = td.ins_discipline_key") == -1) { lfiltClause.where += " AND dp.mld_ins_discipline_key = td.ins_discipline_key"; } + lfiltClause.where += " AND dp.mld_disc_params_keten = 1"; // Geen break, doorvallen naar VD case "VD": // Niet vervallen. Alleen de vakgroepen die gewijzigd mogen worden mag je zien lfiltClause.where += " AND ((sm.mld_stdmelding_vervaldatum is null) " @@ -108,8 +108,8 @@ function getFiltClauseDiscipline(pfiltcode, params) break; case "K": // Alleen de vakgroepen die gewijzigd mogen worden mag je zien if (lfiltClause.from.indexOf("mld_disc_params dp") == -1) { lfiltClause.from += ", mld_disc_params dp"; } - lfiltClause.where += " AND dp.mld_ins_discipline_key = td.ins_discipline_key" - + " AND dp.mld_disc_params_keten = 1"; + if (lfiltClause.where.indexOf("AND dp.mld_ins_discipline_key = td.ins_discipline_key") == -1) { lfiltClause.where += " AND dp.mld_ins_discipline_key = td.ins_discipline_key"; } + lfiltClause.where += " AND dp.mld_disc_params_keten = 1"; break; case "MG": // Alleen de vakgroepen waarop gegroepeerd kan worden mag je zien lfiltClause.where += " AND BITAND(sd.ins_srtdiscipline_mldgroup, 1) = 1"