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

HSLE#36223 Cateringbestelling extra aanvullingen (tbv goedkeuring)

Browse Source 
svn path=/Website/trunk/; revision=30780
This commit is contained in:
Erik Groener
2016-09-20 14:33:21 +00:00
parent 5a2dbc81ec
commit 7424525448
3 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
APPL/RES/res_list.inc
View File

@@ -40,6 +40,7 @@
res_closed search for reservations which are closed
res_approved search for reservations which are approved
res_notapproved search for reservations which are not approved
res_tobeapproved search for reservations which heave to be approved
res_noshowonly show noshow's only
sortout sort out the reservations by
groupres groupres the reservations by
@@ -159,6 +160,7 @@ function res_list (pautfunction, params)
var res_closed = params.res_closed;
var res_approved = params.res_approved;
var res_notapproved = params.res_notapproved;
var res_tobeapproved = params.res_tobeapproved;
var sortout = params.sortout;
var groupres = params.groupres;
var flags = params.flags||[];
@@ -342,8 +344,10 @@ function res_list (pautfunction, params)
+ ", r.res_reservering_ispool"
+ ", rm.res_rsv_ruimte_key"
+ ", rm.res_rsv_ruimte_omschrijving descr"
+ ", rm.res_status_bo_key"
+ ", rm.res_status_fo_key"
+ ", rm.res_rsv_ruimte_flag"
+ ", rm.res_rsv_ruimte_prijs"
+ ", rm.res_rsv_ruimte_dirtlevel dirtlevel"
+ ", rm.res_rsv_ruimte_afgerond"
+ "," + lcl.xsql('rr.res_ruimte_nr', 'rr.res_ruimte_key') + " waar"
@@ -483,8 +487,10 @@ function res_list (pautfunction, params)
+ ", 0 res_reservering_ispool"
+ ", rvarr.res_rsv_ruimte_key"
+ ", res_rsv_ruimte_omschrijving descr"
+ ", rvarr.res_status_bo_key"
+ ", rvarr.res_status_fo_key"
+ ", rvarr.res_rsv_ruimte_flag"
+ ", rvarr.res_rsv_ruimte_prijs"
+ ", rd.res_rsv_deel_dirtlevel dirtlevel"
+ ", rvarr.res_rsv_ruimte_afgerond"
+ ", alg_ruimte_aanduiding waar"
@@ -590,8 +596,10 @@ function res_list (pautfunction, params)
+ ", 0 res_reservering_ispool"
+ ", rvarr.res_rsv_ruimte_key"
+ ", res_rsv_ruimte_omschrijving descr"
+ ", rvarr.res_status_bo_key"
+ ", rvarr.res_status_fo_key"
+ ", rvarr.res_rsv_ruimte_flag"
+ ", rvarr.res_rsv_ruimte_prijs"
+ ", ra.res_rsv_artikel_dirtlevel dirtlevel"
+ ", rvarr.res_rsv_ruimte_afgerond"
+ ", alg_ruimte_aanduiding waar"
@@ -648,8 +656,10 @@ function res_list (pautfunction, params)
sql_select = " rec2.res_reservering_key"
+ ", rec2.res_reservering_ispool"
+ ", rec2.descr"
+ ", rec2.res_status_bo_key"
+ ", rec2.res_status_fo_key"
+ ", rec2.res_rsv_ruimte_flag"
+ ", rec2.res_rsv_ruimte_prijs"
+ ", rec2.dirtlevel"
+ ", rec2.res_rsv_ruimte_afgerond"
+ ", rec2.waar"
@@ -681,8 +691,10 @@ function res_list (pautfunction, params)
sql_groupby = " rec2.res_reservering_key"
+ ", rec2.res_reservering_ispool"
+ ", rec2.descr"
+ ", rec2.res_status_bo_key"
+ ", rec2.res_status_fo_key"
+ ", rec2.res_rsv_ruimte_flag"
+ ", rec2.res_rsv_ruimte_prijs"
+ ", rec2.dirtlevel"
+ ", rec2.waar"
+ ", rec2.contact"
@@ -739,7 +751,13 @@ function res_list (pautfunction, params)
{
approve_sql.push("rec2.res_rsv_ruimte_afgerond = 1");
}
if (res_notapproved)
if (res_tobeapproved)
{
approve_sql.push("rec2.res_rsv_ruimte_afgerond = 0"
+" AND ( (rec2.res_rsv_ruimte_prijs IS NOT NULL AND rec2.res_status_bo_key = 5)"
+ " OR (rec2.res_rsv_ruimte_prijs IS NULL AND rec2.res_status_bo_key IS NULL))");
}
if (res_notapproved) // deze kan weg!!
{
approve_sql.push("rec2.res_rsv_ruimte_afgerond = 0");
}
@@ -751,8 +769,10 @@ function res_list (pautfunction, params)
+ ", res_reservering_ispool"
+ ", res_rsv_ruimte_key"
+ ", descr"
+ ", res_status_bo_key"
+ ", res_status_fo_key"
+ ", res_rsv_ruimte_flag"
+ ", res_rsv_ruimte_prijs"
+ ", MAX(dirtlevel) dirtlevel"
+ ", res_rsv_ruimte_afgerond"
+ ", waar"
@@ -779,8 +799,10 @@ function res_list (pautfunction, params)
+ ", res_reservering_ispool"
+ ", res_rsv_ruimte_key"
+ ", descr"
+ ", res_status_bo_key"
+ ", res_status_fo_key"
+ ", res_rsv_ruimte_flag"
+ ", res_rsv_ruimte_prijs"
+ ", waar"
+ ", datumvan"
+ ", datumtot"

21
APPL/RES/res_search.asp
View File

@@ -134,6 +134,7 @@ if (!res_open && !res_closed)
var res_approved = getFParamInt("res_approved", 1); // Standaard aangevinkt.
var res_notapproved = getFParamInt("res_notapproved", 1); // Standaard aangevinkt.
var res_tobeapproved = getFParamInt("res_tobeapproved", 1); // Standaard aangevinkt.
// minimaal <20><>n van beiden moet aangekruist zijn
if (!res_approved && !res_notapproved)
res_approved = true;
@@ -657,16 +658,34 @@ var authparams = user.checkAutorisation(autfunction);
</tr>
<%
}
if ((backo || minfo || frontend) && (S("res_approval") > 0))
if (S("res_approval") > 0)
{
%>
<tr class="primsearch">
<td></td>
<td align=left>
<%
if (backo || minfo)
{
%>
<input type="checkbox" class="fldresnotapproved" name="res_notapproved" id="res_notapproved" onClick="checkCheckboxes();" value="1" <%=res_notapproved? "checked" : ""%>>
<label for="closed"><%=L("lcl_res_notapproved")%></label>
<% }
if (frontend)
{
%>
<input type="checkbox" class="fldresnotapproved" name="res_tobeapproved" id="res_tobeapproved" onClick="checkCheckboxes();" value="1" <%=res_tobeapproved? "checked" : ""%>>
<label for="closed""><%=L("lcl_res_tobeapproved")%></label>
<%
}
if (backo || minfo || frontend)
{
%>
<input type="checkbox" class="fldresapproved" name="res_approved" id="res_approved" onClick="checkCheckboxes();" value="1" <%=res_approved? "checked" : ""%>>
<label for="closed"><%=L("lcl_res_approved")%></label>
<%
}
%>
</td>
</tr>
<%

5
APPL/RES/res_search_list.asp
View File

@@ -86,9 +86,11 @@ else
if (!res_open && !res_closed)
res_open = true;
// Parameters res_approved en res_notapproved worden alleen doorgegeven indien backo of minfo
// Parameters res_approved en res_notapproved worden doorgegeven indien backo of minfo
// Parameters res_approved en res_tobeapproved worden doorgegeven indien frontend
var res_approved = (getFParamInt("res_approved", 0) == 1);
var res_notapproved = (getFParamInt("res_notapproved", 0) == 1);
var res_tobeapproved = (getFParamInt("res_tobeapproved", 0) == 1);
// Parameters roomcat, objcat en artcat worden alleen doorgegeven indien backo of minfo
var roomcat = (getFParamInt("roomcat", 0) == 1);
@@ -130,6 +132,7 @@ else
params.res_closed = (backo || minfo? res_closed : null); // Wordt alleen gebruikt bij bo en mi
params.res_approved = (backo || minfo || frontend? res_approved : null); // Wordt alleen gebruikt bij bo en mi
params.res_notapproved = (backo || minfo || frontend? res_notapproved : null); // Wordt alleen gebruikt bij bo en mi
params.res_tobeapproved= (frontend? res_tobeapproved : null); // Wordt alleen gebruikt bij frontend
params.res_noshowonly = (getFParam("res_noshowonly", "") == "on"); // Wordt alleen gebruikt bij bo en mi
// Flags