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

FSN#39054 Budgetcontrole uitbreiding: BGT module savepoint

Browse Source 
svn path=/Website/trunk/; revision=32914
This commit is contained in:
Peter Feij
2017-02-22 17:22:23 +00:00
parent b73bb16625
commit f56446d5a2
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
APPL/BGT/bgt_search_list.asp
View File

@@ -11,7 +11,6 @@
Note: UNDER CONSTRUCTION
- actions op kolommen:
- budget > budgetmutaties (tbd)
- opdrachten > naar opdrachtnen bij deze kostensoort
@@ -88,10 +87,13 @@ var transitParam = buildTransitParam([]);
<% } %>
FcltMgr.openDetail(url, $(deze).text());
}
function naarfacturen(ks_key, f_key, deze)
function naarfacturen(ks_key, o_key, f_key, deze)
{
<% if (groupby==3 || groupby==2) { %>
var url = "appl/fin/fin_list.asp?urole=bgt&ks_key="+ks_key; //todo
<% if (groupby==3) { %>
var url = "appl/fin/fin_list.asp?urole=bgt&ks_key="+ks_key;
<% } %>
<% if (groupby==2) { %>
var url = "appl/fin/fin_list.asp?urole=bgt&opdr_key="+o_key;
<% } %>
<% if (groupby==1) { %>
var url = "appl/fin/fin_factuur.asp?urole=bgt&fin_key="+f_key;
@@ -365,7 +367,7 @@ var transitParam = buildTransitParam([]);
+ " pr.bgt_project_key,"
+ " bgt_project_omschrijving ,"
+ " ins_discipline_omschrijving";
// Hier ook de budgetten direct bij kostenrubriek, die komen immers bij de kostensoortgroep niet mee
// Hier ook de budgetten direct bij kostenrubriek, die komen immers bij de kostensoortgroep niet mee
sql1 += " UNION SELECT"
+ " ins_discipline_omschrijving project,"
+ " bgt_project_omschrijving deelproject,"
@@ -390,6 +392,7 @@ var transitParam = buildTransitParam([]);
+ " bgt_project_omschrijving ,"
+ " ins_discipline_omschrijving";
}
if (groupby == 5) // 5. kostenrubriek
{
var sql1 ="SELECT"
@@ -482,7 +485,6 @@ var transitParam = buildTransitParam([]);
+ (groupby == 5 ? "bud.bgt_kostenrubriek_key = besteding.bgt_kostenrubriek_key" : "")
+ (groupby == 6 ? "bud.bgt_project_key = besteding.bgt_project_key" : "");
sql += " ORDER BY "
+ (groupby >= 7 ? "" : "project")
+ (groupby >= 6 ? "" : ",rubriek")
@@ -497,9 +499,12 @@ var transitParam = buildTransitParam([]);
// KOLOM BUDGET
function budgetShow(oRs)
{
var v = safe.curr(Math.round(oRs("budget").Value), true);
v = ("<span class='details"+ (v<0 ? " negative" : "") +"' onclick='naarbudgetmutaties({0}, this)'>" + v +"</span>").format(41); // todo ks_key uit query
return v;
var v = safe.curr(Math.round(oRs("budget").Value), true);
if (groupby == 4)
v = ("<span class='details"+ (v<0 ? " negative" : "") +"' onclick='naarbudgetmutaties({0}, this)'>" + v +"</span>").format(99); // TODO budget_key uit query
else
v = ("<span class='details"+ (v<0 ? " negative" : "") +"'>" + v +"</span>");
return v;
}
function budgetAmount(oRs)
{
@@ -548,10 +553,12 @@ var transitParam = buildTransitParam([]);
if (oRs("prs_kostensoort_key").Value)
{
var v = safe.curr(Math.round(oRs("gefactureerd").Value), true);
if (groupby==2 || groupby==3)
v = ("<span class='details' onclick='naarfacturen({0}, {1}, this)'>" + v +"</span>").format(0, null); // todo ks_key uit query
if (groupby==3)
v = ("<span class='details' onclick='naarfacturen({0}, {1}, {2}, this)'>" + v +"</span>").format(oRs("prs_kostensoort_key").Value, null, null);
if (groupby==2)
v = ("<span class='details' onclick='naarfacturen({0}, {1}, {2}, this)'>" + v +"</span>").format(null, oRs("mld_opdr_key").Value, null);
if (groupby==1)
v = ("<span class='details' onclick='naarfacturen({0}, {1}, this)'>" + v +"</span>").format(null, oRs("fin_factuur_key").Value); // todo ks_key uit query
v = ("<span class='details' onclick='naarfacturen({0}, {1}, {2}, this)'>" + v +"</span>").format(null, null, oRs("fin_factuur_key").Value);
return v;
}
}