extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-05 04:50:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

* check quantity of resource to book against maximum, as conflict check only fails if other events are involved

Browse Source
This commit is contained in:
Ralf Becker 2010-11-11 13:29:37 +00:00
parent b19c4b3030
commit c115d73cfb
1 changed files with 93 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -156,6 +156,7 @@ class calendar_uiforms extends calendar_ui
* Process the edited event and evtl. call edit to redisplay it
*
* @param array $content posted eTemplate content
* @ToDo add conflict check / available quantity of resources when adding participants
*/
function process_edit($content)
{
@ -316,10 +317,23 @@ class calendar_uiforms extends calendar_ui
{
$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'],$id) : 'U';
if ($status)
{
$res_info = $this->bo->resource_info($uid);
// todo check real availability = maximum - already booked quantity
if (isset($res_info['useable']) && $content['participants']['quantity'] > $res_info['useable'])
{
$msg .= lang('Maximum available quantity of %1 exceeded!',$res_info['useable']);
foreach(array('quantity','resource','role') as $n)
{
$event['participants'][$n] = $content['participants'][$n];
}
}
else
{
$event['participants'][$uid] = $event['participant_types'][$type][$id] =
calendar_so::combine_status($status,$content['participants']['quantity'],$content['participants']['role']);
}
}
elseif(!$msg_permission_denied_added)
{
$msg .= lang('Permission denied!');
@ -1195,6 +1209,11 @@ function replace_eTemplate_onsubmit()
$row = 2;
$readonlys = $content['participants'] = $preserv['participants'] = array();
// preserve some ui elements, if set eg. under error-conditions
foreach(array('quantity','resource','role') as $n)
{
if (isset($event['participants'][$n])) $content['participants'][$n] = $event['participants'][$n];
}
foreach($event['participant_types'] as $type => $participants)
{
$name = 'accounts';