[Fmsystem-commits] [11502] controller: add group name to tickets

[Sigurd Nes]

Revision: 11502
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11502
Author:   sigurdne
Date:     2013-12-01 19:17:44 +0000 (Sun, 01 Dec 2013)
Log Message:
-----------
controller: add group name to tickets

Modified Paths:
--------------
    trunk/controller/inc/class.uicase.inc.php
    trunk/controller/js/controller/case.js
    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-12-01 14:27:58 UTC (rev 
11501)
+++ trunk/controller/inc/class.uicase.inc.php   2013-12-01 19:17:44 UTC (rev 
11502)
@@ -427,8 +427,13 @@
 
                        foreach ($check_items_and_cases as $check_item)
                        {
+                               $control_group = 
$this->so_control_group->get_single($check_item->get_control_item()->get_control_group_id());
+                               
$check_item->get_control_item()->set_control_group_name($control_group->get_group_name());
+                               
$check_item->get_control_item()->set_control_area_name($control_group->get_control_area_name());
+
                                foreach($check_item->get_cases_array() as $case)
                                {
+
                                        $component_location_id  = 
$case->get_component_location_id();
                                        $component_id                   = 
$case->get_component_id();
                                        if($component_id)
@@ -553,9 +558,14 @@
                        foreach($case_ids as $case_id)
                        {
                                $case = $this->so->get_single($case_id);
+                               
+                               $check_item = 
$this->so_check_item->get_single($case->get_check_item_id());
+                               $control_item = $check_item->get_control_item();
+                               $control_group = 
$this->so_control_group->get_single($control_item['control_group_id']);
+                               $group_name = $control_group->get_group_name();
                                $component_location_id  = 
$case->get_component_location_id();
 
-                               $message_details .= "Gjøremål {$counter}: \n";
+                               $message_details .= "{$group_name}::Gjøremål 
{$counter}: \n";
 
                                if($component_id = $case->get_component_id())
                                {

Modified: trunk/controller/js/controller/case.js
===================================================================
--- trunk/controller/js/controller/case.js      2013-12-01 14:27:58 UTC (rev 
11501)
+++ trunk/controller/js/controller/case.js      2013-12-01 19:17:44 UTC (rev 
11502)
@@ -54,9 +54,12 @@
                                                        
$(submitBnt).addClass("not_active");
                                          }, 1000);
 
+/*
                                          $(thisForm).delay(1500).slideUp(500, 
function(){
                                                  
$(thisForm).parents("ul.expand_list").find("h4 img").attr("src", 
"controller/images/arrow_right.png");  
                                          });
+*/
+
                                          }
                                  }
                                }

Modified: trunk/controller/templates/base/case/create_case_message.xsl
===================================================================
--- trunk/controller/templates/base/case/create_case_message.xsl        
2013-12-01 14:27:58 UTC (rev 11501)
+++ trunk/controller/templates/base/case/create_case_message.xsl        
2013-12-01 19:17:44 UTC (rev 11502)
@@ -133,7 +133,12 @@
                                                        <xsl:choose>
                                                                <xsl:when 
test="cases_array/child::node()">
                                                                        <li 
class="check_item">
-                                                                               
<h4><span><xsl:value-of select="control_item/title"/></span></h4>
+                                                                               
<h4><span>
+                                                                               
<xsl:value-of select="control_item/control_group_name"/>
+                                                                               
<xsl:text>::</xsl:text>
+                                                                               
<xsl:value-of select="control_item/title"/>
+                                                                               
+                                                                               
</span></h4>
                                                                                
<ul>            
                                                                                
        <xsl:for-each select="cases_array">
                                                                                
                <xsl:variable name="cases_id"><xsl:value-of 
select="id"/></xsl:variable>