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

UWVA#54521 Bezettingsgraad Management Info toont vervallen ruimte

Browse Source 
svn path=/Website/branches/v2018.2/; revision=40646
This commit is contained in:
Alex Tiehuis
2019-01-23 13:24:00 +00:00
parent fbe2693625
commit 25b68b30e6
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/RES/res_list_ppi.inc
View File

@@ -263,6 +263,7 @@ function calcTotals(sql)
+ " , res_ruimte rr"
+ " , res_alg_ruimte ra"
+ " WHERE r.res_rsv_ruimte_verwijder IS NULL"
+ " AND (rr.res_ruimte_vervaldatum IS NULL OR rr.res_ruimte_vervaldatum >= " + ora_date1 + ")"
+ " AND r.res_status_fo_key IN (1, 2)"
+ " AND r.res_ruimte_opstel_key = ro.res_ruimte_opstel_key"
+ " AND ro.res_ruimte_key = rr.res_ruimte_key"
@@ -296,6 +297,7 @@ function calcTotals(sql)
+ " , res_alg_ruimte ra"
+ " WHERE rr1.res_ruimte_key = ra.res_ruimte_key"
+ " AND ra.res_alg_ruimte_aanmaak <= " + ora_date2
+ " AND (rr1.res_ruimte_vervaldatum IS NULL OR rr1.res_ruimte_vervaldatum >= " + ora_date1 + ")"
+ " AND (ra.res_alg_ruimte_verwijder IS NULL"
+ " OR ra.res_alg_ruimte_verwijder >= " + ora_date1 + ")) beschik"
+ " , alg_v_ruimte_gegevens_all ruimte_geg"
@@ -340,6 +342,7 @@ function calcTotals(sql)
+ " , res_ruimte rr"
+ " , res_alg_ruimte ra"
+ " WHERE r.res_rsv_ruimte_verwijder IS NULL"
+ " AND (rr.res_ruimte_vervaldatum IS NULL OR rr.res_ruimte_vervaldatum >= " + ora_date1 + ")"
+ " AND r.res_status_fo_key IN (1, 2)"
+ " AND r.res_ruimte_opstel_key = ro.res_ruimte_opstel_key"
+ " AND ro.res_ruimte_key = rr.res_ruimte_key"
@@ -442,6 +445,7 @@ function calcTotals(sql)
+ " , ("+ sql_werkperiode +") sw"
+ " WHERE rr1.res_ruimte_key = ra.res_ruimte_key"
+ " AND ra.res_alg_ruimte_aanmaak <= " + ora_date2
+ " AND (rr1.res_ruimte_vervaldatum IS NULL OR rr1.res_ruimte_vervaldatum >= " + ora_date1 + ")"
+ " AND ( ra.res_alg_ruimte_verwijder IS NULL"
+ " OR ra.res_alg_ruimte_verwijder >= " + ora_date1
+ " )";