[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.20, 1.42.2.5.2.21 class.soprojects.inc.php, 1.34.2.6.2.21, 1.34.2.6.2.22 class.uiprojecthours.inc.php, 1.22.2.5.2.8, 1.22.2.5.2.9 class.uiprojects.inc.php, 1.47.2.7.2.23, 1.47.2.7.2.24 |
|
Date: |
Fri, 25 Jul 2003 19:00:41 -0400 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv24335/inc
Modified Files:
Tag: Version-0_9_16-branch
class.boprojects.inc.php class.soprojects.inc.php
class.uiprojecthours.inc.php class.uiprojects.inc.php
Log Message:
added mstones
Index: class.boprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.42.2.5.2.20
retrieving revision 1.42.2.5.2.21
diff -C2 -r1.42.2.5.2.20 -r1.42.2.5.2.21
*** class.boprojects.inc.php 25 Jul 2003 01:09:38 -0000 1.42.2.5.2.20
--- class.boprojects.inc.php 25 Jul 2003 23:00:36 -0000 1.42.2.5.2.21
***************
*** 440,444 ****
'pcosts' =>
$pro['pcosts'],
'edate' =>
$pro['edate'],
! 'status' =>
$pro['status']
);
}
--- 440,445 ----
'pcosts' =>
$pro['pcosts'],
'edate' =>
$pro['edate'],
! 'status' =>
$pro['status'],
! 'level' =>
$pro['level']
);
}
Index: class.soprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.34.2.6.2.21
retrieving revision 1.34.2.6.2.22
diff -C2 -r1.34.2.6.2.21 -r1.34.2.6.2.22
*** class.soprojects.inc.php 25 Jul 2003 02:12:37 -0000 1.34.2.6.2.21
--- class.soprojects.inc.php 25 Jul 2003 23:00:37 -0000 1.34.2.6.2.22
***************
*** 173,176 ****
--- 173,177 ----
switch($type)
{
+ case 'all':
case 'amains':
case 'mains': $parent_select = ' AND
parent=0'; break;
***************
*** 320,329 ****
. "'," .
$values['pcosts'] . ',' . intval($values['main']) . ',' .
intval($values['level']) . ')',__LINE__,__FILE__);
- /*$this->db->query("SELECT max(id) FROM
phpgw_p_projects");
- if($this->db->next_record())
- {
- $p_id = $this->db->f(0);
- }*/
-
$p_id = $this->db->get_last_insert_id($table,'id');
$this->db->unlock();
--- 321,324 ----
***************
*** 390,394 ****
$parent = $values['parent'];
$old_parent = $values['old_parent'];
! $main = $old_parent ?
intval($this->id2name($old_parent,'main')) : $id;
//echo "<p>reparent: $id/$main: $old_parent -->
$parent</p>\n";
--- 385,389 ----
$parent = $values['parent'];
$old_parent = $values['old_parent'];
! $main = $old_parent ?
intval($this->id2item(array('project_id' => $old_parent))) : $id;
//echo "<p>reparent: $id/$main: $old_parent -->
$parent</p>\n";
***************
*** 413,419 ****
}
! $new_main = $parent ? $this->id2name($parent,'main') :
$id;
! $new_parent_level = $parent ?
$this->id2name($parent,'level') : -1;
! $old_parent_level = $old_parent ?
$this->id2name($old_parent,'level') : -1;
$level_adj = $old_parent_level - $new_parent_level;
reset($subs);
--- 408,414 ----
}
! $new_main = $parent ? $this->id2item(array('project_id'
=> $parent)) : $id;
! $new_parent_level = $parent ?
$this->id2item(array('project_id' => $parent,'item' => 'level')) : -1;
! $old_parent_level = $old_parent ?
$this->id2item(array('project_id' => $old_parent,'item' => 'level')) : -1;
$level_adj = $old_parent_level - $new_parent_level;
reset($subs);
***************
*** 428,433 ****
}
! function edit_project($values, $book_activities,
$bill_activities)
{
$values['descr'] =
$this->db->db_addslashes($values['descr']);
$values['title'] =
$this->db->db_addslashes($values['title']);
--- 423,452 ----
}
! function edit_project($values, $book_activities = 0,
$bill_activities = 0)
{
+ if (is_array($book_activities))
+ {
+ $this->db2->query('delete from
phpgw_p_projectactivities where project_id=' . $values['project_id']
+ . " and
billable='N'",__LINE__,__FILE__);
+
+ while($activ=each($book_activities))
+ {
+ $this->db->query('insert into
phpgw_p_projectactivities (project_id, activity_id, billable) values (' .
$values['project_id']
+ . ',' .
$activ[1] . ",'N')",__LINE__,__FILE__);
+ }
+ }
+
+ if (is_array($bill_activities))
+ {
+ $this->db2->query('delete from
phpgw_p_projectactivities where project_id=' . $values['project_id']
+ . " and
billable='Y'",__LINE__,__FILE__);
+
+ while($activ=each($bill_activities))
+ {
+ $this->db->query('insert into
phpgw_p_projectactivities (project_id, activity_id, billable) values (' .
$values['project_id']
+ . ',' .
$activ[1] . ",'Y')",__LINE__,__FILE__);
+ }
+ }
+
$values['descr'] =
$this->db->db_addslashes($values['descr']);
$values['title'] =
$this->db->db_addslashes($values['title']);
***************
*** 441,445 ****
if (isset($values['old_parent']) &&
$values['old_parent'] != $values['parent'])
{
! //$this->reparent($values, $book_activities,
$bill_activities);
}
if (!isset($values['main']) || !isset($values['level']))
--- 460,464 ----
if (isset($values['old_parent']) &&
$values['old_parent'] != $values['parent'])
{
! $this->reparent($values);
}
if (!isset($values['main']) || !isset($values['level']))
***************
*** 459,486 ****
.
$values['investment_nr'] . "', pcosts=" . $values['pcosts'] . ', parent=' .
intval($values['parent'])
. ', level=' .
intval($values['level']) . ' where id=' .
$values['project_id'],__LINE__,__FILE__);
-
- if (is_array($book_activities))
- {
- $this->db2->query('delete from
phpgw_p_projectactivities where project_id=' . $values['project_id']
- . " and
billable='N'",__LINE__,__FILE__);
-
- while($activ=each($book_activities))
- {
- $this->db->query('insert into
phpgw_p_projectactivities (project_id, activity_id, billable) values (' .
$values['project_id']
- . ',' .
$activ[1] . ",'N')",__LINE__,__FILE__);
- }
- }
-
- if (is_array($bill_activities))
- {
- $this->db2->query('delete from
phpgw_p_projectactivities where project_id=' . $values['project_id']
- . " and
billable='Y'",__LINE__,__FILE__);
-
- while($activ=each($bill_activities))
- {
- $this->db->query('insert into
phpgw_p_projectactivities (project_id, activity_id, billable) values (' .
$values['project_id']
- . ',' .
$activ[1] . ",'Y')",__LINE__,__FILE__);
- }
- }
$this->db->query('SELECT max(month) FROM phpgw_p_pcosts
where project_id=' . $values['project_id'],__LINE__,__FILE__);
--- 478,481 ----
Index: class.uiprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojecthours.inc.php,v
retrieving revision 1.22.2.5.2.8
retrieving revision 1.22.2.5.2.9
diff -C2 -r1.22.2.5.2.8 -r1.22.2.5.2.9
*** class.uiprojecthours.inc.php 20 Jun 2003 22:04:32 -0000
1.22.2.5.2.8
--- class.uiprojecthours.inc.php 25 Jul 2003 23:00:37 -0000
1.22.2.5.2.9
***************
*** 216,220 ****
$GLOBALS['phpgw']->template->set_var('state_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
!
$GLOBALS['phpgw']->template->set_var('project_list',$this->boprojects->select_project_list('all',(($action
!= 'asubs')?$status:'archive'),$this->project_id));
switch($this->state)
--- 216,220 ----
$GLOBALS['phpgw']->template->set_var('state_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
!
$GLOBALS['phpgw']->template->set_var('project_list',$this->boprojects->select_project_list(array('type'
=> 'all','status' => (($action != 'asubs')?$status:'archive'),'selected' =>
$this->project_id)));
switch($this->state)
Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.47.2.7.2.23
retrieving revision 1.47.2.7.2.24
diff -C2 -r1.47.2.7.2.23 -r1.47.2.7.2.24
*** class.uiprojects.inc.php 25 Jul 2003 02:12:37 -0000 1.47.2.7.2.23
--- class.uiprojects.inc.php 25 Jul 2003 23:00:37 -0000 1.47.2.7.2.24
***************
*** 340,344 ****
{
$space = ' . ';
! $spaceset = str_repeat($space,$level);
}
--- 340,344 ----
{
$space = ' . ';
! $spaceset =
str_repeat($space,$pro[$i]['level']);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php, 1.42.2.5.2.20, 1.42.2.5.2.21 class.soprojects.inc.php, 1.34.2.6.2.21, 1.34.2.6.2.22 class.uiprojecthours.inc.php, 1.22.2.5.2.8, 1.22.2.5.2.9 class.uiprojects.inc.php, 1.47.2.7.2.23, 1.47.2.7.2.24,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: projects/setup phpgw_de.lang, 1.17.2.4.2.13, 1.17.2.4.2.14 setup.inc.php, 1.11.2.2.2.4, 1.11.2.2.2.5 tables_current.inc.php, 1.11.2.1.2.5, 1.11.2.1.2.6 tables_update.inc.php, 1.15.2.1.2.5, 1.15.2.1.2.6
- Next by Date:
[Phpgroupware-cvs] CVS: projects/templates/default form_mstone.tpl, NONE, 1.1.2.1 form.tpl, 1.33.4.14, 1.33.4.15 view.tpl, 1.6.4.6, 1.6.4.7
- Previous by thread:
[Phpgroupware-cvs] CVS: projects/setup phpgw_de.lang, 1.17.2.4.2.13, 1.17.2.4.2.14 setup.inc.php, 1.11.2.2.2.4, 1.11.2.2.2.5 tables_current.inc.php, 1.11.2.1.2.5, 1.11.2.1.2.6 tables_update.inc.php, 1.15.2.1.2.5, 1.15.2.1.2.6
- Next by thread:
[Phpgroupware-cvs] CVS: projects/templates/default form_mstone.tpl, NONE, 1.1.2.1 form.tpl, 1.33.4.14, 1.33.4.15 view.tpl, 1.6.4.6, 1.6.4.7
- Index(es):