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

FSN#29567 kenmerk_groep introduceren

Browse Source 
svn path=/Website/trunk/; revision=21614
This commit is contained in:
Jos Groot Lipman
2014-05-19 09:14:46 +00:00
parent 3f8706c199
commit efe5051f8d
2 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
APPL/MLD/mld_kenmerk.asp
View File

@@ -331,6 +331,23 @@ else
});
}
myFIELD("volgnummer", "fldshort", L("lcl_mld_kenmerk_volgnummer"), kenmerk.kenmerk_volgnummer, {required: true});
sql = "SELECT 0, '' FROM DUAL"
+ " UNION SELECT 1, " + safe.quoted_sql(L("lcl_mld_kenmerk_groep") + " 1") + " FROM DUAL"
+ " UNION SELECT 2, " + safe.quoted_sql(L("lcl_mld_kenmerk_groep") + " 2") + " FROM DUAL"
+ " UNION SELECT 3, " + safe.quoted_sql(L("lcl_mld_kenmerk_groep") + " 3") + " FROM DUAL"
+ " UNION SELECT 4, " + safe.quoted_sql(L("lcl_mld_kenmerk_groep") + " 4") + " FROM DUAL"
+ " UNION SELECT 5, " + safe.quoted_sql(L("lcl_mld_kenmerk_groep") + " 5") + " FROM DUAL"
+ " UNION SELECT 6, " + safe.quoted_sql(L("lcl_mld_kenmerk_groep") + " 6") + " FROM DUAL"
+ " UNION SELECT 7, " + safe.quoted_sql(L("lcl_mld_kenmerk_groep") + " 7") + " FROM DUAL"
+ " UNION SELECT 8, " + safe.quoted_sql(L("lcl_mld_kenmerk_groep") + " 8") + " FROM DUAL"
+ " UNION SELECT 9, " + safe.quoted_sql(L("lcl_mld_kenmerk_groep") + " 9") + " FROM DUAL"
+ " ORDER BY 1";
FCLTselector("groep",
sql,
{ initKey: kenmerk.kenmerk_groep,
label: L("lcl_mld_kenmerk_groep"),
readonly: (mode=='show')
});
sql = "SELECT -1, " + safe.quoted_sql(L("lcl_mld_niet_verplicht")) + " FROM DUAL"
+ " UNION SELECT 1, " + safe.quoted_sql(L("lcl_mld_altijd_verplicht")) + " FROM DUAL"
@@ -359,24 +376,6 @@ else
readonly: (mode=='show')
});
sql = "SELECT 0, " + safe.quoted_sql(L("lcl_mld_defaultgroep")) + " FROM DUAL"
// nog even niet toestaan voor backwards compatibility + " UNION SELECT 1, " + safe.quoted_sql(L("lcl_mld_groep") + " 1") + " FROM DUAL"
+ " UNION SELECT 2, " + safe.quoted_sql(L("lcl_mld_groep") + " 2") + " FROM DUAL"
+ " UNION SELECT 3, " + safe.quoted_sql(L("lcl_mld_groep") + " 3") + " FROM DUAL"
+ " UNION SELECT 4, " + safe.quoted_sql(L("lcl_mld_groep") + " 4") + " FROM DUAL"
+ " UNION SELECT 5, " + safe.quoted_sql(L("lcl_mld_groep") + " 5") + " FROM DUAL"
+ " UNION SELECT 6, " + safe.quoted_sql(L("lcl_mld_groep") + " 6") + " FROM DUAL"
+ " UNION SELECT 7, " + safe.quoted_sql(L("lcl_mld_groep") + " 7") + " FROM DUAL"
+ " UNION SELECT 8, " + safe.quoted_sql(L("lcl_mld_groep") + " 8") + " FROM DUAL"
+ " UNION SELECT 9, " + safe.quoted_sql(L("lcl_mld_groep") + " 9") + " FROM DUAL"
+ " ORDER BY 1";
FCLTselector("groep",
sql,
{ initKey: kenmerk.kenmerk_groep,
label: L("lcl_mld_kenmerk_groep"),
readonly: (mode=='show')
});
myCHECKBOX("toonbaar", "fldcheck", L("lcl_mld_kenmerk_readonly"), kenmerk.kenmerk_toonbaar);
myFIELD("regexp", "fldtxt", L("lcl_regexp"), kenmerk.kenmerk_regexp);
myTEXTAREA("hint", "fldtxt", L("lcl_hint"), kenmerk.kenmerk_hint,

14
APPL/MLD/mld_kenmerk_search_list.asp
View File

@@ -72,6 +72,7 @@ var authparams = user.checkAutorisation("WEB_MLDMGT");
+ " mkm.mld_kenmerk_verplicht,"
+ " mkm.mld_kenmerk_verplicht_status,"
+ " mld_kenmerk_volgnummer,"
+ " mld_kenmerk_groep,"
+ " mld_srtkenmerk_omschrijving,"
+ " mld_srtkenmerk_kenmerktype,"
+ " mkm.mld_srtkenmerk_key,"
@@ -189,8 +190,8 @@ var authparams = user.checkAutorisation("WEB_MLDMGT");
var statusplicht = oRs("mld_kenmerk_verplicht_status").Value;
if (plicht == 1)
txt.push(L("lcl_mld_altijd_verplicht"));
else if (plicht > 1)
txt.push(L("lcl_mld_groepsverplichting") + " " + plicht);
else if (plicht == 2)
txt.push(L("lcl_mld_groepsverplichting"));
if (statusplicht == 1)
txt.push(L("lcl_mld_afgewezen"));
@@ -202,6 +203,14 @@ var authparams = user.checkAutorisation("WEB_MLDMGT");
return txt.join("\n");
}
function fnGroep(oRs)
{
var groep = oRs("mld_kenmerk_groep").Value;
if (!groep)
return "";
return L("lcl_mld_kenmerk_groep") + " " + groep;
}
buttons = {};
//if (canAdd)
{
@@ -226,6 +235,7 @@ var authparams = user.checkAutorisation("WEB_MLDMGT");
rst.addColumn(new Column({caption: L("lcl_mld_vakgroep"), content: "ins_discipline_omschrijving"}));
rst.addColumn(new Column({caption: L("lcl_complain"), content: "mld_stdmelding_omschrijving"}));
rst.addColumn(new Column({caption: L("lcl_mld_kenmerk_volgnummer"), content: "mld_kenmerk_volgnummer"}));
rst.addColumn(new Column({caption: L("lcl_mld_kenmerk_groep"), content: fnGroep}));
rst.addColumn(new Column({caption: L("lcl_mld_kenmerk_verplicht"), content: fnVerplicht}));
rst.addColumn(new Column({caption: L("lcl_mld_srtkenmerk_omschrijving"), content: fnSoort}));
rst.addColumn(new Column({caption: L("lcl_mld_srtkenmerk_kenmerktype"), content: fnKenmerkType}));