[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] projects/inc class.boprojecthours.inc.php class...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] projects/inc class.boprojecthours.inc.php class... |
|
Date: |
Sat, 25 Nov 2006 15:50:00 +0000 |
CVSROOT: /sources/phpgroupware
Module name: projects
Changes by: Sigurd Nes <sigurdne> 06/11/25 15:50:00
Modified files:
inc : class.boprojecthours.inc.php
class.boprojects.inc.php
class.uiprojecthours.inc.php
Log message:
notices
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/projects/inc/class.boprojecthours.inc.php?cvsroot=phpgroupware&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/projects/inc/class.boprojects.inc.php?cvsroot=phpgroupware&r1=1.160&r2=1.161
http://cvs.savannah.gnu.org/viewcvs/projects/inc/class.uiprojecthours.inc.php?cvsroot=phpgroupware&r1=1.84&r2=1.85
Patches:
Index: class.boprojecthours.inc.php
===================================================================
RCS file: /sources/phpgroupware/projects/inc/class.boprojecthours.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- class.boprojecthours.inc.php 8 Apr 2005 15:52:57 -0000 1.37
+++ class.boprojecthours.inc.php 25 Nov 2006 15:50:00 -0000 1.38
@@ -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.boprojecthours.inc.php,v 1.37 2005/04/08 15:52:57
ceb Exp $
+ * @version $Id: class.boprojecthours.inc.php,v 1.38 2006/11/25 15:50:00
sigurdne Exp $
* $Source:
/sources/phpgroupware/projects/inc/class.boprojecthours.inc.php,v $
*/
@@ -19,6 +19,7 @@
var $sort;
var $status;
var $project_id;
+ var $state;
var $public_functions = array
(
Index: class.boprojects.inc.php
===================================================================
RCS file: /sources/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -b -r1.160 -r1.161
--- class.boprojects.inc.php 25 Nov 2006 15:23:22 -0000 1.160
+++ class.boprojects.inc.php 25 Nov 2006 15:50:00 -0000 1.161
@@ -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.boprojects.inc.php,v 1.160 2006/11/25 15:23:22
sigurdne Exp $
+ * @version $Id: class.boprojects.inc.php,v 1.161 2006/11/25 15:50:00
sigurdne Exp $
* $Source:
/sources/phpgroupware/projects/inc/class.boprojects.inc.php,v $
*/
@@ -22,6 +22,7 @@
var $status;
var $html_output;
var $bohours;
+ var $project_id;
var $public_functions = array
(
@@ -120,7 +121,7 @@
}
else
{
- unset($this->project_id);
+ $this->project_id = false;
}
/*if($_project_id)
@@ -157,6 +158,7 @@
function type($action)
{
+ $column ='';
switch ($action)
{
case 'mains' : $column =
'projects_mains'; break;
@@ -195,7 +197,7 @@
$this->order = $data['order'];
$this->sort = $data['sort'];
$this->cat_id = $data['cat_id'];
- $this->status = $data['status'];
+ $this->status =
(isset($data['status'])?$data['status']:'');
$this->state =
(isset($data['state'])?$data['state']:'');
$this->project_id =
(isset($data['project_id'])?$data['project_id']:'');
}
Index: class.uiprojecthours.inc.php
===================================================================
RCS file: /sources/phpgroupware/projects/inc/class.uiprojecthours.inc.php,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- class.uiprojecthours.inc.php 8 Apr 2005 15:52:58 -0000 1.84
+++ class.uiprojecthours.inc.php 25 Nov 2006 15:50:00 -0000 1.85
@@ -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.84 2005/04/08 15:52:58
ceb Exp $
+ * @version $Id: class.uiprojecthours.inc.php,v 1.85 2006/11/25 15:50:00
sigurdne Exp $
* $Source:
/sources/phpgroupware/projects/inc/class.uiprojecthours.inc.php,v $
*/
@@ -191,7 +191,7 @@
for ($i=0;$i<count($pro);$i++)
{
-
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
+
$this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template);
// --------------- template declaration for list records
-------------------------------------
@@ -435,7 +435,7 @@
for ($i=0;$i<count($hours);$i++)
{
-
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
+
$this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template);
// ---------------- template declaration for list records
------------------------------
@@ -571,15 +571,18 @@
}
}
- $values['t_journey'] = intval($values['t_journey_h']*60
+ $values['t_journey_m']);
+ $values['t_journey'] =
intval((isset($values['t_journey_h'])?$values['t_journey_h']:0)*60 +
(isset($values['t_journey_m'])?$values['t_journey_m']:0));
//_debug_array($values);
- $this->project_id = intval($values['project_id']);
- if($values['start'] || $values['stop'] ||
$values['continue'] || $values['pause'])
+ $this->project_id =
(isset($values['project_id'])?intval($values['project_id']):0);
+ if((isset($values['start']) && $values['start'])
+ || (isset($values['stop']) && $values['stop'])
+ || (isset($values['continue']) && $values['continue'])
+ || (isset($values['pause']) && $values['pause']))
{
$error =
$this->bohours->check_ttracker($values);
- if (is_array($error))
+ if (isset($error) && is_array($error))
{
$GLOBALS['phpgw']->template->set_var('message',$GLOBALS['phpgw']->common->error_list($error));
}
@@ -588,7 +591,7 @@
$this->bohours->ttracker($values);
}
}
- elseif($values['apply'])
+ elseif(isset($values['apply']) && $values['apply'])
{
$values['action'] = 'apply';
$values['ttracker'] = True;
@@ -606,12 +609,12 @@
$this->bohours->save_hours($values);
}
}
- elseif($values['save'])
+ elseif(isset($values['save']) && $values['save'])
{
$values['action'] = 'save';
$this->bohours->ttracker($values);
}
- elseif($_GET['delete'])
+ elseif(isset($_GET['delete']) && $_GET['delete'])
{
$this->bohours->delete_hours(array('action' =>
'track','id' => $_GET['track_id']));
}
@@ -701,7 +704,7 @@
for($i=0;$i<count($track['hours']);$i++)
{
-
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
+
$this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template);
// ---------------- template declaration for list records
------------------------------
- [Phpgroupware-cvs] projects/inc class.boprojecthours.inc.php class...,
Sigurd Nes <=