[Fmsystem-commits] [11225] more on controller

[Sigurd Nes]

Revision: 11225
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11225
Author:   sigurdne
Date:     2013-07-02 13:00:20 +0000 (Tue, 02 Jul 2013)
Log Message:
-----------
more on controller

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

Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php   2013-07-02 12:34:02 UTC (rev 
11224)
+++ trunk/controller/inc/class.uicase.inc.php   2013-07-02 13:00:20 UTC (rev 
11225)
@@ -223,6 +223,9 @@
                                                                        
$_component_at_location['short_description'] .= ' (' . 
$cases_at_component_group[$control_group->get_id()][$_component_at_location['id']]
 . ')';
                                                                }
                                                        }
+                                                       
+                                                       array_unshift 
($_components_at_location, array('id'=>'', 'short_description' => 
lang('select')));
+                                                       
                                                        
$control_groups_with_items_array[] = array
                                                        (
                                                                'control_group' 
                        => $control_group->toArray(),
@@ -264,6 +267,7 @@
                                'current_year'                                  
        => $year,
                                'current_month_nr'                              
        => $month,
                            'cases_view'                                        
        => 'add_case',
+               //          'location_required'                                 
=> true
                        );
                        
                        phpgwapi_jquery::load_widget('core');
@@ -298,6 +302,8 @@
                        $check_list = 
$this->so_check_list->get_single($check_list_id);
                                                
                        $control_id = $check_list->get_control_id();
+                       
+                       $location_code = $location_code ? $location_code : 
$check_list->get_location_code();
                        $control = $this->so_control->get_single( $control_id );
                        
                        $check_item = 
$this->so_check_item->get_check_item_by_check_list_and_control_item($check_list_id,
 $control_item_id);

Modified: trunk/controller/templates/base/case/add_case.xsl
===================================================================
--- trunk/controller/templates/base/case/add_case.xsl   2013-07-02 12:34:02 UTC 
(rev 11224)
+++ trunk/controller/templates/base/case/add_case.xsl   2013-07-02 13:00:20 UTC 
(rev 11225)
@@ -41,7 +41,14 @@
                                                                <li>
                                                                        
<h4><img src="controller/images/arrow_right.png" /><span><xsl:value-of 
select="title"/></span></h4>
                                                                                
<form class="frm_register_case expand_item" action="{$action_url}" 
method="post">
-                                                               <input 
type="hidden" name="location_code"  value="" class="required" />
+                                                               <!--input 
type="hidden" name="location_code"  value="" class="required" /-->
+                                                               <input 
type="hidden" name="location_code"  value="" >
+                                                                               
        <xsl:if test="//location_required = 1">
+                                                                               
                        <xsl:attribute name="class" >
+                                                                               
                                <xsl:text>required</xsl:text>
+                                                                               
                        </xsl:attribute>                        
+                                                                               
        </xsl:if>
+                                                               </input>
                                                                <input 
type="hidden" name="control_group_id"  value="{$control_group_id}" />
                                                                <input 
type="hidden" name="component_id"  value="" />
                                                                                
<xsl:variable name="control_item_id"><xsl:value-of select="id"/></xsl:variable>