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

BLST#69062 veldnaam gebruiken voor oRs(x) en DoLog weggehaald

Browse Source 
svn path=/Website/trunk/; revision=54432
This commit is contained in:
Koen Reefman
2022-01-06 21:26:05 +00:00
parent 49da0d8543
commit 72fcaa285b
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
APPL/MLD/mld_fe_menu.inc
View File

@@ -120,7 +120,7 @@ mld_fe_menu = {
filters.disc_key_arr = filters.disc_key_arr || [];
filters.stdmgroep_key_arr = filters.stdmgroep_key_arr || [];
if (level == 9) //
if (level == 9)
return this.get_menu_sql(level, urole, filters);
var select = "";
@@ -131,9 +131,9 @@ mld_fe_menu = {
{
select += "sd.ins_srtdiscipline_key,"
+ "MIN(d.ins_discipline_volgnr),"
+ lcl.xsqla("sd.ins_srtdiscipline_omschrijving", "sd.ins_srtdiscipline_key") + ","
+ "sd.ins_srtdiscipline_image,"
+ "sd.ins_srtdiscipline_color";
+ lcl.xsql("sd.ins_srtdiscipline_omschrijving", "sd.ins_srtdiscipline_key") + " descr,"
+ "sd.ins_srtdiscipline_image image,"
+ "sd.ins_srtdiscipline_color color";
where = " sd.ins_srtdiscipline_key = d.ins_srtdiscipline_key"
+ " AND d.ins_discipline_key IN sm.mld_ins_discipline_key";
groupby = "sd.ins_srtdiscipline_key,"
@@ -149,9 +149,9 @@ mld_fe_menu = {
+ "CASE WHEN sd.ins_srtdiscipline_prefix IS NULL OR " + filters.srtdisc_key_arr.length + " = 1"
+ " THEN ''"
+ " ELSE sd.ins_srtdiscipline_prefix || '-'"
+ "END || " + lcl.xsql("d.ins_discipline_omschrijving", "d.ins_discipline_key") + " full_discname,"
+ "d.ins_discipline_image,"
+ "d.ins_discipline_color";
+ "END || " + lcl.xsql("d.ins_discipline_omschrijving", "d.ins_discipline_key") + " descr,"
+ "d.ins_discipline_image image,"
+ "d.ins_discipline_color color";
where = " sd.ins_srtdiscipline_key = d.ins_srtdiscipline_key"
+ " AND d.ins_discipline_key IN sm.mld_ins_discipline_key";
groupby = "d.ins_discipline_key,"
@@ -168,9 +168,9 @@ mld_fe_menu = {
{
select += "mg.mld_stdmeldinggroep_key,"
+ "MIN(d.ins_discipline_volgnr),"
+ lcl.xsqla("mg.mld_stdmeldinggroep_naam", "mg.mld_stdmeldinggroep_key") + ","
+ "mg.mld_stdmeldinggroep_image,"
+ "mg.mld_stdmeldinggroep_color"
+ lcl.xsql("mg.mld_stdmeldinggroep_naam", "mg.mld_stdmeldinggroep_key") + " descr,"
+ "mg.mld_stdmeldinggroep_image image,"
+ "mg.mld_stdmeldinggroep_color color"
from = "mld_stdmeldinggroep mg,";
where = " sd.ins_srtdiscipline_key = d.ins_srtdiscipline_key"
+ " AND mg.mld_stdmeldinggroep_key IN sm.mld_stdmeldinggroep_key"
@@ -182,8 +182,6 @@ mld_fe_menu = {
+ " ORDER BY 3, 2";
}
__DoLog(filters);
var sql = "WITH stdmelding AS (SELECT mld_ins_discipline_key, mld_stdmeldinggroep_key"
+ " FROM mld_stdmelding sm"
+ " WHERE mld_stdmelding_verwijder IS NULL"

12
APPL/PDA/melding_menu.asp
View File

@@ -88,9 +88,9 @@ function findImage(filename)
var qs = buildTransitParam(["urole"]);
var copy_arr = [];
switch (lvl) {
case 0: qs += "&srtdisc=" + oRs(0).Value; break;
case 1: qs += "&disc=" + oRs(0).Value; break;
case 2: qs += "&stdmgroepkey=" + oRs(0).Value; break;
case 0: qs += "&srtdisc=" + oRs("ins_srtdiscipline_key").Value; break;
case 1: qs += "&disc=" + oRs("ins_discipline_key").Value; break;
case 2: qs += "&stdmgroepkey=" + oRs("mld_stdmeldinggroep_key").Value; break;
}
qs += (lvl != 0 && srtdisc_key_arr.length ? "&srtdisc=" + srtdisc_key_arr.join(",") : "")
+ (lvl != 1 && disc_key_arr.length ? "&disc=" + disc_key_arr.join(",") : "")
@@ -98,9 +98,9 @@ function findImage(filename)
items.push({
"href": "melding_menu.asp?lvl=9" + qs,
"desc": oRs(2).Value || "",
"img": oRs(3).Value || "fa-question fa-rotate-180",
"color": oRs(4).Value || ""
"desc": oRs("descr").Value || "",
"img": oRs("image").Value || "fa-question fa-rotate-180",
"color": oRs("color").Value || ""
});
oRs.MoveNext();
}