[Fmsystem-commits] [9561]

[Torstein]

Revision: 9561
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9561
Author:   vator
Date:     2012-06-12 11:32:34 +0000 (Tue, 12 Jun 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.uicheck_list.inc.php
    trunk/controller/inc/class.uicontrol.inc.php
    trunk/controller/templates/base/check_list/view_control_details.xsl
    trunk/controller/templates/base/check_list/view_control_info.xsl

Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php     2012-06-12 10:43:07 UTC 
(rev 9560)
+++ trunk/controller/inc/class.uicheck_list.inc.php     2012-06-12 11:32:34 UTC 
(rev 9561)
@@ -320,12 +320,6 @@
                        
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/edit_check_list'),
 $data);
                }
                
-               /**
-                * Public function for displaying the edit check list form
-                * 
-                * @param HTTP:: check list id
-                * @return data array
-               */
                function view_cases_for_check_list(){
                        $check_list_id = phpgw::get_var('check_list_id');
                        
@@ -339,8 +333,8 @@
                        
                        $data = array
                        (
-                               'control'                       => 
$control->toArray(),
-                               'check_list'            => 
$check_list->toArray(),
+                               'control'                               => 
$control->toArray(),
+                               'check_list'                    => 
$check_list->toArray(),
                                'location_array'        => $location_array,
                                'date_format'           => $date_format
                        );
@@ -355,14 +349,6 @@
                        
self::render_template_xsl(array('check_list/check_list_tab_menu', 
'check_list/view_cases_for_check_list'), $data);
                }
                
-       
-               
-               /**
-                * Public function for displaying the create message form
-                * 
-                * @param HTTP:: check list id 
-                * @return data array
-               */
                function create_case_message(){
                        $check_list_id = phpgw::get_var('check_list_id');
                                                
@@ -379,10 +365,10 @@
                        
                        $data = array
                        (
-                               'location_array'                => 
$location_array,
-                               'control_array'                 => 
$control->toArray(),
+                               'location_array'        => $location_array,
+                               'control_array'         => $control->toArray(),
                                'check_list'                    => 
$check_list_with_check_items,
-                               'date_format'                   => $date_format
+                               'date_format'           => $date_format
                        );
                        
                        self::add_javascript('controller', 'controller', 
'jquery.js');
@@ -395,51 +381,21 @@
                        self::render_template_xsl('create_case_messsage', 
$data);
                }
                
-               /**
-                * Public function for displaying the create message form
-                * 
-                * @param HTTP:: check list id 
-                * @return data array
-               */
                public function view_control_info(){
                        $check_list_id = phpgw::get_var('check_list_id');
                        
                        $check_list = $this->so->get_single($check_list_id);
                        $control = 
$this->so_control->get_single($check_list->get_control_id());
                        
-                       $cats = CreateObject('phpgwapi.categories', -1, 
'controller', '.control');
-                       $cats->supress_info     = true;
-                       
-                       $control_areas = 
$cats->formatted_xslt_list(array('format'=>'filter','selected' => 
$control_area_id,'globals' => true,'use_acl' => $this->_category_acl));
-                       array_unshift($control_areas['cat_list'],array 
('cat_id'=>'','name'=> lang('select value')));
-                       $control_areas_array2 = array();
-                       
-                       foreach($control_areas['cat_list'] as $cat_list)
-                       {
-                               $control_areas_array2[] = array
-                               (
-                                       'id'    => $cat_list['cat_id'],
-                                       'name'  => $cat_list['name'],
-                               );              
-                       }
-
-                       // Fetches prosedures that are related to first control 
area in list
-                       $control_area_id = $control_areas_array2[1]['id'];
-                       $procedures_array = 
$this->so_procedure->get_procedures_by_control_area($control_area_id);
-                       $role_array = $this->so_control->get_roles();
-                       
                        $location_code = $check_list->get_location_code();  
                        $location_array = 
execMethod('property.bolocation.read_single', array('location_code' => 
$location_code));
                        
                        $data = array
                        (
-                               'location_array'                => 
$location_array,
-                               'control'                               => 
$control->toArray(),
-                               'check_list'                    => 
$check_list->toArray(),
-                               'date_format'                   => $date_format,
-                               'control_areas_array2'  => array('options' => 
$control_areas_array2),
-                               'procedures_array'              => 
$procedures_array,
-                               'role_array'                    => $role_array
+                               'location_array'                                
=> $location_array,
+                               'control'                                       
                        => $control->toArray(),
+                               'check_list'                                    
        => $check_list->toArray(),
+                               'role_array'                                    
        => $role_array
                        );
 
                        self::add_javascript('controller', 'controller', 
'jquery.js');
@@ -517,37 +473,18 @@
                        
                        $control = $this->so_control->get_single($control_id);
                        
-                       // Sigurd: START as categories
-                       $cats   = CreateObject('phpgwapi.categories', -1, 
'controller', '.control');
-                       $cats->supress_info     = true;
-
-                       $control_areas = 
$cats->formatted_xslt_list(array('format'=>'filter','selected' => 
$control_area_id,'globals' => true,'use_acl' => $this->_category_acl));
-                       array_unshift($control_areas['cat_list'],array 
('cat_id'=>'','name'=> lang('select value')));
-                       $control_areas_array2 = array();
-                       foreach($control_areas['cat_list'] as $cat_list)
-                       {
-                               $control_areas_array2[] = array
-                               (
-                                       'id'    => $cat_list['cat_id'],
-                                       'name'  => $cat_list['name'],
-                               );              
-                       }
-                       // END as categories
-                       $control_area_id = $control_areas_array2[1]['id'];
-                       $procedures_array = 
$this->so_procedure->get_procedures_by_control_area($control_area_id);
-                       $role_array = $this->so_control->get_roles();
+                       $procedures_array = 
$this->so_procedure->get_procedures_by_control_area($control->get_control_area_id());
                        
                        $data = array
                        (
-                               'control'       => $control->toArray(),
-                               'procedures_array'                      => 
$procedures_array,
-                               'role_array'                            => 
$role_array
+                               'control'                                       
        => $control->toArray(),
+                               'procedures_array'      => $procedures_array,
                        );
                        
                        
self::render_template_xsl('check_list/view_control_details', $data);
                }
                                                
-               // Function that displays control groups and control items for 
a check list
+               // Displays control groups and control items for a check list
                function register_case(){
                        $check_list_id = phpgw::get_var('check_list_id');
                        
@@ -704,6 +641,7 @@
                        return json_encode( $check_list );
                }
                
+               // Returns open cases for a check list as JSON 
                public function get_cases_for_check_list()
                {
                        $check_list_id = phpgw::get_var('check_list_id');

Modified: trunk/controller/inc/class.uicontrol.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol.inc.php        2012-06-12 10:43:07 UTC 
(rev 9560)
+++ trunk/controller/inc/class.uicontrol.inc.php        2012-06-12 11:32:34 UTC 
(rev 9561)
@@ -256,7 +256,6 @@
                        
                        $control_areas = 
$cats->formatted_xslt_list(array('format'=>'filter','globals' => true,'use_acl' 
=> $this->_category_acl));
                        $control_areas_array = $control_areas['cat_list'];
-                       
                        // END as categories
                
                        if($control != null)

Modified: trunk/controller/templates/base/check_list/view_control_details.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_details.xsl 
2012-06-12 10:43:07 UTC (rev 9560)
+++ trunk/controller/templates/base/check_list/view_control_details.xsl 
2012-06-12 11:32:34 UTC (rev 9561)
@@ -8,11 +8,26 @@
        <fieldset id="control_details">
                <div class="row">
                        <label>Kontrollområde</label>
+                       
                        <xsl:choose>
                        <xsl:when test="editable">
                                <select id="control_area_id" 
name="control_area_id">
-                                       <xsl:apply-templates 
select="control_areas_array2/options"/>
-                               </select>
+                                               <option value="">Velg 
kontrollområde</option>
+                                                       <xsl:for-each 
select="control_areas_array">
+                                                               <xsl:choose>
+                                                                       
<xsl:when test="cat_id = $control_area_id">
+                                                                               
<option value="{cat_id}" selected="selected">
+                                                                               
        <xsl:value-of disable-output-escaping="yes" select="name"/>
+                                                                               
</option>
+                                                                       
</xsl:when>
+                                                                       
<xsl:otherwise>
+                                                                               
<option value="{cat_id}">
+                                                                               
        <xsl:value-of disable-output-escaping="yes" select="name"/>
+                                                                               
</option>
+                                                                       
</xsl:otherwise>
+                                                               </xsl:choose>   
                                                        
+                                                       </xsl:for-each>
+                                               </select>
                        </xsl:when>
                        <xsl:otherwise>
                                <xsl:value-of 
select="control/control_area_name" />
@@ -89,7 +104,7 @@
                                        </select>
                                </xsl:when>
                                <xsl:otherwise>
-                                       <xsl:value-of 
select="control/role_name" />
+                                       <xsl:value-of 
select="control/responsibility_name" />
                                </xsl:otherwise>
                        </xsl:choose>
                </div>

Modified: trunk/controller/templates/base/check_list/view_control_info.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_info.xsl    
2012-06-12 10:43:07 UTC (rev 9560)
+++ trunk/controller/templates/base/check_list/view_control_info.xsl    
2012-06-12 11:32:34 UTC (rev 9561)
@@ -5,6 +5,7 @@
 <div id="main_content" class="medium">
                
        <script>
+         
                $(document).ready(function() {
                        var requestUrl = 
$("#view_control_details").attr("href");
                        load_tab(requestUrl);