[Fmsystem-commits] [12872] property: more on controller integration

[Sigurd Nes]

Revision: 12872
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12872
Author:   sigurdne
Date:     2015-03-18 18:20:14 +0000 (Wed, 18 Mar 2015)
Log Message:
-----------
property: more on controller integration

Modified Paths:
--------------
    trunk/property/inc/class.boentity.inc.php
    trunk/property/inc/class.uientity.inc.php
    trunk/property/templates/base/entity.xsl

Modified: trunk/property/inc/class.boentity.inc.php
===================================================================
--- trunk/property/inc/class.boentity.inc.php   2015-03-18 18:12:03 UTC (rev 
12871)
+++ trunk/property/inc/class.boentity.inc.php   2015-03-18 18:20:14 UTC (rev 
12872)
@@ -910,6 +910,10 @@
                        $control_id                             = 
phpgw::get_var('control_id', 'int');
                        $assigned_to                    = 
phpgw::get_var('control_responsible', 'int');
                        $start_date                             = 
phpgw::get_var('control_start_date', 'string');
+                       $repeat_type                    = 
phpgw::get_var('repeat_type', 'int');
+                       $repeat_interval                = 
phpgw::get_var('repeat_interval', 'int');
+                       $controle_time                  = 
phpgw::get_var('controle_time', 'float');
+                       $service_time                   = 
phpgw::get_var('service_time', 'float');
 
                        $component_arr = 
$this->so->read_single(array('entity_id' => $entity_id, 'cat_id'=> $cat_id, 
'id' => $id));
 
@@ -950,9 +954,13 @@
                                        (
                                                'register_component'    => 
array("{$control_id}_{$location_id}_{$id}"),
                                                'assigned_to'                   
=> $assigned_to,
-                                               'start_date'                    
=> $start_date
+                                               'start_date'                    
=> $start_date,
+                                               'repeat_type'                   
=> $repeat_type,
+                                               'repeat_interval'               
=> $repeat_interval,
+                                               'controle_time'                 
=> $controle_time,
+                                               'service_time'                  
=> $service_time,
                                        );
-
+                                       _debug_array($values);
                                        if($add = 
$so_control->register_control_to_component($values))
                                        {
                                                if($add == PHPGW_ACL_ADD)

Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php   2015-03-18 18:12:03 UTC (rev 
12871)
+++ trunk/property/inc/class.uientity.inc.php   2015-03-18 18:20:14 UTC (rev 
12872)
@@ -2408,6 +2408,9 @@
                                                                array('key' => 
'start_date','label'=>lang('start date'),'sortable'=>false,'resizeable'=>true),
                                                                array('key' => 
'repeat_type','label'=>lang('repeat 
type'),'sortable'=>false,'resizeable'=>true),
                                                                array('key' => 
'repeat_interval','label'=>lang('repeat 
interval'),'sortable'=>false,'resizeable'=>true),
+                                                               array('key' => 
'controle_time','label'=>lang('controle 
time'),'sortable'=>false,'resizeable'=>true),
+                                                               array('key' => 
'service_time','label'=>lang('service 
time'),'sortable'=>false,'resizeable'=>true),
+                                                               array('key' => 
'total_time','label'=>lang('total time'),'sortable'=>false,'resizeable'=>true),
                //                                              array('key' => 
'enabled','label'=>lang('enabled'),'sortable'=>false,'resizeable'=>true),
                                                                array('key' => 
'location_id','hidden'=>true),
                                                                array('key' => 
'component_id','hidden'=>true),
@@ -3573,6 +3576,7 @@
 
                                $entry['start_date'] =  
$GLOBALS['phpgw']->common->show_date($entry['start_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
                                $entry['repeat_type'] = 
$repeat_type_array[$entry['repeat_type']];
+                               $entry['total_time'] = $entry['service_time'] + 
$entry['controle_time'];
                        }
                        if( phpgw::get_var('phpgw_return_as') == 'json' )
                        {

Modified: trunk/property/templates/base/entity.xsl
===================================================================
--- trunk/property/templates/base/entity.xsl    2015-03-18 18:12:03 UTC (rev 
12871)
+++ trunk/property/templates/base/entity.xsl    2015-03-18 18:20:14 UTC (rev 
12872)
@@ -676,7 +676,16 @@
                                                                
oArgs.control_id = $("#control_id").val();
                                                                
oArgs.control_responsible = $("#control_responsible").val();
                                                                
oArgs.control_start_date = $("#control_start_date").val();
+                                                               
oArgs.repeat_type = $("#repeat_type").val();
+                                                               
if(!oArgs.repeat_type)
+                                                               {
+                                                                       
alert('velg type serie');
+                                                                       return;
+                                                               }
 
+                                                               
oArgs.repeat_interval = $("#repeat_interval").val();
+                                                               
oArgs.controle_time = $("#controle_time").val();
+                                                               
oArgs.service_time = $("#service_time").val();
                                                                var requestUrl 
= phpGWLink('index.php', oArgs, true);
 //                                                             
alert(requestUrl);