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

MDUX#41852 onderdeel toevoegen aan object

Browse Source 
svn path=/Website/trunk/; revision=35580
This commit is contained in:
Erik Groener
2017-10-05 12:45:19 +00:00
parent f8a90c7044
commit f366053387
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
APPL/INS/ins.inc
View File

@@ -1601,9 +1601,10 @@ ins = {checkAutLevel:
if (!hasOwner) if (!hasOwner)
{ // Owner filter would imply only owned objects { // Owner filter would imply only owned objects
sqlPosition = (terr_key sqlPosition = "SELECT DISTINCT"
? "SELECT t.alg_terreinsector_omschrijving" + (terr_key
: "SELECT o.alg_plaatsaanduiding" ? " t.alg_terreinsector_omschrijving"
: " o.alg_plaatsaanduiding"
+ " || DECODE(o.alg_plaatsomschrijving, '','' ,' (' || o.alg_plaatsomschrijving || ')')" + " || DECODE(o.alg_plaatsomschrijving, '','' ,' (' || o.alg_plaatsomschrijving || ')')"
) )
+ " plaats" + " plaats"
@@ -1627,7 +1628,7 @@ ins = {checkAutLevel:
+ ", s.ins_srtdeel_upper" + ", s.ins_srtdeel_upper"
+ ", i.ins_deel_getekend" + ", i.ins_deel_getekend"
+ ", i.ins_discipline_key" + ", i.ins_discipline_key"
+ ", l.alg_district_key" + ", CASE WHEN i.ins_alg_ruimte_type = 'A' THEN NULL ELSE l.alg_district_key END alg_district_key"
+ ", i.ins_deel_x" // is coordinaat bekend? + ", i.ins_deel_x" // is coordinaat bekend?
+ ", i.ins_deel_y" + ", i.ins_deel_y"
+ ", i.ins_deel_dwgx" // is dwg coordinaat bekend? + ", i.ins_deel_dwgx" // is dwg coordinaat bekend?
@@ -1743,8 +1744,10 @@ ins = {checkAutLevel:
sqlPosition_org = sqlPosition sqlPosition_org = sqlPosition
+ " AND o.alg_onroerendgoed_keys = i.ins_alg_ruimte_key_org" + " AND o.alg_onroerendgoed_keys = i.ins_alg_ruimte_key_org"
+ " AND o.alg_onroerendgoed_type = i.ins_alg_ruimte_type_org" + " AND o.alg_onroerendgoed_type = i.ins_alg_ruimte_type_org"
+ " AND i.ins_alg_ruimte_type_org IN ('T','R','W')" + " AND i.ins_alg_ruimte_type_org IN ('T','R','W','A')"
+ " AND o.alg_locatie_key = l.alg_locatie_key"; + " AND ( (i.ins_alg_ruimte_type = 'A' AND o.alg_locatie_key IS NULL)"
+ " OR (i.ins_alg_ruimte_type <> 'A' AND o.alg_locatie_key = l.alg_locatie_key)"
+ " )";
sqlPosition += (terr_key sqlPosition += (terr_key
? " AND t.alg_terreinsector_key = i.ins_alg_ruimte_key" ? " AND t.alg_terreinsector_key = i.ins_alg_ruimte_key"
@@ -1752,8 +1755,10 @@ ins = {checkAutLevel:
+ " AND t.alg_locatie_key = l.alg_locatie_key" + " AND t.alg_locatie_key = l.alg_locatie_key"
: " AND o.alg_onroerendgoed_keys = i.ins_alg_ruimte_key" : " AND o.alg_onroerendgoed_keys = i.ins_alg_ruimte_key"
+ " AND o.alg_onroerendgoed_type = i.ins_alg_ruimte_type" + " AND o.alg_onroerendgoed_type = i.ins_alg_ruimte_type"
+ " AND i.ins_alg_ruimte_type IN ('T','R','W')" // Object is NIET uitgeleend, anders was het type 'P'. + " AND i.ins_alg_ruimte_type IN ('T','R','W','A')" // Object is NIET uitgeleend, anders was het type 'P'.
+ " AND o.alg_locatie_key = l.alg_locatie_key" // PF: de redundante ins_alg_locatie_key is niet nodig + " AND ( (i.ins_alg_ruimte_type = 'A' AND o.alg_locatie_key IS NULL)" // PF: de redundante ins_alg_locatie_key is niet nodig
+ " OR (i.ins_alg_ruimte_type <> 'A' AND o.alg_locatie_key = l.alg_locatie_key)"
+ " )"
) )
} }