extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 00:58:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

"order participants addtionally by status: unknow first, then tentative, accepted and last declined"

Browse Source
This commit is contained in:
Ralf Becker 2008-07-18 11:36:09 +00:00
parent c76f649797
commit 667eb5eb82
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,6 +78,11 @@ class calendar_so
* @var asyncservice * @var asyncservice
*/ */
var $async; var $async;
/**
* SQL to sort by status U, T, A, R
*
*/
const STATUS_SORT = "CASE cal_status WHEN 'U' THEN 1 WHEN 'T' THEN 2 WHEN 'A' THEN 3 WHEN 'R' THEN 4 ELSE 0 END ASC";
/** /**
* Constructor of the socal class * Constructor of the socal class
@ -166,7 +171,7 @@ class calendar_so
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','calendar') as $row) // DESC puts users before resources and contacts ),__LINE__,__FILE__,false,'ORDER BY cal_user_type DESC,'.self::STATUS_SORT,'calendar') as $row) // DESC puts users before resources and contacts
{ {
// if the type is not an ordinary user (eg. contact or resource)... // if the type is not an ordinary user (eg. contact or resource)...
if ($row['cal_user_type'] && $row['cal_user_type'] != 'u') if ($row['cal_user_type'] && $row['cal_user_type'] != 'u')
@ -373,7 +378,7 @@ class calendar_so
foreach($this->db->select($this->user_table,'*',array( foreach($this->db->select($this->user_table,'*',array(
'cal_id' => array_unique($ids), 'cal_id' => array_unique($ids),
'cal_recur_date' => $recur_dates, 'cal_recur_date' => $recur_dates,
),__LINE__,__FILE__,false,'ORDER BY cal_id,cal_user_type DESC','calendar') as $row) // DESC puts users before resources and contacts ),__LINE__,__FILE__,false,'ORDER BY cal_id,cal_user_type DESC,'.self::STATUS_SORT,'calendar') as $row) // DESC puts users before resources and contacts
{ {
$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'];