[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] projects/inc class.boprojects.inc.php, 1.63, 1.64 cla
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] projects/inc class.boprojects.inc.php, 1.63, 1.64 class.soprojects.inc.php, 1.48, 1.49 class.uiprojects.inc.php, 1.73, 1.74 |
|
Date: |
Tue, 18 Nov 2003 16:11:47 +0000 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv26038/inc
Modified Files:
class.boprojects.inc.php class.soprojects.inc.php
class.uiprojects.inc.php
Log Message:
fixes
Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** class.uiprojects.inc.php 29 Sep 2003 00:36:35 -0000 1.73
--- class.uiprojects.inc.php 18 Nov 2003 16:11:44 -0000 1.74
***************
*** 800,810 ****
else
{
! $values = array
! (
! 'parent' => $pro_main,
! 'status' => 'active'
! );
!
$GLOBALS['phpgw']->template->set_var('choose','<input type="checkbox"
name="values[choose]" value="True">');
if (!$values['smonth'])
--- 800,807 ----
else
{
!
//$GLOBALS['phpgw']->template->set_var('status','active');
!
//$GLOBALS['phpgw']->template->set_var('parent',$pro_main);
!
$GLOBALS['phpgw']->template->set_var('choose','<input type="checkbox"
name="values[choose]" value="True"' . (isset($values['choose'])?' checked':'')
. '>');
if (!$values['smonth'])
***************
*** 827,835 ****
$this->sbox->getMonthText('values[smonth]',$values['smonth']),
$this->sbox->getDays('values[sday]',$values['sday'])));
! if ($values['edate'] == 0)
{
! $values['eday'] = 0;
! $values['emonth'] = 0;
! $values['eyear'] = 0;
}
else
--- 824,843 ----
$this->sbox->getMonthText('values[smonth]',$values['smonth']),
$this->sbox->getDays('values[sday]',$values['sday'])));
! if (!$values['edate'] || $values['edate'] == 0)
{
! if (!$values['emonth'])
! {
! $values['emonth'] = 0;
! }
!
! if (!$values['eday'])
! {
! $values['eday'] = 0;
! }
!
! if (!$values['eyear'])
! {
! $values['eyear'] = 0;
! }
}
else
***************
*** 850,854 ****
$GLOBALS['phpgw']->template->set_var('title',$values['title']);
$GLOBALS['phpgw']->template->set_var('descr',$values['descr']);
!
$GLOBALS['phpgw']->template->set_var('phours',$values['phours']);
$month = $this->bo->return_date();
--- 858,862 ----
$GLOBALS['phpgw']->template->set_var('title',$values['title']);
$GLOBALS['phpgw']->template->set_var('descr',$values['descr']);
!
$GLOBALS['phpgw']->template->set_var('ptime',$values['ptime']);
$month = $this->bo->return_date();
***************
*** 922,926 ****
$GLOBALS['phpgw']->template->set_var('lang_ptime_main',lang('time planned main
project') . ': ' . lang('work hours'));
!
$GLOBALS['phpgw']->template->set_var('ptime_main',$main['phours']);
$GLOBALS['phpgw']->template->set_var('lang_budget_main',lang('budget main
project') . ': ' . $prefs['currency']);
--- 930,934 ----
$GLOBALS['phpgw']->template->set_var('lang_ptime_main',lang('time planned main
project') . ': ' . lang('work hours'));
!
$GLOBALS['phpgw']->template->set_var('ptime_main',$main['ptime']);
$GLOBALS['phpgw']->template->set_var('lang_budget_main',lang('budget main
project') . ': ' . $prefs['currency']);
***************
*** 1036,1039 ****
--- 1044,1049 ----
$values = $this->bo->read_single_project($project_id);
+ //_debug_array($values);
+
$GLOBALS['phpgw']->template->set_var('cat',$this->bo->cats->id2name($values['cat']));
***************
*** 1097,1101 ****
$GLOBALS['phpgw']->template->set_var('month',$month['monthformatted']);
!
$GLOBALS['phpgw']->template->set_var('phours',$values['phours']);
$GLOBALS['phpgw']->template->set_var('uhours',$values['uhours']);
--- 1107,1111 ----
$GLOBALS['phpgw']->template->set_var('month',$month['monthformatted']);
!
$GLOBALS['phpgw']->template->set_var('ptime',$values['ptime']);
$GLOBALS['phpgw']->template->set_var('uhours',$values['uhours']);
Index: class.boprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** class.boprojects.inc.php 12 Nov 2003 14:33:30 -0000 1.63
--- class.boprojects.inc.php 18 Nov 2003 16:11:44 -0000 1.64
***************
*** 539,543 ****
(
'utime' =>
$this->sohours->get_time_used($project_id),
! 'phours' =>
($pro['ptime']/60),
'title' =>
$GLOBALS['phpgw']->strip_html($pro['title']),
'number' =>
$GLOBALS['phpgw']->strip_html($pro['number']),
--- 539,543 ----
(
'utime' =>
$this->sohours->get_time_used($project_id),
! 'ptime' =>
($pro['ptime']/60),
'title' =>
$GLOBALS['phpgw']->strip_html($pro['title']),
'number' =>
$GLOBALS['phpgw']->strip_html($pro['number']),
Index: class.soprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** class.soprojects.inc.php 14 Nov 2003 13:04:03 -0000 1.48
--- class.soprojects.inc.php 18 Nov 2003 16:11:44 -0000 1.49
***************
*** 73,77 ****
'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'),
--- 73,77 ----
'project_id' => $this->db->f('id'),
'parent' =>
$this->db->f('parent'),
! 'number' =>
$this->db->f('p_number'),
'access' =>
$this->db->f('access'),
'cat' =>
$this->db->f('category'),
***************
*** 1192,1199 ****
function delete_account_project_data($account_id)
{
! if ($account_id && $account_id > 0)
{
! $this->db->query('delete from phpgw_p_hours
where employee=' . intval($account_id),__LINE__,__FILE__);
! $this->db->query('select id from
phpgw_p_projects where coordinator=' . intval($account_id),__LINE__,__FILE__);
while ($this->db->next_record())
--- 1192,1201 ----
function delete_account_project_data($account_id)
{
! $account_id = intval($account_id);
! if ($account_id > 0)
{
! $this->db->query('delete from phpgw_categories
where owner=' . $account_id . " AND cat_appname='projects'",__LINE__,__FILE__);
! $this->db->query('delete from phpgw_p_hours
where employee=' . $account_id,__LINE__,__FILE__);
! $this->db->query('select id from
phpgw_p_projects where coordinator=' . $account_id,__LINE__,__FILE__);
while ($this->db->next_record())
***************
*** 1264,1269 ****
$this->db->query('UPDATE phpgw_p_projects set
coordinator=' . $new . ' where coordinator=' . $old,__LINE__,__FILE__);
$this->db->query('UPDATE phpgw_p_hours set employee=' .
$new . ' where employee=' . $old,__LINE__,__FILE__);
! $this->db->query('UPDATE phpgw_p_projectmembers set
account_id=' . $new . ' where (account_id=' . $old
! . " AND
type='aa')",__LINE__,__FILE__);
}
--- 1266,1273 ----
$this->db->query('UPDATE phpgw_p_projects set
coordinator=' . $new . ' where coordinator=' . $old,__LINE__,__FILE__);
$this->db->query('UPDATE phpgw_p_hours set employee=' .
$new . ' where employee=' . $old,__LINE__,__FILE__);
! $this->db->query('UPDATE phpgw_p_projectmembers set
account_id=' . $new . ' where (account_id=' . $old . " AND
type='aa')",__LINE__,__FILE__);
! $this->db->query('UPDATE phpgw_p_invoice set owner=' .
$new . ' where owner=' . $old,__LINE__,__FILE__);
! $this->db->query('UPDATE phpgw_p_delivery set owner=' .
$new . ' where owner=' . $old,__LINE__,__FILE__);
! $this->db->query('UPDATE phpgw_categories set
cat_owner=' . $new . ' where cat_owner=' . $old . " AND
cat_appname='projects'",__LINE__,__FILE__);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] projects/inc class.boprojects.inc.php, 1.63, 1.64 class.soprojects.inc.php, 1.48, 1.49 class.uiprojects.inc.php, 1.73, 1.74,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] property/templates/default project.xsl, 1.21, 1.22 wo_hour.xsl, 1.20, 1.21 tts.xsl, 1.19, 1.20
- Next by Date:
[Phpgroupware-cvs] phpgwapi/templates/linux-at-work.de about.tpl, 1.1, 1.1.4.1
- Previous by thread:
[Phpgroupware-cvs] property/templates/default project.xsl, 1.21, 1.22 wo_hour.xsl, 1.20, 1.21 tts.xsl, 1.19, 1.20
- Next by thread:
[Phpgroupware-cvs] phpgwapi/templates/linux-at-work.de about.tpl, 1.1, 1.1.4.1
- Index(es):