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

FCLT#56026 Dubbelingen in harmonica MLDUSE

Browse Source 
svn path=/Website/branches/v2018.2/; revision=40520
This commit is contained in:
Erik Groener
2019-01-14 12:40:36 +00:00
parent fe60021e24
commit c09f132bc7
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
APPL/MLD/mld_fe_menu.asp
View File

@@ -118,17 +118,17 @@ var sql = "SELECT sm.mld_stdmelding_key,"
+ " sm.mld_stdmeldinggroep_key,"
+ " d.ins_discipline_key,"
+ " sd.ins_srtdiscipline_key,"
+ " ins_srtdiscipline_prefix,"
+ " mld_stdmelding_image foto,"
+ " mld_stdmelding_externurl"
+ " sd.ins_srtdiscipline_prefix,"
+ " sm.mld_stdmelding_image foto,"
+ " sm.mld_stdmelding_externurl"
+ " FROM mld_stdmelding sm,"
+ " mld_stdmeldinggroep mg,"
+ " mld_discipline d,"
+ " ins_srtdiscipline sd,"
+ " fac_v_webgebruiker fvw,"
+ " fac_functie f"
+ " WHERE mld_stdmelding_notfrontend = 0"
+ " AND mld_stdmelding_verwijder IS NULL"
+ " WHERE sm.mld_stdmelding_notfrontend = 0"
+ " AND sm.mld_stdmelding_verwijder IS NULL"
+ " AND d.ins_discipline_key = sm.mld_ins_discipline_key"
+ " AND sd.ins_srtdiscipline_key = d.ins_srtdiscipline_key"
+ " AND fvw.ins_discipline_key = d.ins_discipline_key"
@@ -157,19 +157,24 @@ if (stdmgroepkeyArr.length){
}
switch (lvl) {
case 2: {
sql+= " ORDER BY " + lcl.xsql('mg.mld_stdmeldinggroep_naam','mg.mld_stdmeldinggroep_key')
+ " , mld_stdmelding_volgnr, " + lcl.xsql('sm.mld_stdmelding_omschrijving','sm.mld_stdmelding_key');
break;
}
sql+= " ORDER BY " + lcl.xsql('mg.mld_stdmeldinggroep_naam','mg.mld_stdmeldinggroep_key')
+ " , sm.mld_stdmelding_volgnr, "
+ lcl.xsql('sm.mld_stdmelding_omschrijving','sm.mld_stdmelding_key');
break;
}
case 0: {
sql+= " ORDER BY " + lcl.xsql('sd.ins_srtdiscipline_omschrijving', 'sd.ins_srtdiscipline_key')
+ " , mld_stdmelding_volgnr, " + lcl.xsql('sm.mld_stdmelding_omschrijving','sm.mld_stdmelding_key');
break;
}
sql+= " ORDER BY " + lcl.xsql('sd.ins_srtdiscipline_omschrijving', 'sd.ins_srtdiscipline_key')
+ " , sm.mld_stdmelding_volgnr, "
+ lcl.xsql('sm.mld_stdmelding_omschrijving','sm.mld_stdmelding_key');
break;
}
default: {
sql+= " ORDER BY d.ins_discipline_volgnr NULLS LAST, " + lcl.xsql('d.ins_discipline_omschrijving', 'd.ins_discipline_key')
+ " , mld_stdmelding_volgnr, " + lcl.xsql('sm.mld_stdmelding_omschrijving','sm.mld_stdmelding_key');
}
sql+= " ORDER BY d.ins_discipline_volgnr NULLS LAST"
+ " , sd.ins_srtdiscipline_prefix, "
+ lcl.xsql('d.ins_discipline_omschrijving', 'd.ins_discipline_key')
+ " , sm.mld_stdmelding_volgnr, "
+ lcl.xsql('sm.mld_stdmelding_omschrijving','sm.mld_stdmelding_key');
}
}
var oRs= Oracle.Execute(sql)
var last_disc = -1;