[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] projects/inc class.bostatistics.inc.php, 1.26 hook_si
|
From: |
ceb |
|
Subject: |
[Phpgroupware-cvs] projects/inc class.bostatistics.inc.php, 1.26 hook_sidebox_menu.inc.php, 1.13 class.soprojects.inc.php, 1.108 class.uiprojects_base.inc.php, 1.9 class.uistatistics.inc.php, 1.60 |
|
Date: |
Fri, 1 Apr 2005 01:00:00 +0200 |
Update of projects/inc
Modified Files:
Branch: MAIN
class.bostatistics.inc.php lines: +4 -2
hook_sidebox_menu.inc.php lines: +3 -3
class.soprojects.inc.php lines: +3 -3
class.uiprojects_base.inc.php lines: +3 -3
class.uistatistics.inc.php lines: +16 -30
Log Message:
update
====================================================
Index: projects/inc/class.bostatistics.inc.php
diff -u projects/inc/class.bostatistics.inc.php:1.25
projects/inc/class.bostatistics.inc.php:1.26
--- projects/inc/class.bostatistics.inc.php:1.25 Thu Jun 3 13:38:59 2004
+++ projects/inc/class.bostatistics.inc.php Thu Mar 31 23:00:22 2005
@@ -208,6 +208,8 @@
}
}
+ //_debug_array($projects);
+
if(is_array($projects))
{
$num_pro = count($projects) - 1;
@@ -278,7 +280,7 @@
$progress_date =
mktime(12,0,0,date('m',$pro['sdate']),date('d',$pro['sdate'])+$progress,date('Y',$pro['sdate']));
-
if($this->boprojects->exists('','par','',$pro['project_id']))
+
if($this->boprojects->exists(array('check' => 'parent','project_id' =>
$pro['project_id'])))
{
$usemap =
(in_array($pro['project_id'],$parent_array)?'open':'closed');
}
====================================================
Index: projects/inc/hook_sidebox_menu.inc.php
diff -u projects/inc/hook_sidebox_menu.inc.php:1.12
projects/inc/hook_sidebox_menu.inc.php:1.13
--- projects/inc/hook_sidebox_menu.inc.php:1.12 Mon Mar 14 17:39:39 2005
+++ projects/inc/hook_sidebox_menu.inc.php Thu Mar 31 23:00:22 2005
@@ -27,11 +27,11 @@
$menu_title = lang('Statistics');
$file[] = array('text' => 'Gantt Chart',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects'));
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects&view=gantt'));
$file[] = array('text' => 'Projects per employee',
'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_users'));
$file[] = array('text' => 'Employees per project',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects'));
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects&view=user'));
$file[] = array('text' => 'work hours statistic',
'url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_users_worktimes'));
====================================================
Index: projects/inc/class.soprojects.inc.php
diff -u projects/inc/class.soprojects.inc.php:1.107
projects/inc/class.soprojects.inc.php:1.108
--- projects/inc/class.soprojects.inc.php:1.107 Mon Mar 14 17:39:39 2005
+++ projects/inc/class.soprojects.inc.php Thu Mar 31 23:00:22 2005
@@ -836,14 +836,14 @@
switch($check)
{
case 'number':
- $column = "'p_number'";
+ $column = 'p_number';
if ($project_id > 0)
{
$editexists = ' and project_id
!=' . $project_id;
}
break;
case 'parent':
- $column = "'parent'";
+ $column = 'parent';
break;
default:
$column = 'project_id';
====================================================
Index: projects/inc/class.uiprojects_base.inc.php
diff -u projects/inc/class.uiprojects_base.inc.php:1.8
projects/inc/class.uiprojects_base.inc.php:1.9
--- projects/inc/class.uiprojects_base.inc.php:1.8 Thu Mar 31 15:50:49 2005
+++ projects/inc/class.uiprojects_base.inc.php Thu Mar 31 23:00:22 2005
@@ -7,7 +7,7 @@
* Project Manager *
* Written by Bettina Gille address@hidden *
* & <address@hidden> *
- * ----------------------------------------------- *
+ * --------------------------------------------------- *
* Copyright 2005 Free Software Foundation, Inc. *
* *
* This program is free software; you can redistribute it and/or *
@@ -252,6 +252,7 @@
$icons .= $this->CreateButton(PROJECT_VIEW);
$icons .= $icon_sep;
$icons .= $this->CreateButton(PROJECT_HOURS);
+ $icons .= $this->CreateButton(PROJECT_EMPLOYEES);
$icons .= $this->CreateButton(PROJECT_GANTTCHART);
$GLOBALS['phpgw']->template->set_var('toolbar_name',
lang('Views'));
@@ -287,7 +288,6 @@
if($this->boprojects->edit_perms($check))
{
$icons =
$this->CreateButton(PROJECT_ACTIVITIES);
- $icons .=
$this->CreateButton(PROJECT_EMPLOYEES);
$icons .= $this->CreateButton(PROJECT_BUDGET);
$GLOBALS['phpgw']->template->set_var('toolbar_name', lang('Administration'));
====================================================
Index: projects/inc/class.uistatistics.inc.php
diff -u projects/inc/class.uistatistics.inc.php:1.59
projects/inc/class.uistatistics.inc.php:1.60
--- projects/inc/class.uistatistics.inc.php:1.59 Thu Mar 31 15:50:49 2005
+++ projects/inc/class.uistatistics.inc.php Thu Mar 31 23:00:22 2005
@@ -97,16 +97,7 @@
$pro_main =
get_var('pro_main',array('POST','GET'));
$pro_users =
get_var('pro_users',array('POST','GET'));
$values = get_var('values',array('POST','GET'));
-
- if($_POST['userstats'])
- {
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=projects.uistatistics.list_users');
- }
-
- if($_POST['worktimestats'])
- {
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=projects.uistatistics.list_users_worktimes');
- }
+ $view = get_var('view',array('POST','GET'));
$pro_user = array();
if($_POST['viewuser'])
@@ -145,11 +136,6 @@
}
}
-/*
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('list projects')
-
. $this->admin_header_info();
- $this->display_app_header();
-*/
$this->ui_base->display_app_header();
$GLOBALS['phpgw']->template->set_file(array('projects_list_t' =>
'stats_projectlist.tpl'));
@@ -158,6 +144,9 @@
$GLOBALS['phpgw']->template->set_block('projects_list_t','user_cols','cols');
$GLOBALS['phpgw']->template->set_block('projects_list_t','project_main','main');
+
$GLOBALS['phpgw']->template->set_block('projects_list_t','gantt_submit','gantt');
+
$GLOBALS['phpgw']->template->set_block('projects_list_t','user_submit','user');
+
$GLOBALS['phpgw']->template->set_var('msg',$msg);
if($pro_main)
@@ -183,7 +172,8 @@
'menuaction' =>
'projects.uistatistics.list_projects',
'pro_main' => $pro_main,
'action' => $action,
- 'cat_id' => $this->cat_id
+ 'cat_id' => $this->cat_id,
+ 'view' => $view
);
if (!$this->start)
@@ -231,7 +221,7 @@
$GLOBALS['phpgw']->template->set_var('sort_coordinator',$this->nextmatchs->show_sort_order($this->sort,'coordinator',$this->order,'/index.php',lang('Coordinator'),$link_data));
$GLOBALS['phpgw']->template->set_var('user_img',$GLOBALS['phpgw']->common->image('phpgwapi','users'));
$GLOBALS['phpgw']->template->set_var('user_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
-
+
$GLOBALS['phpgw']->template->set_var('lang_action',$view=='gantt'?'Gantt
Chart':lang('employees'));
// -------------- end header declaration
---------------------------------------
for ($i=0;$i<count($pro);$i++)
@@ -268,7 +258,8 @@
'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':''):'',
- 'project_id' =>
$pro[$i]['project_id']
+ 'project_id' =>
$pro[$i]['project_id'],
+ 'view_value' =>
($view=='gantt'?'gantt_id][' . $pro[$i]['project_id']:'project_id][' .
$pro[$i]['project_id'])
));
$link_data['project_id'] =
$pro[$i]['project_id'];
@@ -308,20 +299,20 @@
$this->save_sessiondata('pstat');
$GLOBALS['phpgw']->template->set_var('cols','');
+ //$GLOBALS['phpgw']->template->set_var('user','');
+ //$GLOBALS['phpgw']->template->set_var('gantt','');
+
+ $GLOBALS['phpgw']->template->fp($view,$view .
'_submit',True);
$GLOBALS['phpgw']->template->pfp('out','projects_list_t',True);
}
function list_project_employees()
{
- $project_id =
get_var('project_id',array('POST','GET'));
-
- //$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('list project employees')
- //
. $this->admin_header_info();
+ $project_id = get_var('project_id',array('POST','GET'));
$this->ui_base->display_app_header();
-
$GLOBALS['phpgw']->template->set_file(array('projects_list_t' =>
'stats_project_employees.tpl'));
$GLOBALS['phpgw']->template->set_block('projects_list_t','projects_list','list');
$GLOBALS['phpgw']->template->set_block('projects_list_t','user_list','users');
@@ -355,7 +346,7 @@
$this->start = 0;
}
- $this->boprojects->limit = false;
+ $this->boprojects->limit = False;
$this->boprojects->status = $this->status;
$pro = $this->boprojects->list_projects(array('action'
=> 'mainsubsorted','project_id' => $project_id));
@@ -476,16 +467,11 @@
// ------------------------- end record declaration ------------------------
-
$GLOBALS['phpgw']->template->set_var('lang_view_gantt',lang('view gantt
chart'));
-
$GLOBALS['phpgw']->template->set_var('lang_view_users',lang('view users'));
-
$this->save_sessiondata('pstat');
$GLOBALS['phpgw']->template->set_var('cols','');
$GLOBALS['phpgw']->template->pfp('out','projects_list_t',True);
}
-
-
function coordinator_format($employee = '')
{
if (! $employee)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] projects/inc class.bostatistics.inc.php, 1.26 hook_sidebox_menu.inc.php, 1.13 class.soprojects.inc.php, 1.108 class.uiprojects_base.inc.php, 1.9 class.uistatistics.inc.php, 1.60,
ceb <=