[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] hrm/inc class.sojob.inc.php, 1.10 class.uijob.inc.php
From: |
sigurdne |
Subject: |
[Phpgroupware-cvs] hrm/inc class.sojob.inc.php, 1.10 class.uijob.inc.php, 1.9 class.bojob.inc.php, 1.9 |
Date: |
Wed, 30 Nov 2005 20:19:00 +0100 |
Update of hrm/inc
Modified Files:
Branch: MAIN
class.sojob.inc.php lines: +38 -1
class.uijob.inc.php lines: +11 -2
class.bojob.inc.php lines: +8 -1
Log Message:
no message
====================================================
Index: hrm/inc/class.sojob.inc.php
diff -u hrm/inc/class.sojob.inc.php:1.9 hrm/inc/class.sojob.inc.php:1.10
--- hrm/inc/class.sojob.inc.php:1.9 Wed Nov 30 17:07:22 2005
+++ hrm/inc/class.sojob.inc.php Wed Nov 30 19:19:25 2005
@@ -474,6 +474,14 @@
$this->db->query("INSERT INTO hrm_task
(id,job_id,name,descr,category,skill_id,experience_id,entry_date,task_owner) "
. "VALUES ($insert_values)",__LINE__,__FILE__);
+ if(is_array($values['alternative_task']))
+ {
+ foreach($values['alternative_task'] as
$alternative_task)
+ {
+ $this->db->query("UPDATE hrm_task set
parent_task = $task_id WHERE id= $alternative_task",__LINE__,__FILE__);
+ }
+ }
+
$receipt['message'][]=array('msg'=>lang('task item has
been saved'));
$receipt['task_id']= $task_id;
@@ -495,6 +503,16 @@
$table='hrm_task';
$this->db->query("UPDATE $table set $value_set WHERE
id=" . $values['task_id'],__LINE__,__FILE__);
+ $this->db->query("UPDATE hrm_task set parent_task =
NULL WHERE parent_task = " . $values['task_id'] ,__LINE__,__FILE__);
+
+ if(is_array($values['alternative_task']))
+ {
+
+ foreach($values['alternative_task'] as
$alternative_task)
+ {
+ $this->db->query("UPDATE hrm_task set
parent_task = " . $values['task_id'] . " WHERE id=
$alternative_task",__LINE__,__FILE__);
+ }
+ }
$this->db->transaction_commit();
@@ -503,6 +521,25 @@
$receipt['task_id']= $values['task_id'];
return $receipt;
}
+
+
+ function select_task_list($job_id)
+ {
+ $sql = "SELECT * from hrm_task WHERE job_id=" .
intval($job_id);
+
+ $this->db->query($sql,__LINE__,__FILE__);
+
+ while ($this->db->next_record())
+ {
+ $task_list[] = array
+ (
+ 'id' => $this->db->f('id'),
+ 'name' =>
stripslashes($this->db->f('name')),
+ );
+ }
+ return $task_list;
+ }
+
function delete_task($job_id,$id)
{
====================================================
Index: hrm/inc/class.uijob.inc.php
diff -u hrm/inc/class.uijob.inc.php:1.8 hrm/inc/class.uijob.inc.php:1.9
--- hrm/inc/class.uijob.inc.php:1.8 Wed Nov 30 17:07:22 2005
+++ hrm/inc/class.uijob.inc.php Wed Nov 30 19:19:03 2005
@@ -344,6 +344,9 @@
function lookup_task()
{
+ $GLOBALS['phpgw_info']['flags']['noframework'] = True;
+ $GLOBALS['phpgw_info']['flags']['headonly']=true;
+
$job_id = get_var('job_id',array('POST','GET'));
$receipt =
$GLOBALS['phpgw']->session->appsession('session_data','hrm_task_receipt');
@@ -671,6 +674,8 @@
{
$values['job_id']= $job_id;
+ $values['alternative_task'] =
get_var('alternative_task',array('POST'));
+
if ($values['save'] || $values['apply'])
{
if(!$values['cat_id'])
@@ -749,6 +754,8 @@
$msgbox_data = $this->bocommon->msgbox_data($receipt);
+ $task_list =
$this->bo->select_task_list($job_id);
+
$data = array
(
'value_descr' =>
$values['descr'],
@@ -784,7 +791,9 @@
'lang_alternative' =>
lang('alternative'),
'lang_open_popup' =>
lang('open popup window'),
'lang_no_alternative' =>
lang('select alternative'),
-
+ 'task_list'
=> $task_list,
+ 'task_list_size' =>
count($task_list)
+
);
$job_info = $this->bo->read_single_job($job_id);
====================================================
Index: hrm/inc/class.bojob.inc.php
diff -u hrm/inc/class.bojob.inc.php:1.8 hrm/inc/class.bojob.inc.php:1.9
--- hrm/inc/class.bojob.inc.php:1.8 Wed Nov 30 17:07:22 2005
+++ hrm/inc/class.bojob.inc.php Wed Nov 30 19:19:15 2005
@@ -254,4 +254,11 @@
return $job_list;
}
+
+ function select_task_list($job_id)
+ {
+ return $this->so->select_task_list($job_id);
+ }
+
+
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] hrm/inc class.sojob.inc.php, 1.10 class.uijob.inc.php, 1.9 class.bojob.inc.php, 1.9,
sigurdne <=