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

Iets cleaner

Browse Source 
svn path=/Website/trunk/; revision=5100
This commit is contained in:
Jos Groot Lipman
2011-12-06 12:05:32 +00:00
parent 95544adb5f
commit adb69ecccc
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
APPL/Shared/resultset_flex.inc
View File

@@ -1,6 +1,6 @@
<% /*
$Revision: 12 $
$Modtime: 24-02-11 18:35 $
$Revision: 13 $
$Modtime: 5-12-11 13:21 $
File: resultset_flex.inc
Description: Functies die zorgen voor het printen van de flexkenmerken
@@ -228,15 +228,12 @@ function getSqlFlex(flexModule, flexId)
+ " FROM mld_melding m"
+ ", mld_stdmelding msm"
+ ", mld_kenmerk mk"
+ ", mld_srtkenmerk msk"
+ " WHERE m.mld_stdmelding_key = msm.mld_stdmelding_key"
+ " AND ((mk.mld_stdmelding_key = msm.mld_stdmelding_key"
+ " AND mk.mld_kenmerk_niveau = 'S')"
+ " OR (mk.mld_stdmelding_key = msm.mld_ins_discipline_key"
+ " AND mk.mld_kenmerk_niveau = 'D'))"
+ " AND mk.mld_srtkenmerk_key = msk.mld_srtkenmerk_key"
+ " AND mk.mld_kenmerk_verwijder IS NULL"
+ " AND msk.mld_srtkenmerk_verwijder IS NULL";
+ " AND mk.mld_kenmerk_verwijder IS NULL";
sqlFlex = "SELECT "+lcl.xsql('sk.mld_srtkenmerk_omschrijving', 'sk.mld_srtkenmerk_key') +" omschrijving"
+ ", CASE"
@@ -250,7 +247,7 @@ function getSqlFlex(flexModule, flexId)
+ ", k.mld_kenmerk_volgnummer volgnummer"
+ ", "+ lcl.xsql('sk.mld_srtkenmerk_dimensie', 'sk.mld_srtkenmerk_key') + " dimensie"
+ ", sk.mld_srtkenmerk_dec decimalen"
+ " FROM mld_srtkenmerk sk" // TODO: mld_v_aanwezigsrtkenmerk bestaat niet
+ " FROM mld_srtkenmerk sk"
+ ", (" + sql_srtmld_kenmerkmld + ") km" // mld_kenmerk_key / mld_melding_key / mld_kenmerkmelding_waarde inclusief lege waarden
+ ", mld_kenmerk k"
+ " WHERE sk.mld_srtkenmerk_key = k.mld_srtkenmerk_key"