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

AKZA#31924 KPI

Browse Source 
svn path=/Website/branches/v2015.1/; revision=25580
This commit is contained in:
Erik Groener
2015-07-06 10:51:05 +00:00
parent 14c881aced
commit 263a434126
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
APPL/FAC/fac_usrgraph.inc
View File

@@ -105,23 +105,15 @@ function getGraphInit(usrgraph_key, fclt_key, params)
return userGraphInit;
}
function getGraphColors(usrgraph_key, fclt_key)
function getGraphColors(graphInit)
{
var myColors = "";
var myXs = "";
var sql = "SELECT fac_usrgraph_view_name,"
+ " fac_usrgraph_orderby"
+ " FROM fac_usrgraph"
+ " WHERE fac_usrgraph_key = " + usrgraph_key;
var oRs = Oracle.Execute(sql);
// Eerst kijken of de optionele kolom fclt_color aanwezig is. Daarom rwsnv.* opvragen i.p.v. fclt_xas_, fclt_color en fclt_sort.
var sql = "SELECT DISTINCT rwsnv.* FROM " + oRs("fac_usrgraph_view_name") + " rwsnv"
+ (fclt_key != -1? " WHERE rwsnv.fclt_key = " + fclt_key : "")
+ " ORDER BY " + oRs("fac_usrgraph_orderby");
var sql = graphInit.sql + (graphInit.sql_orderby? " ORDER BY " + graphInit.sql_orderby : "");
oRs = Oracle.Execute(sql);
// Eerst kijken of de optionele kolom fclt_color aanwezig is.
var hasColorField = false;
if (!oRs.Eof)
{
@@ -207,6 +199,7 @@ function getGraphData(graphInit, graphAxes)
{
// standaard sorteren op de hoogte y-as waarde (van hoog naar laag, b.v top 10).
sql = sql + " ORDER BY " + graphAxes.yas[0].kolom + " DESC";
graphInit.sql_orderby = graphAxes.yas[0].kolom + " DESC"; //Is nu ook voor getColors te gebruiken.
}
//
var l_arr_x = [];
@@ -274,10 +267,10 @@ function fac_graph_generate (usrgraph_key, fclt_key, params)
{
var params = params || {};
var graphInit = getGraphInit(usrgraph_key, fclt_key, params);
if (fac_graph_type(usrgraph_key) == 1 || fac_graph_type(usrgraph_key) == 3 || fac_graph_type(usrgraph_key) == 4)
var graphColors = getGraphColors(usrgraph_key, fclt_key);
var graphAxes = getGraphAxes(graphInit.sql);
var graphData = getGraphData(graphInit, graphAxes);
if (fac_graph_type(usrgraph_key) == 1 || fac_graph_type(usrgraph_key) == 3 || fac_graph_type(usrgraph_key) == 4)
var graphColors = getGraphColors(graphInit);
if (graphData.teller > 0)
{