[Fmsystem-commits] [10445]

[Torstein]

Revision: 10445
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10445
Author:   vator
Date:     2012-11-04 08:57:02 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/logistic/inc/class.uirequirement.inc.php
    trunk/logistic/setup/phpgw_no.lang
    trunk/logistic/templates/base/requirement/requirement_tabs.xsl
    trunk/logistic/templates/base/requirement/requirement_values.xsl

Modified: trunk/logistic/inc/class.uirequirement.inc.php
===================================================================
--- trunk/logistic/inc/class.uirequirement.inc.php      2012-11-04 07:58:10 UTC 
(rev 10444)
+++ trunk/logistic/inc/class.uirequirement.inc.php      2012-11-04 08:57:02 UTC 
(rev 10445)
@@ -602,7 +602,7 @@
 
                                
$temp_requirement_attributes_array[$cust_attribute_id][] = array(
                                        "id"                                    
                => $requirement_value->get_id(),
-                                       "attrib_value"                          
        => $requirement_value->get_value(),
+                                       "attrib_value"          => 
$requirement_value->get_value(),
                                        "operator"                              
=> $requirement_value->get_operator(),
                                        "cust_attribute"        => $attrib_data
                                );

Modified: trunk/logistic/setup/phpgw_no.lang
===================================================================
--- trunk/logistic/setup/phpgw_no.lang  2012-11-04 07:58:10 UTC (rev 10444)
+++ trunk/logistic/setup/phpgw_no.lang  2012-11-04 08:57:02 UTC (rev 10445)
@@ -13,9 +13,9 @@
 t_new_activity logistic        no      Opprett ny aktivitet på dette prosjektet
 t_new_requirement      logistic        no      Registrer nytt behov på denne 
aktiviteten
 t_view_requirements    logistic        no      Vis registrerte behov på denne 
aktiviteten
-t_new_allocation       logistic        no      Registrer ny booking på denne 
aktiviteten
-t_view_allocations     logistic        no      Vis registrerte bookinger på 
denne aktiviteten
-t_new_type_requirement logistic        no      Nytt type-krav
+t_new_allocation       logistic        no      Tildel ressurser til denne 
aktiviteten
+t_view_allocations     logistic        no      Vis tildelte ressurser til 
denne aktiviteten
+t_new_type_requirement logistic        no      Ny behovstype
 Project_type   logistic        no      Prosjekttype
 settings       logistic        no      innstillinger
 Project types  logistic        no      Prosjekttyper
@@ -35,8 +35,8 @@
 Category       logistic        no      Kategori
 Attributes     logistic        no      Attributter
 Chosen attributes      logistic        no      Valgte attributter
-Administrate requirements      logistic        no      Administrer type-krav
-resource_type_requirement      logistic        no      Ressurstype-krav
+Administrate requirements      logistic        no      Administrer behovstype
+resource_type_requirement      logistic        no      Ressurstypebehov
 Varchar        logistic        no      Text
 Contact        logistic        no      Kontakt
 Entity types   logistic        no      Entitetstyper
@@ -50,33 +50,33 @@
 event  logistic        no      Hendelse
 Link   logistic        no      Lenke
 Add requirement to activity    logistic        no      Registrer behov for 
aktiviteten
-Add requirement        logistic        no      Legg til krav
+Add requirement        logistic        no      Legg til behov
 Requirement details    logistic        no      Detaljer for behov
 Add constraints        logistic        no      Legg til kriterier på behovet
 No of items    logistic        no      Antall
 Num required   logistic        no      Trenger antall 
 Resource type  logistic        no      Ressurstype
-t_new_booking_allocation       logistic        no      Registrer ny booking på 
dette behovet
-t_view_booking_allocations     logistic        no      Vis registrerte 
bookinger på dette behovet
+t_new_booking_allocation       logistic        no      Tildel dette behovet 
ressurser
+t_view_booking_allocations     logistic        no      Vis tildelte ressurser 
på dette behovet
 error_msg_1    logistic        no      Vennligst fyll inn dette feltet
 error_msg_2    logistic        no      Vennligst velg en verdi i listen
 error_msg_3    logistic        no      Vennligst angi sluttdato etter startdato
 Criterias      logistic        no      Kriterier
-Add criterias  logistic        no      Legg til kriterier
+Add criterias  logistic        no      Legg til kriterier på behovet
 favorites      logistic        no      Favoritter
 toggle as favorite     logistic        no      Legg til / fjern som favoritt
-Add allocation to requirement  logistic        no      Bestill ressurser til 
behov
+Add allocation to requirement  logistic        no      Tildel dette behovet 
ressurser
 Delete requirement     logistic        no      Slett behov
-Allocate resources     logistic        no      Bestill ressurser
-Num allocated  logistic        no      Antall bestilte
+Allocate resources     logistic        no      Tildel ressurser
+Num allocated  logistic        no      Antall tildelte ressurser
 Status logistic        no      Status
-Requirement allocation logistic        no      Bestilling av ressurser
+Requirement allocation logistic        no      Tildeling av ressurser
 Activity details       logistic        no      Detaljer for aktivitet
 Status requirement     logistic        no      Status behov
 select logistic        no      Velg
 Add project    logistic        no      Nytt prosjekt
-Booking of resources   logistic        no      Bestilling av ressurser
-Requirement to activity        logistic        no      Krav til aktiviteten
+Booking of resources   logistic        no      Tildeling av ressurser
+Requirement to activity        logistic        no      Behov for aktiviteten
 edit   logistic        no      Rediger
 Overview projects      logistic        no      Oversikt over prosjekter
 Overview for activity  logistic        no      Oversikt for aktiviteten

Modified: trunk/logistic/templates/base/requirement/requirement_tabs.xsl
===================================================================
--- trunk/logistic/templates/base/requirement/requirement_tabs.xsl      
2012-11-04 07:58:10 UTC (rev 10444)
+++ trunk/logistic/templates/base/requirement/requirement_tabs.xsl      
2012-11-04 08:57:02 UTC (rev 10445)
@@ -12,7 +12,7 @@
                                <xsl:when test="requirement/id != '' or 
requirement/id != 0">
                                        <h1 style="float:left;"> 
                                                <span>
-                                                       <xsl:value-of 
select="php:function('lang', 'Requirement to activity')" />
+                                                       <xsl:value-of 
select="php:function('lang', 'Add requirement to activity')" />
                                                </span>
                                                <span style="margin-left:5px;">
                                                        <xsl:value-of 
select="activity/name" />

Modified: trunk/logistic/templates/base/requirement/requirement_values.xsl
===================================================================
--- trunk/logistic/templates/base/requirement/requirement_values.xsl    
2012-11-04 07:58:10 UTC (rev 10444)
+++ trunk/logistic/templates/base/requirement/requirement_values.xsl    
2012-11-04 08:57:02 UTC (rev 10445)
@@ -153,7 +153,13 @@
                                                        
                                                                                
                </xsl:when>
                                                                                
                <xsl:when test="cust_attribute/column_info/type = 'LB'">
-                                                                               
                        <span style="margin-left:10px;"><xsl:value-of 
select="attrib_value" /></span>
+                                                                               
                        <xsl:for-each select="cust_attribute/choice">
+                                                                               
                                        <xsl:if test="id = //attrib_value">
+                                                                               
                                                <span>
+                                                                               
                                                        <xsl:value-of 
select="value"/>
+                                                                               
                                                </span>
+                                                                               
                                        </xsl:if>
+                                                                               
                        </xsl:for-each>
                                                                                
                </xsl:when>
                                                                                
        </xsl:choose>
                                                                                
</div>