[Fmsystem-commits] [10829] Moved print checklist function to the bottom of file

[Torstein]

Revision: 10829
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10829
Author:   vator
Date:     2013-02-14 12:46:43 +0000 (Thu, 14 Feb 2013)
Log Message:
-----------
Moved print checklist function to the bottom of file

Modified Paths:
--------------
    trunk/controller/inc/class.uicheck_list.inc.php

Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php     2013-02-14 12:44:34 UTC 
(rev 10828)
+++ trunk/controller/inc/class.uicheck_list.inc.php     2013-02-14 12:46:43 UTC 
(rev 10829)
@@ -512,38 +512,12 @@
                        phpgwapi_jquery::load_widget('core');
                        self::add_javascript('controller', 'controller', 
'custom_ui.js');
                        self::add_javascript('controller', 'controller', 
'ajax.js');
+      self::add_javascript('controller', 'controller', 'case.js');
                        
                        
self::render_template_xsl(array('check_list/fragments/check_list_tab_menu', 
'check_list/fragments/nav_control_plan', 
'check_list/view_cases_for_check_list', 
'check_list/fragments/select_buildings_on_property'), $data);
                }
                
-               public function print_check_list()
-               {
-                       $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());
-                       $control_groups = 
$this->so_control_group_list->get_control_groups_by_control($control->get_id());
-                       
-                       $saved_groups_with_items_array = array();
-                       
-                       //Populating array with saved control items for each 
group
-                       foreach ($control_groups as $control_group)
-                       {       
-                               $saved_control_items = 
$this->so_control_item_list->get_control_items_by_control_and_group($control->get_id(),
 $control_group->get_id());
-                               
-                               $control_item = 
$this->so_control_item->get_single($control_item_id);
-                               
-                               $saved_groups_with_items_array[] = 
array("control_group" => $control_group->toArray(), "control_items" => 
$saved_control_items);
-                       }
-                       
-                       $data = array
-                       (
-                               'saved_groups_with_items_array' => 
$saved_groups_with_items_array,
-                               'check_list'                                    
                                        => $check_list
-                       );
-                       
-                       
self::render_template_xsl('check_list/print_check_list', $data);
-               }
+       
                
                public function view_control_info()
                {
@@ -697,6 +671,7 @@
 
                        self::add_javascript('controller', 'controller', 
'custom_ui.js');
                        self::add_javascript('controller', 'controller', 
'ajax.js');
+      self::add_javascript('controller', 'controller', 'case.js');
                        
                        
self::render_template_xsl(array('check_list/fragments/check_list_tab_menu', 
'check_list/fragments/nav_control_plan', 'check_list/add_case', 
'check_list/fragments/select_buildings_on_property'), $data);
                }
@@ -771,6 +746,35 @@
                        
                        
self::render_template_xsl('check_list/view_control_items', $data);
                }
+    
+       public function print_check_list()
+               {
+                       $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());
+                       $control_groups = 
$this->so_control_group_list->get_control_groups_by_control($control->get_id());
+                       
+                       $saved_groups_with_items_array = array();
+                       
+                       //Populating array with saved control items for each 
group
+                       foreach ($control_groups as $control_group)
+                       {       
+                               $saved_control_items = 
$this->so_control_item_list->get_control_items_by_control_and_group($control->get_id(),
 $control_group->get_id());
+                               
+                               $control_item = 
$this->so_control_item->get_single($control_item_id);
+                               
+                               $saved_groups_with_items_array[] = 
array("control_group" => $control_group->toArray(), "control_items" => 
$saved_control_items);
+                       }
+                       
+                       $data = array
+                       (
+                               'saved_groups_with_items_array' => 
$saved_groups_with_items_array,
+                               'check_list'                                    
                                        => $check_list
+                       );
+                       
+                       
self::render_template_xsl('check_list/print_check_list', $data);
+               }
        
                // Returns check list info as JSON
                public function get_check_list_info()