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

FSN#39558 divide by zero error afgevangen

Browse Source 
svn path=/Website/trunk/; revision=32857
This commit is contained in:
Koen Reefman
2017-02-16 15:23:20 +00:00
parent 11c8f1013b
commit 4e805c3411
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
APPL/RES/res_list_ppi.inc
View File

@@ -425,7 +425,7 @@ function forhours(fn)
res_colums = res_colums.concat(forhours(function (h) { return [String(h) + ":00", "t" + String(h), "float", true]; }));
select_sql = ", " + forhours(function (h) { return "ROUND((SUM(b"+String(h)+") / SUM(beschikbaar)) * 100, 2) t"+String(h)+""; })
select_sql = ", " + forhours(function (h) { return "(CASE WHEN SUM(beschikbaar) = 0 THEN SUM(b"+String(h)+") ELSE ROUND((SUM(b"+String(h)+") / SUM(beschikbaar)) * 100, 2) END) t"+String(h)+""; });
//order_by = "13";
}
else
@@ -435,7 +435,7 @@ function forhours(fn)
[L("lcl_res_load_in_hours"), "gebruik_uren", "float", true],
[L("lcl_res_available_in_hours"), "beschikbaar_uren", "float", true],
[L("lcl_occupation_perc"), "bezetting", "float", true] ];
select_sql = ", SUM(bezetting) gebruik_uren, SUM(beschikbaar) beschikbaar_uren, ROUND((SUM(bezetting) / SUM(beschikbaar)) * 100, 2) bezetting";
select_sql = ", SUM(bezetting) gebruik_uren, SUM(beschikbaar) beschikbaar_uren, (CASE WHEN SUM(beschikbaar) = 0 THEN 100 ELSE ROUND((SUM(bezetting) / SUM(beschikbaar)) * 100, 2) END) bezetting";
//order_by = "6";
}
@@ -490,9 +490,7 @@ function forhours(fn)
[L("lcl_res_available_in_hours"), "beschikbaar_uren", "float", false],
[L("lcl_occupation_perc"), "bezetting", "float", false] ];
sql = " SELECT periode res_keycolumn"
+ ", SUM(bezetting) gebruik_uren"
+ ", SUM(beschikbaar) beschikbaar_uren"
+ ", ROUND((SUM(bezetting) / SUM(beschikbaar)) * 100, 2) bezetting"
+ select_sql
+ " FROM (" + sqlM + ") data"
+ " GROUP BY periode"
+ " ORDER BY periode";
@@ -519,9 +517,7 @@ function forhours(fn)
[L("lcl_occupation_perc"), "bezetting", "float", false] ];
sql = " SELECT TO_CHAR(TO_DATE(periode,'yyyymmdd'),'d') res_keycolumn"
+ ", SUM(bezetting) gebruik_uren"
+ ", SUM(beschikbaar) beschikbaar_uren"
+ ", ROUND((SUM(bezetting) / SUM(beschikbaar)) * 100, 2) bezetting"
+ select_sql
+ " FROM (" + sqlM + ") data"
+ " GROUP BY TO_CHAR(TO_DATE(periode,'yyyymmdd'),'d')"
+ " ORDER BY TO_CHAR(TO_DATE(periode,'yyyymmdd'),'d')";
@@ -547,9 +543,7 @@ function forhours(fn)
[L("lcl_res_available_in_hours"), "beschikbaar_uren", "float", false],
[L("lcl_occupation_perc"), "bezetting", "float", false] ];
sql = " SELECT periode res_keycolumn"
+ ", SUM(bezetting) gebruik_uren"
+ ", SUM(beschikbaar) beschikbaar_uren"
+ ", ROUND((SUM(bezetting) / SUM(beschikbaar)) * 100, 2) bezetting"
+ select_sql
+ " FROM (" + sqlM + ") data"
+ " GROUP BY periode"
+ " ORDER BY periode";
@@ -721,7 +715,7 @@ function forhours(fn)
case L("lcl_res_nr_of_rooms"): result = tot_aantal_ruimten; break;
case L("lcl_res_load_in_hours"): result = safe.displayfloat(tot_gebruik_uren, 2); break;
case L("lcl_res_available_in_hours"): result = safe.displayfloat(tot_beschikbaar_uren, 2); break;
case L("lcl_occupation_perc"): result = safe.displayfloat((tot_gebruik_uren / tot_beschikbaar_uren) * 100, 2); break;
case L("lcl_occupation_perc"): result = safe.displayfloat((tot_beschikbaar_uren == 0 ? 100 : (tot_gebruik_uren / tot_beschikbaar_uren) * 100), 2); break;
default: result = safe.curr(totaal[parseInt(column.caption, 10)]/tot_aantal_ruimten); break;
}