[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php, 1.42.2.5.
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php, 1.42.2.5.2.22, 1.42.2.5.2.23 class.uiprojects.inc.php, 1.47.2.7.2.25, 1.47.2.7.2.26 |
|
Date: |
Sat, 26 Jul 2003 19:00:09 -0400 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv10329/inc
Modified Files:
Tag: Version-0_9_16-branch
class.boprojects.inc.php class.uiprojects.inc.php
Log Message:
update
Index: class.boprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.42.2.5.2.22
retrieving revision 1.42.2.5.2.23
diff -C2 -r1.42.2.5.2.22 -r1.42.2.5.2.23
*** class.boprojects.inc.php 26 Jul 2003 22:31:25 -0000 1.42.2.5.2.22
--- class.boprojects.inc.php 26 Jul 2003 23:00:06 -0000 1.42.2.5.2.23
***************
*** 415,419 ****
. ' [' .
$cached_data[$pro['coordinator']]['firstname'] . ' '
.
$cached_data[$pro['coordinator']]['lastname'] . ' ]');
! if ($pro['customer'])
{
$customer =
$this->read_single_contact($pro['customer']);
--- 415,419 ----
. ' [' .
$cached_data[$pro['coordinator']]['firstname'] . ' '
.
$cached_data[$pro['coordinator']]['lastname'] . ' ]');
! /*if ($pro['customer'])
{
$customer =
$this->read_single_contact($pro['customer']);
***************
*** 423,427 ****
$pro['sdate'] = $pro['sdate'] + (60*60) *
$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'];
! $sdateout =
$GLOBALS['phpgw']->common->show_date($pro['sdate'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
$projects[] = array
--- 423,439 ----
$pro['sdate'] = $pro['sdate'] + (60*60) *
$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'];
! $sdateout =
$GLOBALS['phpgw']->common->show_date($pro['sdate'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);*/
!
! $mlist = '';
! $mstones =
$this->get_mstones($pro['project_id']);
! if (is_array($mstones))
! {
! $mlist = '<table width="100%"
border="0" cellpadding="0" cellspacing="0">' . "\n";
! for ($i=0;$i<count($mstones);$i++)
! {
! $mlist .= '<tr><td
width="50%">' . $mstones[$i]['title'] . '</td><td width="50%" align="right">' .
$this->formatted_edate($mstones[$i]['edate']) . '</td></tr>' . "\n";
! }
! $mlist .= '</table>';
! }
$projects[] = array
***************
*** 441,445 ****
'edate' =>
$pro['edate'],
'status' =>
$pro['status'],
! 'level' =>
$pro['level']
);
}
--- 453,458 ----
'edate' =>
$pro['edate'],
'status' =>
$pro['status'],
! 'level' =>
$pro['level'],
! 'mstones' =>
$mlist
);
}
Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.47.2.7.2.25
retrieving revision 1.47.2.7.2.26
diff -C2 -r1.47.2.7.2.25 -r1.47.2.7.2.26
*** class.uiprojects.inc.php 26 Jul 2003 22:31:25 -0000 1.47.2.7.2.25
--- class.uiprojects.inc.php 26 Jul 2003 23:00:06 -0000 1.47.2.7.2.26
***************
*** 294,298 ****
$GLOBALS['phpgw']->template->set_var('sort_number',$this->nextmatchs->show_sort_order($this->sort,'num',$this->order,'/index.php',lang('Project
ID'),$link_data));
! if ($action == 'mains')
{
$GLOBALS['phpgw']->template->set_var('sort_action',$this->nextmatchs->show_sort_order($this->sort,'customer',$this->order,'/index.php',lang('Customer'),$link_data));
--- 294,298 ----
$GLOBALS['phpgw']->template->set_var('sort_number',$this->nextmatchs->show_sort_order($this->sort,'num',$this->order,'/index.php',lang('Project
ID'),$link_data));
! /*if ($action == 'mains')
{
$GLOBALS['phpgw']->template->set_var('sort_action',$this->nextmatchs->show_sort_order($this->sort,'customer',$this->order,'/index.php',lang('Customer'),$link_data));
***************
*** 301,307 ****
{
$GLOBALS['phpgw']->template->set_var('sort_action',$this->nextmatchs->show_sort_order($this->sort,'start_date',$this->order,'/index.php',lang('Start
date'),$link_data));
! }
!
$GLOBALS['phpgw']->template->set_var('sort_status',$this->nextmatchs->show_sort_order($this->sort,'status',$this->order,'/index.php',lang('Status'),$link_data));
$GLOBALS['phpgw']->template->set_var('sort_title',$this->nextmatchs->show_sort_order($this->sort,'title',$this->order,'/index.php',lang('Title'),$link_data));
$GLOBALS['phpgw']->template->set_var('sort_end_date',$this->nextmatchs->show_sort_order($this->sort,'end_date',$this->order,'/index.php',lang('Date
due'),$link_data));
--- 301,307 ----
{
$GLOBALS['phpgw']->template->set_var('sort_action',$this->nextmatchs->show_sort_order($this->sort,'start_date',$this->order,'/index.php',lang('Start
date'),$link_data));
! }*/
!
$GLOBALS['phpgw']->template->set_var('lang_milestones',lang('milestones'));
$GLOBALS['phpgw']->template->set_var('sort_title',$this->nextmatchs->show_sort_order($this->sort,'title',$this->order,'/index.php',lang('Title'),$link_data));
$GLOBALS['phpgw']->template->set_var('sort_end_date',$this->nextmatchs->show_sort_order($this->sort,'end_date',$this->order,'/index.php',lang('Date
due'),$link_data));
***************
*** 336,340 ****
(
'number' =>
$pro[$i]['number'],
! 'td_action' => $td_action,
'title' => $spaceset .
($pro[$i]['title']?$pro[$i]['title']:' '),
'end_date' =>
(isset($pro[$i]['edate'])?$edateout:' '),
--- 336,340 ----
(
'number' =>
$pro[$i]['number'],
! 'milestones' =>
(isset($pro[$i]['mstones'])?$pro[$i]['mstones']:' '),
'title' => $spaceset .
($pro[$i]['title']?$pro[$i]['title']:' '),
'end_date' =>
(isset($pro[$i]['edate'])?$edateout:' '),
***************
*** 1612,1618 ****
);
! if (!$pro_parent)
{
! $pro_parent = 0;
}
--- 1612,1618 ----
);
! if (!$pro_main)
{
! $pro_main = 0;
}
***************
*** 1725,1729 ****
if ($action == 'amains')
{
!
$GLOBALS['phpgw']->template->set_var('action_entry',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.archive&pro_parent='
. $pro[$i]['project_id'] . '&action=asubs'));
$GLOBALS['phpgw']->template->set_var('lang_action_entry',lang('Jobs'));
--- 1725,1729 ----
if ($action == 'amains')
{
!
$GLOBALS['phpgw']->template->set_var('action_entry',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.archive&pro_main='
. $pro[$i]['project_id'] . '&action=asubs'));
$GLOBALS['phpgw']->template->set_var('lang_action_entry',lang('Jobs'));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php, 1.42.2.5.2.22, 1.42.2.5.2.23 class.uiprojects.inc.php, 1.47.2.7.2.25, 1.47.2.7.2.26,
Bettina Gille <address@hidden> <=