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

MDUX42347 Als periode van en naar in dezelfde maand vallen komt er een kolom 'Resterend' bij

Browse Source 
svn path=/Website/trunk/; revision=36892
This commit is contained in:
Jos Groot Lipman
2018-02-08 10:32:22 +00:00
parent c69f6b2b05
commit e4e3271ed5
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
APPL/PRS/kpn_overview_list.asp
View File

@@ -30,8 +30,8 @@ var outputmode = getQParamInt("outputmode", 0);
var showall = getQParamInt("showall", 0) == 1;
//Period from start-time until end-time
var datefrom = getQParamDate("date_from", null);
var dateto = getQParamDate("date_to", null);
var datefrom = getQParamDate("date_from");
var dateto = getQParamDate("date_to");
//reservering status: uitv_date en exp_date
var uitv_date = getQParamInt("uitv_date", 0) == 1;
@@ -549,6 +549,11 @@ var ora_date2 = dateto.endToSQL();
return safe.curr(oRs("bedrag").Value + oRs("geraamd").Value);
}
function fncolRemaining(oRs)
{
return safe.curr(oRs("prs_kostenplaats_limiet") - oRs("bedrag").Value + oRs("geraamd").Value);
}
var rst = new ResultsetTable({keyColumn: (groepering_key < 0? "kostenplaats_item_key" : "prs_kostenplaats_key"),
ID: "kpntable",
sql: sql,
@@ -581,6 +586,8 @@ var ora_date2 = dateto.endToSQL();
rst.addColumn(new Column({caption: L("lcl_prs_cost"), content: "bedrag", datatype: "currency"}));
rst.addColumn(new Column({caption: L("lcl_prs_cost_estimate"), content: "geraamd", datatype: "currency"}));
rst.addColumn(new Column({caption: L("lcl_total_cost"), content: fncolTotal, datatype: "currency"}));
if (datefrom.getFullYear() == dateto.getFullYear() && datefrom.getMonth() == dateto.getMonth())
rst.addColumn(new Column({caption: L("lcl_prs_budget_remaining"), content: fncolRemaining, datatype: "currency"}));
}
rst.addColumn(new Column({caption: L("lcl_prs_budget"), content: "prs_kostenplaats_limiet", datatype: "currency"}));
rst.addColumn(new Column({caption: L("lcl_prs_budgetperiode"), content: fncolLimietPeriode, combine: true}));