From 070115399b878ec49e59757fc9c25c4163bbbe66 Mon Sep 17 00:00:00 2001 From: Maykel Geerdink Date: Thu, 21 Jan 2016 15:18:16 +0000 Subject: [PATCH] AKZA#35076: Ook "schoonmaaktijden" voor parkeerplaatsen wenselijk. svn path=/Website/trunk/; revision=27864 --- APPL/BEZ/bez.inc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/APPL/BEZ/bez.inc b/APPL/BEZ/bez.inc index 67f8ac1f18..f2f693582c 100644 --- a/APPL/BEZ/bez.inc +++ b/APPL/BEZ/bez.inc @@ -43,6 +43,10 @@ bez = + " WHERE a.prs_bedrijf_key = " + user.afdeling().prs_bedrijf_key() + " ))"; } + var preposttime = "(SELECT COALESCE(rdp.res_disc_params_preposttime, 0) / 24" + + " FROM res_disc_params rdp" + + " WHERE rdp.res_ins_discipline_key = " + S("vis_parking_key") + ")"; + return " SELECT park.alg_type" + ", park.alg_gebouw_key" + ", park.gebouw_naam" @@ -68,12 +72,12 @@ bez = + " FROM res_v_aanwezigrsv_deel rd" + " WHERE d.res_deel_key = rd.res_deel_key" + " AND rd.res_rsv_deel_van BETWEEN TRUNC(" + bez_afspraak_begin.toSQL(true) + ")" - + " AND " + bez_afspraak_eind.toSQL(true) + " - 1 / 1440" + + " AND " + bez_afspraak_eind.toSQL(true) + " - 1 / 1440 + " + preposttime + " AND rd.res_rsv_deel_tot BETWEEN" - + " " + bez_afspraak_begin.toSQL(true) + " + 1 / 1440" + + " " + bez_afspraak_begin.toSQL(true) + " + 1 / 1440 - " + preposttime + " AND TRUNC(" + bez_afspraak_begin.toSQL(true) + ")" + " + 1" - + " AND rd.res_rsv_deel_van < " + bez_afspraak_eind.toSQL(true) + " - 1 / 1440" - + " AND rd.res_rsv_deel_tot > " + bez_afspraak_begin.toSQL(true) + " + 1 / 1440" + + " AND rd.res_rsv_deel_van < " + bez_afspraak_eind.toSQL(true) + " - 1 / 1440 + " + preposttime + + " AND rd.res_rsv_deel_tot > " + bez_afspraak_begin.toSQL(true) + " + 1 / 1440 - " + preposttime + " AND d.res_discipline_key = " + S("vis_parking_key") + ") reserved" + " FROM res_v_aanwezigdeel d" + ", ins_deel id"