[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.13,1.42.2.5.2.14 class.soprojecthours.inc.php,1.8.4.4,1.8.4.5 class.uiprojecthours.inc.php,1.22.2.5.2.6,1.22.2.5.2.7 class.uiprojects.inc.php,1.47.2.7.2.12,1.47.2.7.2.13 |
|
Date: |
Thu, 12 Jun 2003 17:28:24 -0400 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv28920/inc
Modified Files:
Tag: Version-0_9_16-branch
class.boprojects.inc.php class.soprojecthours.inc.php
class.uiprojecthours.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.13
retrieving revision 1.42.2.5.2.14
diff -C2 -r1.42.2.5.2.13 -r1.42.2.5.2.14
*** class.boprojects.inc.php 7 Jun 2003 23:34:03 -0000 1.42.2.5.2.13
--- class.boprojects.inc.php 12 Jun 2003 21:28:21 -0000 1.42.2.5.2.14
***************
*** 441,445 ****
'utime' =>
$this->sohours->get_time_used($project_id),
'phours' =>
($pro['ptime']/60),
- 'uhours' =>
($pro['utime']/60),
'title' =>
$GLOBALS['phpgw']->strip_html($pro['title']),
'number' =>
$GLOBALS['phpgw']->strip_html($pro['number']),
--- 441,444 ----
***************
*** 458,461 ****
--- 457,469 ----
'processor' =>
$pro['processor']
);
+
+ if ($project['utime'] > 0)
+ {
+ $project['uhours'] = ($project['utime']/60);
+ }
+ else
+ {
+ $project['uhours'] = 0;
+ }
if ($pro['edate'] == 0)
Index: class.soprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojecthours.inc.php,v
retrieving revision 1.8.4.4
retrieving revision 1.8.4.5
diff -C2 -r1.8.4.4 -r1.8.4.5
*** class.soprojecthours.inc.php 9 Jun 2003 22:05:16 -0000 1.8.4.4
--- class.soprojecthours.inc.php 12 Jun 2003 21:28:21 -0000 1.8.4.5
***************
*** 118,125 ****
$this->db->query('INSERT into phpgw_p_hours
(project_id,activity_id,entry_date,start_date,end_date,hours_descr,remark,minutes,'
! .
'status,minperae,billperae,employee,pro_parent) VALUES (' .
$values['project_id'] . ',' . $values['activity_id'] . ','
! . time() . ',' .
$values['sdate'] . ',' . $values['edate'] . ",'" . $values['hours_descr'] .
"','"
! . $values['remark'] .
"'," . $values['ae_minutes'] . ",'" . $values['status'] . "'," .
$values['minperae']
! . ',' .
$values['billperae'] . ',' . $values['employee'] . ',' . $values['pro_parent']
. ')',__LINE__,__FILE__);
}
--- 118,125 ----
$this->db->query('INSERT into phpgw_p_hours
(project_id,activity_id,entry_date,start_date,end_date,hours_descr,remark,minutes,'
! .
'status,minperae,billperae,employee,pro_parent) VALUES (' .
intval($values['project_id']) . ',' . intval($values['activity_id']) . ','
! . time() . ',' .
intval($values['sdate']) . ',' . intval($values['edate']) . ",'" .
$values['hours_descr'] . "','"
! . $values['remark'] .
"'," . intval($values['ae_minutes']) . ",'" . $values['status'] . "'," .
intval($values['minperae'])
! . ',' .
$values['billperae'] . ',' . intval($values['employee']) . ',' .
intval($values['pro_parent']) . ')',__LINE__,__FILE__);
}
***************
*** 130,148 ****
$values['remark'] =
$this->db->db_addslashes($values['remark']);
! $this->db->query('UPDATE phpgw_p_hours SET
activity_id=' . $values['activity_id'] . ',entry_date=' . time() .
',start_date='
! . $values['sdate'] .
',end_date=' . $values['edate'] . ",hours_descr='" . $values['hours_descr'] .
"',remark='"
! . $values['remark'] .
"',minutes=" . $values['ae_minutes'] . ",status='" . $values['status'] .
"',minperae="
! . $values['minperae'] .
',billperae=' . $values['billperae'] . ',employee=' . $values['employee']
! . ' where id=' .
$values['hours_id'],__LINE__,__FILE__);
}
function delete_hours($hours_id)
{
! $this->db->query('Delete from phpgw_p_hours where id='
. $hours_id,__LINE__,__FILE__);
}
function update_hours_act($activity_id, $minperae)
{
! $this->db->query('SELECT id,minperae from phpgw_p_hours
where activity_id=' . $activity_id,__LINE__,__FILE__);
while ($this->db->next_record())
--- 130,148 ----
$values['remark'] =
$this->db->db_addslashes($values['remark']);
! $this->db->query('UPDATE phpgw_p_hours SET
activity_id=' . intval($values['activity_id']) . ',entry_date=' . time() .
',start_date='
! .
intval($values['sdate']) . ',end_date=' . intval($values['edate']) .
",hours_descr='" . $values['hours_descr'] . "',remark='"
! . $values['remark'] .
"',minutes=" . intval($values['ae_minutes']) . ",status='" . $values['status']
. "',minperae="
! .
intval($values['minperae']) . ',billperae=' . $values['billperae'] .
',employee=' . intval($values['employee'])
! . ' where id=' .
intval($values['hours_id']),__LINE__,__FILE__);
}
function delete_hours($hours_id)
{
! $this->db->query('Delete from phpgw_p_hours where id='
. intval($hours_id),__LINE__,__FILE__);
}
function update_hours_act($activity_id, $minperae)
{
! $this->db->query('SELECT id,minperae from phpgw_p_hours
where activity_id=' . intval($activity_id),__LINE__,__FILE__);
while ($this->db->next_record())
***************
*** 158,162 ****
for ($i=0;$i<=count($hours);$i++)
{
! $this->db->query('UPDATE phpgw_p_hours
set minperae=' . $minperae . ' WHERE id=' . $hours[$i],__LINE__,__FILE__);
}
}
--- 158,162 ----
for ($i=0;$i<=count($hours);$i++)
{
! $this->db->query('UPDATE phpgw_p_hours
set minperae=' . intval($minperae) . ' WHERE id=' .
$hours[$i],__LINE__,__FILE__);
}
}
***************
*** 165,171 ****
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');
}
--- 165,172 ----
function get_time_used($project_id)
{
! $this->db->query('SELECT SUM(minutes) as utime from
phpgw_p_hours where project_id=' . intval($project_id),__LINE__,__FILE__);
if ($this->db->next_record())
{
+ //echo $this->db->f('utime');
return $this->db->f('utime');
}
Index: class.uiprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojecthours.inc.php,v
retrieving revision 1.22.2.5.2.6
retrieving revision 1.22.2.5.2.7
diff -C2 -r1.22.2.5.2.6 -r1.22.2.5.2.7
*** class.uiprojecthours.inc.php 10 Jun 2003 22:37:16 -0000
1.22.2.5.2.6
--- class.uiprojecthours.inc.php 12 Jun 2003 21:28:21 -0000
1.22.2.5.2.7
***************
*** 65,74 ****
$data = array
(
! 'start' => $this->start,
! 'query' => $this->query,
! 'filter' => $this->filter,
! 'order' => $this->order,
! 'sort' => $this->sort,
! 'state' => $this->state
);
$this->bo->save_sessiondata($data);
--- 65,75 ----
$data = array
(
! 'start' => $this->start,
! 'query' => $this->query,
! 'filter' => $this->filter,
! 'order' => $this->order,
! 'sort' => $this->sort,
! 'state' => $this->state,
! 'project_id' => $this->project_id
);
$this->bo->save_sessiondata($data);
***************
*** 101,104 ****
--- 102,106 ----
$GLOBALS['phpgw']->template->set_var('lang_coordinator',lang('Coordinator'));
$GLOBALS['phpgw']->template->set_var('lang_cancel',lang('Cancel'));
+
$GLOBALS['phpgw']->template->set_var('lang_done',lang('done'));
$GLOBALS['phpgw']->template->set_var('lang_save',lang('Save'));
$GLOBALS['phpgw']->template->set_var('lang_view',lang('View'));
***************
*** 118,122 ****
$GLOBALS['phpgw']->template->set_var('lang_select_project',lang('Select
project'));
$GLOBALS['phpgw']->template->set_var('lang_minperae',lang('Minutes per
workunit'));
!
$GLOBALS['phpgw']->template->set_var('lang_billperae',lang('Bill per
workunit'));
$GLOBALS['phpgw']->template->set_var('lang_submit',lang('Submit'));
}
--- 120,124 ----
$GLOBALS['phpgw']->template->set_var('lang_select_project',lang('Select
project'));
$GLOBALS['phpgw']->template->set_var('lang_minperae',lang('Minutes per
workunit'));
!
$GLOBALS['phpgw']->template->set_var('lang_billperae',lang('Bill per
hour/workunit'));
$GLOBALS['phpgw']->template->set_var('lang_submit',lang('Submit'));
}
***************
*** 432,435 ****
--- 434,439 ----
if ($values['submit'])
{
+ $values['project_id'] = $project_id;
+ $values['pro_parent'] = $pro_parent;
$values['hours_id'] = $hours_id;
$error = $this->bo->check_values($values);
***************
*** 466,470 ****
$GLOBALS['phpgw']->template->set_var('hidden_vars','<input type="hidden"
name="referer" value="' . $referer . '">');
!
$GLOBALS['phpgw']->template->set_var('cancel_url',$referer);
$GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
--- 470,474 ----
$GLOBALS['phpgw']->template->set_var('hidden_vars','<input type="hidden"
name="referer" value="' . $referer . '">');
!
$GLOBALS['phpgw']->template->set_var('cancel_url',$referer . '&project_id=' .
$project_id);
$GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
***************
*** 604,609 ****
function view_hours()
{
! $hours_id =
get_var('hours_id',array('POST','GET'));
! $referer = get_var('referer',array('POST'));
$referer = $GLOBALS['HTTP_SERVER_VARS']['HTTP_REFERER']
? $GLOBALS['HTTP_SERVER_VARS']['HTTP_REFERER'] : $GLOBALS['HTTP_REFERER'];
--- 608,614 ----
function view_hours()
{
! $hours_id = get_var('hours_id',array('GET'));
! //$referer = get_var('referer',array('POST'));
! $project_id = get_var('project_id',array('GET'));
$referer = $GLOBALS['HTTP_SERVER_VARS']['HTTP_REFERER']
? $GLOBALS['HTTP_SERVER_VARS']['HTTP_REFERER'] : $GLOBALS['HTTP_REFERER'];
***************
*** 618,622 ****
$GLOBALS['phpgw']->template->set_file(array('hours_view' => 'hours_view.tpl'));
!
$GLOBALS['phpgw']->template->set_var('doneurl',$referer);
$nopref = $this->boprojects->check_prefs();
--- 623,627 ----
$GLOBALS['phpgw']->template->set_file(array('hours_view' => 'hours_view.tpl'));
! $GLOBALS['phpgw']->template->set_var('doneurl',$referer
. '&project_id=' . $project_id);
$nopref = $this->boprojects->check_prefs();
Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.47.2.7.2.12
retrieving revision 1.47.2.7.2.13
diff -C2 -r1.47.2.7.2.12 -r1.47.2.7.2.13
*** class.uiprojects.inc.php 11 Jun 2003 21:25:03 -0000 1.47.2.7.2.12
--- class.uiprojects.inc.php 12 Jun 2003 21:28:21 -0000 1.47.2.7.2.13
***************
*** 129,133 ****
$GLOBALS['phpgw']->template->set_var('lang_hours',lang('Work hours'));
$GLOBALS['phpgw']->template->set_var('lang_remarkreq',lang('Remark required'));
!
$GLOBALS['phpgw']->template->set_var('lang_select',lang('Select per button !'));
$GLOBALS['phpgw']->template->set_var('lang_invoices',lang('Invoices'));
$GLOBALS['phpgw']->template->set_var('lang_deliveries',lang('Deliveries'));
--- 129,133 ----
$GLOBALS['phpgw']->template->set_var('lang_hours',lang('Work hours'));
$GLOBALS['phpgw']->template->set_var('lang_remarkreq',lang('Remark required'));
!
$GLOBALS['phpgw']->template->set_var('lang_invoices',lang('Invoices'));
$GLOBALS['phpgw']->template->set_var('lang_deliveries',lang('Deliveries'));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php,1.42.2.5.2.13,1.42.2.5.2.14 class.soprojecthours.inc.php,1.8.4.4,1.8.4.5 class.uiprojecthours.inc.php,1.22.2.5.2.6,1.22.2.5.2.7 class.uiprojects.inc.php,1.47.2.7.2.12,1.47.2.7.2.13,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/inc class.uiinvoice.inc.php,1.25,1.26 class.uiwo_hour.inc.php,1.25,1.26 class.uiproject.inc.php,1.23,1.24 class.uiworkorder.inc.php,1.21,1.22 class.uidrawing.inc.php,1.19,1.20 class.uirequest.inc.php,1.17,1.18 class.uidocument.inc.php,1.9,1.10class.uiinvestment.inc.php,1.19,1.20
- Next by Date:
[Phpgroupware-cvs] CVS: projects/templates/default form.tpl,1.33.4.8,1.33.4.9
- Previous by thread:
[Phpgroupware-cvs] CVS: property/inc class.uiinvoice.inc.php,1.25,1.26 class.uiwo_hour.inc.php,1.25,1.26 class.uiproject.inc.php,1.23,1.24 class.uiworkorder.inc.php,1.21,1.22 class.uidrawing.inc.php,1.19,1.20 class.uirequest.inc.php,1.17,1.18 class.uidocument.inc.php,1.9,1.10class.uiinvestment.inc.php,1.19,1.20
- Next by thread:
[Phpgroupware-cvs] CVS: projects/templates/default form.tpl,1.33.4.8,1.33.4.9
- Index(es):