[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] projects/inc class.bostatistics.inc.php class.s...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] projects/inc class.bostatistics.inc.php class.s... |
|
Date: |
Sat, 25 Nov 2006 17:02:37 +0000 |
CVSROOT: /sources/phpgroupware
Module name: projects
Changes by: Sigurd Nes <sigurdne> 06/11/25 17:02:36
Modified files:
inc : class.bostatistics.inc.php
class.soprojects.inc.php
class.uiprojecthours.inc.php
class.uiprojects.inc.php
class.uistatistics.inc.php
Log message:
notice and link
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/projects/inc/class.bostatistics.inc.php?cvsroot=phpgroupware&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/projects/inc/class.soprojects.inc.php?cvsroot=phpgroupware&r1=1.112&r2=1.113
http://cvs.savannah.gnu.org/viewcvs/projects/inc/class.uiprojecthours.inc.php?cvsroot=phpgroupware&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/projects/inc/class.uiprojects.inc.php?cvsroot=phpgroupware&r1=1.163&r2=1.164
http://cvs.savannah.gnu.org/viewcvs/projects/inc/class.uistatistics.inc.php?cvsroot=phpgroupware&r1=1.61&r2=1.62
Patches:
Index: class.bostatistics.inc.php
===================================================================
RCS file: /sources/phpgroupware/projects/inc/class.bostatistics.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- class.bostatistics.inc.php 8 Apr 2005 15:52:57 -0000 1.27
+++ class.bostatistics.inc.php 25 Nov 2006 17:02:36 -0000 1.28
@@ -6,7 +6,7 @@
* @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package projects
- * @version $Id: class.bostatistics.inc.php,v 1.27 2005/04/08 15:52:57
ceb Exp $
+ * @version $Id: class.bostatistics.inc.php,v 1.28 2006/11/25 17:02:36
sigurdne Exp $
* $Source:
/sources/phpgroupware/projects/inc/class.bostatistics.inc.php,v $
*/
@@ -18,6 +18,7 @@
var $order;
var $sort;
var $type;
+ var $status;
var $public_functions = array
(
Index: class.soprojects.inc.php
===================================================================
RCS file: /sources/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- class.soprojects.inc.php 25 Nov 2006 10:28:07 -0000 1.112
+++ class.soprojects.inc.php 25 Nov 2006 17:02:36 -0000 1.113
@@ -6,7 +6,7 @@
* @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package projects
- * @version $Id: class.soprojects.inc.php,v 1.112 2006/11/25 10:28:07
sigurdne Exp $
+ * @version $Id: class.soprojects.inc.php,v 1.113 2006/11/25 17:02:36
sigurdne Exp $
* $Source:
/sources/phpgroupware/projects/inc/class.soprojects.inc.php,v $
*/
@@ -263,13 +263,13 @@
$k=0;
for($i=$start;$i<$max;++$i)
{
- if(is_array($pro[$i]))
+ if(isset($pro[$i]) &&
is_array($pro[$i]))
{
$spro[$k] = $pro[$i];
++$k;
}
}
- if(is_array($spro))
+ if(isset($spro) && is_array($spro))
{
$pro = $spro;
}
Index: class.uiprojecthours.inc.php
===================================================================
RCS file: /sources/phpgroupware/projects/inc/class.uiprojecthours.inc.php,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- class.uiprojecthours.inc.php 25 Nov 2006 15:50:00 -0000 1.85
+++ class.uiprojecthours.inc.php 25 Nov 2006 17:02:36 -0000 1.86
@@ -6,7 +6,7 @@
* @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package projects
- * @version $Id: class.uiprojecthours.inc.php,v 1.85 2006/11/25 15:50:00
sigurdne Exp $
+ * @version $Id: class.uiprojecthours.inc.php,v 1.86 2006/11/25 17:02:36
sigurdne Exp $
* $Source:
/sources/phpgroupware/projects/inc/class.uiprojecthours.inc.php,v $
*/
@@ -87,7 +87,7 @@
$pro_main =
get_var('pro_main',array('POST','GET'));
$project_id =
get_var('project_id',array('POST','GET'));
- if ($_GET['cat_id'])
+ if (isset($_GET['cat_id']) && $_GET['cat_id'])
{
$this->cat_id = $_GET['cat_id'];
}
Index: class.uiprojects.inc.php
===================================================================
RCS file: /sources/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -b -r1.163 -r1.164
--- class.uiprojects.inc.php 25 Nov 2006 15:23:22 -0000 1.163
+++ class.uiprojects.inc.php 25 Nov 2006 17:02:36 -0000 1.164
@@ -6,7 +6,7 @@
* @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package projects
- * @version $Id: class.uiprojects.inc.php,v 1.163 2006/11/25 15:23:22
sigurdne Exp $
+ * @version $Id: class.uiprojects.inc.php,v 1.164 2006/11/25 17:02:36
sigurdne Exp $
* $Source:
/sources/phpgroupware/projects/inc/class.uiprojects.inc.php,v $
*/
@@ -1472,12 +1472,12 @@
$link_data = array
(
'menuaction' =>
'projects.uiprojects.view_project',
- 'pro_main' => $pro_main,
- 'action' => $action,
+ 'pro_main' =>
(isset($pro_main)?$pro_main:''),
+ 'action' => (isset($action)?$action:''),
'project_id' => $project_id
);
- if($_POST['back'])
+ if(isset($_POST['back']) && $_POST['back'])
{
$clickhistory =
$GLOBALS['phpgw']->session->get_click_path_entry();
$link_data['menuaction'] =
$clickhistory['menuaction'];
@@ -1487,7 +1487,7 @@
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
- if($_POST['done'])
+ if(isset($_POST['done']) && $_POST['done'])
{
$link_data['menuaction'] =
'projects.uiprojects.list_projects';
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
@@ -1523,7 +1523,7 @@
//_debug_array($values);
- if ($action == 'mains' || $action == 'amains')
+ if (isset($action) && ($action == 'mains' || $action ==
'amains'))
{
$GLOBALS['phpgw']->template->set_var('cat',$this->boprojects->cats->id2name($values['cat']));
$GLOBALS['phpgw']->template->set_var('pcosts',$values['pcosts']);
@@ -1549,7 +1549,8 @@
$GLOBALS['phpgw']->template->fp('subhandle','sub',True);
}
*/
-
$GLOBALS['phpgw']->template->set_var('investment_nr',($values['investment_nr']?$values['investment_nr']:$main['investment_nr']));
+ $main['investment_nr'] =
(isset($main['investment_nr'])?$main['investment_nr']:'');
+
$GLOBALS['phpgw']->template->set_var('investment_nr',(isset($values['investment_nr'])?$values['investment_nr']:$main['investment_nr']));
$GLOBALS['phpgw']->template->set_var('number',$values['number']);
Index: class.uistatistics.inc.php
===================================================================
RCS file: /sources/phpgroupware/projects/inc/class.uistatistics.inc.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- class.uistatistics.inc.php 8 Apr 2005 15:52:58 -0000 1.61
+++ class.uistatistics.inc.php 25 Nov 2006 17:02:36 -0000 1.62
@@ -6,7 +6,7 @@
* @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package projects
- * @version $Id: class.uistatistics.inc.php,v 1.61 2005/04/08 15:52:58
ceb Exp $
+ * @version $Id: class.uistatistics.inc.php,v 1.62 2006/11/25 17:02:36
sigurdne Exp $
* $Source:
/sources/phpgroupware/projects/inc/class.uistatistics.inc.php,v $
*/
@@ -83,10 +83,11 @@
$values = get_var('values',array('POST','GET'));
$view = get_var('view',array('POST','GET'));
+ $msg = '';
$pro_user = array();
- if($_POST['viewuser'])
+ if(isset($_POST['viewuser']) && $_POST['viewuser'])
{
- if(is_array($values['project_id']))
+ if(isset($values['project_id']) &&
is_array($values['project_id']))
{
$i = 0;
foreach($values['project_id'] as
$pro_id => $val)
@@ -101,9 +102,9 @@
}
}
- if($_POST['viewgantt'])
+ if(isset($_POST['viewgantt']) && $_POST['viewgantt'])
{
- if(is_array($values['gantt_id']))
+ if(isset($values['gantt_id']) &&
is_array($values['gantt_id']))
{
$i = 0;
foreach($values['gantt_id'] as $pro_id
=> $val)
@@ -137,8 +138,9 @@
{
$main =
$this->boprojects->read_single_project($pro_main);
$GLOBALS['phpgw']->template->set_var('title_main',$main['title']);
-
$GLOBALS['phpgw']->template->set_var('main_url',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.view_project&action=mains&project_id='
-
. $pro_main));
+
$GLOBALS['phpgw']->template->set_var('main_url',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'projects.uiprojects.view_project',
+
'action'=>'mains',
+
'project_id'=> $pro_main)));
$GLOBALS['phpgw']->template->set_var('coordinator_main',$main['coordinatorout']);
$GLOBALS['phpgw']->template->set_var('number_main',$main['number']);
$GLOBALS['phpgw']->template->set_var('customer_main',$main['customerout']);
@@ -217,19 +219,22 @@
'admins_included' => True));
}
-
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
+
$this->nextmatchs->template_alternate_row_class($GLOBALS['phpgw']->template);
//_debug_array($emps);
// --------------- template declaration for list records
-------------------------------------
if ($action == 'mains')
{
- $projects_url =
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects&pro_main='
- .
$pro[$i]['project_id'] . '&action=subs');
+ $projects_url =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'projects.uistatistics.list_projects',
+
'pro_main'=> $pro[$i]['project_id'],
+
'action'=>'subs'));
}
else
{
- $projects_url =
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojecthours.list_hours&project_id='
- .
$pro[$i]['project_id'] . '&action=hours&pro_main=' . $pro_main);
+ $projects_url =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'projects.uiprojecthours.list_hours',
+
'project_id'=> $pro[$i]['project_id'],
+
'action' => 'hours',
+
'pro_main' => $pro_main));
}
$GLOBALS['phpgw']->template->set_var(array
@@ -241,7 +246,7 @@
'edate' =>
$pro[$i]['edateout'],
'coordinator' =>
$pro[$i]['coordinatorout'],
'view_img' =>
$GLOBALS['phpgw']->common->image('phpgwapi','view'),
- 'radio_user_checked' =>
$_POST['viewuser']?(in_array($pro[$i]['project_id'],$pro_user)?'
checked':''):'',
+ 'radio_user_checked' =>
(isset($_POST['viewuser'])?(in_array($pro[$i]['project_id'],$pro_user)?'
checked':''):''),
'project_id' =>
$pro[$i]['project_id'],
'view_value' =>
($view=='gantt'?'gantt_id][' . $pro[$i]['project_id']:'project_id][' .
$pro[$i]['project_id'])
));
@@ -260,7 +265,7 @@
$GLOBALS['phpgw']->template->set_var('employee_list','');
$GLOBALS['phpgw']->template->set_var('users','');
- if(is_array($emps[$pro[$i]['project_id']]))
+ if(isset($emps[$pro[$i]['project_id']]) &&
is_array($emps[$pro[$i]['project_id']]))
{
foreach($emps[$pro[$i]['project_id']]
as $e)
{
@@ -309,8 +314,9 @@
{
$main =
$this->boprojects->read_single_project($pro_main);
$GLOBALS['phpgw']->template->set_var('title_main',$main['title']);
-
$GLOBALS['phpgw']->template->set_var('main_url',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.view_project&action=mains&project_id='
-
. $pro_main));
+
$GLOBALS['phpgw']->template->set_var('main_url',$GLOBALS['phpgw']->link('/index.php',array('menuaction'
=> 'projects.uiprojects.view_project',
+
'action' =>
'mains',
+
'project_id' =>
$pro_main)));
$GLOBALS['phpgw']->template->set_var('coordinator_main',$main['coordinatorout']);
$GLOBALS['phpgw']->template->set_var('number_main',$main['number']);
$GLOBALS['phpgw']->template->set_var('customer_main',$main['customerout']);
@@ -380,15 +386,17 @@
$emps[$pro[$i]['project_id']] =
$this->boprojects->selected_employees(array('project_id' =>
$pro[$i]['project_id'],'roles_included' => True,
'admins_included' => True));
-
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
+
$this->nextmatchs->template_alternate_row_class($GLOBALS['phpgw']->template);
// --------------- template declaration for list records
-------------------------------------
/*$projects_url =
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_project_employees&project_id='
.
$pro[$i]['project_id']);
*/
- $projects_url =
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojecthours.list_hours&project_id='
- .
$pro[$i]['project_id'] . '&action=hours&pro_main=' . $pro[$i]['main']);
+ $projects_url =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'projects.uiprojecthours.list_hours',
+
'project_id'=>
$pro[$i]['project_id'],
+
'action'=>'hours',
+
'pro_main'=>$pro[$i]['main']));
if($pro[$i]['project_id']==$project_id)
{
@@ -544,7 +552,7 @@
$pro[$users[$i]['account_id']] =
$this->boprojects->get_employee_projects($users[$i]['account_id']);
}
-
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
+
$this->nextmatchs->template_alternate_row_class($GLOBALS['phpgw']->template);
// --------------------- template declaration for list records
---------------------------
@@ -615,7 +623,7 @@
$GLOBALS['phpgw']->template->set_var('employee',$employee);
-
$this->nextmatchs->alternate_row_color(&$GLOBALS['phpgw']->template);
+
$this->nextmatchs->alternate_row_class($GLOBALS['phpgw']->template);
if (!$values['sdate'])
{
@@ -662,7 +670,7 @@
while (list($null,$userpro) = each($pro))
{
$summin = 0;
-
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
+
$this->nextmatchs->template_alternate_row_class($GLOBALS['phpgw']->template);
$GLOBALS['phpgw']->template->set_var('e_project',$GLOBALS['phpgw']->strip_html($userpro['title'])
. ' ['
. $GLOBALS['phpgw']->strip_html($userpro['num']) . ']');
$GLOBALS['phpgw']->template->set_var('e_activity',' ');
@@ -695,7 +703,7 @@
$allhours =
$this->bostatistics->get_stat_hours('account', $account_id, $project_id ='',
$values);
$summin=0;
-
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
+
$this->nextmatchs->template_alternate_row_class($GLOBALS['phpgw']->template);
$GLOBALS['phpgw']->template->set_var('e_project','<b>'
. lang('Overall') . '</b>');
$GLOBALS['phpgw']->template->set_var('e_activity',' ');
$GLOBALS['phpgw']->template->set_var('e_hours',' ');
@@ -715,7 +723,7 @@
}
}
-
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
+
$this->nextmatchs->template_alternate_row_class($GLOBALS['phpgw']->template);
$GLOBALS['phpgw']->template->set_var('e_project','<b>'
. lang('Sum') . '</b>');
$GLOBALS['phpgw']->template->set_var('e_activity',' ');
$hrs = intval($summin/60) . ':' . sprintf
("%02d",(int)($summin-intval($summin/60)*60));
@@ -862,8 +870,12 @@
$GLOBALS['phpgw']->template->set_var('css_file',$GLOBALS['phpgw_info']['server']['webserver_url']
. SEP . 'phpgwapi' . SEP . 'templates'
. SEP . 'idots' . SEP . 'css' . SEP .
'idots.css');
-
$GLOBALS['phpgw']->template->set_var('gantt_link',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.get_screen_size&action='
. $action
-
. '&project_id=' . $project_id .
'&gantt_popup=True&start=' . $start . '&end=' . $end));
+
$GLOBALS['phpgw']->template->set_var('gantt_link',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'projects.uistatistics.get_screen_size',
+
'action'=> $action,
+
'project_id'=> $project_id,
+
'gantt_popup'=>'True',
+
'start'=> $start,
+
'end'=> $end)));
@@ -1033,7 +1045,7 @@
while (list($null,$employee) = each($employees))
{
$account_data =
$this->boprojects->cached_accounts($employee['employee']);
-
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
+
$this->nextmatchs->template_alternate_row_class($GLOBALS['phpgw']->template);
$account_id =
$account_data[$employee['employee']]['account_id'];
@@ -1073,7 +1085,7 @@
$prohours =
$this->bostatistics->get_stat_hours('project', $account_id = '', $project_id,
$values);
$summin=0;
-
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
+
$this->nextmatchs->template_alternate_row_class($GLOBALS['phpgw']->template);
$GLOBALS['phpgw']->template->set_var('e_account','<b>'
. lang('Overall') . '</b>');
$GLOBALS['phpgw']->template->set_var('e_activity',' ');
$GLOBALS['phpgw']->template->set_var('e_hours',' ');
@@ -1094,7 +1106,7 @@
$GLOBALS['phpgw']->template->fp('list','stat_list',True);
}
}
-
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
+
$this->nextmatchs->template_alternate_row_class($GLOBALS['phpgw']->template);
$GLOBALS['phpgw']->template->set_var('e_account','<b>'
. lang('sum') . '</b>');
$GLOBALS['phpgw']->template->set_var('e_activity',' ');
$hrs = intval($summin/60). ':' . sprintf
("%02d",(int)($summin-intval($summin/60)*60));
@@ -1267,7 +1279,7 @@
$project_hj =
$this->boprojects->format_minutes($project['sum_minutes_journey']);
$project_hs =
$this->boprojects->format_minutes($project['sum_minutes_all']);
-
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
+
$this->nextmatchs->template_alternate_row_class($GLOBALS['phpgw']->template);
$GLOBALS['phpgw']->template->set_var('pro_name', $project['project_title']);
$GLOBALS['phpgw']->template->set_var('pro_hours', $project_hw);
$GLOBALS['phpgw']->template->set_var('pro_hours_journey', $project_hj);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] projects/inc class.bostatistics.inc.php class.s...,
Sigurd Nes <=