diff --git a/ALLV/allv.sql b/ALLV/allv.sql index e70114e3d..8fd241689 100644 --- a/ALLV/allv.sql +++ b/ALLV/allv.sql @@ -1,16 +1,16 @@ -- Script containing customer specific configuration sql statements for ALLV: Allévo/Allité. -- (c) 2007 Dijkoraad IT bv --- $Revision: 4 $ --- $Modtime: 3-12-07 16:33 $ +-- $Revision: 5 $ +-- $Modtime: 3-12-07 16:58 $ -- -- Support: +31 53 4800700 spool xallv.lst set echo on -/* Formatted on 2007/12/03 16:35 (Formatter Plus v4.8.7) */ -CREATE OR REPLACE VIEW allv_v_reserveringdetails (fclt_f_dag, - fclt_f_locatie, +/* Formatted on 2007/12/03 17:00 (Formatter Plus v4.8.7) */ +CREATE OR REPLACE VIEW allv_v_reserveringdetails (fclt_f_locatie, + fclt_f_datum, hide_f_sort_datum_tijd, hide_f_sort_ruimte, hide_f_sort_resnr, @@ -18,7 +18,6 @@ CREATE OR REPLACE VIEW allv_v_reserveringdetails (fclt_f_dag, resnr, aantal, ruimte, - datum, van, tot, voorzieningen, @@ -26,17 +25,8 @@ CREATE OR REPLACE VIEW allv_v_reserveringdetails (fclt_f_dag, opmerking ) AS - SELECT (CASE - WHEN TO_CHAR (res_geg.res_reservering_van, 'yyyymmdd') = - TO_CHAR (SYSDATE, 'yyyymmdd') - THEN 'Vandaag' - WHEN TO_CHAR (res_geg.res_reservering_van, 'yyyymmdd') = - TO_CHAR (SYSDATE + 1, 'yyyymmdd') - THEN 'Morgen' - ELSE 'Overmorgen' - END - ) dag, - l.alg_locatie_code locatie, + SELECT l.alg_locatie_code locatie, + TO_CHAR (res_geg.res_reservering_van, 'DD-MM-YYYY') datum, res_geg.res_reservering_van sort_datum_tijd, COALESCE (opstelalg.res_ruimte_nr, ruimte_geg.alg_ruimte_aanduiding @@ -66,12 +56,6 @@ AS ) END ) ruimte, - (CASE - WHEN res_geg.res_type <> '1R' AND rrr.alg_ruimte_key IS NULL - THEN '' - ELSE TO_CHAR (res_geg.res_reservering_van, 'DD-MM-YYYY') - END - ) datum, TO_CHAR (res_geg.res_reservering_van, 'HH24:MI') van, TO_CHAR (res_geg.res_reservering_tot, 'HH24:MI') tot, (CASE @@ -225,8 +209,8 @@ AS COALESCE (rrr.alg_ruimte_key, opstelalg.alg_ruimte_key) AND l.alg_locatie_key = ruimte_geg.alg_locatie_key AND res_geg.res_status_bo_key < 5 - ORDER BY dag, - locatie, + ORDER BY locatie, + datum, sort_datum_tijd, sort_ruimte, sort_resnr,