[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] hrm/inc class.sojob.inc.php
From: |
Sigurd Nes |
Subject: |
[Phpgroupware-cvs] hrm/inc class.sojob.inc.php |
Date: |
Tue, 25 Apr 2006 08:12:03 +0000 |
CVSROOT: /sources/phpgroupware
Module name: hrm
Branch:
Changes by: Sigurd Nes <address@hidden> 06/04/25 08:12:03
Modified files:
inc : class.sojob.inc.php
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/hrm/inc/class.sojob.inc.php.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
Patches:
Index: hrm/inc/class.sojob.inc.php
diff -u hrm/inc/class.sojob.inc.php:1.17 hrm/inc/class.sojob.inc.php:1.18
--- hrm/inc/class.sojob.inc.php:1.17 Fri Apr 21 12:57:27 2006
+++ hrm/inc/class.sojob.inc.php Tue Apr 25 08:12:03 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.17 2006/04/21 12:57:27 sigurdne
Exp $
+ * @version $Id: class.sojob.inc.php,v 1.18 2006/04/25 08:12:03 sigurdne
Exp $
*/
/**
@@ -244,7 +244,7 @@
$sql = "SELECT * , phpgw_hrm_quali.id as quali_id from
phpgw_hrm_quali $this->join phpgw_hrm_quali_type ON
phpgw_hrm_quali.quali_type_id = phpgw_hrm_quali_type.id WHERE job_id=" .
intval($job_id);
- $parent_select = ' AND (is_parent =1 OR (is_parent != 1
AND quali_parent IS NULL))';
+ $parent_select = ' AND (is_parent =1 OR (is_parent = 0
AND quali_parent IS NULL))';
if($query)
{
@@ -273,7 +273,7 @@
$num_qualifications = count($qualifications);
for ($i=0;$i < $num_qualifications;$i++)
{
- $sub_select = ' AND quali_parent=' .
$qualifications[$i]['quali_id'] . " AND is_parent != 1";
+ $sub_select = ' AND quali_parent=' .
$qualifications[$i]['quali_id'] . " AND is_parent = 0";
$this->db->query($sql . $querymethod .
$sub_select . $ordermethod,__LINE__,__FILE__);
@@ -1051,6 +1051,8 @@
$this->db->query("INSERT INTO phpgw_hrm_quali
(job_id,quali_type_id,category,skill_id,experience_id,entry_date,quali_owner) "
. "VALUES ($insert_values)",__LINE__,__FILE__);
+ $quali_id =
$this->db->get_last_insert_id('phpgw_hrm_quali','id');
+
if(is_array($values['alternative_qualification']))
{
$this->db->query("UPDATE phpgw_hrm_quali set
is_parent = 1 WHERE id= $quali_id",__LINE__,__FILE__);
@@ -1067,7 +1069,7 @@
$receipt['message'][]=array('msg'=>lang('qualification
item has been saved'));
- $receipt['quali_id'] =
$this->db->get_last_insert_id('phpgw_hrm_quali','id');
+ $receipt['quali_id'] = $quali_id;
$this->db->transaction_commit();
return $receipt;
@@ -1119,11 +1121,11 @@
if($quali_id)
{
- $sql .= " AND phpgw_hrm_quali.id != $quali_id
AND (is_parent !=1 AND (quali_parent is null or quali_parent = $quali_id ))";
+ $sql .= " AND phpgw_hrm_quali.id != $quali_id
AND (is_parent = 0 AND (quali_parent is null or quali_parent = $quali_id ))";
}
else
{
- $sql .= " AND (is_parent !=1 AND (quali_parent
is null))";
+ $sql .= " AND (is_parent = 0 AND (quali_parent
is null))";
}
$this->db->query($sql,__LINE__,__FILE__);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] hrm/inc class.sojob.inc.php,
Sigurd Nes <=