[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.2
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php,1.42.2.5.2.7,1.42.2.5.2.8 class.soprojecthours.inc.php,1.8.4.1,1.8.4.2 class.soprojects.inc.php,1.34.2.6.2.6,1.34.2.6.2.7 class.uiprojects.inc.php,1.47.2.7.2.5,1.47.2.7.2.6 |
|
Date: |
Mon, 02 Jun 2003 18:11:25 -0400 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv17550/inc
Modified Files:
Tag: Version-0_9_16-branch
class.boprojects.inc.php class.soprojecthours.inc.php
class.soprojects.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.7
retrieving revision 1.42.2.5.2.8
diff -C2 -r1.42.2.5.2.7 -r1.42.2.5.2.8
*** class.boprojects.inc.php 27 May 2003 13:28:28 -0000 1.42.2.5.2.7
--- class.boprojects.inc.php 2 Jun 2003 22:11:23 -0000 1.42.2.5.2.8
***************
*** 71,74 ****
--- 71,75 ----
{
$this->soprojects =
CreateObject('projects.soprojects');
+ $this->sohours =
CreateObject('projects.soprojecthours');
$this->contacts =
CreateObject('phpgwapi.contacts');
***************
*** 187,198 ****
'org_name' => 'org_name');
! $entry =
$this->contacts->read_single_entry($abid,$cols);
! return $entry;
}
function return_value($action,$item)
{
! $thing = $this->soprojects->return_value($action,$item);
! return $thing;
}
--- 188,197 ----
'org_name' => 'org_name');
! return $this->contacts->read_single_entry($abid,$cols);
}
function return_value($action,$item)
{
! return $this->soprojects->return_value($action,$item);
}
***************
*** 380,385 ****
function read_single_project($project_id)
{
! $single_pro =
$this->soprojects->read_single_project($project_id);
! return $single_pro;
}
--- 379,410 ----
function read_single_project($project_id)
{
! $pro =
$this->soprojects->read_single_project($project_id);
! $pro['utime'] =
$this->sohours->get_time_used($project_id);
!
! $pro['phours'] = floor($pro['ptime']/60);
! $pro['pminutes'] =
$pro['ptime']-(floor($pro['ptime']/60)*60);
! $pro['uhours'] = floor($pro['utime']/60);
! $pro['uminutes'] =
$pro['utime']-(floor($pro['utime']/60)*60);
!
! if ($pro['edate'] == 0)
! {
! $pro['edate_formatted'] = ' ';
! }
! else
! {
! $pro['edate'] = $pro['edate'] + (60*60) *
$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'];
! $pro['edate_formatted'] =
$GLOBALS['phpgw']->common->show_date($pro['edate'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
! }
!
! $pro['sdate'] = $pro['sdate'] + (60*60) *
$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'];
! $pro['sdate_formatted'] =
$GLOBALS['phpgw']->common->show_date($pro['sdate'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
!
! $pro['udate'] = $pro['udate'] + (60*60) *
$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'];
! $pro['udate_formatted'] =
$GLOBALS['phpgw']->common->show_date($pro['udate'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
!
! $pro['cdate'] = $pro['cdate'] + (60*60) *
$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'];
! $pro['cdate_formatted'] =
$GLOBALS['phpgw']->common->show_date($pro['cdate'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
!
! return $pro;
}
***************
*** 602,605 ****
--- 627,632 ----
$values['budget'] = 0;
}
+
+ $values['ptime'] = intval($values['ptime']);
if ($values['smonth'] || $values['sday'] ||
$values['syear'])
Index: class.soprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojecthours.inc.php,v
retrieving revision 1.8.4.1
retrieving revision 1.8.4.2
diff -C2 -r1.8.4.1 -r1.8.4.2
*** class.soprojecthours.inc.php 26 Apr 2003 01:33:45 -0000 1.8.4.1
--- class.soprojecthours.inc.php 2 Jun 2003 22:11:23 -0000 1.8.4.2
***************
*** 161,164 ****
--- 161,173 ----
}
}
+
+ function get_time_used($project_id)
+ {
+ $this->db->query('SELECT SUM(minutes) as utime from
phpgw_p_hours where project_id=' . $project_id,__LINE__,__FILE__);
+ if ($this->db->next_record())
+ {
+ return $this->db->f('utime');
+ }
+ }
}
?>
Index: class.soprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.34.2.6.2.6
retrieving revision 1.34.2.6.2.7
diff -C2 -r1.34.2.6.2.6 -r1.34.2.6.2.7
*** class.soprojects.inc.php 27 May 2003 13:28:28 -0000 1.34.2.6.2.6
--- class.soprojects.inc.php 2 Jun 2003 22:11:23 -0000 1.34.2.6.2.7
***************
*** 62,65 ****
--- 62,96 ----
}
+ function db2projects()
+ {
+ while ($this->db->next_record())
+ {
+ $projects[] = array
+ (
+ 'project_id' => $this->db->f('id'),
+ 'parent' =>
$this->db->f('parent'),
+ 'number' =>
$this->db->f('num'),
+ 'access' =>
$this->db->f('access'),
+ 'cat' =>
$this->db->f('category'),
+ 'sdate' =>
$this->db->f('start_date'),
+ 'edate' =>
$this->db->f('end_date'),
+ 'coordinator' =>
$this->db->f('coordinator'),
+ 'customer' =>
$this->db->f('customer'),
+ 'status' =>
$this->db->f('status'),
+ 'descr' =>
$this->db->f('descr'),
+ 'title' =>
$this->db->f('title'),
+ 'budget' =>
$this->db->f('budget'),
+ 'ptime' =>
$this->db->f('time_planned'),
+ 'owner' =>
$this->db->f('owner'),
+ 'cdate' =>
$this->db->f('date_created'),
+ 'processor' =>
$this->db->f('processor'),
+ 'udate' =>
$this->db->f('entry_date'),
+ 'investment_nr' =>
$this->db->f('investment_nr')
+ );
+ }
+ return $projects;
+ }
+
+
function read_projects($start = '', $limit = True, $query = '',
$filter = '', $sort = '', $order = '', $status = '', $cat_id = '', $type =
'mains', $pro_parent = '')
{
***************
*** 163,185 ****
}
! $i = 0;
! while ($this->db->next_record())
! {
! $projects[$i]['project_id'] =
$this->db->f('id');
! $projects[$i]['parent'] =
$this->db->f('parent');
! $projects[$i]['number'] =
$this->db->f('num');
! $projects[$i]['access'] =
$this->db->f('access');
! $projects[$i]['cat'] =
$this->db->f('category');
! $projects[$i]['sdate'] =
$this->db->f('start_date');
! $projects[$i]['edate'] =
$this->db->f('end_date');
! $projects[$i]['coordinator'] =
$this->db->f('coordinator');
! $projects[$i]['customer'] =
$this->db->f('customer');
! $projects[$i]['status'] =
$this->db->f('status');
! $projects[$i]['descr'] =
$this->db->f('descr');
! $projects[$i]['title'] =
$this->db->f('title');
! $projects[$i]['budget'] =
$this->db->f('budget');
! $i++;
! }
! return $projects;
}
--- 194,198 ----
}
! return $this->db2projects();
}
***************
*** 188,209 ****
$this->db->query('SELECT * from phpgw_p_projects WHERE
id=' . $project_id,__LINE__,__FILE__);
! if ($this->db->next_record())
{
! $project['project_id'] = $this->db->f('id');
! $project['owner'] =
$this->db->f('owner');
! $project['parent'] =
$this->db->f('parent');
! $project['number'] =
$this->db->f('num');
! $project['access'] =
$this->db->f('access');
! $project['cat'] =
$this->db->f('category');
! $project['sdate'] =
$this->db->f('start_date');
! $project['edate'] =
$this->db->f('end_date');
! $project['coordinator'] =
$this->db->f('coordinator');
! $project['customer'] =
$this->db->f('customer');
! $project['status'] =
$this->db->f('status');
! $project['descr'] =
$this->db->f('descr');
! $project['title'] =
$this->db->f('title');
! $project['budget'] =
$this->db->f('budget');
}
- return $project;
}
--- 201,232 ----
$this->db->query('SELECT * from phpgw_p_projects WHERE
id=' . $project_id,__LINE__,__FILE__);
! $project = $this->db2projects();
!
! if (is_array($project) && list(,$pro) = each($project))
{
! $p = array
! (
! 'project_id' => $pro['project_id'],
! 'owner' =>
$pro['owner'],
! 'parent' =>
$pro['parent'],
! 'number' =>
$pro['number'],
! 'access' =>
$pro['access'],
! 'cat' => $pro['cat'],
! 'sdate' =>
$pro['sdate'],
! 'edate' =>
$pro['edate'],
! 'coordinator' => $pro['coordinator'],
! 'customer' =>
$pro['customer'],
! 'status' =>
$pro['status'],
! 'descr' =>
$pro['descr'],
! 'title' =>
$pro['title'],
! 'budget' =>
$pro['budget'],
! 'ptime' =>
$pro['ptime'],
! 'udate' =>
$pro['udate'],
! 'cdate' =>
$pro['cdate'],
! 'processor' =>
$pro['processor'],
! 'investment_nr' => $pro['investment_nr']
! );
! return $p;
}
}
***************
*** 243,251 ****
$this->db->lock($table);
! $this->db->query("insert into phpgw_p_projects
(owner,access,category,entry_date,start_date,end_date,coordinator,customer,status,"
! .
"descr,title,budget,num,parent) values (" . intval($values['owner']) . ",'" .
$values['access'] . "'," . intval($values['cat']) . ","
! . time() ."," .
intval($values['sdate']) . "," . intval($values['edate']) . "," .
intval($values['coordinator']) . "," . intval($values['customer'])
! . ",'" .
$values['status'] . "','" . $values['descr'] . "','" . $values['title'] . "',"
. $values['budget'] . ",'"
! . $values['number'] .
"'," . intval($values['parent']) . ")",__LINE__,__FILE__);
/*$this->db->query("SELECT max(id) FROM
phpgw_p_projects");
--- 266,275 ----
$this->db->lock($table);
! $this->db->query('INSERT into phpgw_p_projects
(owner,access,category,entry_date,start_date,end_date,coordinator,customer,status,'
! .
'descr,title,budget,num,parent,time_planned,time_used,date_created,processor)
VALUES (' . $this->account
! . ",'" .
$values['access'] . "'," . intval($values['cat']) . ',' . time() . ',' .
intval($values['sdate']) . ','
! .
intval($values['edate']) . ',' . intval($values['coordinator']) . ',' .
intval($values['customer']) . ",'" . $values['status']
! . "','" .
$values['descr'] . "','" . $values['title'] . "'," . $values['budget'] . ",'" .
$values['number'] . "',"
! .
intval($values['parent']) . ',' . intval($values['ptime']) . ',' . time() . ','
. $this->account . ')',__LINE__,__FILE__);
/*$this->db->query("SELECT max(id) FROM
phpgw_p_projects");
***************
*** 289,297 ****
$values['project_id'] = intval($values['project_id']);
! $this->db->query("update phpgw_p_projects set access='"
. $values['access'] . "', category=" . intval($values['cat']) . ", entry_date="
. time() . ",
start_date=" . intval($values['sdate']) . ", end_date=" .
intval($values['edate']) . ", coordinator="
.
intval($values['coordinator']) . ", customer=" . intval($values['customer']) .
", status='" . $values['status'] . "', descr='"
. $values['descr'] .
"', title='" . $values['title'] . "', budget=" . $values['budget'] . ", num='"
! . $values['number'] .
"' where id=" . $values['project_id'],__LINE__,__FILE__);
if (count($book_activities) != 0)
--- 313,322 ----
$values['project_id'] = intval($values['project_id']);
! $this->db->query("UPDATE phpgw_p_projects set access='"
. $values['access'] . "', category=" . intval($values['cat']) . ", entry_date="
. time() . ",
start_date=" . intval($values['sdate']) . ", end_date=" .
intval($values['edate']) . ", coordinator="
.
intval($values['coordinator']) . ", customer=" . intval($values['customer']) .
", status='" . $values['status'] . "', descr='"
. $values['descr'] .
"', title='" . $values['title'] . "', budget=" . $values['budget'] . ", num='"
! . $values['number'] .
"', time_planned=" . intval($values['ptime']) . ', processor=' . $this->account
! . ' where id=' .
$values['project_id'],__LINE__,__FILE__);
if (count($book_activities) != 0)
***************
*** 481,502 ****
switch ($action)
{
! case 'pro': $column = '
num,title '; break;
! case 'edate': $column = ' end_date ';
break;
! case 'sdate': $column = ' start_date
'; break;
}
! $this->db->query('SELECT ' . $column . 'from
phpgw_p_projects where id=' . $item,__LINE__,__FILE__);
if ($this->db->next_record())
{
! switch ($action)
{
! case 'pro': $thing
= $GLOBALS['phpgw']->strip_html($this->db->f('title')) . ' ['
!
. $GLOBALS['phpgw']->strip_html($this->db->f('num')) . ']'; break;
! case 'edate': $thing =
$this->db->f('end_date'); break;
! case 'sdate': $thing =
$this->db->f('start_date'); break;
}
}
}
- return $thing;
}
--- 506,530 ----
switch ($action)
{
! case 'pro': $column =
'num,title'; break;
! case 'edate': $column = 'end_date';
break;
! case 'sdate': $column = 'start_date';
break;
! case 'ptime': $column =
'time_planned'; break;
! case 'invest': $column =
'investment_nr'; break;
}
! $this->db->query('SELECT ' . $column . ' from
phpgw_p_projects where id=' . $item,__LINE__,__FILE__);
if ($this->db->next_record())
{
! if ($action == 'pro')
{
! return
$GLOBALS['phpgw']->strip_html($this->db->f('title')) . ' ['
! .
$GLOBALS['phpgw']->strip_html($this->db->f('num')) . ']';
! }
! else
! {
! return
$GLOBALS['phpgw']->strip_html($this->db->f($column));
}
}
}
}
***************
*** 972,975 ****
--- 1000,1030 ----
$this->db->query('UPDATE phpgw_p_projectmembers set
account_id=' . $new . ' where (account_id=' . $old
. "' AND
type='aa')",__LINE__,__FILE__);
+ }
+
+ function get_planned_time($option)
+ {
+ if(is_array($option))
+ {
+ $action =
(isset($option['action'])?$option['action']:'main');
+ $project_id =
(isset($option['project_id'])?$option['project_id']:'');
+ $parent_id =
(isset($option['parent_id'])?$option['parent_id']:0);
+ }
+
+ switch($action)
+ {
+ case 'main': $filter = 'main=' . $parent_id
. ' and id !=' . $parent_id; break;
+ case 'parent': $filter = 'parent=' .
$parent_id; break;
+ }
+
+ if($project_id)
+ {
+ $editfilter = ' and id !=' . $project_id;
+ }
+
+ $this->db->query('SELECT SUM(time_planned) as sumtime
from phpgw_p_projects where (' . $filter . $editfilter . ')',__LINE__,__FILE__);
+ if ($this->db->next_record())
+ {
+ return $this->db->f('sumtime');
+ }
}
}
Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.47.2.7.2.5
retrieving revision 1.47.2.7.2.6
diff -C2 -r1.47.2.7.2.5 -r1.47.2.7.2.6
*** class.uiprojects.inc.php 6 May 2003 15:47:45 -0000 1.47.2.7.2.5
--- class.uiprojects.inc.php 2 Jun 2003 22:11:23 -0000 1.47.2.7.2.6
***************
*** 99,104 ****
--- 99,108 ----
$GLOBALS['phpgw']->template->set_var('lang_title',lang('Title'));
$GLOBALS['phpgw']->template->set_var('lang_none',lang('None'));
+
$GLOBALS['phpgw']->template->set_var('lang_start_date',lang('Start Date'));
$GLOBALS['phpgw']->template->set_var('lang_end_date',lang('End Date'));
+
$GLOBALS['phpgw']->template->set_var('lang_cdate',lang('Date created'));
+
$GLOBALS['phpgw']->template->set_var('lang_last_update',lang('last update'));
+
$GLOBALS['phpgw']->template->set_var('lang_date_due',lang('Date due'));
$GLOBALS['phpgw']->template->set_var('lang_access',lang('Private'));
***************
*** 109,114 ****
--- 113,121 ----
$GLOBALS['phpgw']->template->set_var('lang_status',lang('Status'));
$GLOBALS['phpgw']->template->set_var('lang_budget',lang('Budget'));
+
$GLOBALS['phpgw']->template->set_var('lang_investment_nr',lang('investment
nr'));
$GLOBALS['phpgw']->template->set_var('lang_customer',lang('Customer'));
$GLOBALS['phpgw']->template->set_var('lang_coordinator',lang('Coordinator'));
+
$GLOBALS['phpgw']->template->set_var('lang_creator',lang('creator'));
+
$GLOBALS['phpgw']->template->set_var('lang_processor',lang('processor'));
$GLOBALS['phpgw']->template->set_var('lang_bookable_activities',lang('Bookable
activities'));
***************
*** 122,125 ****
--- 129,134 ----
$GLOBALS['phpgw']->template->set_var('lang_deliveries',lang('Deliveries'));
$GLOBALS['phpgw']->template->set_var('lang_stats',lang('Statistics'));
+
$GLOBALS['phpgw']->template->set_var('lang_ptime',lang('time planned'));
+
$GLOBALS['phpgw']->template->set_var('lang_utime',lang('time used'));
$GLOBALS['phpgw']->template->set_var('lang_done',lang('done'));
***************
*** 288,291 ****
--- 297,304 ----
if (! $title) $title = ' ';
+ $month =
$GLOBALS['phpgw']->common->show_date(time(),'n');
+ $day =
$GLOBALS['phpgw']->common->show_date(time(),'d');
+ $year =
$GLOBALS['phpgw']->common->show_date(time(),'Y');
+
$edate = $pro[$i]['edate'];
if ($edate == 0)
***************
*** 295,302 ****
else
{
- $month =
$GLOBALS['phpgw']->common->show_date(time(),'n');
- $day =
$GLOBALS['phpgw']->common->show_date(time(),'d');
- $year =
$GLOBALS['phpgw']->common->show_date(time(),'Y');
-
$edate = $edate + (60*60) *
$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'];
$edateout =
$GLOBALS['phpgw']->common->show_date($edate,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
--- 308,311 ----
***************
*** 318,331 ****
{
$sdate = $pro[$i]['sdate'];
! if ($sdate == 0) { $sdateout =
' '; }
! else
! {
! $month =
$GLOBALS['phpgw']->common->show_date(time(),'n');
! $day =
$GLOBALS['phpgw']->common->show_date(time(),'d');
! $year =
$GLOBALS['phpgw']->common->show_date(time(),'Y');
!
! $sdate = $sdate + (60*60) *
$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'];
! $td_action =
$GLOBALS['phpgw']->common->show_date($sdate,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
! }
}
--- 327,332 ----
{
$sdate = $pro[$i]['sdate'];
! $sdate = $sdate + (60*60) *
$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'];
! $td_action =
$GLOBALS['phpgw']->common->show_date($sdate,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
}
***************
*** 635,638 ****
--- 636,642 ----
$GLOBALS['phpgw']->template->set_var('lang_choose',($project_id?'':lang('generate
project id ?')));
+
$GLOBALS['phpgw']->template->set_var('investment_nr','<input type="text"
name="values[investment_nr]" value="' . $values['investment_nr']
+
. '" size="50" maxlength="45">');
+
// ------------ activites bookable ----------------------
***************
*** 661,664 ****
--- 665,669 ----
$GLOBALS['phpgw']->template->set_var('lang_action',lang('Edit job'));
$GLOBALS['phpgw']->template->set_var('lang_number',lang('Job ID'));
+
$GLOBALS['phpgw']->template->set_var('investment_nr',$parent['investment_nr']);
}
***************
*** 749,755 ****
if ($action == 'mains')
{
$GLOBALS['phpgw']->template->set_var('lang_number',lang('Project ID'));
-
$GLOBALS['phpgw']->template->set_var('lang_parent','');
-
$GLOBALS['phpgw']->template->set_var('pro_parent','');
}
else
--- 754,759 ----
if ($action == 'mains')
{
+
$GLOBALS['phpgw']->template->set_var('investment_nr',$values['investment_nr']);
$GLOBALS['phpgw']->template->set_var('lang_number',lang('Project ID'));
}
else
***************
*** 761,767 ****
$GLOBALS['phpgw']->template->set_var('pro_parent',$GLOBALS['phpgw']->strip_html($parent['number'])
. ' ' . $GLOBALS['phpgw']->strip_html($parent['title']));
$GLOBALS['phpgw']->template->set_var('cat',$this->cats->id2name($parent['cat']));
}
$GLOBALS['phpgw']->template->set_var('lang_number',lang('Job ID'));
!
$GLOBALS['phpgw']->template->set_var('lang_parent',lang('Main project:'));
}
--- 765,772 ----
$GLOBALS['phpgw']->template->set_var('pro_parent',$GLOBALS['phpgw']->strip_html($parent['number'])
. ' ' . $GLOBALS['phpgw']->strip_html($parent['title']));
$GLOBALS['phpgw']->template->set_var('cat',$this->cats->id2name($parent['cat']));
+
$GLOBALS['phpgw']->template->set_var('investment_nr',$parent['investment_nr']);
}
$GLOBALS['phpgw']->template->set_var('lang_number',lang('Job ID'));
!
$GLOBALS['phpgw']->template->set_var('lang_parent',lang('Main project'));
}
***************
*** 777,814 ****
$GLOBALS['phpgw']->template->set_var('currency',$prefs['currency']);
! $sdate = $values['sdate'];
! $edate = $values['edate'];
!
! if ($sdate != 0)
! {
! $smonth =
$GLOBALS['phpgw']->common->show_date(time(),'n');
! $sday =
$GLOBALS['phpgw']->common->show_date(time(),'d');
! $syear =
$GLOBALS['phpgw']->common->show_date(time(),'Y');
! $sdate = $sdate + (60*60) *
$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'];
! $sdateout =
$GLOBALS['phpgw']->common->show_date($sdate,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
! }
! else
{
! $sdateout = ' ';
}
! $GLOBALS['phpgw']->template->set_var('sdate',$sdateout);
! if ($edate != 0)
{
! $emonth =
$GLOBALS['phpgw']->common->show_date(time(),'n');
! $eday =
$GLOBALS['phpgw']->common->show_date(time(),'d');
! $eyear =
$GLOBALS['phpgw']->common->show_date(time(),'Y');
! $edate = $edate + (60*60) *
$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'];
! $edateout =
$GLOBALS['phpgw']->common->show_date($edate,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
! }
! else
! {
! $edateout = ' ';
}
! $GLOBALS['phpgw']->template->set_var('edate',$edateout);
$GLOBALS['phpgw']->template->set_var('coordinator',$GLOBALS['phpgw']->accounts->id2name($values['coordinator']));
// ----------------------------------- customer ------------------------------
--- 782,809 ----
$GLOBALS['phpgw']->template->set_var('currency',$prefs['currency']);
! $phours = $values['phours'];
! if ($values['pminutes'] > 0)
{
! $phours .= ':' . ($values['pminutes']);
}
! $GLOBALS['phpgw']->template->set_var('phours',$phours);
! $uhours = $values['uhours'];
! if ($values['uminutes'] > 0)
{
! $uhours .= ':' . ($values['uminutes']);
}
! $GLOBALS['phpgw']->template->set_var('uhours',$uhours);
!
!
$GLOBALS['phpgw']->template->set_var('sdate',$values['sdate_formatted']);
!
$GLOBALS['phpgw']->template->set_var('edate',$values['edate_formatted']);
!
$GLOBALS['phpgw']->template->set_var('udate',$values['udate_formatted']);
!
$GLOBALS['phpgw']->template->set_var('cdate',$values['cdate_formatted']);
$GLOBALS['phpgw']->template->set_var('coordinator',$GLOBALS['phpgw']->accounts->id2name($values['coordinator']));
+
$GLOBALS['phpgw']->template->set_var('owner',$GLOBALS['phpgw']->accounts->id2name($values['owner']));
+
$GLOBALS['phpgw']->template->set_var('processor',$GLOBALS['phpgw']->accounts->id2name($values['processor']));
// ----------------------------------- customer ------------------------------
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php,1.42.2.5.2.7,1.42.2.5.2.8 class.soprojecthours.inc.php,1.8.4.1,1.8.4.2 class.soprojects.inc.php,1.34.2.6.2.6,1.34.2.6.2.7 class.uiprojects.inc.php,1.47.2.7.2.5,1.47.2.7.2.6,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: projects/setup phpgw_en.lang,1.30,1.31 phpgw_fr.lang,1.6,1.7
- Next by Date:
[Phpgroupware-cvs] CVS: projects/setup setup.inc.php,1.11.2.2,1.11.2.2.2.1 tables_current.inc.php,1.11.2.1,1.11.2.1.2.1 tables_update.inc.php,1.15.2.1.2.1,1.15.2.1.2.2
- Previous by thread:
[Phpgroupware-cvs] CVS: projects/setup phpgw_en.lang,1.30,1.31 phpgw_fr.lang,1.6,1.7
- Next by thread:
[Phpgroupware-cvs] CVS: projects/setup setup.inc.php,1.11.2.2,1.11.2.2.2.1 tables_current.inc.php,1.11.2.1,1.11.2.1.2.1 tables_update.inc.php,1.15.2.1.2.1,1.15.2.1.2.2
- Index(es):