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

MNNL#32902 MI per dag

Browse Source 
svn path=/Website/trunk/; revision=25412
This commit is contained in:
Peter Feij
2015-06-08 16:05:40 +00:00
parent 47c9b2bc25
commit 31cd25ab09
3 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
APPL/BEZ/bez_list.inc
View File

@@ -24,8 +24,10 @@
groupbez groupbez groepeer 1) // district (management info)
2) // locatie (management info)
3) // gebouw (management info)
4) // (tijd) management info
5) // (afspraak) (frontoffice)
4) // maand (management info)
5) // week (management info)
6) // dag (management info)
99) // (afspraak) (frontoffice) Lijkt me vervallen (= !groupbez)
bezPark search for visitors with a parking place
bezExpect search for visitors which are expected
bezInside search for visitors which are inside
@@ -300,9 +302,22 @@ function bez_list(pautfunction, params)
+ ", COUNT(rd.res_rsv_deel_key) sum_parking";
}
if (groupbez == 4) // (tijd) management info
if (groupbez == 4) // Maand (management info)
{
sql = "SELECT TO_CHAR(a.bez_afspraak_datum, 'MM') alg_omschr"
sql = "SELECT TO_CHAR(a.bez_afspraak_datum, 'MM-YYYY') alg_omschr"
+ ", COUNT(*) sum_visitors"
+ ", COUNT(rd.res_rsv_deel_key) sum_parking";
}
if (groupbez == 5) // Week (management info)
{
sql = "SELECT TO_CHAR(a.bez_afspraak_datum, 'WW-YYYY') alg_omschr"
+ ", COUNT(*) sum_visitors"
+ ", COUNT(rd.res_rsv_deel_key) sum_parking";
}
if (groupbez == 6) // Dag (management info)
{
sql = "SELECT TRUNC(a.bez_afspraak_datum) alg_omschr"
+ ", COUNT(*) sum_visitors"
+ ", COUNT(rd.res_rsv_deel_key) sum_parking";
}
@@ -596,7 +611,17 @@ function bez_list(pautfunction, params)
if (groupbez == 4)
{
sql += " GROUP BY to_char(a.bez_afspraak_datum, 'MM') " + sql_having
sql += " GROUP BY to_char(a.bez_afspraak_datum, 'MM-YYYY') " + sql_having
+ " ORDER BY 1";
}
if (groupbez == 5)
{
sql += " GROUP BY to_char(a.bez_afspraak_datum, 'WW-YYYY') " + sql_having
+ " ORDER BY 1";
}
if (groupbez == 6)
{
sql += " GROUP BY TRUNC(a.bez_afspraak_datum) " + sql_having
+ " ORDER BY 1";
}
@@ -843,7 +868,7 @@ function bez_list(pautfunction, params)
*********************************************/
var xparams = "";
if (groupbez && groupbez != 5) // minfo
if (groupbez && groupbez != 99) // minfo
{
xparams = {keyColumn: "alg_omschr", // Dummy
sql: sql,
@@ -904,7 +929,7 @@ function bez_list(pautfunction, params)
var rst = new ResultsetTable(xparams);
// Kolommen
if (!groupbez || groupbez == 5)
if (!groupbez || groupbez == 99)
{
if (backo) {
var captionResOk = '<img id="checkall" src="../Pictures/res_ok.gif" class="ilbutton">';
@@ -1004,7 +1029,7 @@ function bez_list(pautfunction, params)
}
}
if (groupbez && groupbez != 5) // groeperingen
if (groupbez && groupbez != 99) // groeperingen
{
var captionGroup = "";
switch (groupbez)
@@ -1013,6 +1038,8 @@ function bez_list(pautfunction, params)
case 2: captionGroup = L("lcl_location"); break;
case 3: captionGroup = L("lcl_building"); break;
case 4: captionGroup = L("lcl_month"); break;
case 5: captionGroup = L("lcl_week"); break;
case 6: captionGroup = L("lcl_day"); break;
}
rst.addColumn(new Column({caption: captionGroup, content: "alg_omschr"}));

2
APPL/BEZ/bez_search.asp
View File

@@ -198,6 +198,8 @@ var authparams = user.checkAutorisation(autfunction);
+ " UNION SELECT 2, " + safe.quoted_sql(L("lcl_location")) + " FROM DUAL"
+ " UNION SELECT 3, " + safe.quoted_sql(L("lcl_building")) + " FROM DUAL"
+ " UNION SELECT 4, " + safe.quoted_sql(L("lcl_month")) + " FROM DUAL"
+ " UNION SELECT 5, " + safe.quoted_sql(L("lcl_week")) + " FROM DUAL"
+ " UNION SELECT 6, " + safe.quoted_sql(L("lcl_day")) + " FROM DUAL"
+ " ORDER BY 1";
FCLTselector("groupby",
sql,

2
APPL/BEZ/bez_search_list.asp
View File

@@ -81,7 +81,7 @@ bez_list ( autfunction,
requestor_key: (requestor_key != -1? requestor_key : null),
host_key: (host_key != -1? host_key : null),
dep_key: (dep_key != -1? dep_key : null),
groupbez: (groupbez != -1? groupbez : null), // fo groepeert op '5' (afspraak)
groupbez: (groupbez != -1? groupbez : null), // fo groepeert op '99' (afspraak)
bezPark: bezPark,
bezExpect: bezExpect,
bezInside: bezInside,