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=29135
This commit is contained in:
Erik Groener
2016-04-22 11:03:53 +00:00
parent 7d76e1d859
commit 086808fe6a
7 changed files with 19 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/API2/model_cad_legenda.inc
View File

@@ -52,7 +52,7 @@ function model_cad_legenda()
this.includes = {
"cad_values": {
"model": new model_cad_legendawaarde(),
"joinfield": "legenda"
"joinfield": "legendas"
}
};

18
APPL/API2/model_cad_legendawaarde.inc
View File

@@ -33,7 +33,7 @@ function model_cad_legendawaarde()
"filter": "exact",
"seq": "cad_s_cad_legendawaarde_key"
},
"legenda": {
"legendas": {
"dbs": "cad_legenda_key",
"label": L("cad_legenda"),
"typ": "key",
@@ -68,7 +68,7 @@ function model_cad_legendawaarde()
this.list = {
"columns": [
"id",
"legenda",
"legendas",
"name",
"description",
"rgb"
@@ -92,20 +92,6 @@ function model_cad_legendawaarde()
};
this.show = {
"requires": {
"js": ["./mgt_tools.js"]
},
"buttons": [
{
"title": "lcl_lcl_terminologie",
"action": "edit_terminologie",
"icon": "doc_text_image.png"
}
]
};
function fnshowcolor(oRs)
{ // Tonen van gekleurde blokjes bij de waarde in de lijst.
var kleur = (oRs.Fields("rgb").Value).replace(/ /g, "");

9
APPL/API2/model_cad_thema.inc
View File

@@ -46,7 +46,7 @@ function model_cad_thema()
"typ": "varchar",
"filter": "like"
},
"legenda": {
"legendas": {
"dbs": "cad_legenda_key",
"label": L("cad_legenda"),
"typ": "key",
@@ -56,7 +56,8 @@ function model_cad_thema()
"desc": "cad_legenda_omschrijving"
},
"defaultvalue": null,
"filter": "exact"
"filter": "exact",
"emptyoption": null
},
"authorization": {
"dbs": "fac_functie_key",
@@ -85,6 +86,7 @@ function model_cad_thema()
"dbs": "cad_thema_type",
"label": L("cad_label_type"),
"typ": "number",
"defaultvalue": 1,
"bits": [
{
"name": "waar",
@@ -139,7 +141,8 @@ function model_cad_thema()
{
"name": "sleepbaar",
"label": L("cad_thema_sleepbaar"),
"mask": 128
"mask": 128,
"readonly": true
}
]
}

12
APPL/MGT/cad_legenda.asp
View File

@@ -30,18 +30,6 @@ scaffolding(this_model,
"id",
"name"
]
},
"show": {
"requires": {
"js": ["./mgt_tools.js"]
},
"buttons": [
{
"title": "lcl_lcl_terminologie",
"action": "edit_terminologie",
"icon": "doc_text_image.png"
}
]
}
});
%>

2
APPL/MGT/cad_legendawaarde.asp
View File

@@ -22,7 +22,7 @@ scaffolding(this_model,
"search": {
"autosearch": true,
"filters": [
"legenda"
"legendas"
]
}
});

13
APPL/MGT/cad_thema.asp
View File

@@ -16,7 +16,7 @@
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_cad_thema.inc" -->
<%
var this_model = model_cad_thema;
var this_model = new model_cad_thema();
this_model.hook_pre_put = function(params, jsondata, key)
{ // update
@@ -33,7 +33,7 @@ scaffolding(this_model,
"autosearch": true,
"filters": [
"name",
"legenda",
"legendas",
"type_place",
"type_situation"
]
@@ -42,7 +42,7 @@ scaffolding(this_model,
"columns": [
"id",
"name",
"legenda",
"legendas",
"type_place",
"type_situation"
]
@@ -63,7 +63,6 @@ scaffolding(this_model,
function GenerateLegenda(data)
{ // Genereer een legenda aan de hand van voorkomende waarden.
//
var rndSQL = "to_char(dbms_utility.get_hash_value(WAARDE,0,power(2,24)), '0XXXXX')";
var legendaName = "Legenda_" + Date.parse(new Date());
var sql = "INSERT INTO cad_legenda"
@@ -78,7 +77,6 @@ scaffolding(this_model,
+ " WHERE cad_legenda_omschrijving = " + safe.quoted_sql(legendaName)
var oRs = Oracle.Execute(sql);
var legenda_key = oRs("cad_legenda_key").Value;
sql = "INSERT INTO cad_legendawaarde"
+ " ( cad_legenda_key"
+ " , cad_legendawaarde_value"
@@ -89,7 +87,6 @@ scaffolding(this_model,
+ " , " + rndSQL
+ " , waarde"
+ " FROM " + data.view_name
Oracle.Execute(sql);
data.legenda = legenda_key;
@@ -104,7 +101,7 @@ scaffolding(this_model,
+ " , cad_legendawaarde_value"
+ " , cad_legendawaarde_rgb"
+ " , cad_legendawaarde_omschr"
+ " ) SELECT DISTINCT " + data.legenda
+ " ) SELECT DISTINCT " + data.legendas
+ " , waarde"
+ " , " + rndSQL
+ " , waarde"
@@ -113,7 +110,7 @@ scaffolding(this_model,
+ " AND NOT EXISTS (SELECT cl.cad_legendawaarde_value"
+ " FROM cad_legendawaarde cl"
+ " WHERE cl.cad_legendawaarde_value = thv.waarde"
+ " AND cl.cad_legenda_key = " + data.legenda
+ " AND cl.cad_legenda_key = " + data.legendas
+ " )";
Oracle.Execute(sql);
}

6
APPL/SCF/scaffolding.inc
View File

@@ -553,7 +553,7 @@ function scf_GROUP_CHECK(pgroup, pclass, pvalue, params)
{
var params = params||{};
var group_val = pvalue & pgroup.mask;
var isreadonly = params.readonly || (mode == "show");
var isallreadonly = params.readonly || (mode == "show");
Response.Write("<tr " + (params.trclass?"class=\""+params.trclass+"\"":"") +">");
Response.Write("<td class=\"label " + pclass + "\">");
@@ -568,6 +568,7 @@ function scf_GROUP_CHECK(pgroup, pclass, pvalue, params)
? (group_val == bit.mask)
: ((group_val & bit.mask) == bit.mask)
);
var isreadonly = isallreadonly || bit.readonly;
Response.Write("<input type=\"hidden\" id=\"has_" + bit.name + "\" name=\"has_" + bit.name + "\" value=\"1\""
+ (params.readonly ? " disabled" : "")
@@ -592,7 +593,7 @@ function scf_GROUP_RADIO(pgroup, pclass, pvalue, params)
{
var params = params||{};
var group_val = pvalue & pgroup.mask;
var isreadonly = params.readonly || (mode == "show");
var isallreadonly = params.readonly || (mode == "show");
Response.Write("<tr " + (params.trclass?"class=\""+params.trclass+"\"":"") +">");
Response.Write("<td class=\"label " + pclass + "\">");
@@ -604,6 +605,7 @@ function scf_GROUP_RADIO(pgroup, pclass, pvalue, params)
{
var bit = pgroup.radios[i];
var ischecked = (group_val == bit.mask);
var isreadonly = isallreadonly || bit.readonly;
if (mode=="show" && ischecked)
{