[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] hrm inc/class.sojob.inc.php inc/class.uijob.inc...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] hrm inc/class.sojob.inc.php inc/class.uijob.inc... |
|
Date: |
Thu, 24 Aug 2006 12:46:49 +0000 |
CVSROOT: /sources/phpgroupware
Module name: hrm
Changes by: Sigurd Nes <sigurdne> 06/08/24 12:46:49
Modified files:
inc : class.sojob.inc.php class.uijob.inc.php
templates/base : job.xsl
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/hrm/inc/class.sojob.inc.php?cvsroot=phpgroupware&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/hrm/inc/class.uijob.inc.php?cvsroot=phpgroupware&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/hrm/templates/base/job.xsl?cvsroot=phpgroupware&r1=1.16&r2=1.17
Patches:
Index: inc/class.sojob.inc.php
===================================================================
RCS file: /sources/phpgroupware/hrm/inc/class.sojob.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- inc/class.sojob.inc.php 20 Jun 2006 13:18:19 -0000 1.20
+++ inc/class.sojob.inc.php 24 Aug 2006 12:46:49 -0000 1.21
@@ -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.20 2006/06/20 13:18:19 sigurdne
Exp $
+ * @version $Id: class.sojob.inc.php,v 1.21 2006/08/24 12:46:49 sigurdne
Exp $
*/
/**
@@ -164,6 +164,30 @@
}
}
+ $sql = "SELECT count(*) as quali_count,job_id FROM
phpgw_hrm_quali GROUP BY job_id";
+ $this->db->query($sql,__LINE__,__FILE__);
+ while ($this->db->next_record())
+ {
+ $quali[$this->db->f('job_id')] =
$this->db->f('quali_count');
+ }
+
+ $sql = "SELECT count(*) as task_count,job_id FROM
phpgw_hrm_task GROUP BY job_id";
+ $this->db->query($sql,__LINE__,__FILE__);
+ while ($this->db->next_record())
+ {
+ $task[$this->db->f('job_id')] =
$this->db->f('task_count');
+ }
+
+ if (is_array($jobs))
+ {
+ for ($i=0;$i<count($jobs);$i++)
+ {
+ $jobs[$i]['quali_count'] =
(int)$quali[$jobs[$i]['id']];
+ $jobs[$i]['task_count'] =
(int)$task[$jobs[$i]['id']];
+ }
+
+ }
+
return $jobs;
}
@@ -241,6 +265,7 @@
$ordermethod = ' order by name asc';
}
+ $groupmethod = ' GROUP BY phpgw_hrm_quali.category';
$sql = "SELECT phpgw_hrm_quali.id as quali_id,
phpgw_hrm_quali.remark as remark,phpgw_hrm_quali_category.descr as
category,phpgw_hrm_quali_type.name,phpgw_hrm_quali_type.descr from
phpgw_hrm_quali"
. " $this->join phpgw_hrm_quali_type ON
phpgw_hrm_quali.quali_type_id = phpgw_hrm_quali_type.id"
Index: inc/class.uijob.inc.php
===================================================================
RCS file: /sources/phpgroupware/hrm/inc/class.uijob.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- inc/class.uijob.inc.php 20 Jun 2006 13:18:19 -0000 1.22
+++ inc/class.uijob.inc.php 24 Aug 2006 12:46:49 -0000 1.23
@@ -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.22 2006/06/20 13:18:19 sigurdne
Exp $
+ * @version $Id: class.uijob.inc.php,v 1.23 2006/08/24 12:46:49 sigurdne
Exp $
*/
/**
@@ -107,11 +107,12 @@
$entry['name'] = $spaceset .
$entry['name'];
}
-
$content[] = array
(
'name'
=> $entry['name'],
'descr'
=> $entry['descr'],
+ 'task_count' =>
$entry['task_count'],
+ 'quali_count' =>
$entry['quali_count'],
'link_add_sub'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.edit_job&parent_id='
. $entry['id']),
'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.edit_job&id='
. $entry['id']),
'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.delete_job&job_id='
. $entry['id']),
@@ -283,7 +284,7 @@
'sort_name' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
-
'var' => 'phpgw_hrm_quali.name',
+
'var' => 'name',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uijob.qualification',
'job_id' =>$job_id,
Index: templates/base/job.xsl
===================================================================
RCS file: /sources/phpgroupware/hrm/templates/base/job.xsl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- templates/base/job.xsl 20 Jun 2006 13:18:19 -0000 1.16
+++ templates/base/job.xsl 24 Aug 2006 12:46:49 -0000 1.17
@@ -1,4 +1,4 @@
-<!-- $Id: job.xsl,v 1.16 2006/06/20 13:18:19 sigurdne Exp $ -->
+<!-- $Id: job.xsl,v 1.17 2006/08/24 12:46:49 sigurdne Exp $ -->
<xsl:template name="app_data">
<xsl:choose>
@@ -131,10 +131,16 @@
<td align="center">
<xsl:variable
name="link_qualification"><xsl:value-of
select="link_qualification"/></xsl:variable>
<a href="{$link_qualification}"
onMouseover="window.status='{$lang_qualification_job_text}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_qualification"/></a>
+ <xsl:text> [</xsl:text>
+ <xsl:value-of select="quali_count"/>
+ <xsl:text>]</xsl:text>
</td>
<td align="center">
<xsl:variable
name="link_task"><xsl:value-of select="link_task"/></xsl:variable>
<a href="{$link_task}"
onMouseover="window.status='{$lang_task_job_text}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_task"/></a>
+ <xsl:text> [</xsl:text>
+ <xsl:value-of select="task_count"/>
+ <xsl:text>]</xsl:text>
</td>
<td align="center">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] hrm inc/class.sojob.inc.php inc/class.uijob.inc...,
Sigurd Nes <=