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

NYBU#38051 verkeerd beschikare uren werd weergegeven

Browse Source 
svn path=/Website/branches/v2016.2/; revision=31057
This commit is contained in:
Ruud Lipper
2016-10-12 10:27:48 +00:00
parent 4c80dafa91
commit bd9441fe15
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/RES/res_list_ppi.inc
View File

@@ -219,7 +219,7 @@ function forhours(fn)
+ ", ((fac.Count_Work_Days(" + ora_date1 + "-1 , " + ora_date2 + "))" + ", ((fac.Count_Work_Days(" + ora_date1 + "-1 , " + ora_date2 + "))"
+ (dayschedule + (dayschedule
? "" ? ""
: " * (LEAST(COALESCE(rr1.res_ruimte_eindtijd, " + S("res_t2") + ")," + S("res_rap_t2") + ")) - GREATEST(COALESCE(rr1.res_ruimte_begintijd, " + S("res_t1") + ")," + S("res_rap_t1") + ")") + ") beschikbaar" : " * (LEAST(COALESCE(rr1.res_ruimte_eindtijd, " + S("res_t2") + ")," + S("res_rap_t2") + ") - GREATEST(COALESCE(rr1.res_ruimte_begintijd, " + S("res_t1") + ")," + S("res_rap_t1") + ")") + ")) beschikbaar"
+ " FROM res_ruimte rr1, res_alg_ruimte ra " + " FROM res_ruimte rr1, res_alg_ruimte ra "
+ " WHERE rr1.res_ruimte_key = ra.res_ruimte_key " + " WHERE rr1.res_ruimte_key = ra.res_ruimte_key "
+ " AND ra.res_alg_ruimte_aanmaak <= " + ora_date2 + " AND ra.res_alg_ruimte_aanmaak <= " + ora_date2