fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [13111] more on controller integration


From: Sigurd Nes
Subject: [Fmsystem-commits] [13111] more on controller integration
Date: Wed, 29 Apr 2015 14:11:29 +0000

Revision: 13111
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13111
Author:   sigurdne
Date:     2015-04-29 14:11:28 +0000 (Wed, 29 Apr 2015)
Log Message:
-----------
more on controller integration

Modified Paths:
--------------
    trunk/controller/inc/class.socontrol.inc.php
    trunk/controller/setup/phpgw_no.lang
    trunk/controller/setup/setup.inc.php
    trunk/controller/setup/tables_current.inc.php
    trunk/controller/setup/tables_update.inc.php
    trunk/property/inc/class.boentity.inc.php
    trunk/property/inc/class.uientity.inc.php
    trunk/property/js/yahoo/entity.edit.js
    trunk/property/templates/base/entity.xsl

Modified: trunk/controller/inc/class.socontrol.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol.inc.php        2015-04-28 23:31:45 UTC 
(rev 13110)
+++ trunk/controller/inc/class.socontrol.inc.php        2015-04-29 14:11:28 UTC 
(rev 13111)
@@ -992,6 +992,7 @@
                        $sql = "SELECT controller_control_component_list.* ,"
                        . " controller_control.title, 
controller_control.enabled as control_enabled,"
                        . " controller_control_component_list.enabled as 
relation_enabled,"
+                       . " controller_control_serie.enabled as serie_enabled,"
                        . " controller_control_serie.id as serie_id,"
                        . " 
controller_control_serie.assigned_to,controller_control_serie.start_date,"
                        . " 
controller_control_serie.repeat_type,controller_control_serie.repeat_interval,"
@@ -1020,6 +1021,7 @@
                                        'repeat_interval'       => 
$this->db->f('repeat_interval'),
                                        'control_enabled'       => 
$this->db->f('control_enabled'),
                                        'relation_enabled'      => 
$this->db->f('relation_enabled'),
+                                       'serie_enabled'         => 
$this->db->f('serie_enabled'),
                                        'service_time'          => 
(float)$this->db->f('service_time'),
                                        'controle_time'         => 
(float)$this->db->f('controle_time'),
                                );
@@ -1348,4 +1350,62 @@
                                return $result;
                        }
                }
+               function update_control_serie($data = array())
+               {
+                       if(!isset($data['ids']) || !$data['ids'])
+                       {
+                               throw new 
Exception("controller_socontrol::update_control_serie - Missing ids in input");
+                       }
+                       if(!isset($data['action']) || !$data['action'])
+                       {
+                               throw new 
Exception("controller_socontrol::update_control_serie - Missing action in 
input");
+                       }
+
+                       $ids            = $data['ids'];
+                       $action         = $data['action'];
+                       $value_set = array();
+                       switch($action)
+                       {
+                               case 'enable':
+                                       $value_set['enabled'] = 1;
+                                       break;
+                               case 'disable':
+                                       $value_set['enabled'] = 0;
+                                       break;
+                               case 'edit':
+                                       if($data['assigned_to'])
+                                       {
+                                               $value_set['assigned_to']       
        = $data['assigned_to'];
+                                       }
+                                       if($data['start_date'])
+                                       {
+                                               $value_set['start_date']        
        = $data['start_date'];
+                                       }
+                                       if($data['repeat_type'])
+                                       {
+                                               $value_set['repeat_type']       
        = $data['repeat_type'];
+                                       }
+                                       if($data['repeat_interval'])
+                                       {
+                                               $value_set['repeat_interval']   
= $data['repeat_interval'];
+                                       }
+                                       if($data['controle_time'])
+                                       {
+                                               $value_set['controle_time']     
        = $data['controle_time'];
+                                       }
+                                       if($data['service_time'])
+                                       {
+                                               $value_set['service_time']      
        = $data['service_time'];
+                                       }
+                                       break;
+                               default:
+                                       throw new 
Exception("controller_socontrol::update_control_serie - not av valid action: 
'{$action}'");
+                                       break;
+                               }
+                               $value_set_update = 
$this->db->validate_update($value_set);
+
+                       $sql = "UPDATE controller_control_serie SET 
{$value_set_update} WHERE id IN (" . implode(',', $ids) . ')';
+                       $this->db->query($sql,__LINE__,__FILE__);
+
+               }
        }

Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang        2015-04-28 23:31:45 UTC (rev 
13110)
+++ trunk/controller/setup/phpgw_no.lang        2015-04-29 14:11:28 UTC (rev 
13111)
@@ -373,4 +373,7 @@
 Status not done        controller      no      Status: Ikke utført
 Status done controller no      Status: Utført
 planned date   common  no      Planlagt Dato
-status components      controller      no      Status komponenter
\ No newline at end of file
+status components      controller      no      Status komponenter
+controle time  common  no      Kontrolltid
+service time   common  no      Servicetid
+total time     common  no      Totaltid
\ No newline at end of file

Modified: trunk/controller/setup/setup.inc.php
===================================================================
--- trunk/controller/setup/setup.inc.php        2015-04-28 23:31:45 UTC (rev 
13110)
+++ trunk/controller/setup/setup.inc.php        2015-04-29 14:11:28 UTC (rev 
13111)
@@ -1,6 +1,6 @@
 <?php
        $setup_info['controller']['name'] = 'controller';
-       $setup_info['controller']['version'] = '0.1.51';
+       $setup_info['controller']['version'] = '0.1.52';
        $setup_info['controller']['app_order'] = 100;
        $setup_info['controller']['enable'] = 1;
        $setup_info['controller']['app_group']  = 'office';

Modified: trunk/controller/setup/tables_current.inc.php
===================================================================
--- trunk/controller/setup/tables_current.inc.php       2015-04-28 23:31:45 UTC 
(rev 13110)
+++ trunk/controller/setup/tables_current.inc.php       2015-04-29 14:11:28 UTC 
(rev 13111)
@@ -167,6 +167,7 @@
                                        'repeat_interval'               => 
array('type' => 'int', 'precision' => '4', 'nullable' => true),
                                        'service_time'                  => 
array('type' => 'decimal','precision' => '20','scale' => '2','nullable' => 
True,'default' => '0.00'),
                                        'controle_time'                 => 
array('type' => 'decimal','precision' => '20','scale' => '2','nullable' => 
True,'default' => '0.00'),
+                                       'enabled'                               
=> array('type' => 'int', 'precision' => 2, 'nullable' => True,'default' => 1)
                                ),
                        'pk' => array('id'),
                        'fk' => array(),

Modified: trunk/controller/setup/tables_update.inc.php
===================================================================
--- trunk/controller/setup/tables_update.inc.php        2015-04-28 23:31:45 UTC 
(rev 13110)
+++ trunk/controller/setup/tables_update.inc.php        2015-04-29 14:11:28 UTC 
(rev 13111)
@@ -1082,3 +1082,18 @@
                $GLOBALS['setup_info']['controller']['currentver'] = '0.1.51';
                return $GLOBALS['setup_info']['controller']['currentver'];
        }
+
+       $test[] = '0.1.51';
+       function controller_upgrade0_1_51()
+       {
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('controller_control_serie','enabled',array(
+                               'type' => 'int',
+                               'precision' => '2',
+                               'nullable' => true,
+                               'default' => 1,
+                       )
+               );
+
+               $GLOBALS['setup_info']['controller']['currentver'] = '0.1.52';
+               return $GLOBALS['setup_info']['controller']['currentver'];
+       }

Modified: trunk/property/inc/class.boentity.inc.php
===================================================================
--- trunk/property/inc/class.boentity.inc.php   2015-04-28 23:31:45 UTC (rev 
13110)
+++ trunk/property/inc/class.boentity.inc.php   2015-04-29 14:11:28 UTC (rev 
13111)
@@ -56,12 +56,13 @@
 
                var $public_functions = array
                        (
-                               'read'                  => true,
-                               'read_single'   => true,
-                               'save'                  => true,
-                               'delete'                => true,
-                               'check_perms'   => true,
-                               'add_control'   => true
+                               'read'                                  => true,
+                               'read_single'                   => true,
+                               'save'                                  => true,
+                               'delete'                                => true,
+                               'check_perms'                   => true,
+                               'add_control'                   => true,
+                               'update_control_serie'  => true
                        );
 
                var $type_app = array();
@@ -961,7 +962,7 @@
                                                'service_time'                  
=> $service_time,
                                                'duplicate'                     
        => true
                                        );
-                                       _debug_array($values);
+       //                              _debug_array($values);
                                        if($add = 
$so_control->register_control_to_component($values))
                                        {
                                                if($add == PHPGW_ACL_ADD)
@@ -1033,4 +1034,27 @@
                        }
                }
 
+               function update_control_serie()
+               {
+                       if($start_date = phpgw::get_var('control_start_date', 
'string'))
+                       {
+                               phpgw::import_class('phpgwapi.datetime');
+                               $start_date = 
phpgwapi_datetime::date_to_timestamp($start_date);
+                       }
+
+                       $so_control     = CreateObject('controller.socontrol');
+
+                       $values = array
+                       (
+                               'ids'                           => 
phpgw::get_var('ids', 'int'),
+                               'action'                        => 
phpgw::get_var('action', 'string'),
+                               'assigned_to'           => 
phpgw::get_var('control_responsible', 'int'),
+                               'start_date'            => $start_date,
+                               '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')
+                       );
+                       $so_control->update_control_serie($values);
+               }
        }

Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php   2015-04-28 23:31:45 UTC (rev 
13110)
+++ trunk/property/inc/class.uientity.inc.php   2015-04-29 14:11:28 UTC (rev 
13111)
@@ -2386,8 +2386,17 @@
 
                        }
 
-                       
if(isset($GLOBALS['phpgw_info']['user']['apps']['controller']))
-                       {
+                               
if(isset($GLOBALS['phpgw_info']['user']['apps']['controller']))
+                               {
+                                       $myButtons[4] = array
+                                       (
+                                               'name'   => "4",
+                                               'values'  => json_encode(array( 
array('id' =>'values[enable_serie]','type'=>'buttons', 'value'=>'enable', 
'label'=>lang('enable'), 'funct'=> 'onActionsClick' , 'classname'=> 
'actionButton', 'value_hidden'=>""),
+                                                                               
                                array('id' 
=>'values[disable_serie]','type'=>'buttons', 'value'=>'disable', 
'label'=>lang('disable'), 'funct'=> 'onActionsClick' , 'classname'=> 
'actionButton', 'value_hidden'=>""),
+                                                                               
                                array('id' 
=>'values[edit_serie]','type'=>'buttons', 'value'=>'edit', 
'label'=>lang('edit'), 'funct'=> 'onActionsClick' , 'classname'=> 
'actionButton', 'value_hidden'=>""),
+                                       ))
+                               );
+
                                $location_id            = 
$GLOBALS['phpgw']->locations->get_id('property', $this->acl_location);
                                $_controls = 
$this->get_controls_at_component($location_id, $id);
 
@@ -2412,11 +2421,12 @@
                                                        array('key' => 
'assigned_to_name','label'=>lang('user'),'sortable'=>false,'resizeable'=>true),
                                                        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' => 
'repeat_interval','label'=>lang('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' => 
'relation_enabled','label'=>lang('enabled'),'sortable'=>false,'resizeable'=>true),
+                                                       array('key' => 
'serie_enabled','label'=>lang('enabled'),'sortable'=>false,'resizeable'=>true),
+                                                       array('key' => 
'select','label'=>lang('select'),'sortable'=>false,'resizeable'=>true),
                                                        array('key' => 
'location_id','hidden'=>true),
                                                        array('key' => 
'component_id','hidden'=>true),
                                                        array('key' => 
'id','hidden'=>true),
@@ -2533,8 +2543,8 @@
                        }
 
                        $repeat_types = array();
-                       $repeat_types[] = array('id'=> -1, 'name' => 
lang('day'));
-                       $repeat_types[] = array('id'=> 1, 'name' => 
lang('weekly'));
+       //              $repeat_types[] = array('id'=> -1, 'name' => 
lang('day'));
+       //              $repeat_types[] = array('id'=> 1, 'name' => 
lang('weekly'));
                        $repeat_types[] = array('id'=> 2, 'name' => 
lang('month'));
                        $repeat_types[] = array('id'=> 3, 'name' => 
lang('year'));
 
@@ -2544,7 +2554,8 @@
                                'controller'                                    
        => $_enable_controller,
                                        'property_js'                           
        => json_encode($GLOBALS['phpgw_info']['server']['webserver_url'] . 
$property_js),
                                        'datatable'                             
                => $datavalues,
-                                       'myColumnDefs'                          
        => $myColumnDefs,       
+                                       'myColumnDefs'                          
        => $myColumnDefs,
+                                       'myButtons'                             
                        => $myButtons,
                                        'enable_bulk'                           
        => $category['enable_bulk'],
                                        'org_unit'                              
        => $category['org_unit'],
                                        'value_org_unit_id'                     
=> $values['org_unit_id'],
@@ -3578,6 +3589,8 @@
                                $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'];
+                               $entry['select'] = "<input type='checkbox' 
class='mychecks' value='{$entry['serie_id']}'></input>";
+
                        }
                        if( phpgw::get_var('phpgw_return_as') == 'json' )
                        {

Modified: trunk/property/js/yahoo/entity.edit.js
===================================================================
--- trunk/property/js/yahoo/entity.edit.js      2015-04-28 23:31:45 UTC (rev 
13110)
+++ trunk/property/js/yahoo/entity.edit.js      2015-04-29 14:11:28 UTC (rev 
13111)
@@ -3,6 +3,11 @@
 var  myPaginator_1, myDataTable_1;
 var  myPaginator_2, myDataTable_2;
 var  myPaginator_3, myDataTable_3;
+var  myPaginator_4, myDataTable_4;
+
+var Button_4_0, Button_4_1, Button_4_2;
+
+
 
/********************************************************************************/
 var FormatterCenter = function(elCell, oRecord, oColumn, oData)
 {
@@ -10,7 +15,154 @@
 }
 
 
/********************************************************************************/
+       this.onActionsClick=function()
+       {
+               flag = false;
+               //validate ckecks true
+               array_checks = 
YAHOO.util.Dom.getElementsByClassName('mychecks');
+               for ( var i in array_checks )
+               {
+                       if(array_checks[i].checked)
+                       {
+                               flag = true;
+                               break;
+                       }
+               }
 
+               if(flag)
+               {
+                       var action = this.get("value");
+
+                       var ids = [];
+
+                       $(".mychecks:checked").each(function () {
+                                       ids.push($(this).val());
+                       });
+
+                       var data = {"ids": ids, "action": action};
+                       data.repeat_interval = $("#repeat_interval").val();
+                       data.controle_time = $("#controle_time").val();
+                       data.service_time = $("#service_time").val();
+                       data.control_responsible = 
$("#control_responsible").val();
+                       data.control_start_date = 
$("#control_start_date").val();
+                       data.repeat_type = $("#repeat_type").val();
+
+                       var formUrl = $("#form").attr("action");
+                       var Url = parseURL(formUrl);
+                       oArgs  = Url.searchObject;
+                       delete oArgs.click_history;
+                       oArgs.menuaction = 
'property.boentity.update_control_serie';
+
+                       var requestUrl = phpGWLink('index.php', oArgs, true);
+       //                                                              
alert(requestUrl);
+
+                       $("#controller_receipt").html("");
+
+                       $.ajax({
+                               type: 'POST',
+                               dataType: 'json',
+                               url: requestUrl,
+                               data: data,
+                               success: function(data) {
+                                       if( data != null)
+                                       {
+                                               
$("#controller_receipt").html(data.status + '::' + data.msg);
+                                               if(data.status_kode == 'ok')
+                                               {
+
+                                               }
+                                       }
+                               }
+                       });
+
+
+                       var oArgs2 = 
{menuaction:'property.uientity.get_controls_at_component', type:oArgs.type, 
entity_id:oArgs.entity_id, cat_id:oArgs.cat_id, id: oArgs.id};
+                       var requestUrl2 = phpGWLink('index.php', oArgs2, true);
+                       execute_async(myDataTable_4, oArgs2);
+               }
+       }
+       
+       this.cleanValuesHiddenActionsButtons=function()
+       {
+               YAHOO.util.Dom.get('hd_values[enable_serie]').value = '';
+               YAHOO.util.Dom.get('hd_values[disable_serie]').value = '';
+       }
+
+       function parseURL(url)
+       {
+               var parser = document.createElement('a'),
+                       searchObject = {},
+                       queries, split, i;
+               // Let the browser do the work
+               parser.href = url;
+               // Convert query string to object
+               queries = parser.search.replace(/^\?/, '').split('&');
+               for( i = 0; i < queries.length; i++ ) {
+                       split = queries[i].split('=');
+                       searchObject[split[0]] = split[1];
+               }
+               return {
+                       protocol: parser.protocol,
+                       host: parser.host,
+                       hostname: parser.hostname,
+                       port: parser.port,
+                       pathname: parser.pathname,
+                       search: parser.search,
+                       searchObject: searchObject,
+                       hash: parser.hash
+               };
+       }
+
+       add_control = function()
+       {
+               var formUrl = $("#form").attr("action");
+               var Url = parseURL(formUrl);
+               oArgs  = Url.searchObject;
+               delete oArgs.click_history;
+               oArgs.menuaction = 'property.boentity.add_control';
+               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);
+
+               $("#controller_receipt").html("");
+
+               $.ajax({
+                       type: 'POST',
+                       dataType: 'json',
+                       url: requestUrl,
+                       success: function(data) {
+                               if( data != null)
+                               {
+                                       
$("#controller_receipt").html(data.status + '::' + data.msg);
+                                       if(data.status_kode == 'ok')
+                                       {
+                                               $("#control_id").val('');
+                                               $("#control_name").val('');
+                                               
$("#control_responsible").val('');
+                                               
$("#control_responsible_user_name").val('');
+                                               
$("#control_start_date").val('');
+                                       }
+                               }
+                       }
+               });
+
+               var oArgs2 = 
{menuaction:'property.uientity.get_controls_at_component', type:oArgs.type, 
entity_id:oArgs.entity_id, cat_id:oArgs.cat_id, id: oArgs.id};
+               var requestUrl2 = phpGWLink('index.php', oArgs2, true);
+               execute_async(myDataTable_4, oArgs2);
+       };
+
        this.myParticularRenderEvent = function()
        {
                this.addFooterDatatable3(myPaginator_3,myDataTable_3);

Modified: trunk/property/templates/base/entity.xsl
===================================================================
--- trunk/property/templates/base/entity.xsl    2015-04-28 23:31:45 UTC (rev 
13110)
+++ trunk/property/templates/base/entity.xsl    2015-04-29 14:11:28 UTC (rev 
13111)
@@ -409,6 +409,7 @@
                        var base_java_url = <xsl:value-of 
select="base_java_url"/>;
                        var datatable = new Array();
                        var myColumnDefs = new Array();
+                       var myButtons = new Array();
 
                        <xsl:for-each select="datatable">
                                datatable[<xsl:value-of select="name"/>] = [
@@ -425,6 +426,9 @@
                        <xsl:for-each select="myColumnDefs">
                                myColumnDefs[<xsl:value-of select="name"/>] = 
<xsl:value-of select="values"/>
                        </xsl:for-each>
+                       <xsl:for-each select="myButtons">
+                               myButtons[<xsl:value-of select="name"/>] = 
<xsl:value-of select="values"/>
+                       </xsl:for-each>
                </script>
                <div class="yui-navset" id="entity_edit_tabview">
                        <xsl:variable name="form_action">
@@ -640,152 +644,95 @@
                                                                var requestUrl 
= phpGWLink('index.php', oArgs);
                                                                var 
Window1=window.open(requestUrl,"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
                                                        }
-<![CDATA[
-                                                       function parseURL(url)
-                                                       {
-                                                               var parser = 
document.createElement('a'),
-                                                                       
searchObject = {},
-                                                                       
queries, split, i;
-                                                               // Let the 
browser do the work
-                                                               parser.href = 
url;
-                                                               // Convert 
query string to object
-                                                               queries = 
parser.search.replace(/^\?/, '').split('&');
-                                                               for( i = 0; i < 
queries.length; i++ ) {
-                                                                       split = 
queries[i].split('=');
-                                                                       
searchObject[split[0]] = split[1];
-                                                               }
-                                                               return {
-                                                                       
protocol: parser.protocol,
-                                                                       host: 
parser.host,
-                                                                       
hostname: parser.hostname,
-                                                                       port: 
parser.port,
-                                                                       
pathname: parser.pathname,
-                                                                       search: 
parser.search,
-                                                                       
searchObject: searchObject,
-                                                                       hash: 
parser.hash
-                                                               };
-                                                       }
-]]>
-                                                       add_control = function()
-                                                       {
-                                                               var formUrl = 
$("#form").attr("action");
-                                                               var Url = 
parseURL(formUrl);
-                                                               oArgs  = 
Url.searchObject;
-                                                               delete 
oArgs.click_history;
-                                                               
oArgs.menuaction = 'property.boentity.add_control';
-                                                               
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);
-
-                                                               
$("#controller_receipt").html("");
-
-                                                               $.ajax({
-                                                                       type: 
'POST',
-                                                                       
dataType: 'json',
-                                                                       url: 
requestUrl,
-                                                                       
success: function(data) {
-                                                                               
if( data != null)
-                                                                               
{
-                                                                               
        $("#controller_receipt").html(data.status + '::' + data.msg);
-                                                                               
        if(data.status_kode == 'ok')
-                                                                               
        {
-                                                                               
                $("#control_id").val('');
-                                                                               
                $("#control_name").val('');
-                                                                               
                $("#control_responsible").val('');
-                                                                               
                $("#control_responsible_user_name").val('');
-                                                                               
                $("#control_start_date").val('');
-                                                                               
        }
-                                                                               
}
-                                                                       }
-                                                               });
-
-                                                               var oArgs2 = 
{menuaction:'property.uientity.get_controls_at_component', type:oArgs.type, 
entity_id:oArgs.entity_id, cat_id:oArgs.cat_id, id: oArgs.id};
-                                                               var requestUrl2 
= phpGWLink('index.php', oArgs2, true);
-                                                               
execute_async(myDataTable_4, oArgs2);
-                                                       };
-
                                                        </script>
                                                        <div 
id="controller_receipt"></div>
-                                                       <fieldset>
-                                                               <legend>
-                                                                       
<xsl:value-of select="php:function('lang', 'new')" />
-                                                               </legend>
-                                                               <label>
+                                                       <xsl:variable 
name="lang_add">
+                                                               <xsl:value-of 
select="php:function('lang', 'add')"/>
+                                                       </xsl:variable>
+
+                                                       <table>
+                                                               <tr>
+                                                               <td>
                                                                        
<xsl:value-of select="php:function('lang', 'user')" />
-                                                               </label>
+                                                               </td>
+                                                               <td>
                                                                <input 
type="text" name="control_responsible" id="control_responsible" value="" 
onClick="lookup_control_responsible();" readonly="readonly" size="6">
                                                                </input>
                                                                <input 
size="30" type="text" name="control_responsible_user_name" 
id="control_responsible_user_name" value="" 
onClick="lookup_control_responsible();" readonly="readonly">
                                                                </input>
-                                                               <br/>
-                                                               <label>
+                                                               </td>
+                                                               </tr>
+                                                               <tr>
+                                                               <td>
                                                                        
<xsl:value-of select="php:function('lang', 'controller')" />
-                                                               </label>
+                                                               </td>
+                                                               <td>
                                                                <input 
type="text" name="control_id" id="control_id" value="" 
onClick="lookup_control();" readonly="readonly" size="6">
                                                                </input>
                                                                <input 
type="text" name="control_name" id="control_name" value="" 
onClick="lookup_control();" readonly="readonly" size="30">
                                                                </input>
-                                                               <xsl:variable 
name="lang_add">
-                                                                       
<xsl:value-of select="php:function('lang', 'add')"/>
-                                                               </xsl:variable>
-                                                               <br/>
+                                                               </td>
+                                                               </tr>
+                                                               <tr>
+                                                                       <td>
 
-                                                               <label>
                                                                        
<xsl:value-of select="php:function('lang', 'start date')" />
-                                                               </label>
+                                                                       </td>
+                                                                       <td>
 
                                                                <input 
type="text" name="control_start_date" id="control_start_date" value=""  
readonly="readonly" size="10">
                                                                </input>
-                                                               <br/>
+                                                                       </td>
+                                                               </tr>
+                                                               <tr>
 
-                                                               <label>
+                                                               <td>
                                                                        
<xsl:value-of select="php:function('lang', 'repeat type')" />
-                                                               </label>
+                                                               </td>
+                                                               <td>
                                                                <select 
id="repeat_type" name="repeat_type">
                                                                        <option 
value=""><xsl:value-of select="php:function('lang', 'select')"/></option>
                                                                        
<xsl:apply-templates select="repeat_types/options"/>
                                                                </select>
-                                                               <br/>
-
-                                                               <label>
+                                                               </td>
+                                                               </tr>
+                                                               <tr>
+                               
+                                                               <td>
                                                                        
<xsl:value-of select="php:function('lang', 'interval')" />
-                                                               </label>
+                                                               </td>
+                                                               <td>
                                                                <input 
type="text" name="repeat_interval" id="repeat_interval" value="1" size="2">
                                                                </input>
-
-                                                               <br/>
-
-                                                               <label>
+                                                               </td>
+                                                               </tr>
+                                                               <tr>
+                                                               <td>
                                                                        
<xsl:value-of select="php:function('lang', 'controle time')" />
-                                                               </label>
+                                                               </td>
+                                                               <td>
                                                                <input 
type="text" name="controle_time" id="controle_time" value="" size="">
                                                                </input>
-                                                               <br/>
-
-                                                               <label>
+                                                               </td>
+                                                               </tr>
+                                                               <tr>
+                                                               <td>
                                                                        
<xsl:value-of select="php:function('lang', 'service time')" />
-                                                               </label>
+                                                               </td>
+                                                               <td>
                                                                <input 
type="text" name="service_time" id="service_time" value="" size="">
                                                                </input>
-
-                                                               <br/>
-
+                                                               </td>
+                                                               </tr>
+                                                               <tr>
+                                                               <td>
                                                                <input 
type="button" name="" value="{$lang_add}" title="{$lang_add}" 
onClick="add_control();">
                                                                </input>
-
-                                                       </fieldset>
+                                                               </td>
+                                                               <td></td>
+                                                               </tr>
+                                                       </table>
                                                        <table>
                                                                <tr>
                                                                        <td>
@@ -796,6 +743,7 @@
                                                                        <table 
cellpadding="2" cellspacing="2" width="80%" align="center">
                                                                        <tr>
                                                                                
<td>
+                                                                               
        <div id="datatable-buttons_4"/>
                                                                                
        <div id="datatable-container_4"/>
                                                                                
</td>
                                                                        </tr>




reply via email to

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