[Fmsystem-commits] [11397] controller: list component info

[Sigurd Nes]

Revision: 11397
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11397
Author:   sigurdne
Date:     2013-10-25 13:50:03 +0000 (Fri, 25 Oct 2013)
Log Message:
-----------
controller: list component info

Modified Paths:
--------------
    trunk/controller/inc/class.uicase.inc.php
    trunk/controller/templates/base/case/create_case_message.xsl

Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php   2013-10-25 13:49:32 UTC (rev 
11396)
+++ trunk/controller/inc/class.uicase.inc.php   2013-10-25 13:50:03 UTC (rev 
11397)
@@ -420,6 +420,21 @@
                                                
                        $check_items_and_cases = 
$this->so_check_item->get_check_items_with_cases($check_list_id, null, "open", 
"no_message_registered");
 
+                       foreach ($check_items_and_cases as $check_item)
+                       {
+                               $component_location_id = 
$check_item->get_control_item()->get_component_location_id();
+
+                               foreach($check_item->get_cases_array() as $case)
+                               {
+                                       $component_id = 
$case->get_component_id();
+                                       if($component_id)
+                                       {
+                                               $short_desc = 
execMethod('property.soentity.get_short_description', array('location_id' => 
$component_location_id, 'id' => $component_id));
+                                               
$case->set_component_descr($short_desc);
+                                       }
+                               }
+                       }
+
                        $control_id = $check_list->get_control_id();
                        $control = $this->so_control->get_single( $control_id );
 

Modified: trunk/controller/templates/base/case/create_case_message.xsl
===================================================================
--- trunk/controller/templates/base/case/create_case_message.xsl        
2013-10-25 13:49:32 UTC (rev 11396)
+++ trunk/controller/templates/base/case/create_case_message.xsl        
2013-10-25 13:50:03 UTC (rev 11397)
@@ -137,7 +137,27 @@
                                                                                
<ul>            
                                                                                
        <xsl:for-each select="cases_array">
                                                                                
                <xsl:variable name="cases_id"><xsl:value-of 
select="id"/></xsl:variable>
-                                                                               
                <li><input type="checkbox"  name="case_ids[]" 
value="{$cases_id}" /><xsl:value-of select="descr"/></li>
+                                                                               
                <li>
+                                                                               
                        <input type="checkbox"  name="case_ids[]" 
value="{$cases_id}" />
+                                                                               
                         <xsl:choose>
+                                                                               
                                  <xsl:when test="component_descr != ''">
+                                                                               
                                          <div class="row">
+                                                                               
                                                <label>
+                                                                               
                                                        <xsl:value-of 
select="php:function('lang','component')" />
+                                                                               
                                                </label> 
+                                                                               
                                          </div>
+                                                                               
                                           <div class="component_descr">
+                                                                               
                                                <xsl:value-of 
select="component_descr"/>
+                                                                               
                                          </div>
+                                                                               
                                 </xsl:when>
+                                                                               
                        </xsl:choose>
+                                                                               
                        <div class="row">
+                                                                               
                                <label>Beskrivelse:</label> 
+                                                                               
                        </div>
+                                                                               
                        <div class="case_descr">
+                                                                               
                                <xsl:value-of select="descr"/>
+                                                                               
                        </div>
+                                                                               
                </li>
                                                                                
        </xsl:for-each>
                                                                                
</ul>
                                                                        </li>