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

FSN#35338 Alle CodeCharge schermen herschrijven naar gewoon ASP II

Browse Source 
svn path=/Website/trunk/; revision=28462
This commit is contained in:
Erik Groener
2016-03-11 09:24:23 +00:00
parent 1152d17e39
commit 997725c99d
16 changed files with 61 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
APPL/API2/model_cad_label.inc
View File

@@ -54,14 +54,7 @@ function model_cad_label()
"dbs": "fac_functie_key",
"label": L("fac_functie_key"),
"typ": "key",
"foreign": {
"tbl": "(SELECT f.fac_functie_key"
+ " , f.fac_functie_code || ': ' || f.fac_functie_omschrijving fac_functie_omschrijving"
+ " FROM fac_functie f"
+ " ORDER BY 2)",
"key": "fac_functie_key",
"desc": "fac_functie_omschrijving"
},
"foreign": fac_functie_foreign("EXT"),
"LOVinit": ""
},
"type_place": {

9
APPL/API2/model_cad_thema.inc
View File

@@ -61,14 +61,7 @@ function model_cad_thema()
"dbs": "fac_functie_key",
"label": L("fac_functie_key"),
"typ": "key",
"foreign": {
"tbl": "(SELECT f.fac_functie_key"
+ " , f.fac_functie_code || ': ' || f.fac_functie_omschrijving fac_functie_omschrijving"
+ " FROM fac_functie f"
+ " ORDER BY 2)",
"key": "fac_functie_key",
"desc": "fac_functie_omschrijving"
},
"foreign": fac_functie_foreign("EXT"),
"LOVinit": ""
},
"type_place": {

15
APPL/API2/model_fac_import_app.inc
View File

@@ -45,21 +45,14 @@ function model_fac_import_app()
"label": L("fac_import_app_xsl"),
"typ": "varchar"
},
"function_key": {
"authorization": {
"dbs": "fac_functie_key",
"label": L("fac_functie_key"),
"typ": "key",
"foreign": {
"tbl": "(SELECT fac_functie_key"
+ " , fac_functie_omschrijving"
+ " FROM fac_functie"
+ " ORDER BY fac_functie_omschrijving ASC)",
"key": "fac_functie_key",
"desc": "fac_functie_omschrijving"
},
"foreign": fac_functie_foreign(),
"filter": "exact"
},
"catalog_key": {
"catalog": {
"dbs": "ins_discipline_key",
"label": L("fac_ins_discipline_key"),
"typ": "key",
@@ -79,7 +72,7 @@ function model_fac_import_app()
"hidden_fld": true,
"defaultvalue": "CATALOGUS"
},
"company_key": {
"company": {
"dbs": "prs_bedrijf_key",
"label": L("prs_bedrijf_key"),
"typ": "key",

7
APPL/API2/model_fac_usergraph.inc
View File

@@ -53,11 +53,13 @@ function model_fac_usergraph()
"required": true,
"LOV": L("mgt_graphtypeLOV")
},
"function_key": {
"authorization": {
"dbs": "fac_functie_key",
"label": L("fac_functie_key"),
"typ": "key",
"foreign": {
"foreign": fac_functie_foreign("EXT"),
/*
{
"tbl": "(SELECT f.fac_functie_key"
+ " , f.fac_functie_code || ': ' || f.fac_functie_omschrijving fac_functie_omschrijving"
+ " FROM fac_functie f"
@@ -65,6 +67,7 @@ function model_fac_usergraph()
"key": "fac_functie_key",
"desc": "fac_functie_omschrijving"
},
*/
"LOVinit": ""
},
"orderby": {

22
APPL/API2/model_fac_usrdata.inc
View File

@@ -14,7 +14,7 @@
<%
function model_fac_usrdata()
{
var tab_key = getQParamInt("fac_usrtab_key", -1);
var tab_key = getQParamInt("usertable", -1);
this.table = "fac_usrdata"
this.primary = "fac_usrdata_key";
@@ -34,7 +34,7 @@ function model_fac_usrdata()
"filter": "exact",
"seq": "fac_s_fac_usrdata_key"
},
"fac_usrtab_key": {
"usertable": {
"dbs": "fac_usrtab_key",
"label": L("fac_usrtab_naam"),
"typ": "key",
@@ -58,18 +58,18 @@ function model_fac_usrdata()
"label": L("fac_usrdata_volgnr"),
"typ": "number"
},
"fac_usrdata_prijs": {
"price": {
"dbs": "fac_usrdata_prijs",
"label": L("fac_usrdata_prijs"),
"typ": "float"
},
"fac_usrdata_vervaldatum": {
"expirationdate": {
"dbs": "fac_usrdata_vervaldatum",
"label": L("fac_usrdata_vervaldatum"),
"typ": "date",
"autosize": true
},
"fac_usrdata_parentkey": {
"reftable": {
"dbs": "fac_usrdata_parentkey",
"label": L("fac_usrdata_parentkey"),
"typ": "key",
@@ -88,8 +88,8 @@ function model_fac_usrdata()
"description",
"name",
"sequence",
"fac_usrdata_prijs",
"fac_usrdata_vervaldatum"
"price",
"expirationdate"
]
};
this.search = {
@@ -132,14 +132,14 @@ function model_fac_usrdata()
var oRs = Oracle.Execute(sql);
if (!oRs.Eof)
{
this.fields.fac_usrdata_parentkey.foreign.where = " fac_usrtab_key = " + oRs("fac_usrtab_parentkey").Value;
this.fields.fac_usrdata_parentkey.label = oRs("fac_usrtab_omschrijving").Value;
this.fields.reftable.foreign.where = " fac_usrtab_key = " + oRs("fac_usrtab_parentkey").Value;
this.fields.reftable.label = oRs("fac_usrtab_omschrijving").Value;
}
else
delete this.fields.fac_usrdata_parentkey;
delete this.fields.reftable;
oRs.Close();
}
else
delete this.fields.fac_usrdata_parentkey;
delete this.fields.reftable;
}
%>

8
APPL/API2/model_fac_usrtab.inc
View File

@@ -73,11 +73,7 @@ function model_fac_usrtab()
"dbs": "fac_functie_key",
"label": L("lcl_mgt_aut_group"),
"typ": "key",
"foreign": {
"tbl": "FAC_FUNCTIE",
"key": "FAC_FUNCTIE_KEY",
"desc": "FAC_FUNCTIE_OMSCHRIJVING"
},
"foreign": fac_functie_foreign(),
"filter": "exact"
}
};
@@ -87,7 +83,7 @@ function model_fac_usrtab()
this.includes = {
"fac_usrdatas": {
"model": new model_fac_usrdata(),
"joinfield": "fac_usrtab_key",
"joinfield": "usertable",
"enable_update": true
}
};

11
APPL/API2/model_fac_widget.inc
View File

@@ -83,18 +83,11 @@ function model_fac_widget()
"typ": "date",
"hidden_fld": true
},
"authorization_key": {
"authorization": {
"dbs": "fac_functie_key",
"label": L("lcl_fac_menuautorisatie"),
"typ": "key",
"foreign": {
"tbl": "(SELECT f.fac_functie_key"
+ " , f.fac_functie_code || ': ' || f.fac_functie_omschrijving fac_functie_omschrijving"
+ " FROM fac_functie f"
+ " ORDER BY 2)",
"key": "fac_functie_key",
"desc": "fac_functie_omschrijving"
},
"foreign": fac_functie_foreign("EXT"),
"filter": "exact",
"defaultvalue": null
}

4
APPL/API2/model_reports.inc
View File

@@ -186,9 +186,9 @@ function model_reports(fac_usrrap_key)
keyfield = mtc[2];
}
if (usrrap.authorisation)
if (usrrap.authorization)
{
var sql = "SELECT fac_functie_code FROM fac_functie WHERE fac_functie_key = " + usrrap.authorisation.id;
var sql = "SELECT fac_functie_code FROM fac_functie WHERE fac_functie_key = " + usrrap.authorization.id;
var oRs = Oracle.Execute(sql);
model.autfunction = oRs("fac_functie_code").Value;
model.authparams = user.checkAutorisation(model.autfunction); // leesrechten is wel het minste

2
APPL/API2/model_reportsx.inc
View File

@@ -30,7 +30,7 @@ function model_reportsx(usrrap_key, rapparams)
"name" : { dbs: "fac_usrrap_omschrijving", typ: "varchar", label: L("lcl_usrrap_report"), filter: "like", translate: true, len : 60, required: true},
"description" : { dbs: "fac_usrrap_info", typ: "varchar", label: L("lcl_usrrap_info"), filter: "like", translate: true },
"viewname" : { dbs: "fac_usrrap_view_name", typ: "varchar", label: L("lcl_usrrap_viewname"), filter: "like", required: true },
"authorisation": { dbs: "fac_functie_key", typ: "key", label: L("lcl_usrrap_functie"), foreign: "fac_functie"},
"authorization": { dbs: "fac_functie_key", typ: "key", label: L("lcl_usrrap_functie"), foreign: "fac_functie"},
"group" : { dbs: "fac_usrrap_groep", typ: "varchar", label: L("lcl_usrrap_groep"), filter: "like" },
"styling" : { dbs: "fac_usrrap_functie", typ: "key", label: L("lcl_usrrap_styling"),
LOV: L("lcl_usrrap_stylingLOV") }, // 0;on-gestylede;1;gestylede;2;procedure;3;procedure gestyled;8;Via tabelizer;16;mobile;32;UDR Template

1
APPL/MGT/cad_label.asp
View File

@@ -13,6 +13,7 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_cad_label.inc" -->
<%
var this_model = new model_cad_label();

1
APPL/MGT/cad_thema.asp
View File

@@ -13,6 +13,7 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_cad_thema.inc" -->
<%
var this_model = model_cad_thema;

11
APPL/MGT/fac_import_app.asp
View File

@@ -1,6 +1,7 @@
<%@language = "javascript" %>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_fac_import_app.inc" -->
<%
@@ -20,17 +21,17 @@ scaffolding(this_model,
"search": {
"autosearch": true,
"filters": [
"catalog_key",
"function_key",
"company_key"
"catalog",
"authorization",
"company"
]
},
"list": {
"columns": [
"id",
"code",
"catalog_key",
"company_key",
"catalog",
"company",
"name"
]
},

1
APPL/MGT/fac_usergraph.asp
View File

@@ -13,6 +13,7 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_fac_usergraph.inc" -->
<%
var this_model = new model_fac_usergraph();

1
APPL/MGT/fac_usrtab.asp
View File

@@ -1,6 +1,7 @@
<%@language = "javascript" %>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_fac_usrtab.inc" -->
<%

1
APPL/MGT/fac_widget.asp
View File

@@ -1,6 +1,7 @@
<%@language = "javascript" %>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_fac_widget.inc" -->
<%

22
APPL/MGT/mgt_tools.inc
View File

@@ -120,7 +120,27 @@
+ " order by fac_kenmerkdomein_upper asc)",
"key": "fac_kenmerkdomein_key",
"desc": "fac_kenmerkdomein_omschrijving"
};
};
}
function fac_functie_foreign(pmode)
{
var tbl;
switch (pmode)
{
case "EXT": tbl = "(SELECT f.fac_functie_key"
+ " , f.fac_functie_code || ': ' || f.fac_functie_omschrijving fac_functie_omschrijving"
+ " FROM fac_functie f"
+ " ORDER BY 2)";
break;
default: tbl = "FAC_FUNCTIE";
}
return {
"tbl": tbl,
"key": "fac_functie_key",
"desc": "fac_functie_omschrijving"
};
}
function checkSrtkenmerkValue(params)