[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: projects/inc class.boprojecthours.inc.php,1.8.2.
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: projects/inc class.boprojecthours.inc.php,1.8.2.1.2.1,1.8.2.1.2.2 class.uiprojecthours.inc.php,1.22.2.5.2.5,1.22.2.5.2.6 |
|
Date: |
Tue, 10 Jun 2003 18:37:19 -0400 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv5150/inc
Modified Files:
Tag: Version-0_9_16-branch
class.boprojecthours.inc.php class.uiprojecthours.inc.php
Log Message:
update
Index: class.boprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojecthours.inc.php,v
retrieving revision 1.8.2.1.2.1
retrieving revision 1.8.2.1.2.2
diff -C2 -r1.8.2.1.2.1 -r1.8.2.1.2.2
*** class.boprojecthours.inc.php 26 Apr 2003 01:33:45 -0000
1.8.2.1.2.1
--- class.boprojecthours.inc.php 10 Jun 2003 22:37:16 -0000
1.8.2.1.2.2
***************
*** 54,58 ****
}
! global $start, $query, $filter, $order, $sort, $state;
if(isset($start)) { $this->start = $start; }
--- 54,65 ----
}
! $start = get_var('start',array('POST','GET'));
! $query = get_var('query',array('POST','GET'));
! $sort = get_var('sort',array('POST','GET'));
! $order = get_var('order',array('POST','GET'));
! $state = get_var('state',array('POST','GET'));
! $filter = get_var('filter',array('POST','GET'));
! $project_id =
get_var('project_id',array('POST','GET'));
!
if(isset($start)) { $this->start = $start; }
***************
*** 62,65 ****
--- 69,73 ----
if(isset($order)) { $this->order = $order; }
if(isset($state)) { $this->state = $state; }
+ if(isset($project_id)) { $this->project_id =
$project_id; }
}
***************
*** 82,85 ****
--- 90,94 ----
$this->sort = $data['sort'];
$this->state = $data['state'];
+ $this->project_id = $data['project_id'];
}
***************
*** 225,234 ****
}
! if ($values['hours_id'])
{
! if ($values['hours_id'] != 0)
! {
!
$this->soprojecthours->edit_hours($values);
! }
}
else
--- 234,240 ----
}
! if ($values['hours_id'] && $values['hours_id'] != 0)
{
! $this->soprojecthours->edit_hours($values);
}
else
Index: class.uiprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojecthours.inc.php,v
retrieving revision 1.22.2.5.2.5
retrieving revision 1.22.2.5.2.6
diff -C2 -r1.22.2.5.2.5 -r1.22.2.5.2.6
*** class.uiprojecthours.inc.php 10 Jun 2003 22:03:35 -0000
1.22.2.5.2.5
--- class.uiprojecthours.inc.php 10 Jun 2003 22:37:16 -0000
1.22.2.5.2.6
***************
*** 44,48 ****
function uiprojecthours()
{
! $this->boprojecthours =
CreateObject('projects.boprojecthours',True);
$this->boprojects =
CreateObject('projects.boprojects');
$this->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
--- 44,48 ----
function uiprojecthours()
{
! $this->bo
= CreateObject('projects.boprojecthours',True);
$this->boprojects =
CreateObject('projects.boprojects');
$this->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
***************
*** 52,61 ****
$this->grants[$this->account] = PHPGW_ACL_READ +
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
! $this->start =
$this->boprojecthours->start;
! $this->query =
$this->boprojecthours->query;
! $this->filter =
$this->boprojecthours->filter;
! $this->order =
$this->boprojecthours->order;
! $this->sort
= $this->boprojecthours->sort;
! $this->state =
$this->boprojecthours->state;
}
--- 52,62 ----
$this->grants[$this->account] = PHPGW_ACL_READ +
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
! $this->start =
$this->bo->start;
! $this->query =
$this->bo->query;
! $this->filter =
$this->bo->filter;
! $this->order =
$this->bo->order;
! $this->sort
= $this->bo->sort;
! $this->state =
$this->bo->state;
! $this->project_id =
$this->bo->project_id;
}
***************
*** 71,75 ****
'state' => $this->state
);
! $this->boprojecthours->save_sessiondata($data);
}
--- 72,76 ----
'state' => $this->state
);
! $this->bo->save_sessiondata($data);
}
***************
*** 99,103 ****
$GLOBALS['phpgw']->template->set_var('lang_customer',lang('Customer'));
$GLOBALS['phpgw']->template->set_var('lang_coordinator',lang('Coordinator'));
!
$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'));
--- 100,104 ----
$GLOBALS['phpgw']->template->set_var('lang_customer',lang('Customer'));
$GLOBALS['phpgw']->template->set_var('lang_coordinator',lang('Coordinator'));
!
$GLOBALS['phpgw']->template->set_var('lang_cancel',lang('Cancel'));
$GLOBALS['phpgw']->template->set_var('lang_save',lang('Save'));
$GLOBALS['phpgw']->template->set_var('lang_view',lang('View'));
***************
*** 116,120 ****
$GLOBALS['phpgw']->template->set_var('lang_end_time',lang('End time'));
$GLOBALS['phpgw']->template->set_var('lang_select_project',lang('Select
project'));
-
$GLOBALS['phpgw']->template->set_var('lang_reset',lang('Clear Form'));
$GLOBALS['phpgw']->template->set_var('lang_minperae',lang('Minutes per
workunit'));
$GLOBALS['phpgw']->template->set_var('lang_billperae',lang('Bill per
workunit'));
--- 117,120 ----
***************
*** 212,216 ****
$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'),$project_id));
switch($this->state)
--- 212,216 ----
$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)
***************
*** 241,254 ****
}
! $hours =
$this->boprojecthours->list_hours($this->start, True, $this->query,
$this->filter, $this->sort, $this->order, $this->state, $project_id);
// --------------------- nextmatch variable template-declarations
------------------------
! $left =
$this->nextmatchs->left('/index.php',$this->start,$this->boprojecthours->total_records,$link_data);
! $right =
$this->nextmatchs->right('/index.php',$this->start,$this->boprojecthours->total_records,$link_data);
$GLOBALS['phpgw']->template->set_var('left',$left);
$GLOBALS['phpgw']->template->set_var('right',$right);
!
$GLOBALS['phpgw']->template->set_var('lang_showing',$this->nextmatchs->show_hits($this->boprojecthours->total_records,$this->start));
// ------------------------- end nextmatch template
--------------------------------------
--- 241,254 ----
}
! $hours = $this->bo->list_hours($this->start, True,
$this->query, $this->filter, $this->sort, $this->order, $this->state,
$project_id);
// --------------------- nextmatch variable template-declarations
------------------------
! $left =
$this->nextmatchs->left('/index.php',$this->start,$this->bo->total_records,$link_data);
! $right =
$this->nextmatchs->right('/index.php',$this->start,$this->bo->total_records,$link_data);
$GLOBALS['phpgw']->template->set_var('left',$left);
$GLOBALS['phpgw']->template->set_var('right',$right);
!
$GLOBALS['phpgw']->template->set_var('lang_showing',$this->nextmatchs->show_hits($this->bo->total_records,$this->start));
// ------------------------- end nextmatch template
--------------------------------------
***************
*** 353,359 ****
$GLOBALS['phpgw']->template->set_var('action','');
}
-
-
$GLOBALS['phpgw']->template->pfp('out','hours_list_t',True);
$this->save_sessiondata();
}
--- 353,358 ----
$GLOBALS['phpgw']->template->set_var('action','');
}
$this->save_sessiondata();
+
$GLOBALS['phpgw']->template->pfp('out','hours_list_t',True);
}
***************
*** 416,425 ****
function edit_hours()
{
! $project_id =
get_var('project_id',array('POST','GET'));
! $pro_parent =
get_var('pro_parent',array('POST','GET'));
! $hours_id =
get_var('hours_id',array('POST','GET'));
! $values = get_var('values',array('POST'));
! $referer = get_var('referer',array('POST'));
if (! $values['submit'])
--- 415,427 ----
function edit_hours()
{
! $project_id =
get_var('project_id',array('POST','GET'));
! $pro_parent =
get_var('pro_parent',array('POST','GET'));
! $hours_id =
get_var('hours_id',array('POST','GET'));
! $values =
get_var('values',array('POST'));
! $referer =
get_var('referer',array('POST'));
!
! $delivery_id =
get_var('delivery_id',array('POST','GET'));
! $invoice_id =
get_var('invoice_id',array('POST','GET'));
if (! $values['submit'])
***************
*** 431,435 ****
{
$values['hours_id'] = $hours_id;
! $error =
$this->boprojecthours->check_values($values);
if (is_array($error))
{
--- 433,437 ----
{
$values['hours_id'] = $hours_id;
! $error = $this->bo->check_values($values);
if (is_array($error))
{
***************
*** 438,442 ****
else
{
!
$this->boprojecthours->save_hours($values);
Header('Location: ' . $referer);
}
--- 440,444 ----
else
{
! $this->bo->save_hours($values);
Header('Location: ' . $referer);
}
***************
*** 464,474 ****
$GLOBALS['phpgw']->template->set_var('hidden_vars','<input type="hidden"
name="referer" value="' . $referer . '">');
!
$GLOBALS['phpgw']->template->set_var('doneurl',$referer);
!
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
if ($hours_id)
{
! $values =
$this->boprojecthours->read_single_hours($hours_id);
$activity_id = $values['activity_id'];
--- 466,476 ----
$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));
if ($hours_id)
{
! $values =
$this->bo->read_single_hours($hours_id);
$activity_id = $values['activity_id'];
***************
*** 592,595 ****
--- 594,598 ----
}
+ $this->save_sessiondata();
$GLOBALS['phpgw']->template->set_var('edithandle','');
$GLOBALS['phpgw']->template->set_var('addhandle','');
***************
*** 627,631 ****
}
! $values =
$this->boprojecthours->read_single_hours($hours_id);
$GLOBALS['phpgw']->template->set_var('status',lang($values['status']));
--- 630,634 ----
}
! $values = $this->bo->read_single_hours($hours_id);
$GLOBALS['phpgw']->template->set_var('status',lang($values['status']));
***************
*** 684,688 ****
if ($confirm)
{
! $this->boprojecthours->delete_hours($hours_id);
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
--- 687,691 ----
if ($confirm)
{
! $this->bo->delete_hours($hours_id);
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: projects/inc class.boprojecthours.inc.php,1.8.2.1.2.1,1.8.2.1.2.2 class.uiprojecthours.inc.php,1.22.2.5.2.5,1.22.2.5.2.6,
Bettina Gille <address@hidden> <=