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

FSN#31698 Rapportgenerator scaffolding aanscherpnig

Browse Source 
svn path=/Website/trunk/; revision=24400
This commit is contained in:
Jos Groot Lipman
2015-03-10 16:26:59 +00:00
parent 44304472b5
commit becca331df
4 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
APPL/API2/model_reportcolumns.inc
View File

@@ -48,9 +48,12 @@ model_reportcolumns =
{
case "date":
case "datetime":
model_reportcolumns.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G,D,W,M,Y");
model_reportcolumns.fields.datatype.LOV = api2.filterLOV(L("lcl_rap_datatypeLOV"), "date,datetime");
model_reportcolumns.fields.datatype.insertonly = false;
model_reportcolumns.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G,D,W,M,Y,H");
model_reportcolumns.fields.datatype.LOV = api2.filterLOV(L("lcl_rap_datatypeLOV"), "date,datetime,time");
break;
case "time":
model_reportcolumns.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G,H");
model_reportcolumns.fields.datatype.LOV = api2.filterLOV(L("lcl_rap_datatypeLOV"), "date,datetime,time");
break;
case "varchar":
model_reportcolumns.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G");
@@ -62,7 +65,6 @@ model_reportcolumns =
case "currency":
model_reportcolumns.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G,S,C,A");
model_reportcolumns.fields.datatype.LOV = api2.filterLOV(L("lcl_rap_datatypeLOV"), "float,currency,integer");
model_reportcolumns.fields.datatype.insertonly = false;
break;
default:
model_reportcolumns.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G");

22
APPL/API2/model_reports.inc
View File

@@ -31,6 +31,13 @@ function model_reports_template()
if (this.autfunction)
user.checkAutorisation(this.autfunction); // leesrechten is wel het minste
// params.filter = params.filter || {};
// params.filter.fclt_3d_locatie_key = user.alg_locatie_key({withcurrent:true});
// params.filter.fclt_3d_gebouw_key = user.alg_gebouw_key({withcurrent:true});
// params.filter.fclt_3d_verdieping_key = user.alg_verdieping_key({withcurrent:true});
// params.filter.fclt_3d_user_key = user_key;
// // TODO: echte 3D erbij?
var groupbys = [];
if (params.columns && params.groupby)
{
@@ -66,6 +73,15 @@ function model_reports_template()
field.label = "AVG(" + field.label + ")";
field.newtyp = "float";
break;
case "H":
if (field.typ == "date" || field.typ == "datetime")
field.sql = "TO_CHAR(" + field.dbs + ", 'YYYY-MM-DD HH24')||':00'";
else
field.sql = "TO_CHAR(" + field.dbs + ", 'HH24')||':00'";
field.newtyp = "varchar";
groupbys.push(field.sql);
field.label = "HOUR(" + field.label + ")";
break;
case "D":
field.sql = "TRUNC(" + field.dbs + ", 'DD')";
field.newtyp = "date";
@@ -154,7 +170,8 @@ function model_reports(fac_usrrap_key)
var field = { dbs: usrrap.columns[i].name,
label: usrrap.columns[i].caption,
typ: usrrap.columns[i].datatype.id,
group: usrrap.columns[i].group
group: usrrap.columns[i].group,
visible: usrrap.columns[i].visible.id
};
if (usrrap.columns[i].filter)
{
@@ -162,6 +179,7 @@ function model_reports(fac_usrrap_key)
{
field.filter = { "date": "range",
"datetime": "range",
"time": "range",
"varchar": "like"
}[ field.typ ] || "exact";
}
@@ -170,7 +188,7 @@ function model_reports(fac_usrrap_key)
field.filter = api2.splitLOV("E;exact;L;like;R;range")[usrrap.columns[i].filter.id]
}
}
var fld = "C" + String(usrrap.columns[i].id)
var fld = field.dbs.toLowerCase(); // "C" + String(usrrap.columns[i].id)
model.fields[fld] = field;
if (usrrap.columns[i].visible.id == 'V')
model.list.columns.push(fld);

4
APPL/FAC/fac_reportx.asp
View File

@@ -11,8 +11,8 @@
},
"show": {
js: ["./fac_reportx.js"],
buttons: [{ title: "lcl_show_report", action: "show_report", icon: "doc_text_image.png" },
{ title: "lcl_clone_report", action: "clone_report", icon: "copy.png" }]
buttons: [{ title: L("lcl_show_report"), action: "show_report", icon: "doc_text_image.png" },
{ title: L("lcl_clone_report"), action: "clone_report", icon: "copy.png" }]
}
});
%>

2
APPL/FAC/fac_usrrap_search.asp
View File

@@ -37,7 +37,7 @@ var p_bAutoexec = (getQParamInt("autoexec", 0) == 1)
var fac_usrrap = usrrap.fac_usrrap_info(usrrap_key);
if (!fac_usrrap.fac_functie_key) // Ongestyled doen we altijd new-style
if (!fac_usrrap.fac_functie) // Ongestyled doen we altijd new-style
Response.Redirect("../fac/fac_report.asp?usrrap_key=" + usrrap_key);
%>