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

FSN#35338 Bevindingen beheerschermen 2016.1

Browse Source 
svn path=/Website/trunk/; revision=29075
This commit is contained in:
Erik Groener
2016-04-20 12:24:45 +00:00
parent aa72a2d76c
commit 0dc77db18e
13 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
APPL/API2/model_cnt_kenmerk.inc
View File

@@ -83,9 +83,8 @@ function model_cnt_kenmerk()
"label": L("mgt_kenmerk_niveau"), "label": L("mgt_kenmerk_niveau"),
"typ": "varchar", "typ": "varchar",
"hidden_fld": true, "hidden_fld": true,
"defaultvalue": "S",
"LOV": fill_cnt_niveau_LOV(), "LOV": fill_cnt_niveau_LOV(),
"defaultvalue": "D" "defaultvalue": "S"
}, },
"sequence": { "sequence": {
"dbs": "cnt_kenmerk_volgnummer", "dbs": "cnt_kenmerk_volgnummer",

4
APPL/API2/model_cnt_srtkenmerk.inc
View File

@@ -21,8 +21,8 @@ function model_cnt_srtkenmerk()
this.record_name = "cnt_srtkenmerk"; this.record_name = "cnt_srtkenmerk";
this.soft_delete = "cnt_srtkenmerk_verwijder"; this.soft_delete = "cnt_srtkenmerk_verwijder";
this.autfunction = "WEB_CNTMGT"; this.autfunction = "WEB_CNTMGT";
this.record_title = L("cnt_srtkenmerk"); this.record_title = L("mgt_srtkenmerk");
this.records_title = L("cnt_srtkenmerk_m"); this.records_title = L("mgt_srtkenmerk_m");
this.fields = { this.fields = {

1
APPL/API2/model_cnt_termijn.inc
View File

@@ -43,6 +43,7 @@ function model_cnt_termijn()
"dbs": "cnt_termijn_type", "dbs": "cnt_termijn_type",
"label": L("cnt_termijn_type"), "label": L("cnt_termijn_type"),
"typ": "varchar", "typ": "varchar",
"required": true,
"LOV": L("cnt_termijn_typeLOV") "LOV": L("cnt_termijn_typeLOV")
}, },
"number": { "number": {

6
APPL/API2/model_fac_groeprechten.inc
View File

@@ -77,7 +77,7 @@ function model_fac_groeprechten (params)
}, },
"ins_discipline": { "ins_discipline": {
"dbs": "ins_discipline_key", "dbs": "ins_discipline_key",
"label": L("ins_discipline_key"), "label": L("mgt_discipline"),
"typ": "key", "typ": "key",
"hidden_fld": true, "hidden_fld": true,
"foreign": { "foreign": {
@@ -232,7 +232,7 @@ function model_fac_groeprechten (params)
this.fields["ins_discipline"] = this.fields["ins_discipline"] =
{ {
"dbs": "nn_disc", "dbs": "nn_disc",
"label": L("ins_discipline_key"), "label": L("mgt_discipline"),
"typ": "varchar", "typ": "varchar",
val: fnFunctieDisc, val: fnFunctieDisc,
"hidden_fld": true "hidden_fld": true
@@ -269,7 +269,7 @@ function model_fac_groeprechten (params)
this.fields["ins_discipline"] = this.fields["ins_discipline"] =
{ {
"dbs": "nn_disc", "dbs": "nn_disc",
"label": L("ins_discipline_key"), "label": L("mgt_discipline"),
"typ": "varchar", "typ": "varchar",
"hidden_fld": true "hidden_fld": true
}; };

16
APPL/API2/model_fac_profielwaarde.inc
View File

@@ -26,13 +26,13 @@ function model_fac_profielwaarde()
var catalogus_sql = "SELECT B.ins_discipline_key" var catalogus_sql = "SELECT B.ins_discipline_key"
+ " , B.ins_discipline_omschrijving as omschrijving" + " , B.ins_discipline_omschrijving as omschrijving"
+ " , '' as prefix" + " , '' as prefix"
+ " , B.ins_discipline_omschrijving" + " , " + safe.qL("lcl_bes_Catalogus") + "||': '|| B.ins_discipline_omschrijving as omschrijving_ext"
+ " FROM bes_v_aanwezigdiscipline B" + " FROM bes_v_aanwezigdiscipline B"
+ " UNION ALL " + " UNION ALL "
+ "SELECT M.ins_discipline_key" + "SELECT M.ins_discipline_key"
+ " , M.ins_discipline_omschrijving" + " , M.ins_discipline_omschrijving"
+ " , S.ins_srtdiscipline_prefix" + " , S.ins_srtdiscipline_prefix"
+ " , S.ins_srtdiscipline_prefix ||'-'|| M.ins_discipline_omschrijving" + " , " + safe.qL("lcl_mld_vakgroep") + "||': '|| S.ins_srtdiscipline_prefix ||'-'|| M.ins_discipline_omschrijving"
+ " FROM mld_v_aanwezigdiscipline M" + " FROM mld_v_aanwezigdiscipline M"
+ " , ins_srtdiscipline S" + " , ins_srtdiscipline S"
+ " WHERE M.ins_srtdiscipline_key = S.ins_srtdiscipline_key"; + " WHERE M.ins_srtdiscipline_key = S.ins_srtdiscipline_key";
@@ -46,10 +46,11 @@ function model_fac_profielwaarde()
"filter": "exact", "filter": "exact",
"seq": "fac_s_fac_profielwaarde_key" "seq": "fac_s_fac_profielwaarde_key"
}, },
"profile_key": { "profile": {
"dbs": "fac_profiel_key", "dbs": "fac_profiel_key",
"label": L("fac_profiel_key"), "label": L("fac_profiel"),
"typ": "key", "typ": "key",
"required": true,
"foreign": { "foreign": {
"tbl": "fac_profiel", "tbl": "fac_profiel",
"key": "fac_profiel_key", "key": "fac_profiel_key",
@@ -62,14 +63,15 @@ function model_fac_profielwaarde()
"typ": "varchar", "typ": "varchar",
"readonly": true "readonly": true
}, },
"catalog_key": { "catalog": {
"dbs": "ins_discipline_key", "dbs": "ins_discipline_key",
"label": L("ins_discipline_key"), "label": L("mgt_discipline"),
"typ": "key", "typ": "key",
"required": true,
"foreign": { "foreign": {
"tbl": "("+ catalogus_sql + ")", "tbl": "("+ catalogus_sql + ")",
"key": "ins_discipline_key", "key": "ins_discipline_key",
"desc": "omschrijving" "desc": "omschrijving_ext"
} }
}, },
"value_limit": { "value_limit": {

2
APPL/API2/model_ins_tab_discipline.inc
View File

@@ -123,7 +123,7 @@ function model_ins_tab_discipline(disc_key, params)
} }
this.autfunction = "WEB_FACMSU"; this.autfunction = "WEB_FACMSU";
this.record_title = L("ins_discipline_key"); // TODO: De generieke termen this.record_title = L("mgt_discipline"); // TODO: De generieke termen
this.records_title = L("res_v_res_catalogus_m"); this.records_title = L("res_v_res_catalogus_m");
var xparams = null; var xparams = null;

2
APPL/API2/model_mld_typeopdr_srtdiscipline.inc
View File

@@ -55,7 +55,7 @@ function model_mld_typeopdr_srtdiscipline()
}, },
"typeopdr_c": { "typeopdr_c": {
"dbs": "ins_discipline_key", "dbs": "ins_discipline_key",
"label": L("ins_discipline_key"), "label": L("mgt_discipline"),
"typ": "key", "typ": "key",
"foreign": { "foreign": {
"tbl": "mld_discipline", "tbl": "mld_discipline",

3
APPL/API2/model_prs_kostensoort.inc
View File

@@ -66,7 +66,8 @@ function model_prs_kostensoort()
"key": "PRS_KOSTENSOORTGRP_KEY", "key": "PRS_KOSTENSOORTGRP_KEY",
"desc": "PRS_KOSTENSOORTGRP_OMS" "desc": "PRS_KOSTENSOORTGRP_OMS"
}, },
"LOVinit": "" "LOVinit": "",
"filter": "exact"
}, },
"charge": { "charge": {
"dbs": "prs_kostensoort_doorbelasten", "dbs": "prs_kostensoort_doorbelasten",

4
APPL/MGT/fac_edit_groeprechten.asp
View File

@@ -194,9 +194,9 @@ function radioTD(name, LOV, val)
if (fdisc) if (fdisc)
{ {
if (disc_arr_key.length == 1) if (disc_arr_key.length == 1)
ROFIELDTR("fldtxt", L("ins_discipline_key"), Oracle.Get("ins_discipline_omschrijving", "ins_tab_discipline", "ins_discipline_key", disc_arr_key[0])); ROFIELDTR("fldtxt", L("mgt_discipline"), Oracle.Get("ins_discipline_omschrijving", "ins_tab_discipline", "ins_discipline_key", disc_arr_key[0]));
else else
ROFIELDTR("fldtxt", L("ins_discipline_key"), "(" + disc_arr_key.length + ")"); ROFIELDTR("fldtxt", L("mgt_discipline"), "(" + disc_arr_key.length + ")");
} }
var prsLOV = api2.splitLOV(buildPrsLevelLOV()); var prsLOV = api2.splitLOV(buildPrsLevelLOV());
var algLOV = api2.splitLOV(buildAlgLevelLOV()); var algLOV = api2.splitLOV(buildAlgLevelLOV());

2
APPL/MGT/fac_functie.asp
View File

@@ -104,7 +104,7 @@
} }
if (disc_key > 0) if (disc_key > 0)
{ {
scf_params.search.labels.push({ "lbl": L("ins_discipline_key"), "txt" : Oracle.Get("ins_discipline_omschrijving", "ins_tab_discipline", "ins_discipline_key", disc_key)}); scf_params.search.labels.push({ "lbl": L("mgt_discipline"), "txt" : Oracle.Get("ins_discipline_omschrijving", "ins_tab_discipline", "ins_discipline_key", disc_key)});
scf_params.list.columns.pop(); // Discipline kolom mag er nu wel tussenuit scf_params.list.columns.pop(); // Discipline kolom mag er nu wel tussenuit
scf_params.list.columns.push( scf_params.list.columns.push(
"authorization.fac_groep", "authorization.fac_groep",

2
APPL/MGT/fac_groep.asp
View File

@@ -104,7 +104,7 @@
} }
if (disc_key > 0) if (disc_key > 0)
{ {
scf_params.search.labels.push({ "lbl": L("ins_discipline_key"), "txt" : Oracle.Get("ins_discipline_omschrijving", "ins_tab_discipline", "ins_discipline_key", disc_key)}); scf_params.search.labels.push({ "lbl": L("mgt_discipline"), "txt" : Oracle.Get("ins_discipline_omschrijving", "ins_tab_discipline", "ins_discipline_key", disc_key)});
} }
scaffolding(model, scf_params); scaffolding(model, scf_params);

6
APPL/MGT/fac_profielwaarde.asp
View File

@@ -22,15 +22,15 @@ scaffolding(this_model,
"search": { "search": {
"autosearch": true, "autosearch": true,
"filters": [ "filters": [
"profile_key" "profile"
] ]
}, },
"list": { "list": {
"columns": [ "columns": [
"id", "id",
"profile_key", "profile",
"prefix", "prefix",
"catalog_key", "catalog",
"value_limit" "value_limit"
] ]
} }

4
APPL/MGT/prs_kostensoort.asp
View File

@@ -22,7 +22,9 @@ scaffolding(this_model,
"search": { "search": {
"autosearch": true, "autosearch": true,
"filters": [ "filters": [
"description" "description",
"name",
"group"
] ]
}, },
"list": { "list": {