From bb9b3d7acc361b61c1ed8d5719c2c494fd1cb5ae Mon Sep 17 00:00:00 2001 From: Maykel Geerdink Date: Tue, 26 Jan 2016 07:59:21 +0000 Subject: [PATCH] HSLE#34978: Overzicht reserveringen aanpassen voor de dag. svn path=/Website/trunk/; revision=27906 --- APPL/RES/res_list.inc | 11 ++++-- APPL/RES/res_search.asp | 70 +++++++++++++++++++++--------------- APPL/RES/res_search_list.asp | 2 ++ 3 files changed, 51 insertions(+), 32 deletions(-) diff --git a/APPL/RES/res_list.inc b/APPL/RES/res_list.inc index 423d01c5c1..39b358a7e3 100644 --- a/APPL/RES/res_list.inc +++ b/APPL/RES/res_list.inc @@ -84,6 +84,7 @@ function res_list (pautfunction, params) // params.floor_key : key // params.room_key : key // params.act_key : key + // params.suppress_cont : boolean (true | false) // params.searchtxt : wildcard string // params.dep_key : key // params.kp : wildcard string @@ -136,6 +137,7 @@ function res_list (pautfunction, params) var floor_key = params.floor_key; var room_key = params.room_key; var act_key = params.act_key; + var suppress_cont = params.suppress_cont; var srtact = params.srtact; var searchtext = params.searchtext; var dep_key = params.dep_key; @@ -296,9 +298,12 @@ function res_list (pautfunction, params) // Hmm, bij nader inzien lijken de indexen niet veel verschil te maken. Haal echter // hieronder een (redundante) vergelijking weg en het wordt langzamer theResrsv += " AND res_rsv_ruimte_van < " + ora_date2 - + " AND res_rsv_ruimte_tot > " + ora_date1 - + " AND TRUNC(res_rsv_ruimte_van,'DD') <= "+dateto.toSQL() - + " AND TRUNC(res_rsv_ruimte_tot,'DD') >= "+datefrom.toSQL(); + + " AND res_rsv_ruimte_tot > " + ora_date1 + + " AND TRUNC(res_rsv_ruimte_van, 'DD') <= " + dateto.toSQL() + + " AND TRUNC(res_rsv_ruimte_tot, 'DD') >= " + datefrom.toSQL() + + (suppress_cont + ? " AND TRUNC(res_rsv_ruimte_tot, 'DD') = " + dateto.toSQL() + : ""); } if (resstatus) theResrsv += " AND res_status_fo_key = " + resstatus; diff --git a/APPL/RES/res_search.asp b/APPL/RES/res_search.asp index 239750f69f..f9c2ca0b52 100644 --- a/APPL/RES/res_search.asp +++ b/APPL/RES/res_search.asp @@ -105,6 +105,7 @@ var room_key = getQParamInt("ruimte_key", -1); // ruimte var roomcat = (getQParamInt("roomcat", 1) == 1); // Standaard aangevinkt var objcat = (getQParamInt("objcat", 1) == 1); // Standaard aangevinkt var artcat = (getQParamInt("artcat", 1) == 1); // Standaard aangevinkt +var suppresscont = (getQParamInt("suppresscont", 1) == 1); // Onderdruk doorlopende reserveringen var act = getQParamInt("act_key", -1); // Activiteit var sortout = getQParamInt("sortout", 1); // Sortering, standaard 1 var group = getQParamInt("groupby", -1); // Groepering, standaard -1 (backo), 4 (maninfo) @@ -257,35 +258,46 @@ var authparams = user.checkAutorisation(autfunction); "> -<% // - FCLTcalendar("date_from", - { label : (frontend ? L("lcl_date") :L("lcl_period_from")), - datum: date_from, - trclass: "primsearch", - volgnr: 1 - }); - // - FCLTcalendar("date_to", - { label: L("lcl_period_to"), - datum: date_to, - trclass: "primsearch", - volgnr: 2 - }); +<% // + FCLTcalendar("date_from", + { label : (frontend ? L("lcl_date") :L("lcl_period_from")), + datum: date_from, + trclass: "primsearch", + volgnr: 1 + }); + // + FCLTcalendar("date_to", + { label: L("lcl_period_to"), + datum: date_to, + trclass: "primsearch", + volgnr: 2 + }); - // - FCLTplaatsselector(authparams.ALGreadlevel, { regiokey: reg_key, - districtkey: dist_key, - locatiekey: loc_key, - gebouwkey: bld_key, - verdiepingkey: floor_key, - ruimtekey: room_key, - startlevel: alg_startlevel, - eindlevel: alg_endlevel, - secsearch: frontend?null:3, // hoger dan gebouw - filtercode: "FAC", - requiredlevel: (S("res_search_require_locatie")==1 ? 2 : null), - whenEmpty: L("lcl_search_generic") // want filter - }); + if (backo || minfo) + { %> + + + + + > + + + +<% } + // + FCLTplaatsselector(authparams.ALGreadlevel, { regiokey: reg_key, + districtkey: dist_key, + locatiekey: loc_key, + gebouwkey: bld_key, + verdiepingkey: floor_key, + ruimtekey: room_key, + startlevel: alg_startlevel, + eindlevel: alg_endlevel, + secsearch: frontend?null:3, // hoger dan gebouw + filtercode: "FAC", + requiredlevel: (S("res_search_require_locatie")==1 ? 2 : null), + whenEmpty: L("lcl_search_generic") // want filter + }); // //if (!frontend) { @@ -410,7 +422,7 @@ var authparams = user.checkAutorisation(autfunction); <% - } + } %> diff --git a/APPL/RES/res_search_list.asp b/APPL/RES/res_search_list.asp index 5edc168dce..4f2ccb7634 100644 --- a/APPL/RES/res_search_list.asp +++ b/APPL/RES/res_search_list.asp @@ -60,6 +60,7 @@ else var floor_key = getFParamInt("verdiepingkey", -1); var room_key = getFParamInt("ruimtekey", -1); var act_key = getFParamInt("act", -1); + var suppress_cont = (getFParamInt("suppresscont", 0) == 1); var searchtext = getFParam("searchtext", null); var requestor_key = getFParamInt("sName_key", -1); // Aanvrager var host_key = getFParamInt("sHost_key", -1); @@ -107,6 +108,7 @@ else params.floor_key = (floor_key != -1? floor_key : null); params.room_key = (room_key != -1? room_key : null); params.act_key = (act_key != -1? act_key : null); + params.suppress_cont = (backo || minfo? suppress_cont : null); // Wordt alleen gebruikt bij bo en mi params.srtact = (srtact != -1? srtact : null); params.searchtext = (searchtext != ""? searchtext : null); params.kp = (kp != ""? kp : null);