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

FSN#32924 Alle CodeCharge schermen herschrijven naar gewoon ASP

Browse Source 
svn path=/Website/trunk/; revision=25851
This commit is contained in:
Erik Groener
2015-08-06 06:41:45 +00:00
parent 9f525943fe
commit 89f3022939
3 changed files with 53 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
APPL/SCF/scaffolding.inc
View File

@@ -169,6 +169,10 @@ function scf_RWFIELDTR(model, fld, val, key, params)
{
var params = params || {};
var field = model.fields[fld];
if (!params.search)
params.required = field.required;
if (!field)
{ // Vanuit scaffolding_search
field = model.fields[fld.replace(/^(start_|end_)/,"")];
@@ -189,7 +193,8 @@ function scf_RWFIELDTR(model, fld, val, key, params)
user_key,
{ label: field.label,
kostenplaatsKey: val?val.id:null,
filtercode: "AA"
filtercode: "AA",
required: params.required
});
}
else if (fupper == "PRS_PERSLID")
@@ -197,7 +202,8 @@ function scf_RWFIELDTR(model, fld, val, key, params)
FCLTpersoonselector(fld,
"sg" + fld,
{ label: field.label,
perslidKey: val?val.id:null
perslidKey: val?val.id:null,
required: params.required
});
}
else if (fupper == "PRS_AFDELING")
@@ -205,7 +211,8 @@ function scf_RWFIELDTR(model, fld, val, key, params)
FCLTafdelingselector(fld,
"sg" + fld,
{ label: field.label,
departmentKey: val?val.id:null
departmentKey: val?val.id:null,
required: params.required
});
}
else if (fupper == "MLD_STDMELDING")
@@ -215,7 +222,8 @@ function scf_RWFIELDTR(model, fld, val, key, params)
{ label: field.label,
stdmelding_key: val?val.id:null,
autfunctionKey: -1,
show_expired: true
show_expired: true,
required: params.required
});
}
else if (fupper == "MLD_DISCIPLINE")
@@ -226,7 +234,8 @@ function scf_RWFIELDTR(model, fld, val, key, params)
disc_key: val?val.id:null,
perslidKey: user_key,
module: "MLDA",
autfunctionKey: -1
autfunctionKey: -1,
required: params.required
});
}
else if (fupper.match(/ALG_RUIMTE|ALG_VERDIEPING|RES_RSV_RUIMTE|MLD_UITVOERENDE|MLD_OPDR|MLD_MELDING|CNT_CONTRACT/) || !foreign)
@@ -247,7 +256,8 @@ function scf_RWFIELDTR(model, fld, val, key, params)
+ " ORDER BY 2";
FCLTselector(fld, sql, { label: field.label,
initKey: params.search?"":(val?val.id:null),
emptyOption: params.search?"":(field.required?null:(field.LOVinit||field.LOVinit==""?field.LOVinit:null))
emptyOption: params.search?"":(field.required?null:(field.LOVinit||field.LOVinit==""?field.LOVinit:null)),
required: params.required
});
}
}
@@ -261,7 +271,8 @@ function scf_RWFIELDTR(model, fld, val, key, params)
var sql = api2.splitLOV2sql(field.LOV);
FCLTselector(fld, sql, { label: field.label,
initKey: val?val.id:null,
emptyOption: field.required?null:(field.LOVinit||field.LOVinit==""?field.LOVinit:null)
emptyOption: field.required?null:(field.LOVinit||field.LOVinit==""?field.LOVinit:null),
required: params.required
});
}
else if (field.typ == "check" || field.typ == "check0")
@@ -278,7 +289,8 @@ function scf_RWFIELDTR(model, fld, val, key, params)
timeField: false,
initEmpty: !val,
initTimeEmpty: !val,
volgnr : 1
volgnr : 1,
required : params.required
});
else if (field.typ == "datetime")
FCLTcalendar(fld, { label : field.label,
@@ -289,17 +301,33 @@ function scf_RWFIELDTR(model, fld, val, key, params)
timeStep : S("res_h")*60,
startTime: S("res_t1"),
endTime : S("res_t2"),
volgnr : 1
volgnr : 1,
required: params.required
});
else
{
var params = {};
if (field.translate && key)
params.translate = { fld: fld.dbs, key: key };
params.translate = { fld: fld.dbs, key: key };
if (field.typ == "memo")
RWTEXTAREATR(fld, "fld", field.label, val, params)
else
{
switch (field.typ)
{
case "varchar": params.datatype = "text"; break;
case "number":
case "float": params.datatype = field.typ; break;
default: params.datatype = "";
}
RWFIELDTR(fld, "fld", field.label, val, params);
}
}
}
function scf_RWHIDDENTR(pname, pvalue)
{
Response.Write('<input type="hidden" id="'+ pname + '" name="' + pname + '" value="' + safe.htmlattr(pvalue) + '">');
}
%>

10
APPL/SCF/scaffolding_edit.inc
View File

@@ -125,6 +125,14 @@ function scaffolding_edit(model, scf_params)
<div id="edit">
<form name="u2" method="post" action="<%=scf_params.this_fullpath%>?mode=save&id=<%=key%><%=transit%>" onsubmit="return false;">
<%
// Eerst de hidden velden.
for (var fld in model.fields)
{
var field = model.fields[fld];
if (field.hidden_fld)
scf_RWHIDDENTR(fld, xxx_data[fld]);
}
BLOCK_START("scf_info", xxx_data["name"] || model.record_title);
for (var fld in model.fields)
{
@@ -133,7 +141,7 @@ function scaffolding_edit(model, scf_params)
scf_ROFIELDTR(model, fld, xxx_data[fld]);
else if (field.insertonly && key > 0)
scf_ROFIELDTR(model, fld, xxx_data[fld]);
else
else if (!field.hidden_fld)
scf_RWFIELDTR(model, fld, xxx_data[fld], key);
}
BLOCK_END();

6
APPL/SCF/scaffolding_show.inc
View File

@@ -94,7 +94,11 @@ function scaffolding_show(model, scf_params)
<%
BLOCK_START("scf_info", model.record_title);
for (var fld in model.fields)
scf_ROFIELDTR(model, fld, xxx_data[fld], key);
{
var field = model.fields[fld];
if (!field.hidden_fld)
scf_ROFIELDTR(model, fld, xxx_data[fld], key);
}
BLOCK_END();
%>
</form>