[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: todo/inc class.bo.inc.php,1.5,1.6 class.ui.inc.p
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: todo/inc class.bo.inc.php,1.5,1.6 class.ui.inc.php,1.7,1.8 |
|
Date: |
Fri, 01 Feb 2002 15:52:42 -0500 |
Update of /cvsroot/phpgroupware/todo/inc
In directory subversions:/tmp/cvs-serv1975/inc
Modified Files:
class.bo.inc.php class.ui.inc.php
Log Message:
matrix fix
Index: class.bo.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/todo/inc/class.bo.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.bo.inc.php 31 Jan 2002 03:13:38 -0000 1.5
--- class.bo.inc.php 1 Feb 2002 20:52:39 -0000 1.6
***************
*** 210,214 ****
{
$v['sdate'] =
$GLOBALS['phpgw']->common->show_date($v['sdate'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
!
if ($v['assigned'])
{
--- 210,215 ----
{
$v['sdate'] =
$GLOBALS['phpgw']->common->show_date($v['sdate'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
! $v['edate'] =
$GLOBALS['phpgw']->common->show_date($v['edate'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
!
if ($v['assigned'])
{
Index: class.ui.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/todo/inc/class.ui.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.ui.inc.php 1 Feb 2002 04:01:46 -0000 1.7
--- class.ui.inc.php 1 Feb 2002 20:52:39 -0000 1.8
***************
*** 148,161 ****
// ---------------- list header variable template-declarations
--------------------------
!
$this->t->set_var(sort_status,$this->nextmatchs->show_sort_order($this->sort,'todo_status',$this->order,'/todo/index.php',lang('Status')));
!
$this->t->set_var(sort_urgency,$this->nextmatchs->show_sort_order($this->sort,'todo_pri',$this->order,'/todo/index.php',lang('Urgency')));
!
$this->t->set_var(sort_title,$this->nextmatchs->show_sort_order($this->sort,'todo_title',$this->order,'/todo/index.php',lang('title')));
!
$this->t->set_var(sort_sdate,$this->nextmatchs->show_sort_order($this->sort,'todo_startdate',$this->order,'/todo/index.php',lang('start
date')));
!
$this->t->set_var(sort_edate,$this->nextmatchs->show_sort_order($this->sort,'todo_enddate',$this->order,'/todo/index.php',lang('end
date')));
!
$this->t->set_var(sort_owner,$this->nextmatchs->show_sort_order($this->sort,'todo_owner',$this->order,'/todo/index.php',lang('created
by')));
!
$this->t->set_var(sort_assigned,$this->nextmatchs->show_sort_order($this->sort,'todo_assigned',$this->order,'/todo/index.php',lang('assigned
to')));
! $this->t->set_var(h_lang_sub,lang('Add Sub'));
! $this->t->set_var(h_lang_view,lang('View'));
! $this->t->set_var(h_lang_edit,lang('Edit'));
// -------------- end header declaration
---------------------------------------
--- 148,161 ----
// ---------------- list header variable template-declarations
--------------------------
!
$this->t->set_var('sort_status',$this->nextmatchs->show_sort_order($this->sort,'todo_status',$this->order,'/todo/index.php',lang('Status')));
!
$this->t->set_var('sort_urgency',$this->nextmatchs->show_sort_order($this->sort,'todo_pri',$this->order,'/todo/index.php',lang('Urgency')));
!
$this->t->set_var('sort_title',$this->nextmatchs->show_sort_order($this->sort,'todo_title',$this->order,'/todo/index.php',lang('title')));
!
$this->t->set_var('sort_sdate',$this->nextmatchs->show_sort_order($this->sort,'todo_startdate',$this->order,'/todo/index.php',lang('start
date')));
!
$this->t->set_var('sort_edate',$this->nextmatchs->show_sort_order($this->sort,'todo_enddate',$this->order,'/todo/index.php',lang('end
date')));
!
$this->t->set_var('sort_owner',$this->nextmatchs->show_sort_order($this->sort,'todo_owner',$this->order,'/todo/index.php',lang('created
by')));
!
$this->t->set_var('sort_assigned',$this->nextmatchs->show_sort_order($this->sort,'todo_assigned',$this->order,'/todo/index.php',lang('assigned
to')));
! $this->t->set_var('h_lang_sub',lang('Add Sub'));
! $this->t->set_var('h_lang_view',lang('View'));
! $this->t->set_var('h_lang_edit',lang('Edit'));
// -------------- end header declaration
---------------------------------------
***************
*** 192,196 ****
}
! if ($todo_list[$i]['edate'] == 0)
{
$datedueout = ' ';
--- 192,196 ----
}
! if ($todo_list[$i]['edate_epoch'] == 0)
{
$datedueout = ' ';
***************
*** 198,202 ****
else
{
! $datedue = $todo_list[$i]['edate'];
$month =
$GLOBALS['phpgw']->common->show_date(time(),'n');
$day =
$GLOBALS['phpgw']->common->show_date(time(),'d');
--- 198,202 ----
else
{
! $datedue =
$todo_list[$i]['edate_epoch'];
$month =
$GLOBALS['phpgw']->common->show_date(time(),'n');
$day =
$GLOBALS['phpgw']->common->show_date(time(),'d');
***************
*** 214,218 ****
}
! $datedueout .=
$GLOBALS['phpgw']->common->show_date($datedue,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
if ($currentdate >= $datedue)
{
--- 214,218 ----
}
! $datedueout .= $todo_list[$i]['edate'];
if ($currentdate >= $datedue)
{
***************
*** 747,771 ****
$ind = $o % count($colors);
! if ($entries[$i]['sdate'] > 0 &&
$entries[$i]['edate'] > 0)
{
! $startd =
date('Y',$entries[$i]['sdate']) . date('m',$entries[$i]['sdate']) .
date('d',$entries[$i]['sdate']);
! $endd = date('Y',$entries[$i]['edate'])
. date('m',$entries[$i]['edate']) . date('d',$entries[$i]['edate']);
!
$this->matrix->setPeriod($GLOBALS['phpgw']->strip_html($entries[$i]['descr']),$startd,$endd,$colors[$ind]);
$subentries =
$this->bo->_list($start,False,$query,$filter,$order,$sort,$cat_id,'subs',$entries[$i]['id']);
for ($j=0;$j<count($subentries);$j++)
{
! if ($subentries[$j]['sdate'] >
0 && $subentries[$j]['edate'] > 0)
{
! $startd =
date('Y',$subentries[$j]['sdate']) . date('m',$subentries[$j]['sdate']) .
date('d',$subentries[$j]['sdate']);
! $endd = date('Y',$subentries[$j]['edate']) .
date('m',$subentries[$j]['edate']) . date('d',$subentries[$j]['edate']);
!
$this->matrix->setPeriod($GLOBALS['phpgw']->strip_html($subentries[$j]['descr']),$startd,$endd,$colors[$ind]);
}
}
}
}
-
$this->matrix->out($GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.matrix'));
-
}
}
--- 747,769 ----
$ind = $o % count($colors);
! if ($entries[$i]['sdate_epoch'] > 0 &&
$entries[$i]['edate_epoch'] > 0)
{
! $startd =
date('Y',$entries[$i]['sdate_epoch']) . date('m',$entries[$i]['sdate_epoch']) .
date('d',$entries[$i]['sdate_epoch']);
! $endd =
date('Y',$entries[$i]['edate_epoch']) . date('m',$entries[$i]['edate_epoch']) .
date('d',$entries[$i]['edate_epoch']);
!
$this->matrix->setPeriod($GLOBALS['phpgw']->strip_html($entries[$i]['title']),$startd,$endd,$colors[$ind]);
$subentries =
$this->bo->_list($start,False,$query,$filter,$order,$sort,$cat_id,'subs',$entries[$i]['id']);
for ($j=0;$j<count($subentries);$j++)
{
! if
($subentries[$j]['sdate_epoch'] > 0 && $subentries[$j]['edate_epoch'] > 0)
{
! $startd =
date('Y',$subentries[$j]['sdate_epoch']) .
date('m',$subentries[$j]['sdate_epoch']) .
date('d',$subentries[$j]['sdate_epoch']);
! $endd =
date('Y',$subentries[$j]['edate_epoch']) .
date('m',$subentries[$j]['edate_epoch']) .
date('d',$subentries[$j]['edate_epoch']);
!
$this->matrix->setPeriod($GLOBALS['phpgw']->strip_html($subentries[$j]['title']),$startd,$endd,$colors[$ind]);
}
}
}
}
$this->matrix->out($GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.matrix'));
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: todo/inc class.bo.inc.php,1.5,1.6 class.ui.inc.php,1.7,1.8,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: todo/inc class.ui.inc.php,1.2.2.3,1.2.2.4
- Next by Date:
[Phpgroupware-cvs] CVS: email/templates/default filters.tpl,1.8,1.9 filters_list.tpl,1.2,1.3
- Previous by thread:
[Phpgroupware-cvs] CVS: todo/inc class.ui.inc.php,1.2.2.3,1.2.2.4
- Next by thread:
[Phpgroupware-cvs] CVS: email/templates/default filters.tpl,1.8,1.9 filters_list.tpl,1.2,1.3
- Index(es):