FSN#31413 res-bon maximeren tot een X aantal deelreserveringen

svn path=/Database/trunk/; revision=23870
This commit is contained in:
Peter Feij
2015-01-14 10:52:27 +00:00
parent b931a5c1d1
commit 8e419c05e0
2 changed files with 29 additions and 10 deletions

View File

@@ -6649,15 +6649,28 @@ AS
IF p_res_rsv_ruimte_key IS NULL
THEN
createopentagattributes ('reservering',
'content',
'complete',
'total',
v_nrdeelres,
'status',
l_status,
NULL,
NULL);
IF v_nrdeelres <= fac.getsetting ('res_xml_max_rsv_ruimte')
THEN
createopentagattributes ('reservering',
'content',
'complete',
'total',
v_nrdeelres,
'status',
l_status,
NULL,
NULL);
ELSE
createopentagattributes ('reservering',
'content',
'complete',
'total',
v_nrdeelres,
'status',
l_status,
'mode',
'concise');
END IF;
ELSE
createopentagattributes ('reservering',
'content',
@@ -6697,7 +6710,12 @@ AS
OR (p_res_rsv_ruimte_key IS NOT NULL
AND rec1.res_rsv_ruimte_key = p_res_rsv_ruimte_key)
THEN
create_res_rsv_ruimte_node (rec1.res_rsv_ruimte_key, FALSE);
IF v_nrdeelres <= fac.getsetting ('res_xml_max_rsv_ruimte')
THEN
create_res_rsv_ruimte_node (rec1.res_rsv_ruimte_key, FALSE);
ELSE
create_res_rsv_ruimte_node (rec1.res_rsv_ruimte_key, TRUE);
END IF;
END IF;
END LOOP;
END IF;

View File

@@ -441,6 +441,7 @@ DEFINE_SETTING('RES', 0003, 'res_noshow_detailed' , 'number'
DEFINE_SETTING('RES', 0003, 'res_vcalendar_link' , 'number' , '1' , 'Download naar ''Outlook''')
DEFINE_SETTING('RES', 0003, 'res_room_order' , 'number' , '0' , 'Planbord sorted by capacity or description (0=capacity (default) | 1=description)')
DEFINE_SETTING('FAC', 0001, 'res_plan_max_bezet' , 'number' , '0' , 'Maximum planbord ''occupied'' fields. AiAi timeout prevention (future use)')
DEFINE_SETTING('RES', 0003, 'res_xml_max_rsv_ruimte' , 'number' , '60' , 'Maximum number of non-concise rsv_ruimte nodes in reserering node')
DEFINE_SETTING('RES', 0009, 'res_image_path' , 'string' , NULL , 'path to folder storing res_ruimte pictures')
DEFINE_SETTING('RES', 0003, 'res_with_mld' , 'number' , '0' , 'Reservering kan meldingen hebben {0=Nee (default) | 1=Ja}')
DEFINE_SETTING('RES', 0003, 'res_delete_ask_kosten' , 'number' , '1' , 'Aks for recharge costs at delete (0=never ask, 1=ask after, 2=ask only final, 3=ask only final after)')