svn path=/Website/trunk/; revision=39673
This commit is contained in:
Erik Groener
2018-11-06 12:54:40 +00:00
parent bc4bc5ed2c
commit bc18b6bf97

View File

@@ -192,7 +192,7 @@ switch (req_info)
{
sql = "SELECT DISTINCT"
+ " d.bgt_ins_discipline_key disc_key"
+ " , -1 project_key"
+ " , p.bgt_project_key project_key"
+ " , NULL rubriek_key"
+ " , NULL groep_key"
+ " , NULL soort_key"
@@ -206,11 +206,13 @@ switch (req_info)
: ", -1"
) + " kostenplaats_key"
+ " FROM bgt_disc_params d"
+ " , bgt_project p"
+ " , prs_kostenplaats s"
+ " WHERE d.bgt_ins_discipline_key = s.ins_discipline_key"
+ " WHERE d.bgt_ins_discipline_key = p.ins_discipline_key"
+ " AND s.ins_discipline_key = p.ins_discipline_key(+)"
+ " AND s.prs_kostenplaats_verwijder IS NULL"
+ (root_key != -1 ? " AND s.ins_discipline_key = " + root_key : "")
+ (init_key != -1 ? " AND s.prs_kostenplaats_key = " + init_key : "");
+ (parent_key != -1 ? " AND p.bgt_project_key = " + parent_key : "")
+ (init_key != -1 ? " AND (s.prs_kostenplaats_key = " + init_key + " OR p.prs_kostenplaats_key = " + init_key + ")" : "");
break;
}
}
@@ -353,9 +355,11 @@ switch (req_info)
+ " , NULL srt_key"
+ " , NULL kpn_key"
+ " FROM prs_kostenplaats kp"
+ " , prs_kostenplaatsgrp kg"
+ " WHERE kp.prs_kostenplaatsgrp_key = kg.prs_kostenplaatsgrp_key"
+ " AND kg.bgt_project_key = " + parent_key;
+ " , ins_tab_discipline d"
+ " , bgt_project p"
+ " WHERE p.ins_discipline_key = d.ins_discipline_key"
+ " AND k.ins_discipline_key = d.ins_discipline_key
+ " AND p.bgt_project_key = " + parent_key;
break;
}
case "B":
@@ -442,10 +446,17 @@ switch (req_info)
{
case "KG":
{
sql = "SELECT kg.prs_kostenplaatsgrp_key sel_key"
sql = "SELECT DISTINCT kg.prs_kostenplaatsgrp_key sel_key"
+ " , kg.prs_kostenplaatsgrp_nr ||' - '|| kg.prs_kostenplaatsgrp_oms sel_oms"
+ " FROM prs_kostenplaatsgrp kg"
+ " WHERE kg.bgt_project_key = " + parent_key;
+ " , prs_kostenplaats kp"
+ " , ins_tab_discipline d"
+ " , bgt_project p"
+ " WHERE d.ins_discipline_key = p.ins_discipline_key"
+ " AND d.ins_discipline_key = kp.ins_discipline_key"
+ " AND kp.prs_kostenplaatsgrp_key = kg.prs_kostenplaatsgrp_key(+)"
+ " AND kp.prs_kostenplaats_verwijder IS NULL"
+ " AND p.bgt_project_key = " + parent_key;
break;
}
case "KP":