phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] hrm inc/class.uiuser.inc.php templates/base/use...


From: Sigurd Nes
Subject: [Phpgroupware-cvs] hrm inc/class.uiuser.inc.php templates/base/use...
Date: Wed, 28 Jun 2006 10:21:43 +0000

CVSROOT:        /sources/phpgroupware
Module name:    hrm
Changes by:     Sigurd Nes <sigurdne>   06/06/28 10:21:43

Modified files:
        inc            : class.uiuser.inc.php 
        templates/base : user.xsl 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/hrm/inc/class.uiuser.inc.php?cvsroot=phpgroupware&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/hrm/templates/base/user.xsl?cvsroot=phpgroupware&r1=1.7&r2=1.8

Patches:
Index: inc/class.uiuser.inc.php
===================================================================
RCS file: /sources/phpgroupware/hrm/inc/class.uiuser.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- inc/class.uiuser.inc.php    27 Jun 2006 08:51:15 -0000      1.19
+++ inc/class.uiuser.inc.php    28 Jun 2006 10:21:43 -0000      1.20
@@ -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.19 2006/06/27 08:51:15 
sigurdne Exp $
+       * @version $Id: class.uiuser.inc.php,v 1.20 2006/06/28 10:21:43 
sigurdne Exp $
        */
 
        /**
@@ -344,6 +344,7 @@
                                        'place'                 => 
$entry['place'],
                                        'start_date'            => 
$entry['start_date'],
                                        'end_date'              => 
$entry['end_date'],
+                                       'category'              => 
$entry['category'],
                                        'link_edit'             => $link_edit,
                                        'link_view'             => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.".uiuser.view&user_id=$user_id&training_id="
 . $entry['training_id']),
                                        'link_delete'           => $link_delete,
@@ -376,6 +377,17 @@
                                                                                
                                'cat_id'        =>$this->cat_id,
                                                                                
                                'allrows'       => $this->allrows)
                                                                                
)),
+                               'sort_start_date'       => 
$this->nextmatchs->show_sort_order(array
+                                                                               
(
+                                                                               
        'sort'  => $this->sort,
+                                                                               
        'var'   =>      'start_date',
+                                                                               
        'order' =>      $this->order,
+                                                                               
        'extra'         => array('menuaction'   => 
$this->currentapp.'.uiuser.training',
+                                                                               
                                'user_id'       =>$user_id,
+                                                                               
                                'query'         =>$this->query,
+                                                                               
                                'cat_id'        =>$this->cat_id,
+                                                                               
                                'allrows'       => $this->allrows)
+                                                                               
)),
                                'lang_place'    => lang('place'),
                                'sort_title'    => 
$this->nextmatchs->show_sort_order(array
                                                                                
(
@@ -388,6 +400,7 @@
                                                                                
                                'cat_id'        =>$this->cat_id,
                                                                                
                                'allrows' => $this->allrows)
                                                                                
)),
+                               'lang_category' => lang('category'),
                                'lang_title'    => lang('training'),
                                'lang_start_date'=> lang('start date'),
                                'lang_end_date' => lang('end date'),
@@ -421,11 +434,18 @@
 
                        $msgbox_data = $this->bocommon->msgbox_data($receipt);
 
+                       $link_cv_data = array
+                       (
+                               'menuaction'    => 
$this->currentapp.'.uiuser.view_cv',
+                               'user_id'       => $user_id,
+                               'order'         => $this->order,
+                               'sort'          => $this->sort
+                       );
 
 
                        $data = array
                        (
-                               'link_cv'                               => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiuser.view_cv&user_id='
 . $user_id),
+                               'link_cv'                               => 
$GLOBALS['phpgw']->link('/index.php',$link_cv_data),
                                'lang_cv_statustext'                    => 
lang('A printout version of the CV'),
                                'text_cv'                               => 'CV',
                                'table_header_training'                 => 
$table_header,

Index: templates/base/user.xsl
===================================================================
RCS file: /sources/phpgroupware/hrm/templates/base/user.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- templates/base/user.xsl     28 Jun 2006 08:40:00 -0000      1.7
+++ templates/base/user.xsl     28 Jun 2006 10:21:43 -0000      1.8
@@ -1,4 +1,4 @@
-<!-- $Id: user.xsl,v 1.7 2006/06/28 08:40:00 sigurdne Exp $ -->
+<!-- $Id: user.xsl,v 1.8 2006/06/28 10:21:43 sigurdne Exp $ -->
 
        <xsl:template name="app_data">
                <xsl:choose>
@@ -158,15 +158,19 @@
        <xsl:template match="table_header_training">
                <xsl:variable name="sort_title"><xsl:value-of 
select="sort_title"/></xsl:variable>
                <xsl:variable name="sort_place"><xsl:value-of 
select="sort_place"/></xsl:variable>
+               <xsl:variable name="sort_start_date"><xsl:value-of 
select="sort_start_date"/></xsl:variable>
                <tr class="th">
+                       <td class="th_text" width="5%" align="center">
+                               <xsl:value-of select="lang_category"/>
+                       </td>
                        <td class="th_text" width="10%" align="left">
                                <a href="{$sort_title}"><xsl:value-of 
select="lang_title"/></a>
                        </td>
                        <td class="th_text" width="10%" align="left">
                                <a href="{$sort_place}"><xsl:value-of 
select="lang_place"/></a>
                        </td>
-                       <td class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_start_date"/>
+                       <td class="th_text" width="10%" align="left">
+                               <a href="{$sort_start_date}"><xsl:value-of 
select="lang_start_date"/></a>
                        </td>
                        <td class="th_text" width="5%" align="center">
                                <xsl:value-of select="lang_end_date"/>
@@ -203,6 +207,9 @@
                                </xsl:attribute>
 
                                <td align="left">
+                                       <xsl:value-of select="category"/>
+                               </td>
+                               <td align="left">
                                        <xsl:value-of select="title"/>
                                </td>
                                <td align="left">




reply via email to

[Prev in Thread] Current Thread [Next in Thread]