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

FCLT#56301 PvE Volksbank: verbruiksartikelen beschikbaar obv minimale duur en aantal prs

Browse Source 
svn path=/Website/trunk/; revision=40902
This commit is contained in:
Alex Tiehuis
2019-02-12 08:37:08 +00:00
parent 35de15a679
commit 00a0309727
3 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/API2/model_res_disc_params.inc
View File

@@ -105,14 +105,14 @@ model_res_disc_params =
"mintime": {
"dbs": "res_disc_params_min_duur",
"label": L("res_catalogus_min_duur"),
"typ": "number",
"typ": "float",
"defaultvalue": 0,
"multiedit": true
},
"minparticipants": {
"dbs": "res_disc_params_min_deelnmrs",
"label": L("res_catalogus_min_participants"),
"typ": "float",
"typ": "number",
"defaultvalue": 0,
"multiedit": true
},

2
APPL/RES/res_edit_objcat.asp
View File

@@ -463,7 +463,7 @@ var new_item_key = 0; // Globaal
+ " FROM RES_v_aanwezigDISCIPLINE d, res_disc_params rd"
+ " WHERE ins_discipline_min_level = 2"
+ " AND rd.res_ins_discipline_key = d.ins_discipline_key"
+ " AND rd.res_disc_params_min_deelnmrs <= " + res_bezoekers
+ " AND (rd.res_disc_params_min_deelnmrs <= " + res_bezoekers + " OR ( rd.res_disc_params_min_deelnmrs = 0 AND " + res_bezoekers + " IS NULL ))"
+ " AND rd.res_disc_params_min_duur <= " + res_duur
+ " AND d.ins_discipline_key IN"
+ "(SELECT g.ins_discipline_key"

16
APPL/RES/res_edit_rsv_ruimte_save.asp
View File

@@ -44,26 +44,16 @@ var res_bezoekers = getFParamInt("bezoekers", null);
var date_from = getFParamDate("date_from", null); // die hebben we vaak nodig
if (!date_from)
{ // fe_lastminute kon kalender niet bewerken
var sql = "SELECT res_rsv_ruimte_van, res_rsv_ruimte_tot, res_rsv_ruimte_bezoekers"
var sql = "SELECT res_rsv_ruimte_van, res_rsv_ruimte_tot"
+ " FROM res_rsv_ruimte"
+ " WHERE res_rsv_ruimte_key = " + rsv_ruimte_key;
var oRs = Oracle.Execute(sql);
date_from = new Date(oRs("res_rsv_ruimte_van").Value);
date_to = new Date(oRs("res_rsv_ruimte_tot").Value);
if (res_bezoekers == null) { res_bezoekers = oRs("res_rsv_ruimte_bezoekers").value; }
oRs.Close();
}
else
{
if (rsv_ruimte_key > -1 && res_bezoekers == null)
{
var sql = "SELECT res_rsv_ruimte_bezoekers"
+ " FROM res_rsv_ruimte"
+ " WHERE res_rsv_ruimte_key = " + rsv_ruimte_key;
var oRs = Oracle.Execute(sql);
res_bezoekers = oRs("res_rsv_ruimte_bezoekers").value;
oRs.Close();
}
if (date_from.getSeconds() > 0 || date_from.getMilliseconds() > 0)
date_from.setSeconds(59, 1000); // Omhoog afronden op minuten, minimaliseert conflicten
var date_to = getFParamDate("date_to"); // die hebben we vaak nodig
@@ -125,8 +115,8 @@ if (rsv_ruimte_key > -1)
+ " AND ra.res_artikel_key = ara.res_artikel_key"
+ " AND d.ins_discipline_key = ra.res_discipline_key"
+ " AND rd.res_ins_discipline_key = d.ins_discipline_key"
+ " AND (rd.res_disc_params_min_deelnmrs > " + res_bezoekers
+ " OR rd.res_disc_params_min_duur > " + durationHours + ")";
+ " AND (" + (res_bezoekers == null ? " rd.res_disc_params_min_deelnmrs > 0" : " rd.res_disc_params_min_deelnmrs > " + res_bezoekers)
+ " OR rd.res_disc_params_min_duur > " + durationHours + ")";
oRs = Oracle.Execute(sql);
if (!oRs.Eof)
{