[Fmsystem-commits] [7638]

[Erik Holm-Larsen]

Revision: 7638
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7638
Author:   erikhl
Date:     2011-09-16 11:35:08 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.soprocedure.inc.php
    trunk/controller/inc/class.uiprocedure.inc.php

Modified: trunk/controller/inc/class.soprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.soprocedure.inc.php      2011-09-16 11:24:14 UTC 
(rev 7637)
+++ trunk/controller/inc/class.soprocedure.inc.php      2011-09-16 11:35:08 UTC 
(rev 7638)
@@ -71,6 +71,7 @@
                $id = intval($procedure->get_id());
                        
                $values = array(
+                       'title = ' . $this->marshal($procedure->get_title(), 
'string'),
                        'purpose = ' . 
$this->marshal($procedure->get_purpose(), 'string'),
                        'responsibility = ' . 
$this->marshal($procedure->get_responsibility(), 'string'),
                        'description = ' . 
$this->marshal($procedure->get_description(), 'string'),

Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php      2011-09-16 11:24:14 UTC 
(rev 7637)
+++ trunk/controller/inc/class.uiprocedure.inc.php      2011-09-16 11:35:08 UTC 
(rev 7638)
@@ -68,10 +68,15 @@
                                                ),
                                                array(
                                                        'key' => 'title',
-                                                       'label' => 
lang('Title'),
+                                                       'label' => 
lang('Procedure title'),
                                                        'sortable'      => false
                                                ),
                                                array(
+                                                       'key' => 'purpose',
+                                                       'label' => 
lang('Procedure purpose'),
+                                                       'sortable'      => false
+                                               ),
+                                               array(
                                                        'key' => 'link',
                                                        'hidden' => true
                                                )
@@ -83,111 +88,6 @@
                        self::render_template_xsl('datatable', $data);
                }
 
-/*             public function display_control_items_json()
-               {
-                       $this->bo = CreateObject('booking.boapplication');
-                       $this->resource_bo = CreateObject('booking.boresource');
-
-                       if ( 
!isset($GLOBALS['phpgw_info']['user']['apps']['admin']) &&
-                            $GLOBALS['phpgw']->acl->check('admin', 
phpgwapi_acl::ADD, 'controller') )
-                       {
-                               $filters['id'] = 
$this->bo->accessable_applications($GLOBALS['phpgw_info']['user']['id']);
-                       }
-                       $filters['status'] = 'NEW';
-                       if(isset($_SESSION['showall']))
-                       {
-                               $filters['status'] = array('NEW', 
'PENDING','REJECTED', 'ACCEPTED');
-                $testdata =  phpgw::get_var('buildings', 'int', 'REQUEST', 
null);
-                if ($testdata != 0)
-                {
-                    $filters['building_name'] = 
$this->bo->so->get_building(phpgw::get_var('buildings', 'int', 'REQUEST', 
null));        
-                }
-                else
-                {
-                    unset($filters['building_name']);                
-                }
-                $testdata2 =  phpgw::get_var('activities', 'int', 'REQUEST', 
null);
-                if ($testdata2 != 0)
-                {
-                    $filters['activity_id'] = 
$this->bo->so->get_activities(phpgw::get_var('activities', 'int', 'REQUEST', 
null));        
-                }
-                else
-                {
-                    unset($filters['activity_id']);                
-                }
-                
-                       }
-                       else
-                       {
-                               if (phpgw::get_var('status') == 'none')
-                               {
-                                       $filters['status'] = array('NEW', 
'PENDING', 'REJECTED', 'ACCEPTED');
-                               } 
-                               else
-                               {
-                       $filters['status'] = phpgw::get_var('status');
-                               }
-                $testdata =  phpgw::get_var('buildings', 'int', 'REQUEST', 
null);
-                if ($testdata != 0)
-                {
-                    $filters['building_name'] = 
$this->bo->so->get_building(phpgw::get_var('buildings', 'int', 'REQUEST', 
null));        
-                }
-                else
-                {
-                    unset($filters['building_name']);                
-                }
-                $testdata2 =  phpgw::get_var('activities', 'int', 'REQUEST', 
null);
-                if ($testdata2 != 0)
-                {
-                    $filters['activity_id'] = 
$this->bo->so->get_activities(phpgw::get_var('activities', 'int', 'REQUEST', 
null));        
-                }
-                else
-                {
-                    unset($filters['activity_id']);                
-                }
-            }
-
-                       $params = array(
-                               'start' => phpgw::get_var('startIndex', 'int', 
'REQUEST', 0),
-                               'results' => phpgw::get_var('results', 'int', 
'REQUEST', null),
-                               'query' => phpgw::get_var('query'),
-                               'sort'  => phpgw::get_var('sort'),
-                               'dir'   => phpgw::get_var('dir'),
-                               'filters' => $filters
-                       );
-
-                       $applications = $this->bo->so->read($params);
-
-                       foreach($applications['results'] as &$application)
-                       {
-                               if (strstr($application['building_name'],"%"))
-                               {
-                                       $search = array('%2C','%C3%85', 
'%C3%A5', '%C3%98', '%C3%B8', '%C3%86', '%C3%A6');
-                                       $replace = array 
(',','Å','å','Ø','ø','Æ','æ');
-                                       $application['building_name'] = 
str_replace($search, $replace, $application['building_name']);
-                               }
-
-                               $application['status'] = 
lang($application['status']);
-                               $application['created'] = 
pretty_timestamp($application['created']);
-                               $application['modified'] = 
pretty_timestamp($application['modified']);
-                               $application['frontend_modified'] = 
pretty_timestamp($application['frontend_modified']);
-                               $application['resources'] = 
$this->resource_bo->so->read(array('filters'=>array('id'=>$application['resources'])));
-                               $application['resources'] = 
$application['resources']['results'];
-                               if($application['resources'])
-                               {
-                                       $names = array();
-                                       foreach($application['resources'] as 
$res)
-                                       {
-                                               $names[] = $res['name'];
-                                       }
-                                       $application['what'] = 
$application['resources'][0]['building_name']. ' ('.join(', ', $names).')';
-                               }
-                       }
-                       array_walk($applications["results"], array($this, 
"_add_links"), "controller.uicontrol_item2.index");
-
-                       return $this->yui_results($applications);
-               }       */      
-               
                public function edit()
                {
                        $procedure_id = phpgw::get_var('id');
@@ -214,6 +114,7 @@
                                        
                                        if(isset($procedure_id) && 
$procedure_id > 0)
                                        {
+                                               $proc_id = $procedure_id;
                                                if($this->so->store($procedure))
                                                {
                                                        $message = 
lang('messages_saved_form');
@@ -400,14 +301,15 @@
                                //Add action column to each row in result table
                                array_walk(
                                        $result_data['results'],
-                                       array($this, 'add_actions'), 
-                                       array(                                  
                                                                // Parameters 
(non-object pointers)
+                                       array($this, '_add_links'),
+                                       "controller.uiprocedure.view"); 
+/*                                     array(                                  
                                                                // Parameters 
(non-object pointers)
                                                $procedure_id,                  
                                                        // [1] The procedure id
                                                $editable,                      
                                                                // [2] Editable 
flag                    
-                                       )
-                               );
+                                       )*/
+                               //);
                        }
-
+//_debug_array($result_data);
                        return $this->yui_results($result_data, 
'total_records', 'results');
 
                }