[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: projects/inc class.bodeliveries.inc.php,1.15,1.
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: projects/inc class.bodeliveries.inc.php,1.15,1.15.4.1 class.boprojecthours.inc.php,1.8.2.1,1.8.2.1.2.1 class.boprojects.inc.php,1.42.2.5,1.42.2.5.2.1 class.sobilling.inc.php,1.11.2.1,1.11.2.1.2.1 class.sodeliveries.inc.php,1.15.2.1,1.15.2.1.2.1 class.soprojecthours.inc.php,1.8,1.8.4.1 class.soprojects.inc.php,1.34.2.6,1.34.2.6.2.1 class.uibilling.inc.php,1.18.2.6,1.18.2.6.2.1 class.uideliveries.inc.php,1.21.2.3,1.21.2.3.2.1 class.uiprojecthours.inc.php,1.22.2.5,1.22.2.5.2.1 class.uiprojects.inc.php,1.47.2.7,1.47.2.7.2.1 class.uistatistics.inc.php,1.10.2.2,1.10.2.2.2.1 |
|
Date: |
Fri, 25 Apr 2003 21:33:48 -0400 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv31991/inc
Modified Files:
Tag: Version-0_9_16-branch
class.bodeliveries.inc.php class.boprojecthours.inc.php
class.boprojects.inc.php class.sobilling.inc.php
class.sodeliveries.inc.php class.soprojecthours.inc.php
class.soprojects.inc.php class.uibilling.inc.php
class.uideliveries.inc.php class.uiprojecthours.inc.php
class.uiprojects.inc.php class.uistatistics.inc.php
Log Message:
update app_header, globals, nextmatch calls etc
Index: class.bodeliveries.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.bodeliveries.inc.php,v
retrieving revision 1.15
retrieving revision 1.15.4.1
diff -C2 -r1.15 -r1.15.4.1
*** class.bodeliveries.inc.php 5 Jan 2002 23:56:37 -0000 1.15
--- class.bodeliveries.inc.php 26 Apr 2003 01:33:45 -0000 1.15.4.1
***************
*** 65,71 ****
}
! function read_deliveries($query, $sort, $order, $limit,
$project_id)
{
! $del = $this->sodeliveries->read_deliveries($query,
$sort, $order, $limit, $project_id);
$this->total_records =
$this->sodeliveries->total_records;
return $del;
--- 65,71 ----
}
! function read_deliveries($start, $query, $sort, $order, $limit,
$project_id)
{
! $del = $this->sodeliveries->read_deliveries($start,
$query, $sort, $order, $limit, $project_id);
$this->total_records =
$this->sodeliveries->total_records;
return $del;
Index: class.boprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojecthours.inc.php,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.1.2.1
diff -C2 -r1.8.2.1 -r1.8.2.1.2.1
Index: class.boprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.42.2.5
retrieving revision 1.42.2.5.2.1
diff -C2 -r1.42.2.5 -r1.42.2.5.2.1
*** class.boprojects.inc.php 3 Feb 2003 20:55:37 -0000 1.42.2.5
--- class.boprojects.inc.php 26 Apr 2003 01:33:45 -0000 1.42.2.5.2.1
***************
*** 79,89 ****
}
! $start = $GLOBALS['HTTP_POST_VARS']['start'] ?
$GLOBALS['HTTP_POST_VARS']['start'] : $GLOBALS['HTTP_GET_VARS']['start'];
! $query = $GLOBALS['HTTP_POST_VARS']['query'] ?
$GLOBALS['HTTP_POST_VARS']['query'] : $GLOBALS['HTTP_GET_VARS']['query'];
! $sort = $GLOBALS['HTTP_POST_VARS']['sort'] ?
$GLOBALS['HTTP_POST_VARS']['sort'] : $GLOBALS['HTTP_GET_VARS']['sort'];
! $order = $GLOBALS['HTTP_POST_VARS']['order'] ?
$GLOBALS['HTTP_POST_VARS']['order'] : $GLOBALS['HTTP_GET_VARS']['order'];
! $cat_id = $GLOBALS['HTTP_POST_VARS']['cat_id'] ?
$GLOBALS['HTTP_POST_VARS']['cat_id'] : $GLOBALS['HTTP_GET_VARS']['cat_id'];
! $filter = $GLOBALS['HTTP_POST_VARS']['filter'] ?
$GLOBALS['HTTP_POST_VARS']['filter'] : $GLOBALS['HTTP_GET_VARS']['filter'];
! $status = $GLOBALS['HTTP_POST_VARS']['status'] ?
$GLOBALS['HTTP_POST_VARS']['status'] : $GLOBALS['HTTP_GET_VARS']['status'];
if(isset($start)) { $this->start = $start; }
--- 79,89 ----
}
! $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'));
! $cat_id = get_var('cat_id',array('POST','GET'));
! $filter = get_var('filter',array('POST','GET'));
! $status = get_var('status',array('POST','GET'));
if(isset($start)) { $this->start = $start; }
***************
*** 114,117 ****
--- 114,119 ----
case 'asubs' : $column = 'projects_asubs';
break;
case 'ustat' : $column = 'projects_ustat';
break;
+ case 'bill' : $column =
'projects_bill'; break;
+ case 'del' : $column =
'projects_del'; break;
}
return $column;
Index: class.sobilling.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.sobilling.inc.php,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.1.2.1
diff -C2 -r1.11.2.1 -r1.11.2.1.2.1
Index: class.sodeliveries.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.sodeliveries.inc.php,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.1.2.1
diff -C2 -r1.15.2.1 -r1.15.2.1.2.1
Index: class.soprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojecthours.inc.php,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -C2 -r1.8 -r1.8.4.1
*** class.soprojecthours.inc.php 9 Jan 2002 01:06:53 -0000 1.8
--- class.soprojecthours.inc.php 26 Apr 2003 01:33:45 -0000 1.8.4.1
***************
*** 7,11 ****
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000,2001,2002 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 7,11 ----
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000 - 2003 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
***************
*** 37,41 ****
}
! function read_hours($start, $limit = True, $query = '',
$filter, $sort = '', $order = '', $state, $project_id)
{
if ($order)
--- 37,41 ----
}
! function read_hours($start, $limit = True, $query = '', $filter
= '', $sort = '', $order = '', $state, $project_id)
{
if ($order)
***************
*** 55,59 ****
}
! if ($filter == 'private')
{
$filtermethod .= " AND employee='" .
$this->account . "'";
--- 55,59 ----
}
! if ($filter == 'yours')
{
$filtermethod .= " AND employee='" .
$this->account . "'";
Index: class.soprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.34.2.6
retrieving revision 1.34.2.6.2.1
diff -C2 -r1.34.2.6 -r1.34.2.6.2.1
*** class.soprojects.inc.php 18 Aug 2002 21:47:21 -0000 1.34.2.6
--- class.soprojects.inc.php 26 Apr 2003 01:33:45 -0000 1.34.2.6.2.1
***************
*** 254,258 ****
if ($p_id && ($p_id != 0))
{
! if (count($book_activities) != 0)
{
while($activ=each($book_activities))
--- 254,258 ----
if ($p_id && ($p_id != 0))
{
! if (is_array($book_activities))
{
while($activ=each($book_activities))
***************
*** 263,267 ****
}
! if (count($bill_activities) != 0)
{
while($activ=each($bill_activities))
--- 263,267 ----
}
! if (is_array($bill_activities))
{
while($activ=each($bill_activities))
***************
*** 496,502 ****
switch ($action)
{
- case 'mains': $p_table = ' phpgw_p_projects';
break;
- case 'subs' : $p_table = '
phpgw_p_projects'; break;
case 'act' : $p_table = '
phpgw_p_activities '; break;
}
--- 496,501 ----
switch ($action)
{
case 'act' : $p_table = '
phpgw_p_activities '; break;
+ default : $p_table = '
phpgw_p_projects'; break;
}
***************
*** 633,637 ****
$this->db->query("DELETE from phpgw_p_projectmembers
WHERE type='" . $aa . "' OR type='" . $ag . "'",__LINE__,__FILE__);
! if (count($users) != 0)
{
while($activ=each($users))
--- 632,636 ----
$this->db->query("DELETE from phpgw_p_projectmembers
WHERE type='" . $aa . "' OR type='" . $ag . "'",__LINE__,__FILE__);
! if (is_array($users))
{
while($activ=each($users))
***************
*** 642,646 ****
}
! if (count($groups) != 0)
{
while($activ=each($groups))
--- 641,645 ----
}
! if (is_array($groups))
{
while($activ=each($groups))
Index: class.uibilling.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uibilling.inc.php,v
retrieving revision 1.18.2.6
retrieving revision 1.18.2.6.2.1
diff -C2 -r1.18.2.6 -r1.18.2.6.2.1
*** class.uibilling.inc.php 5 Jul 2002 15:34:32 -0000 1.18.2.6
--- class.uibilling.inc.php 26 Apr 2003 01:33:45 -0000 1.18.2.6.2.1
***************
*** 7,11 ****
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000,2001,2002 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 7,11 ----
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000 - 2003 Bettina Gille *
* *
[...1193 lines suppressed...]
/* if ($sum == $sum_netto) {
$t->set_var('error_hint',''); }
else { $t->set_var('error_hint',lang('Error in
calculation sum does not match !')); } */
! $GLOBALS['phpgw']->template->set_var('error_hint','');
$tax = $this->format_tax($prefs['tax']);
! $GLOBALS['phpgw']->template->set_var('tax',$tax);
$taxpercent = ($tax/100);
$sum_tax = $sum_netto*$taxpercent;
!
$GLOBALS['phpgw']->template->set_var('sum_netto',sprintf("%01.2f",round($sum_netto,2)));
!
$GLOBALS['phpgw']->template->set_var('sum_tax',sprintf("%01.2f",round($sum_tax,2)));
$sum_sum = $sum_tax + $sum_netto;
!
$GLOBALS['phpgw']->template->set_var('sum_sum',sprintf("%01.2f",round($sum_sum,2)));
! // $GLOBALS['phpgw']->template->set_var('sumaes',$sumaes);
!
$GLOBALS['phpgw']->template->pfp('out','bill_list_t',True);
$GLOBALS['phpgw']->common->phpgw_exit();
}
Index: class.uideliveries.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uideliveries.inc.php,v
retrieving revision 1.21.2.3
retrieving revision 1.21.2.3.2.1
diff -C2 -r1.21.2.3 -r1.21.2.3.2.1
*** class.uideliveries.inc.php 1 Feb 2002 17:04:21 -0000 1.21.2.3
--- class.uideliveries.inc.php 26 Apr 2003 01:33:45 -0000 1.21.2.3.2.1
***************
*** 7,11 ****
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000,2001,2002 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 7,11 ----
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000 - 2003 Bettina Gille *
* *
[...1094 lines suppressed...]
}
--- 866,883 ----
}
!
$GLOBALS['phpgw']->template->set_var('aes',$aes);
$act_descr =
$GLOBALS['phpgw']->strip_html($note['act_descr']);
if (! $act_descr) { $act_descr =
' '; }
!
$GLOBALS['phpgw']->template->set_var('act_descr',$act_descr);
!
$GLOBALS['phpgw']->template->set_var('billperae',$note['billperae']);
$hours_descr =
$GLOBALS['phpgw']->strip_html($note['hours_descr']);
if (! $hours_descr) { $hours_descr =
' '; }
!
$GLOBALS['phpgw']->template->set_var('hours_descr',$hours_descr);
!
$GLOBALS['phpgw']->template->fp('list','del_list',True);
}
}
! $GLOBALS['phpgw']->template->set_var('sumaes',$sumaes);
!
$GLOBALS['phpgw']->template->pfp('out','del_list_t',True);
$GLOBALS['phpgw']->common->phpgw_exit();
}
Index: class.uiprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojecthours.inc.php,v
retrieving revision 1.22.2.5
retrieving revision 1.22.2.5.2.1
diff -C2 -r1.22.2.5 -r1.22.2.5.2.1
*** class.uiprojecthours.inc.php 20 Mar 2003 00:05:04 -0000 1.22.2.5
--- class.uiprojecthours.inc.php 26 Apr 2003 01:33:45 -0000
1.22.2.5.2.1
***************
*** 7,11 ****
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000,2001,2002 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 7,11 ----
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000 - 2003 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
***************
*** 37,41 ****
(
'list_hours' => True,
- 'add_hours' => True,
'edit_hours' => True,
'delete_hours' => True,
--- 37,40 ----
***************
*** 50,54 ****
$this->sbox
= CreateObject('phpgwapi.sbox');
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
- $this->t
= $GLOBALS['phpgw']->template;
$this->grants =
$GLOBALS['phpgw']->acl->get_grants('projects');
$this->grants[$this->account] = PHPGW_ACL_READ +
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
--- 49,52 ----
***************
*** 78,131 ****
function set_app_langs()
{
!
$this->t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
!
$this->t->set_var('row_on',$GLOBALS['phpgw_info']['theme']['row_on']);
!
$this->t->set_var('row_off',$GLOBALS['phpgw_info']['theme']['row_off']);
!
! $this->t->set_var('lang_category',lang('Category'));
! $this->t->set_var('lang_select',lang('Select'));
! $this->t->set_var('lang_descr',lang('Description'));
! $this->t->set_var('lang_title',lang('Title'));
! $this->t->set_var('lang_none',lang('None'));
! $this->t->set_var('lang_start_date',lang('Start Date'));
! $this->t->set_var('lang_end_date',lang('End Date'));
! $this->t->set_var('lang_date_due',lang('Date due'));
! $this->t->set_var('lang_access',lang('Private'));
! $this->t->set_var('lang_projects',lang('Projects'));
! $this->t->set_var('lang_jobs',lang('Jobs'));
! $this->t->set_var('lang_number',lang('Project ID'));
! $this->t->set_var('lang_title',lang('Title'));
! $this->t->set_var('lang_status',lang('Status'));
! $this->t->set_var('lang_save',lang('Save'));
! $this->t->set_var('lang_edit',lang('Edit'));
! $this->t->set_var('lang_budget',lang('Budget'));
! $this->t->set_var('lang_customer',lang('Customer'));
!
$this->t->set_var('lang_coordinator',lang('Coordinator'));
! $this->t->set_var('lang_done',lang('Done'));
! $this->t->set_var('lang_save',lang('Save'));
! $this->t->set_var('lang_view',lang('View'));
! $this->t->set_var('lang_hours',lang('Work hours'));
! $this->t->set_var('lang_activity',lang('Activity'));
! $this->t->set_var('lang_project',lang('Project'));
! $this->t->set_var('lang_descr',lang('Short
description'));
! $this->t->set_var('lang_remark',lang('Remark'));
! $this->t->set_var('lang_status',lang('Status'));
! $this->t->set_var('lang_employee',lang('Employee'));
! $this->t->set_var('lang_work_date',lang('Work date'));
! $this->t->set_var('lang_start_date',lang('Start date'));
! $this->t->set_var('lang_end_date',lang('End date'));
! $this->t->set_var('lang_work_time',lang('Work time'));
! $this->t->set_var('lang_start_time',lang('Start time'));
! $this->t->set_var('lang_end_time',lang('End time'));
! $this->t->set_var('lang_select_project',lang('Select
project'));
! $this->t->set_var('lang_reset',lang('Clear Form'));
! $this->t->set_var('lang_minperae',lang('Minutes per
workunit'));
! $this->t->set_var('lang_billperae',lang('Bill per
workunit'));
! $this->t->set_var('lang_submit',lang('Submit'));
}
function display_app_header()
{
! $this->t->set_file(array('header' => 'header.tpl'));
! $this->t->set_block('header','projects_header');
$this->set_app_langs();
--- 76,129 ----
function set_app_langs()
{
!
$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
!
$GLOBALS['phpgw']->template->set_var('row_on',$GLOBALS['phpgw_info']['theme']['row_on']);
!
$GLOBALS['phpgw']->template->set_var('row_off',$GLOBALS['phpgw_info']['theme']['row_off']);
!
!
$GLOBALS['phpgw']->template->set_var('lang_category',lang('Category'));
!
$GLOBALS['phpgw']->template->set_var('lang_select',lang('Select'));
!
$GLOBALS['phpgw']->template->set_var('lang_descr',lang('Description'));
!
$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_date_due',lang('Date due'));
!
$GLOBALS['phpgw']->template->set_var('lang_access',lang('Private'));
!
$GLOBALS['phpgw']->template->set_var('lang_projects',lang('Projects'));
!
$GLOBALS['phpgw']->template->set_var('lang_jobs',lang('Jobs'));
!
$GLOBALS['phpgw']->template->set_var('lang_number',lang('Project ID'));
!
$GLOBALS['phpgw']->template->set_var('lang_title',lang('Title'));
!
$GLOBALS['phpgw']->template->set_var('lang_status',lang('Status'));
!
$GLOBALS['phpgw']->template->set_var('lang_save',lang('Save'));
!
$GLOBALS['phpgw']->template->set_var('lang_edit',lang('Edit'));
!
$GLOBALS['phpgw']->template->set_var('lang_budget',lang('Budget'));
!
$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'));
!
$GLOBALS['phpgw']->template->set_var('lang_hours',lang('Work hours'));
!
$GLOBALS['phpgw']->template->set_var('lang_activity',lang('Activity'));
!
$GLOBALS['phpgw']->template->set_var('lang_project',lang('Project'));
!
$GLOBALS['phpgw']->template->set_var('lang_descr',lang('Short description'));
!
$GLOBALS['phpgw']->template->set_var('lang_remark',lang('Remark'));
!
$GLOBALS['phpgw']->template->set_var('lang_status',lang('Status'));
!
$GLOBALS['phpgw']->template->set_var('lang_employee',lang('Employee'));
!
$GLOBALS['phpgw']->template->set_var('lang_work_date',lang('Work date'));
!
$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_work_time',lang('Work time'));
!
$GLOBALS['phpgw']->template->set_var('lang_start_time',lang('Start time'));
!
$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'));
!
$GLOBALS['phpgw']->template->set_var('lang_submit',lang('Submit'));
}
function display_app_header()
{
! $GLOBALS['phpgw']->template->set_file(array('header' =>
'header.tpl'));
!
$GLOBALS['phpgw']->template->set_block('header','projects_header');
$this->set_app_langs();
***************
*** 133,163 ****
if ($this->boprojects->isprojectadmin('pad'))
{
!
$this->t->set_var('admin_info',lang('Administrator'));
!
$this->t->set_var('space1',' ');
!
$this->t->set_var('link_activities',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act'));
!
$this->t->set_var('lang_activities',lang('Activities'));
}
if ($this->boprojects->isprojectadmin('pbo'))
{
!
$this->t->set_var('book_info',lang('Bookkeeper'));
! $this->t->set_var('break',' | ');
!
$this->t->set_var('space2',' ');
!
$this->t->set_var('link_billing',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains'));
!
$this->t->set_var('lang_billing',lang('Billing'));
!
$this->t->set_var('link_delivery',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uideliveries.list_projects&action=mains'));
!
$this->t->set_var('lang_delivery',lang('Deliveries'));
! }
!
!
$this->t->set_var('link_jobs',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=subs'));
!
$this->t->set_var('link_hours',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojecthours.list_hours'));
!
$this->t->set_var('link_statistics',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects&action=mains'));
! $this->t->set_var('lang_statistics',lang('Statistics'));
!
$this->t->set_var('link_projects',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=mains'));
! $this->t->set_var('lang_projects',lang('Projects'));
!
$this->t->set_var('link_archiv',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.archive&action=amains'));
! $this->t->set_var('lang_archiv',lang('archive'));
! $this->t->fp('app_header','projects_header');
$GLOBALS['phpgw']->common->phpgw_header();
--- 131,161 ----
if ($this->boprojects->isprojectadmin('pad'))
{
!
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
!
$GLOBALS['phpgw']->template->set_var('space1',' ');
!
$GLOBALS['phpgw']->template->set_var('link_activities',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act'));
!
$GLOBALS['phpgw']->template->set_var('lang_activities',lang('Activities'));
}
if ($this->boprojects->isprojectadmin('pbo'))
{
!
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
!
$GLOBALS['phpgw']->template->set_var('break',' | ');
!
$GLOBALS['phpgw']->template->set_var('space2',' ');
!
$GLOBALS['phpgw']->template->set_var('link_billing',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains'));
!
$GLOBALS['phpgw']->template->set_var('lang_billing',lang('Billing'));
!
$GLOBALS['phpgw']->template->set_var('link_delivery',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uideliveries.list_projects&action=mains'));
!
$GLOBALS['phpgw']->template->set_var('lang_delivery',lang('Deliveries'));
! }
!
!
$GLOBALS['phpgw']->template->set_var('link_jobs',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=subs'));
!
$GLOBALS['phpgw']->template->set_var('link_hours',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojecthours.list_hours'));
!
$GLOBALS['phpgw']->template->set_var('link_statistics',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects&action=mains'));
!
$GLOBALS['phpgw']->template->set_var('lang_statistics',lang('Statistics'));
!
$GLOBALS['phpgw']->template->set_var('link_projects',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=mains'));
!
$GLOBALS['phpgw']->template->set_var('lang_projects',lang('Projects'));
!
$GLOBALS['phpgw']->template->set_var('link_archiv',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.archive&action=amains'));
!
$GLOBALS['phpgw']->template->set_var('lang_archiv',lang('archive'));
!
$GLOBALS['phpgw']->template->fp('app_header','projects_header');
$GLOBALS['phpgw']->common->phpgw_header();
***************
*** 186,195 ****
function list_hours()
{
! global $project_id, $action, $pro_parent;
$this->display_app_header();
! $this->t->set_file(array('hours_list_t' =>
'hours_listhours.tpl'));
! $this->t->set_block('hours_list_t','hours_list','list');
$link_data = array
--- 184,195 ----
function list_hours()
{
! $action = get_var('action',array('POST','GET'));
! $project_id =
get_var('project_id',array('POST','GET'));
! $pro_parent =
get_var('pro_parent',array('POST','GET'));
$this->display_app_header();
!
$GLOBALS['phpgw']->template->set_file(array('hours_list_t' =>
'hours_listhours.tpl'));
!
$GLOBALS['phpgw']->template->set_block('hours_list_t','hours_list','list');
$link_data = array
***************
*** 201,224 ****
);
! $GLOBALS['filter'] = $this->filter;
! $GLOBALS['query'] = $this->query;
!
$this->t->set_var('project_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
!
$this->t->set_var('filter_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
!
$this->t->set_var('filter_list',$this->nextmatchs->filter(1));
!
$this->t->set_var('search_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
!
$this->t->set_var('search_list',$this->nextmatchs->search(1));
!
$this->t->set_var('state_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
!
! if ($action != 'asubs')
! {
! $this->t->set_var(lang_action,lang('Work hours
list'));
!
$this->t->set_var('project_list',$this->boprojects->select_project_list('all',$status,$project_id));
! }
! else
! {
! $this->t->set_var(lang_action,lang('Work hours
archive'));
!
$this->t->set_var('project_list',$this->boprojects->select_project_list('all','archive',$project_id));
! }
switch($this->state)
--- 201,213 ----
);
!
$GLOBALS['phpgw']->template->set_var('project_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
!
$GLOBALS['phpgw']->template->set_var('filter_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
!
$GLOBALS['phpgw']->template->set_var('filter_list',$this->nextmatchs->new_filter(array('format'
=> 'yours','filter' => $this->filter)));
!
$GLOBALS['phpgw']->template->set_var('search_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
!
$GLOBALS['phpgw']->template->set_var('search_list',$this->nextmatchs->search(array('query'
=> $this->query)));
!
$GLOBALS['phpgw']->template->set_var('state_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . (($action == 'asubs')?lang('work hours
archive'):lang('list work hours'));
!
$GLOBALS['phpgw']->template->set_var('project_list',$this->boprojects->select_project_list('all',(($action
!= 'asubs')?$status:'archive'),$project_id));
switch($this->state)
***************
*** 235,239 ****
. '<option value="billed"' .
$state_sel[3] . '>' . lang('Billed') . '</option>' . "\n";
! $this->t->set_var('state_list',$state_list);
$coordinator =
$this->boprojects->return_value('co',$project_id);
--- 224,228 ----
. '<option value="billed"' .
$state_sel[3] . '>' . lang('Billed') . '</option>' . "\n";
!
$GLOBALS['phpgw']->template->set_var('state_list',$state_list);
$coordinator =
$this->boprojects->return_value('co',$project_id);
***************
*** 255,262 ****
$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);
! $this->t->set_var('left',$left);
! $this->t->set_var('right',$right);
!
$this->t->set_var('lang_showing',$this->nextmatchs->show_hits($this->boprojecthours->total_records,$this->start));
// ------------------------- end nextmatch template
--------------------------------------
--- 244,251 ----
$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
--------------------------------------
***************
*** 264,274 ****
// ---------------- list header variable template-declarations
--------------------------
!
$this->t->set_var('sort_hours_descr',$this->nextmatchs->show_sort_order($this->sort,'hours_descr',$this->order,'/index.php',lang('Description')));
!
$this->t->set_var('sort_status',$this->nextmatchs->show_sort_order($this->sort,'status',$this->order,'/index.php',lang('Status')));
!
$this->t->set_var('sort_start_date',$this->nextmatchs->show_sort_order($this->sort,'start_date',$this->order,'/index.php',lang('Work
date')));
!
$this->t->set_var('sort_start_time',$this->nextmatchs->show_sort_order($this->sort,'start_date',$this->order,'/index.php',lang('Start
time')));
!
$this->t->set_var('sort_end_time',$this->nextmatchs->show_sort_order($this->sort,'end_date',$this->order,'/index.php',lang('End
time')));
!
$this->t->set_var('sort_hours',$this->nextmatchs->show_sort_order($this->sort,'minutes',$this->order,'/index.php',lang('Hours')));
!
$this->t->set_var('sort_employee',$this->nextmatchs->show_sort_order($this->sort,'employee',$this->order,'/index.php',lang('Employee')));
// -------------- end header declaration
---------------------------------------
--- 253,263 ----
// ---------------- list header variable template-declarations
--------------------------
!
$GLOBALS['phpgw']->template->set_var('sort_hours_descr',$this->nextmatchs->show_sort_order($this->sort,'hours_descr',$this->order,'/index.php',lang('Description')));
!
$GLOBALS['phpgw']->template->set_var('sort_status',$this->nextmatchs->show_sort_order($this->sort,'status',$this->order,'/index.php',lang('Status')));
!
$GLOBALS['phpgw']->template->set_var('sort_start_date',$this->nextmatchs->show_sort_order($this->sort,'start_date',$this->order,'/index.php',lang('Work
date')));
!
$GLOBALS['phpgw']->template->set_var('sort_start_time',$this->nextmatchs->show_sort_order($this->sort,'start_date',$this->order,'/index.php',lang('Start
time')));
!
$GLOBALS['phpgw']->template->set_var('sort_end_time',$this->nextmatchs->show_sort_order($this->sort,'end_date',$this->order,'/index.php',lang('End
time')));
!
$GLOBALS['phpgw']->template->set_var('sort_hours',$this->nextmatchs->show_sort_order($this->sort,'minutes',$this->order,'/index.php',lang('Hours')));
!
$GLOBALS['phpgw']->template->set_var('sort_employee',$this->nextmatchs->show_sort_order($this->sort,'employee',$this->order,'/index.php',lang('Employee')));
// -------------- end header declaration
---------------------------------------
***************
*** 283,287 ****
$status = $hours[$i]['status'];
$statusout = lang($status);
! $this->t->set_var('tr_color',$tr_color);
$sdate =
$this->format_htime($hours[$i]['sdate']);
--- 272,276 ----
$status = $hours[$i]['status'];
$statusout = lang($status);
!
$GLOBALS['phpgw']->template->set_var('tr_color',$tr_color);
$sdate =
$this->format_htime($hours[$i]['sdate']);
***************
*** 299,303 ****
// ---------------- template declaration for list records
------------------------------
! $this->t->set_var(array('employee' =>
$employeeout,
'hours_descr' => $hours_descr,
'status' => $statusout,
--- 288,292 ----
// ---------------- template declaration for list records
------------------------------
!
$GLOBALS['phpgw']->template->set_var(array('employee' => $employeeout,
'hours_descr' => $hours_descr,
'status' => $statusout,
***************
*** 328,345 ****
{
$link_data['menuaction'] =
'projects.uiprojecthours.edit_hours';
!
$this->t->set_var('edit',$GLOBALS['phpgw']->link('/index.php',$link_data));
!
$this->t->set_var('lang_edit_entry',lang('Edit'));
}
else
{
! $this->t->set_var('edit','');
!
$this->t->set_var('lang_edit_entry',' ');
}
$link_data['menuaction'] =
'projects.uiprojecthours.view_hours';
!
$this->t->set_var('view',$GLOBALS['phpgw']->link('/index.php',$link_data));
!
$this->t->set_var('lang_view_entry',lang('View'));
! $this->t->fp('list','hours_list',True);
// --------------------------- end record declaration
-----------------------------------
--- 317,334 ----
{
$link_data['menuaction'] =
'projects.uiprojecthours.edit_hours';
!
$GLOBALS['phpgw']->template->set_var('edit',$GLOBALS['phpgw']->link('/index.php',$link_data));
!
$GLOBALS['phpgw']->template->set_var('lang_edit_entry',lang('Edit'));
}
else
{
!
$GLOBALS['phpgw']->template->set_var('edit','');
!
$GLOBALS['phpgw']->template->set_var('lang_edit_entry',' ');
}
$link_data['menuaction'] =
'projects.uiprojecthours.view_hours';
!
$GLOBALS['phpgw']->template->set_var('view',$GLOBALS['phpgw']->link('/index.php',$link_data));
!
$GLOBALS['phpgw']->template->set_var('lang_view_entry',lang('View'));
!
$GLOBALS['phpgw']->template->fp('list','hours_list',True);
// --------------------------- end record declaration
-----------------------------------
***************
*** 351,356 ****
if
($this->boprojects->check_perms($this->grants[$coordinator],PHPGW_ACL_ADD) ||
$coordinator == $this->account)
{
! $link_data['menuaction'] =
'projects.uiprojecthours.add_hours';
! $this->t->set_var('action','<form
method="POST" action="' . $GLOBALS['phpgw']->link('/index.php',$link_data)
. '"><input
type="submit" value="' . lang('Add') . '"></form>');
}
--- 340,346 ----
if
($this->boprojects->check_perms($this->grants[$coordinator],PHPGW_ACL_ADD) ||
$coordinator == $this->account)
{
! $link_data['menuaction'] =
'projects.uiprojecthours.edit_hours';
! unset($link_data['hours_id']);
!
$GLOBALS['phpgw']->template->set_var('action','<form method="POST" action="' .
$GLOBALS['phpgw']->link('/index.php',$link_data)
. '"><input
type="submit" value="' . lang('Add') . '"></form>');
}
***************
*** 358,365 ****
else
{
! $this->t->set_var('action','');
}
! $this->t->pfp('out','hours_list_t',True);
$this->save_sessiondata();
}
--- 348,355 ----
else
{
!
$GLOBALS['phpgw']->template->set_var('action','');
}
!
$GLOBALS['phpgw']->template->pfp('out','hours_list_t',True);
$this->save_sessiondata();
}
***************
*** 421,577 ****
}
- function add_hours()
- {
- global $project_id, $pro_parent, $values, $submit;
-
- $link_data = array
- (
- 'menuaction' =>
'projects.uiprojecthours.list_hours',
- 'project_id' => $project_id,
- 'pro_parent' => $pro_parent
- );
-
- if ($submit)
- {
- $values['project_id'] = $project_id;
- $values['pro_parent'] = $pro_parent;
- $error =
$this->boprojecthours->check_values($values);
- if (is_array($error))
- {
-
$this->t->set_var('message',$GLOBALS['phpgw']->common->error_list($error));
- }
- else
- {
-
$this->boprojecthours->save_hours($values);
- Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',$link_data));
- }
- }
-
- $this->display_app_header();
-
- $this->t->set_file(array('hours_add' =>
'hours_formhours.tpl'));
- $this->t->set_block('hours_add','add','addhandle');
- $this->t->set_block('hours_add','edit','edithandle');
-
-
$this->t->set_var('doneurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
-
- $link_data['menuaction'] =
'projects.uiprojecthours.add_hours';
-
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
- $this->t->set_var('lang_action',lang('Add work hours'));
-
-
$this->t->set_var('project_name',$this->boprojects->return_value('pro',$project_id));
-
- if ($pro_parent)
- {
-
$this->t->set_var('pro_parent',$GLOBALS['phpgw']->strip_html($this->boprojects->return_value('pro',$pro_parent)));
- $this->t->set_var('lang_pro_parent',lang('Main
project:'));
- }
-
-
$this->t->set_var('activity_list',$this->boprojects->select_hours_activities($project_id,
$values['activity_id']));
-
- $sdate = $this->hdate_format($values['sdate']);
-
-
$this->t->set_var('start_date_select',$GLOBALS['phpgw']->common->dateformatorder($this->sbox->getYears('values[syear]',$sdate['year']),
-
$this->sbox->getMonthText('values[smonth]',$sdate['month']),
-
$this->sbox->getDays('values[sday]',$sdate['day'])));
-
- $amsel = ' checked';
- $pmsel = '';
-
- if
($GLOBALS['phpgw_info']['user']['preferences']['common']['timeformat'] == '12')
- {
- if ($sdate['hour'] >= 12)
- {
- $amsel = '';
- $pmsel = ' checked';
- if ($sdate['hour'] > 12)
- {
- $sdate['hour'] = $sdate['hour']
- 12;
- }
- }
-
- if ($sdate['hour'] == 0)
- {
- $sdate['hour'] = 12;
- }
-
- $sradio = '<input type="radio"
name="values[sampm]" value="am"' . $amsel . '>am';
- $sradio .= '<input type="radio"
name="values[sampm]" value="pm"' . $pmsel . '>pm';
- $this->t->set_var('sradio',$sradio);
- }
- else
- {
- $this->t->set_var('sradio','');
- }
-
- $this->t->set_var('shour',$sdate['hour']);
- $this->t->set_var('smin',$sdate['min']);
-
- $edate = $this->hdate_format($values['edate']);
-
-
$this->t->set_var('end_date_select',$GLOBALS['phpgw']->common->dateformatorder($this->sbox->getYears('values[eyear]',$edate['year']),
-
$this->sbox->getMonthText('values[emonth]',$edate['month']),
-
$this->sbox->getDays('values[eday]',$edate['day'])));
-
- if
($GLOBALS['phpgw_info']['user']['preferences']['common']['timeformat'] == '12')
- {
- if ($edate['hour'] >= 12)
- {
- $amsel = '';
- $pmsel = ' checked';
-
- if ($edate['hour'] > 12)
- {
- $edate['hour'] = $edate['hour']
- 12;
- }
- }
- if ($edate['hour'] == 0)
- {
- $edate['hour'] = 12;
- }
-
- $eradio = '<input type="radio"
name="values[eampm]" value="am"' . $amsel . '>am';
- $eradio .= '<input type="radio"
name="values[eampm]" value="pm"' . $pmsel . '>pm';
- $this->t->set_var('eradio',$eradio);
- }
- else
- {
- $this->t->set_var('eradio','');
- }
-
- $this->t->set_var('ehour',$edate['hour']);
- $this->t->set_var('emin',$edate['min']);
-
- $this->t->set_var('remark',nl2br($values['remark']));
- $this->t->set_var('hours_descr',$values['hours_descr']);
-
- $this->t->set_var('hours',$values['hours']);
- $this->t->set_var('minutes',$values['minutes']);
-
-
$this->t->set_var('status_list',$this->status_format($values['status']));
-
-
$this->t->set_var('employee_list',$this->employee_format($values['employee']));
-
- $this->t->set_var('edithandle','');
- $this->t->set_var('addhandle','');
- $this->t->pfp('out','hours_add');
- $this->t->pfp('addhandle','add');
- }
-
function edit_hours()
{
! global $project_id, $pro_parent, $hours_id, $values,
$submit, $referer;
! if (! $submit)
! {
! $referer =
$GLOBALS['HTTP_SERVER_VARS']['HTTP_REFERER'] ?
$GLOBALS['HTTP_SERVER_VARS']['HTTP_REFERER'] : $GLOBALS['HTTP_REFERER'];
! }
! if (!$hours_id)
{
! Header('Location: ' . $referer);
}
! if ($submit)
{
$values['hours_id'] = $hours_id;
--- 411,429 ----
}
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'])
{
! $referer =
$GLOBALS['HTTP_SERVER_VARS']['HTTP_REFERER'] ?
$GLOBALS['HTTP_SERVER_VARS']['HTTP_REFERER'] : $GLOBALS['HTTP_REFERER'];
}
! if ($values['submit'])
{
$values['hours_id'] = $hours_id;
***************
*** 579,583 ****
if (is_array($error))
{
!
$this->t->set_var('message',$GLOBALS['phpgw']->common->error_list($error));
}
else
--- 431,435 ----
if (is_array($error))
{
!
$GLOBALS['phpgw']->template->set_var('message',$GLOBALS['phpgw']->common->error_list($error));
}
else
***************
*** 600,622 ****
$this->display_app_header();
! $this->t->set_file(array('hours_edit' =>
'hours_formhours.tpl'));
! $this->t->set_block('hours_edit','add','addhandle');
! $this->t->set_block('hours_edit','edit','edithandle');
! $this->t->set_var('hidden_vars','<input type="hidden"
name="referer" value="' . $referer . '">');
! $this->t->set_var('doneurl',$referer);
!
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
! $this->t->set_var('lang_action',lang('Edit work
hours'));
! $values =
$this->boprojecthours->read_single_hours($hours_id);
!
$this->t->set_var('status_list',$this->status_format($values['status']));
!
$this->t->set_var('employee_list',$this->employee_format($values['employee']));
$sdate = $this->hdate_format($values['sdate']);
!
$this->t->set_var('start_date_select',$GLOBALS['phpgw']->common->dateformatorder($this->sbox->getYears('values[syear]',$sdate['year']),
$this->sbox->getMonthText('values[smonth]',$sdate['month']),
$this->sbox->getDays('values[sday]',$sdate['day'])));
--- 452,478 ----
$this->display_app_header();
! $form = ($hours_id?'edit':'add');
! $GLOBALS['phpgw']->template->set_file(array('hours_' .
$form => 'hours_formhours.tpl'));
! $GLOBALS['phpgw']->template->set_block('hours_' .
$form,'add','addhandle');
! $GLOBALS['phpgw']->template->set_block('hours_' .
$form,'edit','edithandle');
!
$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));
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($hours_id?lang('edit work hours'):lang('add work
hours'));
! if ($hours_id)
! {
! $values =
$this->boprojecthours->read_single_hours($hours_id);
! }
!
$GLOBALS['phpgw']->template->set_var('status_list',$this->status_format($values['status']));
!
$GLOBALS['phpgw']->template->set_var('employee_list',$this->employee_format($values['employee']));
$sdate = $this->hdate_format($values['sdate']);
!
$GLOBALS['phpgw']->template->set_var('start_date_select',$GLOBALS['phpgw']->common->dateformatorder($this->sbox->getYears('values[syear]',$sdate['year']),
$this->sbox->getMonthText('values[smonth]',$sdate['month']),
$this->sbox->getDays('values[sday]',$sdate['day'])));
***************
*** 644,660 ****
$sradio = '<input type="radio"
name="values[sampm]" value="am"' . $amsel . '>am';
$sradio .= '<input type="radio"
name="values[sampm]" value="pm"' . $pmsel . '>pm';
! $this->t->set_var('sradio',$sradio);
}
else
{
! $this->t->set_var('sradio','');
}
! $this->t->set_var('shour',$sdate['hour']);
! $this->t->set_var('smin',$sdate['min']);
$edate = $this->hdate_format($values['edate']);
!
$this->t->set_var('end_date_select',$GLOBALS['phpgw']->common->dateformatorder($this->sbox->getYears('values[eyear]',$edate['year']),
$this->sbox->getMonthText('values[emonth]',$edate['month']),
$this->sbox->getDays('values[eday]',$edate['day'])));
--- 500,516 ----
$sradio = '<input type="radio"
name="values[sampm]" value="am"' . $amsel . '>am';
$sradio .= '<input type="radio"
name="values[sampm]" value="pm"' . $pmsel . '>pm';
!
$GLOBALS['phpgw']->template->set_var('sradio',$sradio);
}
else
{
!
$GLOBALS['phpgw']->template->set_var('sradio','');
}
!
$GLOBALS['phpgw']->template->set_var('shour',$sdate['hour']);
!
$GLOBALS['phpgw']->template->set_var('smin',$sdate['min']);
$edate = $this->hdate_format($values['edate']);
!
$GLOBALS['phpgw']->template->set_var('end_date_select',$GLOBALS['phpgw']->common->dateformatorder($this->sbox->getYears('values[eyear]',$edate['year']),
$this->sbox->getMonthText('values[emonth]',$edate['month']),
$this->sbox->getDays('values[eday]',$edate['day'])));
***************
*** 679,708 ****
$eradio = '<input type="radio"
name="values[eampm]" value="am"' . $amsel . '>am';
$eradio .= '<input type="radio"
name="values[eampm]" value="pm"' . $pmsel . '>pm';
! $this->t->set_var('eradio',$eradio);
}
else
{
! $this->t->set_var('eradio','');
}
! $this->t->set_var('ehour',$edate['hour']);
! $this->t->set_var('emin',$edate['min']);
!
$this->t->set_var('remark',nl2br($GLOBALS['phpgw']->strip_html($values['remark'])));
!
$this->t->set_var('hours_descr',$GLOBALS['phpgw']->strip_html($values['hours_descr']));
!
$this->t->set_var('hours',floor($values['ae_minutes']/60));
!
$this->t->set_var('minutes',($values['ae_minutes']-((floor($values['ae_minutes']/60)*60))));
if ($values['pro_parent'] != 0)
{
!
$this->t->set_var('pro_parent',$GLOBALS['phpgw']->strip_html($this->boprojects->return_value('pro',$values['pro_parent'])));
! $this->t->set_var('lang_pro_parent',lang('Main
project:'));
}
!
$this->t->set_var('project_name',$GLOBALS['phpgw']->strip_html($this->boprojects->return_value('pro',$values['project_id'])));
!
$this->t->set_var('activity_list',$this->boprojects->select_hours_activities($values['project_id'],$values['activity_id']));
$coordinator =
$this->boprojects->return_value('co',$values['project_id']);
--- 535,564 ----
$eradio = '<input type="radio"
name="values[eampm]" value="am"' . $amsel . '>am';
$eradio .= '<input type="radio"
name="values[eampm]" value="pm"' . $pmsel . '>pm';
!
$GLOBALS['phpgw']->template->set_var('eradio',$eradio);
}
else
{
!
$GLOBALS['phpgw']->template->set_var('eradio','');
}
!
$GLOBALS['phpgw']->template->set_var('ehour',$edate['hour']);
!
$GLOBALS['phpgw']->template->set_var('emin',$edate['min']);
!
$GLOBALS['phpgw']->template->set_var('remark',nl2br($GLOBALS['phpgw']->strip_html($values['remark'])));
!
$GLOBALS['phpgw']->template->set_var('hours_descr',$GLOBALS['phpgw']->strip_html($values['hours_descr']));
!
$GLOBALS['phpgw']->template->set_var('hours',floor($values['ae_minutes']/60));
!
$GLOBALS['phpgw']->template->set_var('minutes',($values['ae_minutes']-((floor($values['ae_minutes']/60)*60))));
if ($values['pro_parent'] != 0)
{
!
$GLOBALS['phpgw']->template->set_var('pro_parent',$GLOBALS['phpgw']->strip_html($this->boprojects->return_value('pro',$values['pro_parent'])));
!
$GLOBALS['phpgw']->template->set_var('lang_pro_parent',lang('Main project:'));
}
!
$GLOBALS['phpgw']->template->set_var('project_name',$GLOBALS['phpgw']->strip_html($this->boprojects->return_value('pro',$values['project_id'])));
!
$GLOBALS['phpgw']->template->set_var('activity_list',$this->boprojects->select_hours_activities($values['project_id'],$values['activity_id']));
$coordinator =
$this->boprojects->return_value('co',$values['project_id']);
***************
*** 720,740 ****
{
$link_data['menuaction'] =
'projects.uiprojecthours.delete_hours';
! $this->t->set_var('delete','<form method="POST"
action="' . $GLOBALS['phpgw']->link('/index.php',$link_data)
. '"><input type="submit" value="' . lang('Delete') .'"></form>');
}
else
{
! $this->t->set_var('delete',' ');
}
! $this->t->set_var('edithandle','');
! $this->t->set_var('addhandle','');
! $this->t->pfp('out','hours_edit');
! $this->t->pfp('edithandle','edit');
}
function view_hours()
{
! global $hours_id, $referer;
$referer = $GLOBALS['HTTP_SERVER_VARS']['HTTP_REFERER']
? $GLOBALS['HTTP_SERVER_VARS']['HTTP_REFERER'] : $GLOBALS['HTTP_REFERER'];
--- 576,598 ----
{
$link_data['menuaction'] =
'projects.uiprojecthours.delete_hours';
!
$GLOBALS['phpgw']->template->set_var('delete','<form method="POST" action="' .
$GLOBALS['phpgw']->link('/index.php',$link_data)
. '"><input type="submit" value="' . lang('Delete') .'"></form>');
}
else
{
!
$GLOBALS['phpgw']->template->set_var('delete',' ');
}
! $GLOBALS['phpgw']->template->set_var('edithandle','');
! $GLOBALS['phpgw']->template->set_var('addhandle','');
!
! $GLOBALS['phpgw']->template->pfp('out','hours_' .
$form);
! $GLOBALS['phpgw']->template->pfp($form .
'handle',$form);
}
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'];
***************
*** 747,758 ****
$this->display_app_header();
! $this->t->set_file(array('hours_view' =>
'hours_view.tpl'));
! $this->t->set_var('lang_action',lang('View work
hours'));
! $this->t->set_var('doneurl',$referer);
$nopref = $this->boprojects->check_prefs();
if ($nopref)
{
! $this->t->set_var('pref_message',lang('Please
set your preferences for this application !'));
}
else
--- 605,616 ----
$this->display_app_header();
!
$GLOBALS['phpgw']->template->set_file(array('hours_view' => 'hours_view.tpl'));
!
$GLOBALS['phpgw']->template->set_var('lang_action',lang('View work hours'));
!
$GLOBALS['phpgw']->template->set_var('doneurl',$referer);
$nopref = $this->boprojects->check_prefs();
if ($nopref)
{
!
$GLOBALS['phpgw']->template->set_var('pref_message',lang('Please set your
preferences for this application !'));
}
else
***************
*** 763,786 ****
$values =
$this->boprojecthours->read_single_hours($hours_id);
! $this->t->set_var('status',lang($values['status']));
$sdate = $this->format_htime($values['sdate']);
$edate = $this->format_htime($values['edate']);
! $this->t->set_var('sdate',$sdate['date']);
! $this->t->set_var('stime',$sdate['time']);
! $this->t->set_var('edate',$edate['date']);
! $this->t->set_var('etime',$edate['time']);
!
$this->t->set_var('remark',nl2br($GLOBALS['phpgw']->strip_html($values['remark'])));
!
$this->t->set_var('hours_descr',$GLOBALS['phpgw']->strip_html($values['hours_descr']));
!
$this->t->set_var('hours',floor($values['ae_minutes']/60));
!
$this->t->set_var('minutes',($values['ae_minutes']-(floor($values['ae_minutes']/60)*60)));
! $this->t->set_var('currency',$prefs['currency']);
! $this->t->set_var('minperae',$values['minperae']);
! $this->t->set_var('billperae',$values['billperae']);
$cached_data =
$this->boprojects->cached_accounts($values['employee']);
--- 621,644 ----
$values =
$this->boprojecthours->read_single_hours($hours_id);
!
$GLOBALS['phpgw']->template->set_var('status',lang($values['status']));
$sdate = $this->format_htime($values['sdate']);
$edate = $this->format_htime($values['edate']);
!
$GLOBALS['phpgw']->template->set_var('sdate',$sdate['date']);
!
$GLOBALS['phpgw']->template->set_var('stime',$sdate['time']);
!
$GLOBALS['phpgw']->template->set_var('edate',$edate['date']);
!
$GLOBALS['phpgw']->template->set_var('etime',$edate['time']);
!
$GLOBALS['phpgw']->template->set_var('remark',nl2br($GLOBALS['phpgw']->strip_html($values['remark'])));
!
$GLOBALS['phpgw']->template->set_var('hours_descr',$GLOBALS['phpgw']->strip_html($values['hours_descr']));
!
$GLOBALS['phpgw']->template->set_var('hours',floor($values['ae_minutes']/60));
!
$GLOBALS['phpgw']->template->set_var('minutes',($values['ae_minutes']-(floor($values['ae_minutes']/60)*60)));
!
$GLOBALS['phpgw']->template->set_var('currency',$prefs['currency']);
!
$GLOBALS['phpgw']->template->set_var('minperae',$values['minperae']);
!
$GLOBALS['phpgw']->template->set_var('billperae',$values['billperae']);
$cached_data =
$this->boprojects->cached_accounts($values['employee']);
***************
*** 788,809 ****
. ' [' .
$cached_data[$values['employee']]['firstname'] . ' '
.
$cached_data[$values['employee']]['lastname'] . ' ]');
! $this->t->set_var('employee',$employeeout);
!
$this->t->set_var('project_name',$GLOBALS['phpgw']->strip_html($this->boprojects->return_value('pro',$values['project_id'])));
if ($values['pro_parent'] != 0)
{
!
$this->t->set_var('pro_parent',$GLOBALS['phpgw']->strip_html($this->boprojects->return_value('pro',$values['pro_parent'])));
! $this->t->set_var('lang_pro_parent',lang('Main
project:'));
}
!
$this->t->set_var('activity',$GLOBALS['phpgw']->strip_html($this->boprojects->return_value('act',$values['activity_id'])));
! $this->t->pfp('out','hours_view');
}
function delete_hours()
{
! global $confirm, $hours_id, $project_id;
$link_data = array
--- 646,669 ----
. ' [' .
$cached_data[$values['employee']]['firstname'] . ' '
.
$cached_data[$values['employee']]['lastname'] . ' ]');
!
$GLOBALS['phpgw']->template->set_var('employee',$employeeout);
!
$GLOBALS['phpgw']->template->set_var('project_name',$GLOBALS['phpgw']->strip_html($this->boprojects->return_value('pro',$values['project_id'])));
if ($values['pro_parent'] != 0)
{
!
$GLOBALS['phpgw']->template->set_var('pro_parent',$GLOBALS['phpgw']->strip_html($this->boprojects->return_value('pro',$values['pro_parent'])));
!
$GLOBALS['phpgw']->template->set_var('lang_pro_parent',lang('Main project:'));
}
!
$GLOBALS['phpgw']->template->set_var('activity',$GLOBALS['phpgw']->strip_html($this->boprojects->return_value('act',$values['activity_id'])));
! $GLOBALS['phpgw']->template->pfp('out','hours_view');
}
function delete_hours()
{
! $hours_id =
get_var('hours_id',array('POST','GET'));
! $project_id =
get_var('project_id',array('POST','GET'));
! $confirm = get_var('confirm',array('POST'));
$link_data = array
***************
*** 822,838 ****
$this->display_app_header();
! $this->t->set_file(array('hours_delete' =>
'delete.tpl'));
! $this->t->set_var('lang_subs','');
! $this->t->set_var('subs', '');
!
$this->t->set_var('nolink',$GLOBALS['phpgw']->link('/index.php',$link_data));
! $this->t->set_var('deleteheader',lang('Are you sure you
want to delete this entry ?'));
! $this->t->set_var('lang_no',lang('No'));
! $this->t->set_var('lang_yes',lang('Yes'));
$link_data['menuaction'] =
'projects.uiprojecthours.delete_hours';
!
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
! $this->t->pfp('out','hours_delete');
}
}
--- 682,698 ----
$this->display_app_header();
!
$GLOBALS['phpgw']->template->set_file(array('hours_delete' => 'delete.tpl'));
! $GLOBALS['phpgw']->template->set_var('lang_subs','');
! $GLOBALS['phpgw']->template->set_var('subs', '');
!
$GLOBALS['phpgw']->template->set_var('nolink',$GLOBALS['phpgw']->link('/index.php',$link_data));
!
$GLOBALS['phpgw']->template->set_var('deleteheader',lang('Are you sure you want
to delete this entry ?'));
!
$GLOBALS['phpgw']->template->set_var('lang_no',lang('No'));
!
$GLOBALS['phpgw']->template->set_var('lang_yes',lang('Yes'));
$link_data['menuaction'] =
'projects.uiprojecthours.delete_hours';
!
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
! $GLOBALS['phpgw']->template->pfp('out','hours_delete');
}
}
Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.47.2.7
retrieving revision 1.47.2.7.2.1
diff -C2 -r1.47.2.7 -r1.47.2.7.2.1
*** class.uiprojects.inc.php 1 Sep 2002 17:46:44 -0000 1.47.2.7
--- class.uiprojects.inc.php 26 Apr 2003 01:33:45 -0000 1.47.2.7.2.1
***************
*** 7,11 ****
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000,2001,2002 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 7,11 ----
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000 - 2003 Bettina Gille *
* *
[...2554 lines suppressed...]
!
$GLOBALS['phpgw']->template->set_var('lang_delivery_entry',lang('Deliveries'));
}
else
{
!
$GLOBALS['phpgw']->template->set_var('lang_invoice_entry',' ');
!
$GLOBALS['phpgw']->template->set_var('lang_delivery_entry',' ');
}
!
$GLOBALS['phpgw']->template->set_var('stats',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.project_stat&project_id='
.
$pro[$i]['project_id']));
!
$GLOBALS['phpgw']->template->set_var('lang_stats_entry',lang('Statistics'));
!
$GLOBALS['phpgw']->template->fp('list','projects_list',True);
}
// ------------------------- end record declaration ------------------------
!
$GLOBALS['phpgw']->template->pfp('out','projects_list_t',True);
$this->save_sessiondata($action);
}
Index: class.uistatistics.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uistatistics.inc.php,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.2.2.1
diff -C2 -r1.10.2.2 -r1.10.2.2.2.1
*** class.uistatistics.inc.php 1 Feb 2002 02:33:28 -0000 1.10.2.2
--- class.uistatistics.inc.php 26 Apr 2003 01:33:45 -0000 1.10.2.2.2.1
***************
*** 7,11 ****
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000,2001,2002 Bettina Gille *
* *
* This program is free software; you can redistribute it and/or *
--- 7,11 ----
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
! * Copyright (C) 2000 - 2003 Bettina Gille *
* *
[...995 lines suppressed...]
!
$GLOBALS['phpgw']->template->set_var('e_account',' ');
!
$GLOBALS['phpgw']->template->set_var('e_activity',$GLOBALS['phpgw']->strip_html($proall['descr'])
. ' ['
. $GLOBALS['phpgw']->strip_html($proall['num']) . ']');
$summin += $proall['min'];
$hrs = floor($proall['min']/60). ':' .
sprintf ("%02d",(int)($proall['min']-floor($proall['min']/60)*60));
!
$GLOBALS['phpgw']->template->set_var('e_hours',$hrs);
!
$GLOBALS['phpgw']->template->fp('list','stat_list',True);
}
}
!
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
! $GLOBALS['phpgw']->template->set_var('e_account','<b>'
. lang('sum') . '</b>');
!
$GLOBALS['phpgw']->template->set_var('e_activity',' ');
$hrs = floor($summin/60). ':' . sprintf
("%02d",(int)($summin-floor($summin/60)*60));
! $GLOBALS['phpgw']->template->set_var('e_hours',$hrs);
!
$GLOBALS['phpgw']->template->fp('list','stat_list',True);
! $GLOBALS['phpgw']->template->pfp('out','project_stat');
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: projects/inc class.bodeliveries.inc.php,1.15,1.15.4.1 class.boprojecthours.inc.php,1.8.2.1,1.8.2.1.2.1 class.boprojects.inc.php,1.42.2.5,1.42.2.5.2.1 class.sobilling.inc.php,1.11.2.1,1.11.2.1.2.1 class.sodeliveries.inc.php,1.15.2.1,1.15.2.1.2.1 class.soprojecthours.inc.php,1.8,1.8.4.1 class.soprojects.inc.php,1.34.2.6,1.34.2.6.2.1 class.uibilling.inc.php,1.18.2.6,1.18.2.6.2.1 class.uideliveries.inc.php,1.21.2.3,1.21.2.3.2.1 class.uiprojecthours.inc.php,1.22.2.5,1.22.2.5.2.1 class.uiprojects.inc.php,1.47.2.7,1.47.2.7.2.1 class.uistatistics.inc.php,1.10.2.2,1.10.2.2.2.1,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: projects/templates/default archive.tpl,1.5,1.5.4.1 bill_list.tpl,1.13,1.13.4.1 bill_listhours.tpl,1.20,1.20.4.1 bill_listinvoice.tpl,1.10,1.10.4.1 del_listhours.tpl,1.16,1.16.4.1 form.tpl,1.33,1.33.4.1 formactivity.tpl,1.14,1.14.4.1 hours_formhours.tpl,1.20,1.20.4.1 hours_listhours.tpl,1.16,1.16.4.1 hours_view.tpl,1.5.2.1,1.5.2.1.2.1 list.tpl,1.24.2.1,1.24.2.1.2.1 listactivities.tpl,1.16,1.16.4.1preference_colspan.tpl,1.3.2.1,1.3.2.1.2.1 preferences.tpl,1.19.2.2,1.19.2.2.2.1stats_projectlist.tpl,1.11,1.11.4.1 stats_projectstat.tpl,1.11,1.11.4.1 stats_userlist.tpl,1.9,1.9.4.1 stats_userstat.tpl,1.11,1.11.4.1 view.tpl,1.6,1.6.4.1
- Next by Date:
[Phpgroupware-cvs] CVS: phpgwapi/setup phpgw_en.lang,1.55,1.56
- Previous by thread:
[Phpgroupware-cvs] CVS: projects/templates/default archive.tpl,1.5,1.5.4.1 bill_list.tpl,1.13,1.13.4.1 bill_listhours.tpl,1.20,1.20.4.1 bill_listinvoice.tpl,1.10,1.10.4.1 del_listhours.tpl,1.16,1.16.4.1 form.tpl,1.33,1.33.4.1 formactivity.tpl,1.14,1.14.4.1 hours_formhours.tpl,1.20,1.20.4.1 hours_listhours.tpl,1.16,1.16.4.1 hours_view.tpl,1.5.2.1,1.5.2.1.2.1 list.tpl,1.24.2.1,1.24.2.1.2.1 listactivities.tpl,1.16,1.16.4.1preference_colspan.tpl,1.3.2.1,1.3.2.1.2.1 preferences.tpl,1.19.2.2,1.19.2.2.2.1stats_projectlist.tpl,1.11,1.11.4.1 stats_projectstat.tpl,1.11,1.11.4.1 stats_userlist.tpl,1.9,1.9.4.1 stats_userstat.tpl,1.11,1.11.4.1 view.tpl,1.6,1.6.4.1
- Next by thread:
[Phpgroupware-cvs] CVS: phpgwapi/setup phpgw_en.lang,1.55,1.56
- Index(es):