[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] hrm inc/class.acl2.inc.php inc/class.bojob.inc....
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] hrm inc/class.acl2.inc.php inc/class.bojob.inc.... |
|
Date: |
Sat, 15 Apr 2006 19:04:13 +0000 |
CVSROOT: /sources/phpgroupware
Module name: hrm
Branch:
Changes by: Sigurd Nes <address@hidden> 06/04/15 19:04:13
Modified files:
inc : class.acl2.inc.php class.bojob.inc.php
class.soadmin.inc.php class.socategory.inc.php
class.sojob.inc.php class.soplace.inc.php
class.souser.inc.php class.uijob.inc.php
class.uiuser.inc.php
setup : default_records.inc.php setup.inc.php
tables_current.inc.php tables_update.inc.php
Log message:
rename tables
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/hrm/inc/class.acl2.inc.php.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/hrm/inc/class.bojob.inc.php.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/hrm/inc/class.soadmin.inc.php.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/hrm/inc/class.socategory.inc.php.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/hrm/inc/class.sojob.inc.php.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/hrm/inc/class.soplace.inc.php.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/hrm/inc/class.souser.inc.php.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/hrm/inc/class.uijob.inc.php.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/hrm/inc/class.uiuser.inc.php.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/hrm/setup/default_records.inc.php.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/hrm/setup/setup.inc.php.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/hrm/setup/tables_current.inc.php.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/hrm/setup/tables_update.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: hrm/inc/class.acl2.inc.php
diff -u hrm/inc/class.acl2.inc.php:1.9 hrm/inc/class.acl2.inc.php:1.10
--- hrm/inc/class.acl2.inc.php:1.9 Fri Feb 24 13:49:24 2006
+++ hrm/inc/class.acl2.inc.php Sat Apr 15 19:04:13 2006
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage accounts
- * @version $Id: class.acl2.inc.php,v 1.9 2006/02/24 13:49:24 sigurdne
Exp $
+ * @version $Id: class.acl2.inc.php,v 1.10 2006/04/15 19:04:13 sigurdne
Exp $
*/
/**
@@ -139,7 +139,7 @@
$this->acl2();
}
- $sql = 'select * from hrm_acl join phpgw_accounts on
hrm_acl.acl_account = phpgw_accounts.account_id where (acl_account in (';
+ $sql = 'select * from phpgw_hrm_acl join phpgw_accounts
on phpgw_hrm_acl.acl_account = phpgw_accounts.account_id where (acl_account in
(';
if(!$account_type || $account_type == 'accounts' ||
$account_type == 'both')
{
@@ -253,14 +253,14 @@
{
$this->db->transaction_begin();
- $sql = 'delete from hrm_acl where acl_account = '.
intval($this->account_id);
+ $sql = 'delete from phpgw_hrm_acl where acl_account =
'. intval($this->account_id);
$this->db->query($sql ,__LINE__,__FILE__);
reset ($this->data);
while(list($idx,$value) = each($this->data))
{
- $sql = "SELECT id as location FROM
hrm_acl_location WHERE id like '".$this->data[$idx]['location']."%' AND
appname='" . $this->data[$idx]['appname'] . "' AND id !=
'".$this->data[$idx]['location'] . "'";
+ $sql = "SELECT id as location FROM
phpgw_hrm_acl_location WHERE id like '".$this->data[$idx]['location']."%' AND
appname='" . $this->data[$idx]['appname'] . "' AND id !=
'".$this->data[$idx]['location'] . "'";
$this->db->query($sql,__LINE__,__FILE__);
while($this->db->next_record())
{
@@ -288,7 +288,7 @@
{
if ($this->data[$idx]['account'] ==
$this->account_id)
{
- $sql = 'insert into hrm_acl
(acl_appname, acl_location, acl_account, acl_rights,acl_grantor,acl_type)';
+ $sql = 'insert into phpgw_hrm_acl
(acl_appname, acl_location, acl_account, acl_rights,acl_grantor,acl_type)';
$sql .= "
values('".$this->data[$idx]['appname']."', '"
.
$this->data[$idx]['location']."', "
.$this->account_id.', '
@@ -303,7 +303,7 @@
/*remove duplicates*/
- $sql = "SELECT * FROM hrm_acl WHERE acl_account='" .
$this->account_id . "' GROUP BY acl_appname, acl_location, acl_account,
acl_rights,acl_grantor,acl_type";
+ $sql = "SELECT * FROM phpgw_hrm_acl WHERE
acl_account='" . $this->account_id . "' GROUP BY acl_appname, acl_location,
acl_account, acl_rights,acl_grantor,acl_type";
$this->db->query($sql,__LINE__,__FILE__);
while($this->db->next_record())
{
@@ -319,12 +319,12 @@
if(is_array($unique_data))
{
- $sql = 'delete from hrm_acl where acl_account =
'. intval($this->account_id);
+ $sql = 'delete from phpgw_hrm_acl where
acl_account = '. intval($this->account_id);
$this->db->query($sql ,__LINE__,__FILE__);
while(list($idx,$value) = each($unique_data))
{
- $sql = 'insert into hrm_acl
(acl_appname, acl_location, acl_account, acl_rights,acl_grantor,acl_type)';
+ $sql = 'insert into phpgw_hrm_acl
(acl_appname, acl_location, acl_account, acl_rights,acl_grantor,acl_type)';
$sql .= "
values('".$unique_data[$idx]['appname']."', '"
.
$unique_data[$idx]['location']."', "
.$this->account_id.', '
@@ -535,7 +535,7 @@
function get_location_list($app, $required)
{
// User piece
- $sql = "select acl_location, acl_rights from hrm_acl
where acl_appname = '$app' ";
+ $sql = "select acl_location, acl_rights from
phpgw_hrm_acl where acl_appname = '$app' ";
$sql .= " and (acl_account in ('".$this->account_id."',
0"; // group 0 covers all users
$equalto =
$GLOBALS['phpgw']->accounts->security_equals($this->account_id);
if (is_array($equalto) && count($equalto) > 0)
@@ -592,7 +592,7 @@
$inherit_location[] = $location; // in case the
location is not found in the location table
- $sql = "SELECT id as location FROM hrm_acl_location
WHERE id like '".$location."%' AND appname='" . $app . "' AND id != '"
.$location . "'";
+ $sql = "SELECT id as location FROM
phpgw_hrm_acl_location WHERE id like '".$location."%' AND appname='" . $app .
"' AND id != '" .$location . "'";
$this->db->query($sql,__LINE__,__FILE__);
while($this->db->next_record())
{
@@ -601,7 +601,7 @@
foreach($inherit_location as $acl_location)
{
- $sql = 'insert into hrm_acl (acl_appname,
acl_location, acl_account, acl_rights,acl_grantor,acl_type)';
+ $sql = 'insert into phpgw_hrm_acl (acl_appname,
acl_location, acl_account, acl_rights,acl_grantor,acl_type)';
$sql .= " values ('" . $app . "','" .
$acl_location . "','" . $account_id . "','" . $rights . ", NULL ,0')";
$this->db->query($sql ,__LINE__,__FILE__);
}
@@ -635,7 +635,7 @@
$account_sel = ' and acl_account=' .
$account_id;
}
- $sql = "delete from hrm_acl where acl_appname like '" .
$app . "' and acl_location like '" . $location . "%'" . $account_sel;
+ $sql = "delete from phpgw_hrm_acl where acl_appname
like '" . $app . "' and acl_location like '" . $location . "%'" . $account_sel;
$this->db->query($sql ,__LINE__,__FILE__);
return $this->db->num_rows();
}
@@ -661,7 +661,7 @@
$account_id =
get_account_id($accountid,$this->account_id);
$cache_accountid[$accountid] = $account_id;
}
- $sql = 'SELECT acl_appname, acl_rights from hrm_acl ';
+ $sql = 'SELECT acl_appname, acl_rights from
phpgw_hrm_acl ';
$sql .= "where acl_location = '" .
$this->db->db_addslashes($location) . "' ";
$sql .= 'AND acl_account = ' . intval($account_id);
$this->db->query($sql ,__LINE__,__FILE__);
@@ -788,7 +788,7 @@
// $db2 = $this->db;
$memberships =
$GLOBALS['phpgw']->accounts->membership($account_id);
- $sql = "select acl_appname, acl_rights from hrm_acl
where acl_location = 'run' and "
+ $sql = "select acl_appname, acl_rights from
phpgw_hrm_acl where acl_location = 'run' and "
. 'acl_account in ';
$security = '('.$account_id;
while($groups = @each($memberships))
@@ -862,7 +862,7 @@
$at_location = " AND acl_location =
'$location'";
}
- $sql = "SELECT acl_account,acl_grantor, acl_rights FROM
hrm_acl WHERE acl_appname = '$app' $at_location AND acl_grantor IS NOT NULL AND
acl_type = $type AND "
+ $sql = "SELECT acl_account,acl_grantor, acl_rights FROM
phpgw_hrm_acl WHERE acl_appname = '$app' $at_location AND acl_grantor IS NOT
NULL AND acl_type = $type AND "
. "acl_account in ";
$security = "('". $this->account_id ."'";
$myaccounts = CreateObject('phpgwapi.accounts');
Index: hrm/inc/class.bojob.inc.php
diff -u hrm/inc/class.bojob.inc.php:1.12 hrm/inc/class.bojob.inc.php:1.13
--- hrm/inc/class.bojob.inc.php:1.12 Fri Dec 2 22:40:13 2005
+++ hrm/inc/class.bojob.inc.php Sat Apr 15 19:04:13 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage user
- * @version $Id: class.bojob.inc.php,v 1.12 2005/12/02 22:40:13 sigurdne
Exp $
+ * @version $Id: class.bojob.inc.php,v 1.13 2006/04/15 19:04:13 sigurdne
Exp $
*/
/**
@@ -113,13 +113,13 @@
{
if ($this->use_session)
{
-
$GLOBALS['phpgw']->session->appsession('session_data','hrm_job',$data);
+
$GLOBALS['phpgw']->session->appsession('session_data','phpgw_hrm_job',$data);
}
}
function read_sessiondata()
{
- $data =
$GLOBALS['phpgw']->session->appsession('session_data','hrm_job');
+ $data =
$GLOBALS['phpgw']->session->appsession('session_data','phpgw_hrm_job');
$this->start = $data['start'];
$this->query = $data['query'];
Index: hrm/inc/class.soadmin.inc.php
diff -u hrm/inc/class.soadmin.inc.php:1.6 hrm/inc/class.soadmin.inc.php:1.7
--- hrm/inc/class.soadmin.inc.php:1.6 Fri Feb 24 13:24:14 2006
+++ hrm/inc/class.soadmin.inc.php Sat Apr 15 19:04:13 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage admin
- * @version $Id: class.soadmin.inc.php,v 1.6 2006/02/24 13:24:14
sigurdne Exp $
+ * @version $Id: class.soadmin.inc.php,v 1.7 2006/04/15 19:04:13
sigurdne Exp $
*/
/**
@@ -42,7 +42,7 @@
{
$filter .= ' AND allow_grant=1';
}
- $this->db->query("SELECT * FROM hrm_acl_location
$filter ORDER BY id ");
+ $this->db->query("SELECT * FROM phpgw_hrm_acl_location
$filter ORDER BY id ");
$i = 0;
while ($this->db->next_record())
Index: hrm/inc/class.socategory.inc.php
diff -u hrm/inc/class.socategory.inc.php:1.6
hrm/inc/class.socategory.inc.php:1.7
--- hrm/inc/class.socategory.inc.php:1.6 Fri Jan 27 17:02:29 2006
+++ hrm/inc/class.socategory.inc.php Sat Apr 15 19:04:13 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage admin
- * @version $Id: class.socategory.inc.php,v 1.6 2006/01/27 17:02:29
sigurdne Exp $
+ * @version $Id: class.socategory.inc.php,v 1.7 2006/04/15 19:04:13
sigurdne Exp $
*/
/**
@@ -108,16 +108,16 @@
switch($type)
{
case 'training':
- $table='hrm_training_category';
+ $table='phpgw_hrm_training_category';
break;
case 'experience':
- $table='hrm_experience_category';
+ $table='phpgw_hrm_experience_category';
break;
case 'skill_level':
- $table='hrm_skill_level';
+ $table='phpgw_hrm_skill_level';
break;
case 'task':
- $table='hrm_task_category';
+ $table='phpgw_hrm_task_category';
break;
}
Index: hrm/inc/class.sojob.inc.php
diff -u hrm/inc/class.sojob.inc.php:1.15 hrm/inc/class.sojob.inc.php:1.16
--- hrm/inc/class.sojob.inc.php:1.15 Fri Jan 27 17:02:29 2006
+++ hrm/inc/class.sojob.inc.php Sat Apr 15 19:04:13 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage job
- * @version $Id: class.sojob.inc.php,v 1.15 2006/01/27 17:02:29 sigurdne
Exp $
+ * @version $Id: class.sojob.inc.php,v 1.16 2006/04/15 19:04:13 sigurdne
Exp $
*/
/**
@@ -59,7 +59,7 @@
$ordermethod = ' order by name asc';
}
- $table = 'hrm_job';
+ $table = 'phpgw_hrm_job';
$parent_select = ' WHERE job_level =0';
@@ -171,7 +171,7 @@
function read_single_job($id)
{
- $table = 'hrm_job';
+ $table = 'phpgw_hrm_job';
$sql = "SELECT * FROM $table where id='$id'";
@@ -221,7 +221,7 @@
}
- $sql = "SELECT * , hrm_task.id as task_id from hrm_task
$this->join hrm_task_type ON hrm_task.task_type_id = hrm_task_type.id WHERE
job_id=" . intval($job_id);
+ $sql = "SELECT * , phpgw_hrm_task.id as task_id from
phpgw_hrm_task $this->join phpgw_hrm_task_type ON phpgw_hrm_task.task_type_id =
phpgw_hrm_task_type.id WHERE job_id=" . intval($job_id);
$parent_select = ' AND (is_parent =1 OR (is_parent != 1
AND task_parent IS NULL))';
@@ -300,7 +300,7 @@
function read_single_task($id)
{
- $sql = "SELECT * , hrm_task_type.id as task_type_id
FROM hrm_task $this->join hrm_task_type ON hrm_task.task_type_id =
hrm_task_type.id WHERE hrm_task.id=" . intval($id);
+ $sql = "SELECT * , phpgw_hrm_task_type.id as
task_type_id FROM phpgw_hrm_task $this->join phpgw_hrm_task_type ON
phpgw_hrm_task.task_type_id = phpgw_hrm_task_type.id WHERE phpgw_hrm_task.id="
. intval($id);
$this->db->query($sql,__LINE__,__FILE__);
@@ -322,7 +322,7 @@
function read_single_task_type($id)
{
- $sql = "SELECT * FROM hrm_task_type WHERE id=" .
intval($id);
+ $sql = "SELECT * FROM phpgw_hrm_task_type WHERE id=" .
intval($id);
$this->db->query($sql,__LINE__,__FILE__);
@@ -365,7 +365,7 @@
$ordermethod = ' order by name asc';
}
- $table = 'hrm_task_type';
+ $table = 'phpgw_hrm_task_type';
if($query)
{
@@ -406,7 +406,7 @@
function add_job($values)
{
- $table = 'hrm_job';
+ $table = 'phpgw_hrm_job';
if($values['parent_id'])
{
@@ -448,7 +448,7 @@
function edit_job($values)
{
$this->db->transaction_begin();
- $table = 'hrm_job';
+ $table = 'phpgw_hrm_job';
$this->db->query("SELECT job_level FROM $table where
id=" . intval($values['id']),__LINE__,__FILE__);
$this->db->next_record();
@@ -508,7 +508,7 @@
{
$continue = false;
$move_child = array();
- $this->db->query("SELECT id FROM hrm_job where
job_parent=" . intval($this->job_parent),__LINE__,__FILE__);
+ $this->db->query("SELECT id FROM phpgw_hrm_job where
job_parent=" . intval($this->job_parent),__LINE__,__FILE__);
while ($this->db->next_record())
{
$this->move_child[] = array(
@@ -542,7 +542,7 @@
$continue = false;
$move_child = array();
- $this->db->query("SELECT id FROM hrm_job where
job_parent=" . intval($this->job_id),__LINE__,__FILE__);
+ $this->db->query("SELECT id FROM phpgw_hrm_job where
job_parent=" . intval($this->job_id),__LINE__,__FILE__);
while ($this->db->next_record())
{
$this->move_child[] = array(
@@ -576,7 +576,7 @@
{
$this->db->transaction_begin();
- $this->db->query("SELECT job_parent,job_level FROM
hrm_job where id=" . intval($id),__LINE__,__FILE__);
+ $this->db->query("SELECT job_parent,job_level FROM
phpgw_hrm_job where id=" . intval($id),__LINE__,__FILE__);
$this->db->next_record();
$this->level =
(int)$this->db->f('job_level');
$this->job_parent =
(int)$this->db->f('job_parent');
@@ -596,17 +596,17 @@
$child['job_parent'];
if($child['job_parent'] ||
$child['job_parent']===0)
{
- $sql = "UPDATE hrm_job set
job_level= $new_level,job_parent = " . intval($child['job_parent']) . " WHERE
id=" . intval($child['id']);
+ $sql = "UPDATE phpgw_hrm_job
set job_level= $new_level,job_parent = " . intval($child['job_parent']) . "
WHERE id=" . intval($child['id']);
}
else
{
- $sql = "UPDATE hrm_job set
job_level= $new_level WHERE id=" . intval($child['id']);
+ $sql = "UPDATE phpgw_hrm_job
set job_level= $new_level WHERE id=" . intval($child['id']);
}
$this->db->query($sql,__LINE__,__FILE__);
}
}
- $this->db->query("DELETE FROM hrm_job WHERE id=" .
intval($id),__LINE__,__FILE__);
+ $this->db->query("DELETE FROM phpgw_hrm_job WHERE id="
. intval($id),__LINE__,__FILE__);
$this->db->transaction_commit();
}
@@ -618,7 +618,7 @@
function reset_job_type_hierarchy()
{
- $sql = "UPDATE hrm_job set job_level= 0,job_parent = 0";
+ $sql = "UPDATE phpgw_hrm_job set job_level=
0,job_parent = 0";
$this->db->query($sql,__LINE__,__FILE__);
}
@@ -627,7 +627,7 @@
$values['descr'] =
$this->db->db_addslashes($values['descr']);
$values['name'] =
$this->db->db_addslashes($values['name']);
- $values['task_type_id'] =
$this->bocommon->next_id('hrm_task_type');
+ $values['task_type_id'] =
$this->bocommon->next_id('phpgw_hrm_task_type');
$insert_values=array(
$values['task_type_id'],
@@ -638,7 +638,7 @@
);
$insert_values =
$this->bocommon->validate_db_insert($insert_values);
- $this->db->query("INSERT INTO hrm_task_type
(id,name,descr,entry_date,type_owner) "
+ $this->db->query("INSERT INTO phpgw_hrm_task_type
(id,name,descr,entry_date,type_owner) "
. "VALUES ($insert_values)",__LINE__,__FILE__);
$receipt['message'][]=array('msg'=>lang('task type item
has been saved'));
@@ -657,7 +657,7 @@
$value_set =
$this->bocommon->validate_db_update($value_set);
- $this->db->query("UPDATE hrm_task_type set $value_set
WHERE id=" . $values['task_type_id'],__LINE__,__FILE__);
+ $this->db->query("UPDATE phpgw_hrm_task_type set
$value_set WHERE id=" . $values['task_type_id'],__LINE__,__FILE__);
$this->db->transaction_commit();
@@ -670,7 +670,7 @@
function check_task_type($values)
{
- $sql = "SELECT * FROM hrm_task_type WHERE id=" .
intval($values['task_type_id']);
+ $sql = "SELECT * FROM phpgw_hrm_task_type WHERE id=" .
intval($values['task_type_id']);
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record())
@@ -688,7 +688,7 @@
{
$this->db->transaction_begin();
- $task_id = $this->bocommon->next_id('hrm_task');
+ $task_id = $this->bocommon->next_id('phpgw_hrm_task');
$insert_values=array(
$task_id,
@@ -703,21 +703,21 @@
$insert_values =
$this->bocommon->validate_db_insert($insert_values);
- $this->db->query("INSERT INTO hrm_task
(id,job_id,task_type_id,category,skill_id,experience_id,entry_date,task_owner) "
+ $this->db->query("INSERT INTO phpgw_hrm_task
(id,job_id,task_type_id,category,skill_id,experience_id,entry_date,task_owner) "
. "VALUES ($insert_values)",__LINE__,__FILE__);
if(is_array($values['alternative_task']))
{
- $this->db->query("UPDATE hrm_task set is_parent
= 1 WHERE id= $task_id",__LINE__,__FILE__);
+ $this->db->query("UPDATE phpgw_hrm_task set
is_parent = 1 WHERE id= $task_id",__LINE__,__FILE__);
foreach($values['alternative_task'] as
$alternative_task)
{
- $this->db->query("UPDATE hrm_task set
task_parent = $task_id WHERE id= $alternative_task",__LINE__,__FILE__);
+ $this->db->query("UPDATE phpgw_hrm_task
set task_parent = $task_id WHERE id= $alternative_task",__LINE__,__FILE__);
}
}
else
{
- $this->db->query("UPDATE hrm_task set is_parent
= 0 WHERE id=" . (int)$task_id,__LINE__,__FILE__);
+ $this->db->query("UPDATE phpgw_hrm_task set
is_parent = 0 WHERE id=" . (int)$task_id,__LINE__,__FILE__);
}
$receipt['message'][]=array('msg'=>lang('task item has
been saved'));
@@ -740,23 +740,23 @@
$value_set =
$this->bocommon->validate_db_update($value_set);
- $table='hrm_task';
+ $table='phpgw_hrm_task';
$this->db->query("UPDATE $table set $value_set WHERE
id=" . $values['task_id'],__LINE__,__FILE__);
- $this->db->query("UPDATE hrm_task set task_parent =
NULL WHERE task_parent = " . $values['task_id'] ,__LINE__,__FILE__);
+ $this->db->query("UPDATE phpgw_hrm_task set task_parent
= NULL WHERE task_parent = " . $values['task_id'] ,__LINE__,__FILE__);
if(is_array($values['alternative_task']))
{
- $this->db->query("UPDATE hrm_task set is_parent
= 1 WHERE id= " . $values['task_id'],__LINE__,__FILE__);
+ $this->db->query("UPDATE phpgw_hrm_task set
is_parent = 1 WHERE id= " . $values['task_id'],__LINE__,__FILE__);
foreach($values['alternative_task'] as
$alternative_task)
{
- $this->db->query("UPDATE hrm_task set
task_parent = " . $values['task_id'] . " WHERE id=
$alternative_task",__LINE__,__FILE__);
+ $this->db->query("UPDATE phpgw_hrm_task
set task_parent = " . $values['task_id'] . " WHERE id=
$alternative_task",__LINE__,__FILE__);
}
}
else
{
- $this->db->query("UPDATE hrm_task set is_parent
= 0 WHERE id= " . $values['task_id'],__LINE__,__FILE__);
+ $this->db->query("UPDATE phpgw_hrm_task set
is_parent = 0 WHERE id= " . $values['task_id'],__LINE__,__FILE__);
}
$this->db->transaction_commit();
@@ -770,11 +770,11 @@
function select_task_list($job_id,$task_id='')
{
- $sql = "SELECT * ,hrm_task.id as task_id from hrm_task
$this->join hrm_task_type ON hrm_task.task_type_id = hrm_task_type.id WHERE
job_id=" . intval($job_id);
+ $sql = "SELECT * ,phpgw_hrm_task.id as task_id from
phpgw_hrm_task $this->join phpgw_hrm_task_type ON phpgw_hrm_task.task_type_id =
phpgw_hrm_task_type.id WHERE job_id=" . intval($job_id);
if($task_id)
{
- $sql .= " AND hrm_task.id != $task_id AND
(is_parent !=1 AND (task_parent is null or task_parent = $task_id ))";
+ $sql .= " AND phpgw_hrm_task.id != $task_id AND
(is_parent !=1 AND (task_parent is null or task_parent = $task_id ))";
}
else
{
@@ -801,8 +801,8 @@
function delete_task($job_id,$id)
{
$this->db->transaction_begin();
- $this->db->query('UPDATE hrm_task set task_parent =
NULL WHERE task_parent = ' . intval($id) . ' AND job_id=' .
intval($job_id),__LINE__,__FILE__);
- $this->db->query('DELETE FROM hrm_task WHERE id=' .
intval($id) . ' AND job_id=' . intval($job_id),__LINE__,__FILE__);
+ $this->db->query('UPDATE phpgw_hrm_task set task_parent
= NULL WHERE task_parent = ' . intval($id) . ' AND job_id=' .
intval($job_id),__LINE__,__FILE__);
+ $this->db->query('DELETE FROM phpgw_hrm_task WHERE id='
. intval($id) . ' AND job_id=' . intval($job_id),__LINE__,__FILE__);
$this->db->transaction_commit();
}
}
Index: hrm/inc/class.soplace.inc.php
diff -u hrm/inc/class.soplace.inc.php:1.4 hrm/inc/class.soplace.inc.php:1.5
--- hrm/inc/class.soplace.inc.php:1.4 Fri Jan 27 17:02:29 2006
+++ hrm/inc/class.soplace.inc.php Sat Apr 15 19:04:13 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage place
- * @version $Id: class.soplace.inc.php,v 1.4 2006/01/27 17:02:29
sigurdne Exp $
+ * @version $Id: class.soplace.inc.php,v 1.5 2006/04/15 19:04:13
sigurdne Exp $
*/
/**
@@ -65,7 +65,7 @@
$ordermethod = ' order by name asc';
}
- $table = 'hrm_training_place';
+ $table = 'phpgw_hrm_training_place';
if($query)
{
@@ -105,7 +105,7 @@
function read_single($id)
{
- $sql = 'SELECT * FROM hrm_training_place where id=' .
intval($id);
+ $sql = 'SELECT * FROM phpgw_hrm_training_place where
id=' . intval($id);
$this->db->query($sql,__LINE__,__FILE__);
@@ -125,7 +125,7 @@
function read_training($id)
{
- $sql = "SELECT hrm_training.id as
training_id,hrm_training.title as title,
hrm_training.start_date,hrm_training.end_date,hrm_training_place.name as place
FROM hrm_training $this->left_join hrm_training_place on
hrm_training.place_id=hrm_training_place.id WHERE hrm_training.user_id=" .
intval($id);
+ $sql = "SELECT phpgw_hrm_training.id as
training_id,phpgw_hrm_training.title as title,
phpgw_hrm_training.start_date,phpgw_hrm_training.end_date,phpgw_hrm_training_place.name
as place FROM phpgw_hrm_training $this->left_join phpgw_hrm_training_place on
phpgw_hrm_training.place_id=phpgw_hrm_training_place.id WHERE
phpgw_hrm_training.user_id=" . intval($id);
$this->db->query($sql,__LINE__,__FILE__);
@@ -152,7 +152,7 @@
$values['address'] =
$this->db->db_addslashes($values['address']);
$values['town'] =
$this->db->db_addslashes($values['town']);
$values['descr'] =
$this->db->db_addslashes($values['descr']);
- $values['place_id'] =
$this->bocommon->next_id('hrm_training_place');
+ $values['place_id'] =
$this->bocommon->next_id('phpgw_hrm_training_place');
$insert_values=array(
$values['place_id'],
@@ -164,7 +164,7 @@
);
$insert_values =
$this->bocommon->validate_db_insert($insert_values);
- $this->db->query("INSERT INTO hrm_training_place
(id,name,address,zip,town, remark) "
+ $this->db->query("INSERT INTO phpgw_hrm_training_place
(id,name,address,zip,town, remark) "
. "VALUES ($insert_values)",__LINE__,__FILE__);
$receipt['message'][]=array('msg'=>lang('training item
has been saved'));
@@ -188,7 +188,7 @@
$value_set =
$this->bocommon->validate_db_update($value_set);
- $this->db->query("UPDATE hrm_training_place set
$value_set WHERE id=" . $values['place_id'],__LINE__,__FILE__);
+ $this->db->query("UPDATE phpgw_hrm_training_place set
$value_set WHERE id=" . $values['place_id'],__LINE__,__FILE__);
$this->db->transaction_commit();
@@ -201,12 +201,12 @@
function delete($id)
{
- $this->db->query('DELETE FROM hrm_training_place WHERE
id=' . intval($id),__LINE__,__FILE__);
+ $this->db->query('DELETE FROM phpgw_hrm_training_place
WHERE id=' . intval($id),__LINE__,__FILE__);
}
function select_place_list()
{
- $this->db->query("SELECT * FROM hrm_training_place
ORDER BY name ");
+ $this->db->query("SELECT * FROM
phpgw_hrm_training_place ORDER BY name ");
$i = 0;
while ($this->db->next_record())
Index: hrm/inc/class.souser.inc.php
diff -u hrm/inc/class.souser.inc.php:1.10 hrm/inc/class.souser.inc.php:1.11
--- hrm/inc/class.souser.inc.php:1.10 Fri Feb 24 13:24:21 2006
+++ hrm/inc/class.souser.inc.php Sat Apr 15 19:04:13 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage user
- * @version $Id: class.souser.inc.php,v 1.10 2006/02/24 13:24:21
sigurdne Exp $
+ * @version $Id: class.souser.inc.php,v 1.11 2006/04/15 19:04:13
sigurdne Exp $
*/
/**
@@ -124,7 +124,7 @@
function read_single_training($id)
{
- $sql = 'SELECT * FROM hrm_training where id=' .
intval($id);
+ $sql = 'SELECT * FROM phpgw_hrm_training where id=' .
intval($id);
$this->db->query($sql,__LINE__,__FILE__);
@@ -176,7 +176,7 @@
$ordermethod = ' order by start_date asc';
}
- $sql = "SELECT hrm_training.id as
training_id,hrm_training.title as title,
hrm_training.start_date,hrm_training.end_date,hrm_training_place.name as place
FROM hrm_training $this->left_join hrm_training_place on
hrm_training.place_id=hrm_training_place.id WHERE hrm_training.user_id=" .
intval($user_id);
+ $sql = "SELECT phpgw_hrm_training.id as
training_id,phpgw_hrm_training.title as title,
phpgw_hrm_training.start_date,phpgw_hrm_training.end_date,phpgw_hrm_training_place.name
as place FROM phpgw_hrm_training $this->left_join phpgw_hrm_training_place on
phpgw_hrm_training.place_id=phpgw_hrm_training_place.id WHERE
phpgw_hrm_training.user_id=" . intval($user_id);
$this->db->query($sql . $ordermethod
,__LINE__,__FILE__);
@@ -200,7 +200,7 @@
$values['new_place_address'] =
$this->db->db_addslashes($values['new_place_address']);
$values['new_place_town'] =
$this->db->db_addslashes($values['new_place_town']);
$values['new_place_descr'] =
$this->db->db_addslashes($values['new_place_descr']);
- $values['place_id'] =
$this->bocommon->next_id('hrm_training_place');
+ $values['place_id'] =
$this->bocommon->next_id('phpgw_hrm_training_place');
$insert_values=array(
$values['place_id'],
@@ -212,7 +212,7 @@
);
$insert_values =
$this->bocommon->validate_db_insert($insert_values);
- $this->db->query("INSERT INTO hrm_training_place
(id,name,address,zip,town, remark) "
+ $this->db->query("INSERT INTO phpgw_hrm_training_place
(id,name,address,zip,town, remark) "
. "VALUES ($insert_values)",__LINE__,__FILE__);
return $values['place_id'];
@@ -230,7 +230,7 @@
$values['place_id'] = $this->add_place($values);
}
- $training_id = $this->bocommon->next_id('hrm_training');
+ $training_id =
$this->bocommon->next_id('phpgw_hrm_training');
$insert_values=array(
$training_id,
@@ -249,7 +249,7 @@
$insert_values =
$this->bocommon->validate_db_insert($insert_values);
- $this->db->query("INSERT INTO hrm_training
(id,user_id,category,title,start_date,end_date,reference,skill,place_id,descr,entry_date,owner)
"
+ $this->db->query("INSERT INTO phpgw_hrm_training
(id,user_id,category,title,start_date,end_date,reference,skill,place_id,descr,entry_date,owner)
"
. "VALUES ($insert_values)",__LINE__,__FILE__);
$receipt['message'][]=array('msg'=>lang('training item
has been saved'));
@@ -280,7 +280,7 @@
$value_set =
$this->bocommon->validate_db_update($value_set);
- $table='hrm_training';
+ $table='phpgw_hrm_training';
$this->db->query("UPDATE $table set $value_set WHERE
id=" . $values['training_id'],__LINE__,__FILE__);
@@ -295,12 +295,12 @@
function delete_training($user_id,$id)
{
- $this->db->query('DELETE FROM hrm_training WHERE id='
. intval($id) . ' AND user_id=' . intval($user_id),__LINE__,__FILE__);
+ $this->db->query('DELETE FROM phpgw_hrm_training WHERE
id=' . intval($id) . ' AND user_id=' . intval($user_id),__LINE__,__FILE__);
}
function select_category_list()
{
- $this->db->query("SELECT id, descr FROM
hrm_training_category ORDER BY descr ");
+ $this->db->query("SELECT id, descr FROM
phpgw_hrm_training_category ORDER BY descr ");
$i = 0;
while ($this->db->next_record())
@@ -314,7 +314,7 @@
function select_place_list()
{
- $this->db->query("SELECT * FROM hrm_training_place
ORDER BY name ");
+ $this->db->query("SELECT * FROM
phpgw_hrm_training_place ORDER BY name ");
$i = 0;
while ($this->db->next_record())
Index: hrm/inc/class.uijob.inc.php
diff -u hrm/inc/class.uijob.inc.php:1.17 hrm/inc/class.uijob.inc.php:1.18
--- hrm/inc/class.uijob.inc.php:1.17 Fri Feb 24 13:24:28 2006
+++ hrm/inc/class.uijob.inc.php Sat Apr 15 19:04:13 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage job
- * @version $Id: class.uijob.inc.php,v 1.17 2006/02/24 13:24:28 sigurdne
Exp $
+ * @version $Id: class.uijob.inc.php,v 1.18 2006/04/15 19:04:13 sigurdne
Exp $
*/
/**
@@ -273,7 +273,7 @@
'sort_name' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
-
'var' => 'hrm_task.name',
+
'var' => 'phpgw_hrm_task.name',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uijob.task',
'job_id' =>$job_id,
Index: hrm/inc/class.uiuser.inc.php
diff -u hrm/inc/class.uiuser.inc.php:1.15 hrm/inc/class.uiuser.inc.php:1.16
--- hrm/inc/class.uiuser.inc.php:1.15 Mon Apr 10 09:28:10 2006
+++ hrm/inc/class.uiuser.inc.php Sat Apr 15 19:04:13 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage user
- * @version $Id: class.uiuser.inc.php,v 1.15 2006/04/10 09:28:10
sigurdne Exp $
+ * @version $Id: class.uiuser.inc.php,v 1.16 2006/04/15 19:04:13
sigurdne Exp $
*/
/**
@@ -349,7 +349,7 @@
'sort_place' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
-
'var' => 'hrm_training_place.name',
+
'var' => 'phpgw_hrm_training_place.name',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiuser.training',
'user_id' =>$user_id,
@@ -361,7 +361,7 @@
'sort_title' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
-
'var' => 'hrm_training.title',
+
'var' => 'phpgw_hrm_training.title',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiuser.training',
'user_id' =>$user_id,
Index: hrm/setup/default_records.inc.php
diff -u hrm/setup/default_records.inc.php:1.4
hrm/setup/default_records.inc.php:1.5
--- hrm/setup/default_records.inc.php:1.4 Tue Mar 14 10:31:39 2006
+++ hrm/setup/default_records.inc.php Sat Apr 15 19:04:13 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage setup
- * @version $Id: default_records.inc.php,v 1.4 2006/03/14 10:31:39
sigurdne Exp $
+ * @version $Id: default_records.inc.php,v 1.5 2006/04/15 19:04:13
sigurdne Exp $
*/
@@ -17,9 +17,9 @@
* @package hrm
*/
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO hrm_acl_location
(appname,id, descr) VALUES ('hrm', '.', 'Top')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO hrm_acl_location
(appname,id, descr, allow_grant) VALUES ('hrm', '.user', 'User',1)");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO hrm_acl_location
(appname,id, descr) VALUES ('hrm', '.job', 'Job description')");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
phpgw_hrm_acl_location (appname,id, descr) VALUES ('hrm', '.', 'Top')");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
phpgw_hrm_acl_location (appname,id, descr, allow_grant) VALUES ('hrm', '.user',
'User',1)");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
phpgw_hrm_acl_location (appname,id, descr) VALUES ('hrm', '.job', 'Job
description')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_acl_location
(appname,id, descr) VALUES ('hrm', '.', 'Top')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_acl_location
(appname,id, descr, allow_grant) VALUES ('hrm', '.user', 'User',1)");
Index: hrm/setup/setup.inc.php
diff -u hrm/setup/setup.inc.php:1.7 hrm/setup/setup.inc.php:1.8
--- hrm/setup/setup.inc.php:1.7 Sat Mar 11 23:20:47 2006
+++ hrm/setup/setup.inc.php Sat Apr 15 19:04:13 2006
@@ -8,12 +8,12 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage setup
- * @version $Id: setup.inc.php,v 1.7 2006/03/11 23:20:47 skwashd Exp $
+ * @version $Id: setup.inc.php,v 1.8 2006/04/15 19:04:13 sigurdne Exp $
*/
$setup_info['hrm']['name'] = 'hrm';
$setup_info['hrm']['title'] = 'Human resource management';
- $setup_info['hrm']['version'] = '0.9.17.001';
+ $setup_info['hrm']['version'] = '0.9.17.002';
$setup_info['hrm']['app_order'] = 20;
$setup_info['hrm']['enable'] = 1;
$setup_info['hrm']['globals_checked'] = True;
@@ -52,20 +52,20 @@
Training items is categorized as education, courses or work
experiences';
$setup_info['hrm']['tables'] = array(
- 'hrm_acl',
- 'hrm_acl_location',
- 'hrm_org',
- 'hrm_job',
- 'hrm_task',
- 'hrm_task_type',
- 'hrm_task_job',
- 'hrm_training',
- 'hrm_training_category',
- 'hrm_training_place',
- 'hrm_training_task',
- 'hrm_experience_category',
- 'hrm_skill_level',
- 'hrm_task_category'
+ 'phpgw_hrm_acl',
+ 'phpgw_hrm_acl_location',
+ 'phpgw_hrm_org',
+ 'phpgw_hrm_job',
+ 'phpgw_hrm_task',
+ 'phpgw_hrm_task_type',
+ 'phpgw_hrm_task_job',
+ 'phpgw_hrm_training',
+ 'phpgw_hrm_training_category',
+ 'phpgw_hrm_training_place',
+ 'phpgw_hrm_training_task',
+ 'phpgw_hrm_experience_category',
+ 'phpgw_hrm_skill_level',
+ 'phpgw_hrm_task_category'
);
/* The hooks this app includes, needed for hooks registration */
Index: hrm/setup/tables_current.inc.php
diff -u hrm/setup/tables_current.inc.php:1.13
hrm/setup/tables_current.inc.php:1.14
--- hrm/setup/tables_current.inc.php:1.13 Fri Feb 24 13:24:49 2006
+++ hrm/setup/tables_current.inc.php Sat Apr 15 19:04:13 2006
@@ -8,11 +8,11 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage setup
- * @version $Id: tables_current.inc.php,v 1.13 2006/02/24 13:24:49
sigurdne Exp $
+ * @version $Id: tables_current.inc.php,v 1.14 2006/04/15 19:04:13
sigurdne Exp $
*/
$phpgw_baseline = array(
- 'hrm_org' => array(
+ 'phpgw_hrm_org' => array(
'fd' => array(
'id' => array('type' => 'auto','precision' =>
'4','nullable' => False),
'org_parent' => array('type' =>
'int','precision' => '4','nullable' => True),
@@ -31,7 +31,7 @@
'uc' => array()
),
- 'hrm_job' => array(
+ 'phpgw_hrm_job' => array(
'fd' => array(
'id' => array('type' => 'auto','precision' =>
'4','nullable' => False),
'job_parent' => array('type' =>
'int','precision' => '4','nullable' => True),
@@ -48,7 +48,7 @@
'uc' => array()
),
- 'hrm_task_type' => array(
+ 'phpgw_hrm_task_type' => array(
'fd' => array(
'id' => array('type' => 'int','precision' =>
'4','nullable' => False),
'name' => array('type' => 'varchar','precision'
=> '100','nullable' => True),
@@ -62,7 +62,7 @@
'uc' => array()
),
- 'hrm_task' => array(
+ 'phpgw_hrm_task' => array(
'fd' => array(
'id' => array('type' => 'auto','precision' =>
'4','nullable' => False),
'job_id' => array('type' => 'int','precision'
=> '4','nullable' => False),
@@ -81,7 +81,7 @@
'uc' => array()
),
- 'hrm_task_job' => array(
+ 'phpgw_hrm_task_job' => array(
'fd' => array(
'task_id' => array('type' => 'int','precision'
=> '4','nullable' => False),
'job_id' => array('type' => 'int','precision'
=> '4','nullable' => False),
@@ -94,7 +94,7 @@
'uc' => array()
),
- 'hrm_training' => array(
+ 'phpgw_hrm_training' => array(
'fd' => array(
'id' => array('type' => 'int','precision' =>
'4','nullable' => False),
'user_id' => array('type' => 'int','precision'
=> '4','nullable' => False),
@@ -115,7 +115,7 @@
'ix' => array(),
'uc' => array()
),
- 'hrm_training_category' => array(
+ 'phpgw_hrm_training_category' => array(
'fd' => array(
'id' => array('type' => 'int','precision' =>
'4','nullable' => False),
'descr' => array('type' =>
'varchar','precision' => '40','nullable' => True),
@@ -126,7 +126,7 @@
'uc' => array()
),
- 'hrm_training_place' => array(
+ 'phpgw_hrm_training_place' => array(
'fd' => array(
'id' => array('type' => 'int','precision' =>
'4','nullable' => False),
'name' => array('type' => 'varchar','precision'
=> '64','nullable' => True),
@@ -140,7 +140,7 @@
'ix' => array(),
'uc' => array()
),
- 'hrm_training_task' => array(
+ 'phpgw_hrm_training_task' => array(
'fd' => array(
'training_id' => array('type' =>
'int','precision' => '4','nullable' => False),
'task_id' => array('type' => 'int','precision'
=> '4','nullable' => False),
@@ -151,7 +151,7 @@
'ix' => array(),
'uc' => array()
),
- 'hrm_acl' => array(
+ 'phpgw_hrm_acl' => array(
'fd' => array(
'acl_appname' => array('type' =>
'varchar','precision' => '50'),
'acl_location' => array('type' =>
'varchar','precision' => '255'),
@@ -165,7 +165,7 @@
'fk' => array(),
'uc' => array()
),
- 'hrm_acl_location' => array(
+ 'phpgw_hrm_acl_location' => array(
'fd' => array(
'appname' => array('type' =>
'varchar','precision' => '25','nullable' => False),
'id' => array('type' => 'varchar','precision'
=> '50','nullable' => False),
@@ -177,7 +177,7 @@
'ix' => array(),
'uc' => array()
),
- 'hrm_experience_category' => array(
+ 'phpgw_hrm_experience_category' => array(
'fd' => array(
'id' => array('type' => 'int','precision' =>
'4','nullable' => False),
'descr' => array('type' =>
'varchar','precision' => '40','nullable' => True),
@@ -187,7 +187,7 @@
'ix' => array(),
'uc' => array()
),
- 'hrm_skill_level' => array(
+ 'phpgw_hrm_skill_level' => array(
'fd' => array(
'id' => array('type' => 'int','precision' =>
'4','nullable' => False),
'descr' => array('type' =>
'varchar','precision' => '40','nullable' => True),
@@ -197,7 +197,7 @@
'ix' => array(),
'uc' => array()
),
- 'hrm_task_category' => array(
+ 'phpgw_hrm_task_category' => array(
'fd' => array(
'id' => array('type' => 'int','precision' =>
'4','nullable' => False),
'descr' => array('type' =>
'varchar','precision' => '40','nullable' => True),
Index: hrm/setup/tables_update.inc.php
diff -u hrm/setup/tables_update.inc.php:1.2 hrm/setup/tables_update.inc.php:1.3
--- hrm/setup/tables_update.inc.php:1.2 Sat Feb 25 18:18:51 2006
+++ hrm/setup/tables_update.inc.php Sat Apr 15 19:04:13 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage setup
- * @version $Id: tables_update.inc.php,v 1.2 2006/02/25 18:18:51
sigurdne Exp $
+ * @version $Id: tables_update.inc.php,v 1.3 2006/04/15 19:04:13
sigurdne Exp $
*/
/**
@@ -43,3 +43,32 @@
$GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit();
return $GLOBALS['setup_info']['hrm']['currentver'];
}
+
+ /**
+ * Update hrm version from 0.9.17.001 to 0.9.17.002
+ */
+
+ $test[] = '0.9.17.001';
+ function hrm_upgrade0_9_17_001()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->RenameTable('hrm_acl','phpgw_hrm_acl');
+
$GLOBALS['phpgw_setup']->oProc->RenameTable('hrm_acl_location','phpgw_hrm_acl_location');
+
$GLOBALS['phpgw_setup']->oProc->RenameTable('hrm_org','phpgw_hrm_org');
+
$GLOBALS['phpgw_setup']->oProc->RenameTable('hrm_job','phpgw_hrm_job');
+
$GLOBALS['phpgw_setup']->oProc->RenameTable('hrm_task','phpgw_hrm_task');
+
$GLOBALS['phpgw_setup']->oProc->RenameTable('hrm_task_type','phpgw_hrm_task_type');
+
$GLOBALS['phpgw_setup']->oProc->RenameTable('hrm_task_job','phpgw_hrm_task_job');
+
$GLOBALS['phpgw_setup']->oProc->RenameTable('hrm_training','phpgw_hrm_training');
+
$GLOBALS['phpgw_setup']->oProc->RenameTable('hrm_training_category','phpgw_hrm_training_category');
+
$GLOBALS['phpgw_setup']->oProc->RenameTable('hrm_training_place','phpgw_hrm_training_place');
+
$GLOBALS['phpgw_setup']->oProc->RenameTable('hrm_training_task','phpgw_hrm_training_task');
+
$GLOBALS['phpgw_setup']->oProc->RenameTable('hrm_experience_category','phpgw_hrm_experience_category');
+
$GLOBALS['phpgw_setup']->oProc->RenameTable('hrm_skill_level','phpgw_hrm_skill_level');
+
$GLOBALS['phpgw_setup']->oProc->RenameTable('hrm_task_category','phpgw_hrm_task_category');
+
+ $GLOBALS['setup_info']['hrm']['currentver'] = '0.9.17.002';
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit();
+ return $GLOBALS['setup_info']['hrm']['currentver'];
+ }
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] hrm inc/class.acl2.inc.php inc/class.bojob.inc....,
Sigurd Nes <=