Met FSN#35338 is de prefix in de vakgroep omschrivjng opgenomen, dan hoeft de losse kolom niet meer.

svn path=/Website/branches/v2017.1/; revision=33982
This commit is contained in:
Jos Groot Lipman
2017-05-23 14:52:45 +00:00
parent ef4d260485
commit 7fd06653a8
2 changed files with 1 additions and 17 deletions

View File

@@ -25,13 +25,11 @@ function model_fac_profielwaarde()
var catalogus_sql = "SELECT B.ins_discipline_key"
+ " , B.ins_discipline_omschrijving as omschrijving"
+ " , '' as prefix"
+ " , " + safe.qL("lcl_bes_Catalogus") + "||': '|| B.ins_discipline_omschrijving as omschrijving_ext"
+ " FROM bes_v_aanwezigdiscipline B"
+ " UNION ALL "
+ "SELECT M.ins_discipline_key"
+ " , M.ins_discipline_omschrijving"
+ " , S.ins_srtdiscipline_prefix"
+ " , " + safe.qL("lcl_mld_vakgroep") + "||': '|| S.ins_srtdiscipline_prefix ||'-'|| M.ins_discipline_omschrijving"
+ " FROM mld_v_aanwezigdiscipline M"
+ " , ins_srtdiscipline S"
@@ -58,12 +56,6 @@ function model_fac_profielwaarde()
"desc": "fac_profiel_omschrijving"
}
},
"prefix": {
"dbs": "catalogus.prefix",
"label": L("ins_discipline_prefix"),
"typ": "varchar",
"readonly": true
},
"catalog": {
"dbs": "ins_discipline_key",
"label": L("mgt_discipline"),
@@ -91,7 +83,6 @@ function model_fac_profielwaarde()
this.list = {
"columns": [
"id",
"prefix",
"catalog",
"valuelimit"
]
@@ -104,13 +95,7 @@ function model_fac_profielwaarde()
};
var ext_sql = "("+catalogus_sql+") catalogus"
this.REST_GET = generic_REST_GET(this, {
"GET": {
"tables": [ ext_sql],
"wheres": [ "fac_profielwaarde.ins_discipline_key = catalogus.ins_discipline_key"]
}
});
this.REST_GET = generic_REST_GET(this);
this.REST_POST = generic_REST_POST(this);
this.REST_PUT = generic_REST_PUT(this);
this.REST_DELETE = generic_REST_DELETE(this);

View File

@@ -29,7 +29,6 @@ scaffolding(this_model,
"columns": [
"id",
"profile",
"prefix",
"catalog",
"valuelimit"
]