FSN#33999 MJB totaal kolom erbij

svn path=/Website/trunk/; revision=30054
This commit is contained in:
Jos Groot Lipman
2016-07-14 11:17:43 +00:00
parent 367ad0858b
commit a368a19fb1
2 changed files with 25 additions and 4 deletions

View File

@@ -57,15 +57,15 @@ var inflatiepct = getQParamFloat("inflatie", 1.0);
var inflatiefactor = 1 + (inflatiepct / 100);
var transitParam = buildTransitParam(["toyear", "toyear", "srtgroep", "srtdeel", "inflatie"]);
// lcl.set_dialect(1 /* ctr_discipline */, "CTR_DISCIPLINE_KEY");
%>
<html>
<head>
<%
FCLTHeader.Generate({ outputmode: outputmode });
%>
<style>
span.orgbedrag { color: #888; font-size: 8px; }
</style>
<script type="text/javascript">
var urole = "<%=urole%>";
function naarlocatie(loc_key, deze)
@@ -320,6 +320,17 @@ var transitParam = buildTransitParam(["toyear", "toyear", "srtgroep", "srtdeel",
return Math.round(column.totalsum);
}
// Voor de laatste kolom
function fnTotal(oRs)
{
var s = 0;
for (var j = 0; j < jaren.length; j++)
{
s = s + oRs(String(jaren[j])).Value;
}
return Math.round(s);
}
var doneclik = {}; // Altijd alleen de eerste klikken
function fnfnClickBedrag(jaar) // altijd afronden
{
@@ -330,7 +341,7 @@ var transitParam = buildTransitParam(["toyear", "toyear", "srtgroep", "srtdeel",
var v = Math.round(oRs(jaar).Value);
var org_v = Math.round(oRs(jaar + "_ORGBEDRAG").Value);
if (v != org_v)
v = "<span class='orgbedrag'>({1})</span>{0}".format(v, org_v);
v = "<span class='mjborgbedrag'>({1})</span>{0}".format(v, org_v);
var deel_key = oRs("ins_deel_key").Value;
var srtcont_key = oRs("ins_srtcontrole_key").Value;
@@ -398,6 +409,9 @@ var transitParam = buildTransitParam(["toyear", "toyear", "srtgroep", "srtdeel",
tdClass: "mjobjaar",
content: content, total: true, fnAmount: fnfnBedragNumber(String(jaren[j])) }));
}
rst.addColumn(new Column({caption: L("lcl_Total"), datatype: "number",
tdClass: "mjbtotal",
content: fnTotal, total: true }));
var count = rst.processResultset();

View File

@@ -4011,6 +4011,13 @@ td.kpidetails {
min-width: 300px;
}
.mjbtotal {
border-left:1px solid #aaa;
}
span.mjborgbedrag {
color: #888; font-size: 8px;
}
/* toaster stuff */
.jq-icon-info { background-color: #31708f; color: #d9edf7; border-color: #bce8f1; }
.jq-icon-warning { background-color: #8a6d3b; color: #fcf8e3; border-color: #faebcc; }