fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [8669]


From: Torstein
Subject: [Fmsystem-commits] [8669]
Date: Tue, 24 Jan 2012 13:38:18 +0000

Revision: 8669
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8669
Author:   vator
Date:     2012-01-24 13:38:17 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.menu.inc.php
    trunk/controller/inc/class.uicalendar.inc.php
    trunk/controller/inc/class.uicheck_list.inc.php
    trunk/controller/inc/class.uicheck_list_for_location.inc.php
    trunk/controller/inc/component/class.calendar_builder.inc.php
    trunk/controller/js/controller/ajax.js
    trunk/controller/js/controller/custom_drag_drop.js
    trunk/controller/templates/base/calendar/view_calendar_year.xsl
    trunk/controller/templates/base/check_list/cases_tab_menu.xsl
    trunk/controller/templates/base/check_list/check_list_tab_menu.xsl
    trunk/controller/templates/base/check_list/edit_check_list.xsl
    trunk/controller/templates/base/check_list/register_case.xsl
    trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
    trunk/controller/templates/base/check_list/view_check_list.xsl
    trunk/controller/templates/base/check_list/view_check_lists.xsl
    trunk/controller/templates/base/check_list/view_control_info.xsl
    trunk/controller/templates/base/check_list/view_control_items.xsl
    trunk/controller/templates/base/check_list/view_measurements.xsl
    trunk/controller/templates/base/check_list/view_open_cases.xsl
    trunk/controller/templates/base/control_item/view_control_item_list.xsl
    trunk/controller/templates/base/tab_view_check_lists_garbage.xsl
    trunk/controller/templates/base/view_check_lists_for_location_garbage.xsl

Modified: trunk/controller/inc/class.menu.inc.php
===================================================================
--- trunk/controller/inc/class.menu.inc.php     2012-01-24 13:35:13 UTC (rev 
8668)
+++ trunk/controller/inc/class.menu.inc.php     2012-01-24 13:38:17 UTC (rev 
8669)
@@ -99,7 +99,7 @@
                                        'check_list' => array
                                        (
                                                'text'  => lang('Check_list'),
-                                               'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'controller.uicheck_list.index') ),
+                                               'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'controller.uicheck_list_for_location.index') ),
                                                'image' => array('property', 
'location_1'),
                                        ),
                                        'calendar_overview' => array
@@ -117,7 +117,7 @@
                                        'check_list' => array
                                        (
                                                'text'  => lang('Check_list'),
-                                               'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'controller.uicheck_list.index') ),
+                                               'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'controller.uicheck_list_for_location.index') ),
                                                'image' => array('property', 
'location_1'),
                                        ),
                                        'location_check_list' => array

Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php       2012-01-24 13:35:13 UTC 
(rev 8668)
+++ trunk/controller/inc/class.uicalendar.inc.php       2012-01-24 13:38:17 UTC 
(rev 8669)
@@ -218,8 +218,6 @@
                        
                        $controls_calendar_array = 
$this->calendar_builder->build_calendar_array( $controls_calendar_array, 
$control_check_list_array, 12, "view_months" );
                        
-                       //print_r($controls_calendar_array);
-                                       
                        $location_array = 
execMethod('property.bolocation.read_single', array('location_code' => 
$location_code));
                        
                        $heading_array = array("Jan", "Feb", "Mar", "Apr", 
"Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Des");
@@ -344,7 +342,7 @@
                                $this->so_check_item->store( $check_item );
                        }
                        
-                       $this->redirect(array('menuaction' => 
'controller.uicheck_list.view_check_list', 'check_list_id'=>$check_list_id));   
  
+                       $this->redirect(array('menuaction' => 
'controller.uicheck_list_for_location.view_check_list', 
'check_list_id'=>$check_list_id));        
                }
                
                /* Kommentert ut av Torstein 21.01.2012 - Tror ikke vi bruker 
denne... Kanskje den bør slettes...

Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php     2012-01-24 13:35:13 UTC 
(rev 8668)
+++ trunk/controller/inc/class.uicheck_list.inc.php     2012-01-24 13:38:17 UTC 
(rev 8669)
@@ -59,14 +59,12 @@
                        'get_check_list_info'                           =>      
true,
                //      'control_calendar_status_overview'      =>      true,
                        'add_check_item_to_list'                        =>      
true,
-                       'update_check_list'                                     
=>      true,
                        'view_control_items'                            =>      
true,
-                       'view_control_details'                          =>      
true,
-                       'print_check_list'                                      
=>      true,
-                       'register_case'                                         
=>      true,
-                       'view_open_cases'                                       
=>      true,
-                       'view_closed_cases'                                     
=>      true,
-                       'view_measurements'                                     
=>      true,
+                       //'view_control_details'                                
=>      true,
+                       //'register_case'                                       
        =>      true,
+                       //'view_open_cases'                                     
=>      true,
+                       //'view_closed_cases'                                   
=>      true,
+                       //'view_measurements'                                   
=>      true,
                        'get_cases_for_check_list'                      =>      
true
                );
 
@@ -195,8 +193,8 @@
 
                        self::render_template_xsl('view_check_list', $data);
                }
-               */
        
+       
                // Returns check list info as JSON
                public function get_check_list_info()
                {
@@ -233,32 +231,7 @@
                        self::render_template_xsl('edit_check_list', $data);
                }
                */
-               public function update_check_list(){
-                       $check_list_id = phpgw::get_var('check_list_id');
-                       $status = (int)phpgw::get_var('status');
-                       $comment = phpgw::get_var('comment');
-                       $deadline_date = phpgw::get_var('deadline_date');
-                       $completed_date = phpgw::get_var('completed_date');
-                       $planned_date = phpgw::get_var('planned_date');
-                       
-                       $planned_date_ts = 
date_helper::get_timestamp_from_date( $planned_date, "d/m-Y" ); 
-                       $completed_date_ts = 
date_helper::get_timestamp_from_date( $completed_date, "d/m-Y" );
-                       
-                       // Fetches check_list from DB
-                       $update_check_list = 
$this->so_check_list->get_single($check_list_id);
-                       $update_check_list->set_status( $status );
-                       $update_check_list->set_comment( $comment );
-                       $update_check_list->set_completed_date( 
$completed_date_ts );
-                       $update_check_list->set_planned_date( $planned_date_ts 
);
-
-                       $check_list_id = $this->so_check_list->update( 
$update_check_list );
-                       
-                       if($check_list_id > 0)
-                               return json_encode( array( "saveStatus" => 
"updated" ) );
-                       else
-                               return json_encode( array( "saveStatus" => 
"not_updated" ) );
-               }
-               
+                               
                /* Kommentert ut av Torstein 21.01.2012 - Tror ikke vi bruker 
denne... Kanskje den bør slettes...
                * 
                public function control_calendar_status_overview()
@@ -281,6 +254,7 @@
                }
                */
                
+               /*
                public function view_control_items(){
                        $check_list_id = phpgw::get_var('check_list_id');
                        $check_list = 
$this->so_check_list->get_single($check_list_id);
@@ -343,35 +317,7 @@
                        
                        
self::render_template_xsl('check_list/view_control_details', $data);
                }
-               
-               public function print_check_list(){
-                       $check_list_id = phpgw::get_var('check_list_id');
-                       $check_list = 
$this->so_check_list->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->toArray()
-                       );
-                       
-                       
self::render_template_xsl('check_list/print_check_list', $data);
-               }
-               
                function register_case(){
                        $check_list_id = phpgw::get_var('check_list_id');
                        
@@ -462,7 +408,7 @@
                        
                        self::render_template_xsl( 
array('check_list/cases_tab_menu', 'check_list/view_measurements'), $data );
                }
-
+*/
                /* Kommentert ut av Torstein 21.01.2012 - Tror ikke vi bruker 
denne... Kanskje den bør slettes...
                * 
                public function view_check_lists_for_control()
@@ -513,7 +459,7 @@
                        self::render_template_xsl('view_check_list', $data);
                }
                */
-               
+               /*
                public function save_check_items(){
                        $check_item_ids = phpgw::get_var('check_item_ids');
                        $check_list_id = phpgw::get_var('check_list_id');
@@ -741,4 +687,4 @@
 
                        return $this->yui_results($results);
                }
-       }
+       }
\ No newline at end of file

Modified: trunk/controller/inc/class.uicheck_list_for_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list_for_location.inc.php        
2012-01-24 13:35:13 UTC (rev 8668)
+++ trunk/controller/inc/class.uicheck_list_for_location.inc.php        
2012-01-24 13:38:17 UTC (rev 8669)
@@ -31,14 +31,17 @@
        phpgw::import_class('phpgwapi.yui');
        phpgw::import_class('controller.uicommon');
        phpgw::import_class('controller.socontrol_area');
+       phpgw::import_class('controller.socheck_list');
        
        include_class('controller', 'check_list', 'inc/model/');
        include_class('controller', 'date_generator', 'inc/component/');
        include_class('controller', 'status_checker', 'inc/helper/');
        include_class('controller', 'date_helper', 'inc/helper/');
-               
+       include_class('controller', 'check_item', 'inc/model/');
+       
        class controller_uicheck_list_for_location extends controller_uicommon
        {
+               /*
                var $cat_id;
                var $start;
                var $query;
@@ -48,39 +51,54 @@
                var $currentapp;
                var $type_id;
                var $location_code;
-               
+               */
                private $so_control_area;
                private $so_control;
-               private $so_check_list;
+               private $so;
                private $so_control_item;
                private $so_check_item;
                private $so_procedure;
+               private $so_control_group_list;
+               private $so_control_item_list;
        
                var $public_functions = array(
-                                                                               
'index' => true,
-                                                                               
'view_locations_for_control'    => true,
-                                                                               
'add_location_to_control'               => true,
                                                                                
'add_check_list'                                => true,
                                                                                
'save_check_list'                               => true,
                                                                                
'edit_check_list'                               => true,
                                                                                
'create_case_message'                   => true,
                                                                                
'view_control_info'                     => true,
-                                                                               
'view_cases_for_check_list'             => true
+                                                                               
'view_cases_for_check_list'             => true,
+                                                                               
'update_check_list'                             => true,
+                                                                               
'print_check_list'                              => true,
+                                                                               
'register_case'                                 => true,
+                                                                               
'view_open_cases'                               => true,
+                                                                               
'view_closed_cases'                             => true,
+                                                                               
'view_measurements'                             => true,
+                                                                               
'view_control_details'                  => true,
+                                                                               
'view_control_items'                    => true,
+                                                                               
'add_check_item_to_list'                => true,
+                                                                               
'save_check_items'                              => true,
+                                                                               
'save_check_item'                               => true,
+                                                                               
'get_check_list_info'                   => true,
+                                                                               
'get_cases_for_check_list'              => true
                                                                        );
 
                function __construct()
                {
                        parent::__construct();
-                       
+/*
                        $this->bo                                       = 
CreateObject('property.bolocation',true);
                        $this->bocommon                         = & 
$this->bo->bocommon;
+                       */
                        $this->so_control_area          = 
CreateObject('controller.socontrol_area');
                        $this->so_control                       = 
CreateObject('controller.socontrol');
-                       $this->so_check_list            = 
CreateObject('controller.socheck_list');
+                       $this->so                                       = 
CreateObject('controller.socheck_list');
                        $this->so_control_item          = 
CreateObject('controller.socontrol_item');
                        $this->so_check_item            = 
CreateObject('controller.socheck_item');
                        $this->so_procedure                     = 
CreateObject('controller.soprocedure');
-                       
+                       $this->so_control_group_list = 
CreateObject('controller.socontrol_group_list');
+                       $this->so_control_item_list = 
CreateObject('controller.socontrol_item_list');
+                       /*
                        $this->type_id                          = 
$this->bo->type_id;
                        
                        $this->start                            = 
$this->bo->start;
@@ -95,8 +113,8 @@
                        $this->allrows                          = 
$this->bo->allrows;
                        $this->lookup                           = 
$this->bo->lookup;
                        $this->location_code            = 
$this->bo->location_code;
-                       
-                       
self::set_active_menu('controller::control::location_for_check_list');
+                       */
+                       
self::set_active_menu('controller::control::check_list');
                }       
        
                function add_check_list(){
@@ -153,7 +171,7 @@
                function edit_check_list(){
                        $check_list_id = phpgw::get_var('check_list_id');
                        
-                       $check_list = 
$this->so_check_list->get_single($check_list_id);
+                       $check_list = $this->so->get_single($check_list_id);
                        $control = 
$this->so_control->get_single($check_list->get_control_id());
                        
                        $date_format = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
@@ -182,7 +200,7 @@
                function view_cases_for_check_list(){
                        $check_list_id = phpgw::get_var('check_list_id');
                        
-                       $check_list = 
$this->so_check_list->get_single($check_list_id);
+                       $check_list = $this->so->get_single($check_list_id);
                        $control = 
$this->so_control->get_single($check_list->get_control_id());
                                
                        $date_format = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
@@ -234,7 +252,7 @@
                        $check_list->set_planned_date($planned_date_ts);
                        $check_list->set_completed_date($completed_date_ts);
                        
-                       $check_list_id = 
$this->so_check_list->store($check_list);
+                       $check_list_id = $this->so->store($check_list);
                        
                        $this->redirect(array('menuaction' => 
'controller.uicheck_list_for_location.edit_check_list', 
'check_list_id'=>$check_list_id));
                }
@@ -242,7 +260,7 @@
                function create_case_message(){
                        $check_list_id = phpgw::get_var('check_list_id');
                                                
-                       $check_list_with_check_items = 
$this->so_check_list->get_single_with_check_items($check_list_id);
+                       $check_list_with_check_items = 
$this->so->get_single_with_check_items($check_list_id);
                                                
                        $control_id = 
$check_list_with_check_items["control_id"];
                        $control = $this->so_control->get_single( $control_id );
@@ -274,7 +292,7 @@
                public function view_control_info(){
                        $check_list_id = phpgw::get_var('check_list_id');
                        
-                       $check_list = 
$this->so_check_list->get_single($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');
@@ -318,5 +336,307 @@
                        
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/view_control_info'),
 $data);
                }
                
-               public function query(){}                       
+               public function update_check_list(){
+                       $check_list_id = phpgw::get_var('check_list_id');
+                       $status = (int)phpgw::get_var('status');
+                       $comment = phpgw::get_var('comment');
+                       $deadline_date = phpgw::get_var('deadline_date');
+                       $completed_date = phpgw::get_var('completed_date');
+                       $planned_date = phpgw::get_var('planned_date');
+                       
+                       $planned_date_ts = 
date_helper::get_timestamp_from_date( $planned_date, "d/m-Y" ); 
+                       $completed_date_ts = 
date_helper::get_timestamp_from_date( $completed_date, "d/m-Y" );
+                       
+                       // Fetches check_list from DB
+                       $update_check_list = 
$this->so->get_single($check_list_id);
+                       $update_check_list->set_status( $status );
+                       $update_check_list->set_comment( $comment );
+                       $update_check_list->set_completed_date( 
$completed_date_ts );
+                       $update_check_list->set_planned_date( $planned_date_ts 
);
+
+                       $check_list_id = $this->so->update( $update_check_list 
);
+                       
+                       if($check_list_id > 0)
+                               return json_encode( array( "saveStatus" => 
"updated" ) );
+                       else
+                               return json_encode( array( "saveStatus" => 
"not_updated" ) );
+               }
+               
+               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->toArray()
+                       );
+                       
+                       
self::render_template_xsl('check_list/print_check_list', $data);
+               }
+               
+               function view_control_details(){
+                       $control_id = phpgw::get_var('control_id');
+                       
+                       $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();
+                       
+                       $data = array
+                       (
+                               'control'       => $control->toArray(),
+                               'procedures_array'                      => 
$procedures_array,
+                               'role_array'                            => 
$role_array
+                       );
+                       
+                       
self::render_template_xsl('check_list/view_control_details', $data);
+               }
+                                               
+               function register_case(){
+                       $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());
+                                                               
+                       // Fetches all control items for check list
+                       $control_items_for_check_list = array();
+                       
+                       $control_items = 
$this->so_control_item_list->get_control_items_by_control($check_list->get_control_id());
+                       $check_items = 
$this->so_check_item->get_check_items($check_list_id, null, null, 
"return_object");
+                       
+                       $remove_control_item_ids_array = array();
+                       
+                       foreach($check_items as $check_item){
+                               if($check_item->get_control_item()->get_type() 
== "control_item_type_2" & $check_item->get_status() == 1){
+                                       $remove_control_item_ids_array[] = 
$check_item->get_control_item_id();
+                               }
+                       }
+                       
+                       foreach($control_items as $control_item){
+                               if( !in_array($control_item->get_id(), 
$remove_control_item_ids_array) ){
+                                       $control_items_for_check_list[] = 
$control_item->toArray(); 
+                               }
+                       }
+                       
+                       $location_array = execMethod( 
'property.bolocation.read_single', array('location_code' => 
$check_list->get_location_code()) );
+                       
+                       $data = array
+                       (
+                               'control'                                       
        => $control->toArray(),
+                               'check_list'                                    
=> $check_list->toArray(),
+                               'location_array'        => $location_array,
+                               'control_items_for_check_list'  => 
$control_items_for_check_list,
+                       );
+                       
+                       
self::render_template_xsl(array('check_list/check_list_tab_menu', 
'check_list/register_case'), $data);
+                       self::add_javascript('controller', 'controller', 
'jquery.js');
+                       self::add_javascript('controller', 'controller', 
'custom_ui.js');
+                       self::add_javascript('controller', 'controller', 
'ajax.js');
+               }
+               
+               function view_open_cases(){
+                       $check_list_id = phpgw::get_var('check_list_id');
+                       
+                       $check_list = $this->so->get_single($check_list_id);
+                       
+                       $open_check_items_and_cases = 
$this->so_check_item->get_check_items_with_cases($check_list_id, 'open', null, 
'return_array');
+                       
+                       $data = array
+                       (
+                               'open_check_items_and_cases'    => 
$open_check_items_and_cases,
+                               'check_list'                                    
=> $check_list->toArray()
+                       );
+                       
+                       self::render_template_xsl( 
array('check_list/cases_tab_menu', 'check_list/view_open_cases'), $data );      
             
+               }
+               
+               function view_closed_cases(){
+                       $check_list_id = phpgw::get_var('check_list_id');
+                       
+                       $check_list = $this->so->get_single($check_list_id);
+                       
+                       $closed_check_items_and_cases = 
$this->so_check_item->get_check_items_with_cases($check_list_id, 'closed', 
null, 'return_array');
+                                                       
+                       $data = array
+                       (
+                               'closed_check_items_and_cases'  => 
$closed_check_items_and_cases,
+                               'check_list'                                    
=> $check_list->toArray()
+                       );
+                       
+                       self::render_template_xsl( 
array('check_list/cases_tab_menu', 'check_list/view_closed_cases'), $data );
+               }
+               
+               function view_measurements(){
+                       $check_list_id = phpgw::get_var('check_list_id');
+                       
+                       $check_list = $this->so->get_single($check_list_id);
+                                               
+                       // Fetches check items that registeres measurement
+                       $measurement_check_items = 
$this->so_check_item->get_check_items($check_list_id, null, 
'control_item_type_2', "return_array");
+                       
+                       $data = array
+                       (
+                               'measurement_check_items'       => 
$measurement_check_items,
+                               'check_list'                            => 
$check_list->toArray()
+                       );
+                       
+                       self::render_template_xsl( 
array('check_list/cases_tab_menu', 'check_list/view_measurements'), $data );
+               }
+               
+               function view_control_items(){
+                       $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->toArray()
+                       );
+                       
+                       
self::render_template_xsl('check_list/view_control_items', $data);
+               }
+               
+               function add_check_item_to_list(){
+                       $control_item_id = phpgw::get_var('control_item_id');
+                       $check_list_id = phpgw::get_var('check_list_id');
+                       $comment = phpgw::get_var('comment');
+                       $status = (int)phpgw::get_var('status');
+                       $type = phpgw::get_var('type');
+
+                       $check_item_obj = new controller_check_item();
+                       $check_item_obj->set_status($status);
+                       $check_item_obj->set_comment($comment);
+                       $check_item_obj->set_check_list_id($check_list_id);
+                       $check_item_obj->set_control_item_id($control_item_id);
+
+                       if($type == 'control_item_type_2'){
+                               $measurement = phpgw::get_var('measurement');
+                               $check_item_obj->set_measurement($measurement);
+                       }
+                       
+                       $check_item_id = $this->so_check_item->store( 
$check_item_obj );
+
+                       if($check_item_id > 0)
+                               return json_encode( array( "saveStatus" => 
"saved" ) );
+                       else
+                               return json_encode( array( "saveStatus" => 
"not_saved" ) );
+               }
+               
+               public function save_check_items(){
+                       $check_item_ids = phpgw::get_var('check_item_ids');
+                       $check_list_id = phpgw::get_var('check_list_id');
+
+                       foreach($check_item_ids as $check_item_id){
+                               $status = phpgw::get_var('status_' . 
$check_item_id);
+                               $comment = phpgw::get_var('comment_' . 
$check_item_id);
+
+                               $check_item = 
$this->so_check_item->get_single($check_item_id);
+
+                               $check_item->set_status( $status );
+                               $check_item->set_comment( $comment );
+
+                               $this->so_check_item->store( $check_item );
+                       }
+
+                       $this->redirect(array('menuaction' => 
'controller.uicheck_list_for_location.view_check_list', 
'check_list_id'=>$check_list_id));
+               }
+               
+               public function save_check_item(){
+                       $check_item_id = phpgw::get_var('check_item_id');
+                       $comment = phpgw::get_var('comment');
+                       $status = (int)phpgw::get_var('status');
+                                                                       
+                       $check_item = 
$this->so_check_item->get_single($check_item_id);
+                       $control_item_id = $check_item->get_control_item_id();
+                       
+                       $control_item = 
$this->so_control_item->get_single($check_item->get_control_item_id());
+                       
+                       if($control_item->get_type() == 'control_item_type_2')
+                       {
+                               $measurement = phpgw::get_var('measurement');
+                               $check_item->set_measurement( $measurement );   
+                       }
+                       
+                       $check_item->set_status( $status );
+                       $check_item->set_comment( $comment );
+                       
+                       $check_item_id = $this->so_check_item->store( 
$check_item );
+
+                       if($check_item_id > 0){
+                               $status_checker = new status_checker();
+                               $status_checker->update_check_list_status( 
$check_item->get_check_list_id() );
+                               
+                               return json_encode( array( "saveStatus" => 
"saved" ) );
+                       }
+                       else
+                               return json_encode( array( "status" => 
"not_saved" ) );
+               }
+               
+               // Returns check list info as JSON
+               public function get_check_list_info()
+               {
+                       $check_list_id = phpgw::get_var('check_list_id');
+                       $check_list = 
$this->so_check_list->get_single_with_check_items($check_list_id, "open");
+                       
+                       return json_encode( $check_list );
+               }
+               
+               public function get_cases_for_check_list()
+               {
+                       $check_list_id = phpgw::get_var('check_list_id');
+
+                       $check_items_with_cases = 
$this->so_check_item->get_check_items_with_cases($check_list_id, "open", null, 
"return_array");
+                       
+                       return json_encode( $check_items_with_cases );
+               }
+               
+               public function query(){}
        }

Modified: trunk/controller/inc/component/class.calendar_builder.inc.php
===================================================================
--- trunk/controller/inc/component/class.calendar_builder.inc.php       
2012-01-24 13:35:13 UTC (rev 8668)
+++ trunk/controller/inc/component/class.calendar_builder.inc.php       
2012-01-24 13:38:17 UTC (rev 8669)
@@ -17,7 +17,7 @@
                
                foreach($control_array as $control){
 
-                       $calendar_array = $this->init_calendar( $control, 
$calendar_array, $num_days_in_month, $period_type );
+                       $calendar_array = $this->init_calendar( $control, 
$calendar_array, $num, $period_type );
 
                        // Inserts check_list object on deadline month in 
twelve_months_array
                        foreach($control->get_check_lists_array() as 
$check_list){
@@ -106,7 +106,7 @@
 
                        $twelve_month_array[$i-1]["status"] = $status;
                }
-                               
+                       
                for($from_month;$from_month<=$to_month;$from_month++){
        
                        $trail_from_date_ts = strtotime("$from_month/01/$year");
@@ -122,7 +122,7 @@
                                
                                $twelve_month_array[$from_month-1]["status"] = 
$status;
                                $twelve_month_array[$from_month-1]["info"] = 
$num_open_cases_for_control_array["count"];
-                       }else{
+                       }else if( empty($num_open_cases_for_control_array) &  
$todays_date_ts > $trail_to_date_ts){
                                $status = 
"controls_accomplished_without_errors";
                                
                                $twelve_month_array[$from_month-1]["status"] = 
$status;
@@ -134,10 +134,10 @@
                return $controls_calendar_array;
        }
                
-       function init_calendar( $control, $calendar_array, $num_days_in_month, 
$period_type ){
+       function init_calendar( $control, $calendar_array, $num, $period_type ){
                
                // Initialises twelve_months_array
-               for($i=1;$i<=$num_days_in_month;$i++){
+               for($i=1;$i<=$num;$i++){
                        $calendar_array[$i] = null;
                }
                

Modified: trunk/controller/js/controller/ajax.js
===================================================================
--- trunk/controller/js/controller/ajax.js      2012-01-24 13:35:13 UTC (rev 
8668)
+++ trunk/controller/js/controller/ajax.js      2012-01-24 13:38:17 UTC (rev 
8669)
@@ -170,7 +170,7 @@
                
                var add_param = $(thisA).find("span").text();
                
-               var requestUrl = 
"http://portico/pe/index.php?menuaction=controller.uicheck_list.get_cases_for_check_list";
 + add_param;
+               var requestUrl = 
"http://portico/pe/index.php?menuaction=controller.uicheck_list_for_location.get_cases_for_check_list";
 + add_param;
                
                $.ajax({
                          type: 'POST',
@@ -342,9 +342,6 @@
                });
        });
        
-       
-       
-       
        // Delete a case item from list
        $(".delete_case").live("click", function(){
                var clickElem = $(this);
@@ -386,13 +383,6 @@
                return false;
        });
        
-       $(".make_case_editable").live("click", function(e){
-               var thisForm = $(this);
-               var submitBnt = $(thisForm).find("input[type='submit']");
-               $(submitBnt).removeClass("not_active");
-       });
-       
-       
        $("#frm_update_check_list").live("click", function(e){
                var thisForm = $(this);
                var submitBnt = $(thisForm).find("input[type='submit']");
@@ -416,6 +406,7 @@
                var submitBnt = $(thisForm).find("input[type='submit']");
                $(submitBnt).removeClass("not_active");
        });
+       
 });
 
 

Modified: trunk/controller/js/controller/custom_drag_drop.js
===================================================================
--- trunk/controller/js/controller/custom_drag_drop.js  2012-01-24 13:35:13 UTC 
(rev 8668)
+++ trunk/controller/js/controller/custom_drag_drop.js  2012-01-24 13:38:17 UTC 
(rev 8669)
@@ -3,6 +3,9 @@
 var next_elem;
 var prev_elem;
 var adj_y;
+var status_drag_group = false;
+var status_drag = false;
+var saveOrderForm;
 
 $(document).ready(function(){
 
@@ -23,7 +26,9 @@
                
                $(drag_elem).css("left", $(placeholder).position().left + "px");
                $(drag_elem).css("top",  $(placeholder).position().top + "px");
-                                                                       
+                                                               
+               saveOrderForm = $(this).parents("form");
+               
                start_drag();
        });
        
@@ -47,33 +52,33 @@
                                                                        
                start_drag_group();
        });
+});
+
+//Delete a control item list
+$(".delete").live("click", function(){
+       var clickElem = $(this);
+       var clickRow = $(this).parent();
        
-       // Delete a control item list
-       $(".delete").live("click", function(){
-               var clickElem = $(this);
-               var clickRow = $(this).parent();
-               
-               var url = $(clickElem).attr("href");
+       var url = $(clickElem).attr("href");
+
+       // Sending request for deleting a control item list
+       $.ajax({
+               type: 'POST',
+               url: url,
+               success: function() {
+                       $(clickRow).fadeOut("slow");
+                       
+                       var next_row = $(clickRow).next();
+                       
+                       // Updating order numbers for rows below deleted row  
+                       while( $(next_row).length > 0){
+                               update_order_nr(next_row, "-");
+                               next_row = $(next_row).next();
+                       }               
+               }
+       });
        
-               // Sending request for deleting a control item list
-               $.ajax({
-                       type: 'POST',
-                       url: url,
-                       success: function() {
-                               $(clickRow).fadeOut("slow");
-                               
-                               var next_row = $(clickRow).next();
-                               
-                               // Updating order numbers for rows below 
deleted row  
-                               while( $(next_row).length > 0){
-                                       update_order_nr(next_row, "-");
-                                       next_row = $(next_row).next();
-                               }               
-                       }
-               });
-               
-               return false;
-       });
+       return false;
 });
 
 function start_drag(){
@@ -96,6 +101,8 @@
                        // Updating order number for drag element and previous 
element
                        update_order_nr(placeholder, "+");
                        update_order_nr(prev_elem, "-");
+                       
+                       status_drag = true;
                }
                // Move drag element over previous element
                else if( $(prev_elem).length > 0 && e.pageY < 
$(prev_elem).offset().top + $(prev_elem).height()/2 ){
@@ -106,10 +113,27 @@
                        // Updating order number for drag element and next 
element
                        update_order_nr(placeholder, "-");
                        update_order_nr(next_elem, "+");
+                       
+                       status_drag = true;
                }
        }); 
 }
 
+// Release binding for mouse events
+function stop_drag(){
+       $(drag_elem).remove();
+
+       $(document).unbind("mousemove");
+       $(document).unbind("mouseup");
+       
+       if(status_drag)
+       {
+               var this_submit_btn = 
$(saveOrderForm).find("input[type='submit']");
+               $(this_submit_btn).css({opacity: 1 });
+               $(this_submit_btn).removeAttr('disabled');
+       }
+}
+
 function start_drag_group(){
        $(document).bind("mouseup", stop_drag_group);
 
@@ -117,7 +141,7 @@
                
                var x = 0;
                var y = e.pageY - adj_y;
-
+               
                $(drag_elem).css("left", x + "px");
                $(drag_elem).css("top", y + "px");
                
@@ -130,9 +154,12 @@
                        // Updating order number for drag element and previous 
element
                        update_group_order_nr(placeholder, "+");
                        update_group_order_nr(prev_elem, "-");
+                       
+                       status_drag_group = true; 
                }
                // Move drag element over previous element
                else if( $(prev_elem).length > 0 && e.pageY < 
$(prev_elem).offset().top + $(prev_elem).height()/2 ){
+                       
                        $(placeholder).insertBefore(prev_elem);
                        prev_elem = $(placeholder).prev();
                        next_elem = $(placeholder).next();
@@ -140,45 +167,35 @@
                        // Updating order number for drag element and next 
element
                        update_group_order_nr(placeholder, "-");
                        update_group_order_nr(next_elem, "+");
+                       
+                       status_drag_group = true;
                }
        }); 
 }
 
-
-
-// Release binding for mouse events
-function stop_drag(){
-       $(drag_elem).remove();
-
-       $(document).unbind("mousemove");
-       $(document).unbind("mouseup");
-       
-       var thisForm = $(this);
-       var this_submit_btn = $(thisForm).find("input[type='submit']");
-       $(this_submit_btn).css({opacity: 1 });
-       $(this_submit_btn).removeAttr('disabled');
-}
-
 //Release binding for mouse events
 function stop_drag_group(){
        $(drag_elem).remove();
        
-       $('li.drag_group').each(function() {
-               var group_order_nr = $(this).find("span.group_order_nr").text();
-               var control_group_id = 
$(this).find("input[name='control_group_id']").val();
-               var control_id = $("#control_id").val();
+       if(status_drag_group){
+               $('li.drag_group').each(function() {
+                       var group_order_nr = 
$(this).find("span.group_order_nr").text();
+                       var control_group_id = 
$(this).find("input[name='control_group_id']").val();
+                       var control_id = $("#control_id").val();
+                       
+                       var requestUrl = 
"index.php?menuaction=controller.uicontrol_group.save_group_order";
+                       
+                       $.ajax({
+                                 type: 'POST',
+                                 url: requestUrl + "&control_id=" + control_id 
+ "&control_group_id=" + control_group_id + "&group_order_nr=" + group_order_nr,
+                                 success: function() {
+                                         
+                                 }
+                       });     
                
-               var requestUrl = 
"index.php?menuaction=controller.uicontrol_group.save_group_order";
-               
-               $.ajax({
-                         type: 'POST',
-                         url: requestUrl + "&control_id=" + control_id + 
"&control_group_id=" + control_group_id + "&group_order_nr=" + group_order_nr,
-                         success: function() {
-                                 
-                         }
                });     
+       }
        
-       });
        
        $(document).unbind("mousemove");
        $(document).unbind("mouseup");

Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl     
2012-01-24 13:35:13 UTC (rev 8668)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl     
2012-01-24 13:38:17 UTC (rev 8669)
@@ -109,7 +109,7 @@
                                                <div class="months">
                                                <xsl:for-each 
select="calendar_array">
                                                        <xsl:choose>
-                                                                       
<xsl:when test="status = 'control_registered' or status = 
'controls_registered'">
+                                                                       
<xsl:when test="status = 'control_registered'">
                                                                                
<div>
                                                                                
<a>
                                                                                
        <xsl:attribute name="href">
@@ -125,6 +125,11 @@
                                                                                
</a>
                                                                                
</div>
                                                                        
</xsl:when>
+                                                                       
<xsl:when test="status = 'controls_registered'">
+                                                                               
<div>
+                                                                               
        <img height="15" src="controller/images/status_icon_yellow_ring.png" />
+                                                                               
</div>
+                                                                       
</xsl:when>
                                                                        
<xsl:when test="status = 'control_planned'">
                                                                                
<div>
                                                                                
<a>

Modified: trunk/controller/templates/base/check_list/cases_tab_menu.xsl
===================================================================
--- trunk/controller/templates/base/check_list/cases_tab_menu.xsl       
2012-01-24 13:35:13 UTC (rev 8668)
+++ trunk/controller/templates/base/check_list/cases_tab_menu.xsl       
2012-01-24 13:38:17 UTC (rev 8669)
@@ -8,7 +8,7 @@
                                <xsl:attribute 
name="class">active</xsl:attribute>
                        </xsl:if>                               
                        <xsl:attribute name="href">
-                               
<xsl:text>index.php?menuaction=controller.uicheck_list.view_open_cases</xsl:text>
+                               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_open_cases</xsl:text>
                                <xsl:text>&amp;check_list_id=</xsl:text>
                                <xsl:value-of select="check_list/id"/>
                                
<xsl:text>&amp;phpgw_return_as=stripped_html</xsl:text>
@@ -20,7 +20,7 @@
                                <xsl:attribute 
name="class">active</xsl:attribute>
                        </xsl:if>                                       
                        <xsl:attribute name="href">
-                               
<xsl:text>index.php?menuaction=controller.uicheck_list.view_closed_cases</xsl:text>
+                               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_closed_cases</xsl:text>
                                <xsl:text>&amp;check_list_id=</xsl:text>
                                <xsl:value-of select="check_list/id"/>
                                
<xsl:text>&amp;phpgw_return_as=stripped_html</xsl:text>
@@ -32,7 +32,7 @@
                                <xsl:attribute 
name="class">active</xsl:attribute>
                        </xsl:if>                                       
                        <xsl:attribute name="href">
-                               
<xsl:text>index.php?menuaction=controller.uicheck_list.view_measurements</xsl:text>
+                               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_measurements</xsl:text>
                                <xsl:text>&amp;check_list_id=</xsl:text>
                                <xsl:value-of select="check_list/id"/>
                                
<xsl:text>&amp;phpgw_return_as=stripped_html</xsl:text>

Modified: trunk/controller/templates/base/check_list/check_list_tab_menu.xsl
===================================================================
--- trunk/controller/templates/base/check_list/check_list_tab_menu.xsl  
2012-01-24 13:35:13 UTC (rev 8668)
+++ trunk/controller/templates/base/check_list/check_list_tab_menu.xsl  
2012-01-24 13:38:17 UTC (rev 8669)
@@ -40,7 +40,7 @@
                <div>
                        <a class="btn focus first">
                                <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uicheck_list.register_case</xsl:text>
+                                       
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.register_case</xsl:text>
                                        <xsl:text>&amp;check_list_id=</xsl:text>
                                        <xsl:value-of select="check_list/id"/>
                                </xsl:attribute>

Modified: trunk/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/edit_check_list.xsl      
2012-01-24 13:35:13 UTC (rev 8668)
+++ trunk/controller/templates/base/check_list/edit_check_list.xsl      
2012-01-24 13:38:17 UTC (rev 8669)
@@ -34,7 +34,7 @@
        
                <h3 class="box_header">Sjekklistedetaljer</h3>
                <fieldset class="check_list_details">
-                       <form id="frm_update_check_list" 
action="index.php?menuaction=controller.uicheck_list.update_check_list" 
method="post">
+                       <form id="frm_update_check_list" 
action="index.php?menuaction=controller.uicheck_list_for_location.update_check_list"
 method="post">
                                
                        <xsl:variable name="check_list_id"><xsl:value-of 
select="check_list/id"/></xsl:variable>
                        <input id="check_list_id" type="hidden" 
name="check_list_id" value="{$check_list_id}" />

Modified: trunk/controller/templates/base/check_list/register_case.xsl
===================================================================
--- trunk/controller/templates/base/check_list/register_case.xsl        
2012-01-24 13:35:13 UTC (rev 8668)
+++ trunk/controller/templates/base/check_list/register_case.xsl        
2012-01-24 13:38:17 UTC (rev 8669)
@@ -46,7 +46,7 @@
                                                                        </form>
                                                                </xsl:when>
                                                                <xsl:when 
test="type = 'control_item_type_2'">
-                                                               <form 
id="frm_save_check_item" 
action="index.php?menuaction=controller.uicheck_list.save_check_item&amp;phpgw_return_as=json"
 method="post">
+                                                               <form 
id="frm_save_check_item" 
action="index.php?menuaction=controller.uicheck_list_for_location.save_check_item&amp;phpgw_return_as=json"
 method="post">
                                                                        
<xsl:variable name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
                                                                        <input 
type="hidden" name="control_item_id" value="{$control_item_id}" /> 
                                                                        <input 
name="status" type="hidden" value="1" />

Modified: 
trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl    
2012-01-24 13:35:13 UTC (rev 8668)
+++ trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl    
2012-01-24 13:38:17 UTC (rev 8669)
@@ -64,7 +64,7 @@
                
                <a style="display:none;" id="view_open_cases">
                        <xsl:attribute name="href">
-                               
<xsl:text>index.php?menuaction=controller.uicheck_list.view_open_cases</xsl:text>
+                               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_open_cases</xsl:text>
                                <xsl:text>&amp;check_list_id=</xsl:text>
                                <xsl:value-of select="check_list/id"/>
                                
<xsl:text>&amp;phpgw_return_as=stripped_html</xsl:text>

Modified: trunk/controller/templates/base/check_list/view_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_check_list.xsl      
2012-01-24 13:35:13 UTC (rev 8668)
+++ trunk/controller/templates/base/check_list/view_check_list.xsl      
2012-01-24 13:38:17 UTC (rev 8669)
@@ -53,7 +53,7 @@
                
                <a>
                        <xsl:attribute name="href">
-                       
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
+                       
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
                                <xsl:text>&amp;check_list_id=</xsl:text>
                                <xsl:value-of select="check_list/id"/>
                        </xsl:attribute>

Modified: trunk/controller/templates/base/check_list/view_check_lists.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_check_lists.xsl     
2012-01-24 13:35:13 UTC (rev 8668)
+++ trunk/controller/templates/base/check_list/view_check_lists.xsl     
2012-01-24 13:38:17 UTC (rev 8669)
@@ -51,7 +51,7 @@
                                                   <div>
                                                           <a>
                                                                        
<xsl:attribute name="href">
-                                                                               
<xsl:text>index.php?menuaction=controller.uicheck_list.view_check_list</xsl:text>
+                                                                               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_check_list</xsl:text>
                                                                                
<xsl:text>&amp;check_list_id=</xsl:text>
                                                                                
        <xsl:value-of select="id"/>
                                                                        
</xsl:attribute>
@@ -81,7 +81,7 @@
                </ul>
                 <a>
                        <xsl:attribute name="href">
-                               
<xsl:text>index.php?menuaction=controller.uicheck_list.control_calendar_status_overview</xsl:text>
+                               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.control_calendar_status_overview</xsl:text>
                                <xsl:text>&amp;control_id=</xsl:text>
                                        <xsl:value-of 
select="control_as_array/id"/>
                        </xsl:attribute>

Modified: trunk/controller/templates/base/check_list/view_control_info.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_info.xsl    
2012-01-24 13:35:13 UTC (rev 8668)
+++ trunk/controller/templates/base/check_list/view_control_info.xsl    
2012-01-24 13:38:17 UTC (rev 8669)
@@ -76,7 +76,7 @@
        <div class="tab_menu">
                <a id="view_control_details" class="active">
                        <xsl:attribute name="href">
-                               
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_details</xsl:text>
+                               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_control_details</xsl:text>
                                <xsl:text>&amp;control_id=</xsl:text>
                                <xsl:value-of select="control/id"/>
                                
<xsl:text>&amp;phpgw_return_as=stripped_html</xsl:text>
@@ -85,7 +85,7 @@
                </a>
                <a id="view_control_items">
                        <xsl:attribute name="href">
-                               
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_items</xsl:text>
+                               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_control_items</xsl:text>
                                <xsl:text>&amp;check_list_id=</xsl:text>
                                <xsl:value-of select="check_list/id"/>
                                
<xsl:text>&amp;phpgw_return_as=stripped_html</xsl:text>

Modified: trunk/controller/templates/base/check_list/view_control_items.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_items.xsl   
2012-01-24 13:35:13 UTC (rev 8668)
+++ trunk/controller/templates/base/check_list/view_control_items.xsl   
2012-01-24 13:38:17 UTC (rev 8669)
@@ -38,7 +38,7 @@
 </ul>
 <a style="margin-top:20px;" id="print_control_items" class="btn" 
target="_blank">
        <xsl:attribute name="href">
-               
<xsl:text>index.php?menuaction=controller.uicheck_list.print_check_list</xsl:text>
+               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.print_check_list</xsl:text>
                <xsl:text>&amp;check_list_id=</xsl:text>
                <xsl:value-of select="check_list/id"/>
                <xsl:text>&amp;phpgw_return_as=stripped_html</xsl:text>

Modified: trunk/controller/templates/base/check_list/view_measurements.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_measurements.xsl    
2012-01-24 13:35:13 UTC (rev 8668)
+++ trunk/controller/templates/base/check_list/view_measurements.xsl    
2012-01-24 13:38:17 UTC (rev 8669)
@@ -18,7 +18,7 @@
                                        <xsl:for-each 
select="measurement_check_items">
                                                        <li>
                                                                <h4><img 
src="controller/images/arrow_right.png" width="14"/><span><xsl:value-of 
select="control_item/title"/></span></h4>                                       
       
-                                                               <form 
id="frm_save_check_item" 
action="index.php?menuaction=controller.uicheck_list.save_check_item" 
method="post">
+                                                               <form 
id="frm_save_check_item" 
action="index.php?menuaction=controller.uicheck_list_for_location.save_check_item"
 method="post">
                                                                        
<xsl:variable name="check_item_id"><xsl:value-of select="id"/></xsl:variable>
                                                                        <input 
type="hidden" name="check_item_id" value="{$check_item_id}" />
                                                                        <input 
type="hidden" name="type" value="control_item_type_2" />

Modified: trunk/controller/templates/base/check_list/view_open_cases.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_open_cases.xsl      
2012-01-24 13:35:13 UTC (rev 8668)
+++ trunk/controller/templates/base/check_list/view_open_cases.xsl      
2012-01-24 13:38:17 UTC (rev 8669)
@@ -78,7 +78,7 @@
                        
                        <a style="font-size: 11px;margin-top: 20px;padding: 3px 
20px;" class="btn focus">
                                <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uicheck_list.register_case</xsl:text>
+                                       
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.register_case</xsl:text>
                                        <xsl:text>&amp;check_list_id=</xsl:text>
                                        <xsl:value-of select="check_list/id"/>
                                </xsl:attribute>

Modified: 
trunk/controller/templates/base/control_item/view_control_item_list.xsl
===================================================================
--- trunk/controller/templates/base/control_item/view_control_item_list.xsl     
2012-01-24 13:35:13 UTC (rev 8668)
+++ trunk/controller/templates/base/control_item/view_control_item_list.xsl     
2012-01-24 13:38:17 UTC (rev 8669)
@@ -51,7 +51,7 @@
                <div style="margin:20px 0;">
                        <a  
style="text-decoration:underline;font-size:20px;color:#333;">
                                <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uicheck_list.save_check_list</xsl:text>
+                                       
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.save_check_list</xsl:text>
                                        <xsl:text>&amp;control_id=</xsl:text>
                                                <xsl:value-of 
select="control_as_array/id"/>
                                </xsl:attribute>

Modified: trunk/controller/templates/base/tab_view_check_lists_garbage.xsl
===================================================================
--- trunk/controller/templates/base/tab_view_check_lists_garbage.xsl    
2012-01-24 13:35:13 UTC (rev 8668)
+++ trunk/controller/templates/base/tab_view_check_lists_garbage.xsl    
2012-01-24 13:38:17 UTC (rev 8669)
@@ -48,7 +48,7 @@
                                                   <div>
                                                           <a>
                                                                        
<xsl:attribute name="href">
-                                                                               
<xsl:text>index.php?menuaction=controller.uicheck_list.view_check_list</xsl:text>
+                                                                               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_check_list</xsl:text>
                                                                                
<xsl:text>&amp;check_list_id=</xsl:text>
                                                                                
        <xsl:value-of select="id"/>
                                                                        
</xsl:attribute>

Modified: 
trunk/controller/templates/base/view_check_lists_for_location_garbage.xsl
===================================================================
--- trunk/controller/templates/base/view_check_lists_for_location_garbage.xsl   
2012-01-24 13:35:13 UTC (rev 8668)
+++ trunk/controller/templates/base/view_check_lists_for_location_garbage.xsl   
2012-01-24 13:38:17 UTC (rev 8669)
@@ -62,7 +62,7 @@
                                                                                
                <xsl:otherwise>
                                                                                
                 <a class="view_check_list">
                                                                                
                        <xsl:attribute name="href">
-                                                                               
                                
<xsl:text>index.php?menuaction=controller.uicheck_list.get_check_list_info</xsl:text>
+                                                                               
                                
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.get_check_list_info</xsl:text>
                                                                                
                                <xsl:text>&amp;phpgw_return_as=json</xsl:text>
                                                                                
                                <xsl:text>&amp;check_list_id=</xsl:text>
                                                                                
                                <xsl:value-of select="id"/>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]