extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 00:43:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar: show status set for the whole series at recurrences too, unless they have an individual status

Browse Source 
removed previous participants call now completly, as the above changes archive the same thing, without enumerating all recurrences to the database
This commit is contained in:
Ralf Becker 2011-08-03 12:37:08 +00:00
parent 2b41a75944
commit 641aed0f20
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
calendar/inc/class.calendar_so.inc.php
View File

@ -217,15 +217,16 @@ class calendar_so
if ($recur_date) if ($recur_date)
{ {
// also remember recur_date, maybe we need it later, duno now // also remember recur_date, maybe we need it later, duno now
$recur_date = $events[$ids]['recur_date'] = $events[$ids]['start']; $recur_date = array(0,$events[$ids]['recur_date'] = $events[$ids]['start']);
} }
} }
// participants, if a recur_date give, we read that recurance, else the one users from the default entry with recur_date=0 // participants, if a recur_date give, we read that recurance, plus the one users from the default entry with recur_date=0
// sorting by cal_recur_date ASC makes sure recurence status always overwrites series status
foreach($this->db->select($this->user_table,'*',array( foreach($this->db->select($this->user_table,'*',array(
'cal_id' => $ids, 'cal_id' => $ids,
'cal_recur_date' => $recur_date, 'cal_recur_date' => $recur_date,
),__LINE__,__FILE__,false,'ORDER BY cal_user_type DESC,'.self::STATUS_SORT,'calendar') as $row) // DESC puts users before resources and contacts ),__LINE__,__FILE__,false,'ORDER BY cal_user_type DESC,cal_recur_date ASC,'.self::STATUS_SORT,'calendar') as $row) // DESC puts users before resources and contacts
{ {
// combine all participant data in uid and status values // combine all participant data in uid and status values
$uid = self::combine_user($row['cal_user_type'],$row['cal_user_id']); $uid = self::combine_user($row['cal_user_type'],$row['cal_user_id']);
@ -659,6 +660,9 @@ class calendar_so
$row['alarm'] = array(); $row['alarm'] = array();
$row['recur_exception'] = $row['recur_exception'] ? explode(',',$row['recur_exception']) : array(); $row['recur_exception'] = $row['recur_exception'] ? explode(',',$row['recur_exception']) : array();
// compile a list of recurrences per cal_id
if (!in_array($id,(array)$recur_ids[$row['cal_id']])) $recur_ids[$row['cal_id']][] = $id;
$events[$id] = egw_db::strip_array_keys($row,'cal_'); $events[$id] = egw_db::strip_array_keys($row,'cal_');
} }
//_debug_array($events); //_debug_array($events);
@ -677,13 +681,25 @@ class calendar_so
{ {
$id = $row['cal_id']; $id = $row['cal_id'];
if ($row['cal_recur_date']) $id .= '-'.$row['cal_recur_date']; if ($row['cal_recur_date']) $id .= '-'.$row['cal_recur_date'];
if (!in_array($id,(array)$recur_ids[$row['cal_id']])) $recur_ids[$row['cal_id']][] = $id;
if (!isset($events[$id])) continue; // not needed first entry of recuring event
// combine all participant data in uid and status values // combine all participant data in uid and status values
$events[$id]['participants'][self::combine_user($row['cal_user_type'],$row['cal_user_id'])] = $uid = self::combine_user($row['cal_user_type'],$row['cal_user_id']);
self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']); $status = self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']);
// set accept/reject/tentative of series for all recurrences
if (!$row['cal_recur_date'])
{
foreach((array)$recur_ids[$row['cal_id']] as $i)
{
if (isset($events[$i]) && !isset($events[$i]['participants'][$uid]))
{
$events[$i]['participants'][$uid] = $status;
}
}
}
// set data, if recurrence is requested
if (isset($events[$id])) $events[$id]['participants'][$uid] = $status;
} }
//custom fields are not shown in the regular views, so we only query them, if explicitly required //custom fields are not shown in the regular views, so we only query them, if explicitly required
if (!is_null($params['cfs'])) if (!is_null($params['cfs']))
@ -1144,7 +1160,7 @@ ORDER BY cal_user_type, cal_usre_id
{ {
if ($name[0] == '#') if ($name[0] == '#')
{ {
if (is_array($value) && array_key_exists('id',$value)) if (is_array($value) && array_key_exists('id',$value))
{ {
//error_log(__METHOD__.__LINE__."$name => ".array2string($value).function_backtrace()); //error_log(__METHOD__.__LINE__."$name => ".array2string($value).function_backtrace());
$value = $value['id']; $value = $value['id'];
@ -1517,11 +1533,6 @@ ORDER BY cal_user_type, cal_usre_id
$where[] = '(cal_recur_date=0 OR cal_recur_date >= '.time().')'; $where[] = '(cal_recur_date=0 OR cal_recur_date >= '.time().')';
} }
// check if the user has any status database entries and create the default set if needed
// a status update before having the necessary entries happens on e.g. group invitations
// commented out, as it causes problems when called with a single / not all participants (not sure why it is necessary anyway)
// $this->participants($cal_id,array(self::combine_user($user_type,$user_id) => 'U'),0,true);
if ($status == 'G') // remove group invitations, as we dont store them in the db if ($status == 'G') // remove group invitations, as we dont store them in the db
{ {
$this->db->delete($this->user_table,$where,__LINE__,__FILE__,'calendar'); $this->db->delete($this->user_table,$where,__LINE__,__FILE__,'calendar');