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

FCLT#55262 Verwijderde vakgroeptype zijn bij nieuwe meldingen zichtbaar

Browse Source 
svn path=/Website/trunk/; revision=39757
This commit is contained in:
Erik Groener
2018-11-12 13:30:05 +00:00
parent ac382a43cb
commit bf26b60934
6 changed files with 127 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
APPL/BGT/bgt_budget.asp
View File

@@ -16,6 +16,7 @@
<!-- #include file="../api2/model_bgt_budget.inc" -->
<%
var parent = getQParam("parent", "");
var project_key = getQParamInt("budgetproject", -1);
var kostenrubriek_key = getQParamInt("budgetcostcategory", -1);
var kostensoortgrp_key = getQParamInt("costtypegroup", -1);
var kostensoort_key = getQParamInt("costtype", -1);
@@ -46,6 +47,7 @@ if (mode == "search" || mode == "edit")
// gaan, waarbij de selectievelden ingevuld worden met de bekende waarden.
%>
<script>
if (<%=project_key%> >= -1) var budgetproject_key = <%=project_key%>;
if (<%=kostenrubriek_key%> >= -1) var budgetcostcategory_key = <%=kostenrubriek_key%>;
if (<%=kostensoortgrp_key%> >= -1) var costtypegroup_key = <%=kostensoortgrp_key%>;
if (<%=kostensoort_key%> >= -1) var costtype_key = <%=kostensoort_key%>;
@@ -55,7 +57,7 @@ if (mode == "search" || mode == "edit")
var model_params = {
"search": {
"autosearch": (parent == "costtype" && kostensoort_key > 0 ? true : false),
"autosearch": ((parent == "costtype" && kostensoort_key > 0) || (parent == "search") ? true : false),
"filters": [
"budgetdiscipline",
"budgetproject",
@@ -105,32 +107,41 @@ var model_params = {
}
}
// Het budget-scherm wordt aangeroepen vanuit het scherm kostensoort.
// Als deze key bekend is kunnen alle parents worden ingevuld.
if (parent == "costtype" && kostensoort_key > 0)
{
var sql = "SELECT p.ins_discipline_key"
+ " , p.bgt_project_key"
+ " , r.bgt_kostenrubriek_key"
+ " , g.prs_kostensoortgrp_key"
+ " FROM bgt_project p"
+ " , bgt_kostenrubriek r"
+ " , prs_kostensoortgrp g"
+ " , prs_kostensoort s"
+ " WHERE p.bgt_project_key = r.bgt_project_key"
+ " AND r.bgt_kostenrubriek_key = g.bgt_kostenrubriek_key"
+ " AND g.prs_kostensoortgrp_key = s.prs_kostensoortgrp_key"
+ " AND s.prs_kostensoort_key = " + kostensoort_key;
var oRs = Oracle.Execute(sql);
// Het budget-scherm wordt aangeroepen vanuit het scherm kostensoort.
// Als deze key bekend is kunnen alle parents worden ingevuld.
if (parent == "costtype" && kostensoort_key > 0)
{
var sql = "SELECT p.ins_discipline_key"
+ " , p.bgt_project_key"
+ " , r.bgt_kostenrubriek_key"
+ " , g.prs_kostensoortgrp_key"
+ " FROM bgt_project p"
+ " , bgt_kostenrubriek r"
+ " , prs_kostensoortgrp g"
+ " , prs_kostensoort s"
+ " WHERE p.bgt_project_key = r.bgt_project_key"
+ " AND r.bgt_kostenrubriek_key = g.bgt_kostenrubriek_key"
+ " AND g.prs_kostensoortgrp_key = s.prs_kostensoortgrp_key"
+ " AND s.prs_kostensoort_key = " + kostensoort_key;
var oRs = Oracle.Execute(sql);
model_params.transit = {
"budgetdiscipline": oRs("ins_discipline_key").Value,
"budgetproject": oRs("bgt_project_key").Value,
"budgetcostcategory": oRs("bgt_kostenrubriek_key").Value,
"costtypegroup": oRs("prs_kostensoortgrp_key").Value
// Geen "costtype" omdat er slecht 1 budget per costensoort mag bestaan.
}
model_params.transit = {
"budgetdiscipline": oRs("ins_discipline_key").Value,
"budgetproject": oRs("bgt_project_key").Value,
"budgetcostcategory": oRs("bgt_kostenrubriek_key").Value,
"costtypegroup": oRs("prs_kostensoortgrp_key").Value
// Geen "costtype" omdat er slecht 1 budget per costensoort mag bestaan.
}
}
else if (parent == "search")
{ // Scherm wordt aangeroepen vanuit bgt_search_list.
model_params.transit = {
"budgetproject": project_key,
"budgetcostcategory": kostenrubriek_key,
"costtypegroup": kostensoortgrp_key,
"costtype": kostensoort_key
}
}
scaffolding(this_model, model_params);
%>

105
APPL/BGT/bgt_search_list.asp
View File

@@ -67,71 +67,72 @@ var transitParam = buildTransitParam([]);
if (outputmode == 0)
{
%>
<script type="text/javascript">
<script>
function naarbudget(discipline_key, project_key, rubriek_key, groep_key, soort_key, deze)
{
<% if (groupby==6) { %>
var url = "appl/bgt/bgt_budget.asp?budgetproject="+project_key;
<% } %>
<% if (groupby==5) { %>
var url = "appl/bgt/bgt_budget.asp?" + (rubriek_key ? "budgetcostcategory="+rubriek_key : "budgetdiscipline="+discipline_key);
<% } %>
<% if (groupby==4) { %>
var url = "appl/bgt/bgt_budget.asp?budgetcostcategory="+rubriek_key + "&costtypegroup="+groep_key;
<% } %>
<% if (groupby==3) { %>
var url = "appl/bgt/bgt_budget.asp?budgetcostcategory="+rubriek_key + "&costtypegroup="+groep_key + "&costtype="+soort_key;
<% } %>
<% if (groupby > 2) { %>
var url = "appl/bgt/bgt_budget.asp?parent=search"; // + (discipline_key ? "&budgetdiscipline="+discipline_key : "");
FcltMgr.openDetail(url);
<% if (groupby==6) { %>
url += "&budgetproject="+project_key;
<% } %>
<% if (groupby==5) { %>
url += (rubriek_key ? "&budgetcostcategory="+rubriek_key : "&budgetdiscipline="+discipline_key);
<% } %>
<% if (groupby==4) { %>
url += "&budgetcostcategory="+rubriek_key + "&costtypegroup="+groep_key;
<% } %>
<% if (groupby==3) { %>
url += "&budgetcostcategory="+rubriek_key + "&costtypegroup="+groep_key + "&costtype="+soort_key;
<% } %>
FcltMgr.openDetail(url);
<% } %>
}
function naaropdracht(d_key, p_key, r_key, g_key, s_key, deze)
{
<% if (groupby==6) { %>
var url = "appl/bgt/mld_opdr.asp?budgetproject="+p_key;
<% if (groupby > 1) { %>
var url = "appl/bgt/mld_opdr.asp?parent=search";
<% if (groupby==6) { %>
url += "&budgetproject="+p_key;
<% } %>
<% if (groupby==5) { %>
url += (r_key ? "&budgetcostcategory="+r_key : "&budgetdiscipline="+d_key);
<% } %>
<% if (groupby==4) { %>
url += "&costtypegroup="+g_key;
<% } %>
<% if (groupby==3) { %>
url += "&costtype="+s_key;
<% } %>
<% if (groupby==2) { %>
if (!p_key && !r_key && !g_key && s_key)
url = "appl/bgt/mld_opdr.asp?id="+s_key;
else
url += "&budgetdiscipline="+d_key;
<% } %>
FcltMgr.openDetail(url, $(deze).text());
<% } %>
<% if (groupby==5) { %>
var url = "appl/bgt/mld_opdr.asp?" + (r_key ? "budgetcostcategory="+r_key : "budgetdiscipline="+d_key);
<% } %>
<% if (groupby==4) { %>
var url = "appl/bgt/mld_opdr.asp?costtypegroup="+g_key;
<% } %>
<% if (groupby==3) { %>
var url = "appl/bgt/mld_opdr.asp?costtype="+s_key;
<% } %>
<% if (groupby==2) { %>
if (!p_key && !r_key && !g_key && s_key)
var url = "appl/bgt/mld_opdr.asp?id="+s_key;
<% } %>
FcltMgr.openDetail(url, $(deze).text());
}
function naarfacturen(ks_key, o_key, f_key, deze)
{
<% if (groupby==3) { %>
var url = "appl/bgt/fin_factuur.asp?costtype="+ks_key;
<% if (groupby>=1 && groupby<=3) { %>
var url = "appl/bgt/fin_factuur.asp?parent=search";
<% if (groupby==3) { %>
url += "&costtype="+ks_key;
<% } %>
<% if (groupby==2) { %>
url += "&order="+o_key;
<% } %>
<% if (groupby==1) { %>
url = "appl/bgt/fin_factuur.asp?id="+f_key;
<% } %>
FcltMgr.openDetail(url, $(deze).text());
<% } %>
<% if (groupby==2) { %>
var url = "appl/bgt/fin_factuur.asp?order="+o_key;
<% } %>
<% if (groupby==1) { %>
var url = "appl/bgt/fin_factuur.asp?id="+f_key;
<% } %>
FcltMgr.openDetail(url, $(deze).text());
}
<%
var bgt_edit = "";
switch (groupby)
{
case 1: bgt_edit = "bgt/fin_factuur.asp?id="; break;
case 2: bgt_edit = "bgt/mld_opdr.asp?id="; break;
case 3: bgt_edit = "mgt/prs_kostensoort.asp?id="; break;
case 4: bgt_edit = "mgt/prs_kostensoortgrp.asp?id="; break;
case 5: bgt_edit = "bgt/bgt_kostenrubriek.asp?id="; break;
case 6: bgt_edit = "bgt/bgt_project.asp?id="; break;
}
%>
<%
var bgt_edit = "";
switch (groupby)
@@ -839,7 +840,7 @@ var transitParam = buildTransitParam([]);
{
v = "<span class='details' onclick='FcltMgr.stopPropagation(event); naaropdracht({0},{1},{2},{3},{4}, this)'>" + v +"</span>";
if (groupby==6) /* het totale opdrachtenoverzicht */
v = (v).format(oRs("bgt_project_key").Value);
v = (v).format(bgtdisc_key, oRs("bgt_project_key").Value, null, null, null);
else if (groupby==5) /* opdrachten binnen de rubriek */
{
if (bgtproj_key_arr.length == 1)

16
APPL/BGT/fin_factuur.asp
View File

@@ -15,9 +15,11 @@
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../api2/model_fin_factuur.inc" -->
<%
var p_mld_opdr_key = getQParamInt("opdrachtcommon", -1);
var parent = getQParam("parent", "");
var discipline_key = getQParamInt("budgetdiscipline", -1);
var project_key = getQParamInt("budgetproject", -1);
var kostensoort_key = getQParamInt("costtype", -1);
var p_mld_opdr_key = getQParamInt("opdrachtcommon", -1);
p_mld_opdr_key = (p_mld_opdr_key == -1 ? getQParamInt("order", -1) : p_mld_opdr_key);
var this_model = new model_fin_factuur();
@@ -42,6 +44,7 @@ if (mode == "search")
%>
<script>
if (<%=p_mld_opdr_key%> >= -1) var order_key = <%=p_mld_opdr_key%>;
if (<%=kostensoort_key%> >= -1) var costtype_key = <%=kostensoort_key%>;
</script>
<%
}
@@ -59,9 +62,11 @@ if (mode == "edit")
var model_params = {
"search": {
"autosearch": ((parent == "search") ? true : false),
"filters": [
"budgetdiscipline",
"budgetproject",
"costtype",
"company",
"order",
"additional",
@@ -73,6 +78,7 @@ var model_params = {
"transit": [
"budgetdiscipline",
"budgetproject",
"costtype",
"company",
"order"
],
@@ -110,5 +116,13 @@ var model_params = {
}
}
if (parent == "search")
{ // Scherm wordt aangeroepen vanuit bgt_search_list.
model_params.transit = {
costtype: kostensoort_key,
opdrachtcommon: p_mld_opdr_key
}
}
scaffolding(this_model, model_params);
%>

8
APPL/BGT/fin_factuur.js
View File

@@ -25,11 +25,13 @@ function init_factuur()
var v_order = (typeof $("#order").val() == "undefined" ? -1 : $("#order").val() );
v_order = ( (v_order == null && typeof(order_key) == "number") ? order_key : v_order );
var v_costtype = (typeof(costtype_key) == "number" ? costtype_key : -1);
}
else
{ // fin_factuur vanuit mld_opdr
var v_budgetdiscipline = budgetdiscipline_key;
var v_budgetproject = budgetproject_key;
var v_costtype = costtype_key;
var v_company = company_key;
var v_order = mldopdracht_key;
}
@@ -40,6 +42,7 @@ function init_factuur()
if (v_budgetproject != -1) { init_niveau = "P"; init_key = v_budgetproject; }
if (v_company != -1) { init_niveau = "B"; init_key = v_company; }
if (v_order != -1) { init_niveau = "O"; init_key = v_order; }
if (v_costtype != -1) { init_niveau = "S"; init_key = v_costtype; }
if (init_key > 0)
{
@@ -227,4 +230,9 @@ function process_info(data)
select.val(sel_key);
$("input#contingency").prop("disabled", true );
if (data.niveau == "S")
{ // De kostensoort alleen tonen.
select.prev().remove();
select.parent().removeClass("multitoggle");
}
}

8
APPL/BGT/get_bgt_info_ajax.asp
View File

@@ -173,8 +173,8 @@ switch (req_info)
+ " , r.bgt_kostenrubriek_key rubriek_key"
+ " , g.prs_kostensoortgrp_key groep_key"
+ " , s.prs_kostensoort_key soort_key"
+ " , NULL opdracht_key"
+ " , NULL bedrijf_key"
+ " , -1 opdracht_key"
+ " , -1 bedrijf_key"
+ " , COALESCE(s.prs_kostenplaats_key, p.prs_kostenplaats_key) kostenplaats_key"
+ " FROM bgt_disc_params d"
+ " , bgt_project p"
@@ -411,8 +411,8 @@ switch (req_info)
+ " AND r.bgt_kostenrubriek_key = g.bgt_kostenrubriek_key"
+ " AND g.prs_kostensoortgrp_key = s.prs_kostensoortgrp_key"
+ " AND s.prs_kostensoort_key = o.prs_kostensoort_key"
+ " AND o.mld_uitvoerende_keys = " + child_key
+ " AND p.bgt_project_key = " + parent_key;
+ (child_key > 0 ? " AND o.mld_uitvoerende_keys = " + child_key : "")
+ (parent_key > 0 ? " AND p.bgt_project_key = " + parent_key : "");
order = " ORDER BY o.mld_opdr_ordernr"
+ " , o.mld_opdr_bedrijfopdr_volgnr";
break;

11
APPL/BGT/mld_opdr.asp
View File

@@ -15,6 +15,7 @@
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../api2/model_mld_opdr.inc" -->
<%
var parent = getQParam("parent", "");
var project_key = getQParamInt("budgetproject", -1);
var kostenrubriek_key = getQParamInt("budgetcostcategory", -1);
var kostensoortgrp_key = getQParamInt("costtypegroup", -1);
@@ -51,6 +52,7 @@ if (mode == "search")
var model_params = {
"search": {
"autosearch": ((parent == "search") ? true : false),
"filters": [
"budgetdiscipline",
"budgetproject",
@@ -183,5 +185,14 @@ var model_params = {
}
}
if (parent == "search")
{ // Scherm wordt aangeroepen vanuit bgt_search_list.
model_params.transit = {
"budgetcostcategory": kostenrubriek_key,
"costtypegroup": kostensoortgrp_key,
"costtype": kostensoort_key
}
}
scaffolding(this_model, model_params);
%>