fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [17005] Property: FDV-131


From: sigurdne
Subject: [Fmsystem-commits] [17005] Property: FDV-131
Date: Mon, 28 Aug 2017 11:35:24 -0400 (EDT)

Revision: 17005
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17005
Author:   sigurdne
Date:     2017-08-28 11:35:24 -0400 (Mon, 28 Aug 2017)
Log Message:
-----------
Property: FDV-131

Modified Paths:
--------------
    trunk/property/inc/class.bogeneric.inc.php
    trunk/property/inc/class.menu.inc.php
    trunk/property/inc/class.sogeneric.inc.php
    trunk/property/inc/class.uigeneric.inc.php
    trunk/property/setup/default_records.inc.php
    trunk/property/setup/phpgw_no.lang
    trunk/property/setup/setup.inc.php
    trunk/property/setup/tables_current.inc.php
    trunk/property/setup/tables_update.inc.php
    trunk/property/templates/base/generic.xsl

Modified: trunk/property/inc/class.bogeneric.inc.php
===================================================================
--- trunk/property/inc/class.bogeneric.inc.php  2017-08-28 09:18:11 UTC (rev 
17004)
+++ trunk/property/inc/class.bogeneric.inc.php  2017-08-28 15:35:24 UTC (rev 
17005)
@@ -135,7 +135,7 @@
 
                        $filter = array('list' => ''); // translates to "list 
IS NULL"
                        $system_location = 
$this->location_info['system_location'] ? 
$this->location_info['system_location'] : $this->location_info['acl_location'];
-                       
+
                        $columns = 
$this->custom->find($this->location_info['acl_app'], $system_location, 0, '', 
'', '', true, false, $filter);
                        $column_list = 
$this->bocommon->select_multi_list($selected, $columns);
 
@@ -151,6 +151,8 @@
                        }
                        $values = $this->so->read($data);
 
+                       $dateformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+
                        foreach ($values as &$entry)
                        {
                                foreach ($this->location_info['fields'] as 
$field)
@@ -157,8 +159,12 @@
                                {
                                        if (isset($entry[$field['name']]) && 
$entry[$field['name']])
                                        {
-                                               if 
(isset($field['values_def']['get_single_value']) && 
$field['values_def']['get_single_value'] == 'get_user')
+                                               if($field['type'] == 'date')
                                                {
+                                                       $entry[$field['name']] 
= $GLOBALS['phpgw']->common->show_date($entry[$field['name']], $dateformat);
+                                               }
+                                               else if 
(isset($field['values_def']['get_single_value']) && 
$field['values_def']['get_single_value'] == 'get_user')
+                                               {
                                                        $entry[$field['name']] 
= $GLOBALS['phpgw']->accounts->get($entry[$field['name']])->__toString();
                                                }
                                                else if (isset($field['role']) 
&& $field['role'] == 'parent')

Modified: trunk/property/inc/class.menu.inc.php
===================================================================
--- trunk/property/inc/class.menu.inc.php       2017-08-28 09:18:11 UTC (rev 
17004)
+++ trunk/property/inc/class.menu.inc.php       2017-08-28 15:35:24 UTC (rev 
17005)
@@ -464,6 +464,30 @@
                                        );
                                }
 
+                               $location_exception_children = array
+                               (
+                                       'severity' => array
+                                               (
+                                               'text' => lang('severity'),
+                                               'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uigeneric.index',
+                                                       'type' => 
'location_exception_severity'))
+                                       ),
+                                       'category' => array
+                                               (
+                                               'text' => lang('category'),
+                                               'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uigeneric.index',
+                                                       'type' => 
'location_exception_category')),
+                                               'children' => array(
+                                                       'category_text' => array
+                                                       (
+                                                               'text' => 
lang('text'),
+                                                               'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uigeneric.index',
+                                                                       'type' 
=> 'location_exception_category_text'))
+                                                       )
+                                               )
+                                       )
+                               );
+
                                $admin_children_location = array
                                        (
                                        'street' => array
@@ -511,6 +535,14 @@
                                                'text' => lang('location 
contact'),
                                                'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uigeneric.index',
                                                        'type' => 
'location_contact'))
+                                       ),
+                                       'location_exception' => array
+                                               (
+                                               'text' => lang('location 
exception'),
+                                               'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uigeneric.index',
+                                                       'type' => 
'location_exception')),
+                                               'children' => 
$location_exception_children
+
                                        )
                                );
 

Modified: trunk/property/inc/class.sogeneric.inc.php
===================================================================
--- trunk/property/inc/class.sogeneric.inc.php  2017-08-28 09:18:11 UTC (rev 
17004)
+++ trunk/property/inc/class.sogeneric.inc.php  2017-08-28 15:35:24 UTC (rev 
17005)
@@ -2446,6 +2446,198 @@
 
                                        break;
 
+                               case 'location_exception_severity':
+                                       $info = array
+                                               (
+                                               'table' => 
'fm_location_exception_severity',
+                                               'id' => array('name' => 'id', 
'type' => 'int', 'descr' => lang('id')),
+                                               'fields' => array
+                                                       (
+                                                       array
+                                                       (
+                                                               'name' => 
'name',
+                                                               'descr' => 
lang('name'),
+                                                               'type' => 
'varchar',
+                                                               'nullable' => 
false
+                                                       )
+                                               ),
+                                               'edit_msg' => lang('edit'),
+                                               'add_msg' => lang('add'),
+                                               'name' => lang('severity'),
+                                               'acl_app' => 'property',
+                                               'acl_location' => '.admin',
+                                               'menu_selection' => 
'admin::property::location::location_exception::severity'
+                                       );
+                                       break;
+                               case 'location_exception_category':
+                                       $info = array
+                                               (
+                                               'table' => 
'fm_location_exception_category',
+                                               'id' => array('name' => 'id', 
'type' => 'auto'),
+                                               'fields' => array
+                                               (
+                                                       array(
+                                                               'name' => 
'parent_id',
+                                                               'descr' => 
lang('parent'),
+                                                               'type' => 
'select',
+                                                               'sortable' => 
true,
+                                                               'nullable' => 
true,
+                                                               'filter' => 
false,
+                                                               'role' => 
'parent',
+                                                               'values_def' => 
array
+                                                               (
+                                                                       
'valueset' => false,
+                                                                       
'method' => 'property.bogeneric.get_list',
+                                                                       
'method_input' => array('type' => 'location_exception_category', 'role' => 
'parent', 'selected' => '##parent_id##')
+                                                               )
+                                                       ),
+                                                       array
+                                                       (
+                                                               'name' => 
'name',
+                                                               'descr' => 
lang('name'),
+                                                               'type' => 
'varchar',
+                                                               'nullable' => 
false
+                                                       )
+                                               ),
+                                               'edit_msg' => lang('edit'),
+                                               'add_msg' => lang('add'),
+                                               'name' => lang('severity 
category'),
+                                               'acl_app' => 'property',
+                                               'acl_location' => '.admin',
+                                               'menu_selection' => 
'admin::property::location::location_exception::category'
+                                       );
+                                       break;
+
+                               case 'location_exception_category_text':
+                                       $info = array
+                                               (
+                                               'table' => 
'fm_location_exception_category_text',
+                                               'id' => array('name' => 'id', 
'type' => 'auto'),
+                                               'fields' => array
+                                               (
+                                                       array
+                                                       (
+                                                               'name' => 
'name',
+                                                               'descr' => 
lang('name'),
+                                                               'type' => 
'varchar',
+                                                               'nullable' => 
false
+                                                       ),
+                                                       array
+                                                       (
+                                                               'name' => 
'category_id',
+                                                               'descr' => 
lang('category'),
+                                                               'type' => 
'select',
+                                                               'nullable' => 
false,
+                                                               'filter' => 
true,
+                                                               'sortable' => 
true,
+                                                               'values_def' => 
array
+                                                               (
+                                                                       
'valueset' => false,
+                                                                       
'method' => 'property.bogeneric.get_list',
+                                                                       
'get_single_value' => 'property.sogeneric.get_name',
+                                                                       
'method_input' => array('type' => 'location_exception_category', 'selected' => 
'##category_id##')
+                                                               )
+                                                       )
+                                               ),
+                                               'edit_msg' => lang('edit'),
+                                               'add_msg' => lang('add'),
+                                               'name' => lang('severity 
category text'),
+                                               'acl_app' => 'property',
+                                               'acl_location' => '.admin',
+                                               'menu_selection' => 
'admin::property::location::location_exception::category::category_text'
+                                       );
+                                       break;
+
+                               case 'location_exception':
+                                       $info = array
+                                               (
+                                               'table' => 
'fm_location_exception',
+                                               'id' => array('name' => 'id', 
'type' => 'auto'),
+                                               'fields' => array
+                                               (
+                                                       array
+                                                       (
+                                                               'name' => 
'location_code',
+                                                               'descr' => 
lang('location'),
+                                                               'type' => 
'location',
+                                                               'nullable' => 
false
+                                                       ),
+                                                       array
+                                                       (
+                                                               'name' => 
'descr',
+                                                               'descr' => 
lang('descr'),
+                                                               'type' => 
'text',
+                                                               'nullable' => 
false
+                                                       ),
+                                                       array
+                                                       (
+                                                               'name' => 
'start_date',
+                                                               'descr' => 
lang('start date'),
+                                                               'type' => 
'date',
+                                                               'nullable' => 
false
+                                                       ),
+                                                       array
+                                                       (
+                                                               'name' => 
'end_date',
+                                                               'descr' => 
lang('end date'),
+                                                               'type' => 
'date',
+                                                               'nullable' => 
true
+                                                       ),
+                                                       array
+                                                       (
+                                                               'name' => 
'reference',
+                                                               'descr' => 
lang('reference'),
+                                                               'type' => 
'text',
+                                                               'nullable' => 
true
+                                                       ),
+                                                       array
+                                                       (
+                                                               'name' => 
'severity_id',
+                                                               'descr' => 
lang('severity'),
+                                                               'type' => 
'select',
+                                                               'nullable' => 
false,
+                                                               'filter' => 
true,
+                                                               'sortable' => 
true,
+                                                               'values_def' => 
array
+                                                               (
+                                                                       
'valueset' => false,
+                                                                       
'method' => 'property.bogeneric.get_list',
+                                                                       
'get_single_value' => 'property.sogeneric.get_name',
+                                                                       
'method_input' => array('type' => 'location_exception_severity', 'selected' => 
'##severity_id##')
+                                                               )
+                                                       ),
+                                                       array
+                                                       (
+                                                               'name' => 
'category_id',
+                                                               'descr' => 
lang('category'),
+                                                               'type' => 
'select',
+                                                               'nullable' => 
false,
+                                                               'filter' => 
true,
+                                                               'sortable' => 
true,
+                                                               'values_def' => 
array
+                                                               (
+                                                                       
'valueset' => false,
+                                                                       
'method' => 'property.bogeneric.get_list',
+                                                                       
'get_single_value' => 'property.sogeneric.get_name',
+                                                                       
'method_input' => array('role' => 'parent', 'type' => 
'location_exception_category', 'selected' => '##category_id##')
+                                                               )
+                                                       )
+                                               ),
+                                               'edit_msg' => lang('edit'),
+                                               'add_msg' => lang('add'),
+                                               'name' => lang('severity 
category text'),
+                                               'acl_app' => 'property',
+                                               'acl_location' => '.admin',
+                                               'menu_selection' => 
'admin::property::location::location_exception::category::category_text',
+                                               'default' => array
+                                               (
+                                                       'user_id' => 
array('add' => '$this->account'),
+                                                       'entry_date' => 
array('add' => 'time()'),
+                                                       'modified_date' => 
array('add' => 'time()', 'edit' => 'time()'),
+                                               ),
+                                       );
+                                       break;
+
 // START CONTROLLER TABLES
                                case 'controller_check_item_status':
                                        $info = array

Modified: trunk/property/inc/class.uigeneric.inc.php
===================================================================
--- trunk/property/inc/class.uigeneric.inc.php  2017-08-28 09:18:11 UTC (rev 
17004)
+++ trunk/property/inc/class.uigeneric.inc.php  2017-08-28 15:35:24 UTC (rev 
17005)
@@ -124,6 +124,9 @@
                                        case 'html':
                                                $value_type = 'html';
                                                break;
+                                       case 'date':
+                                               $value_type = 'date';
+                                               break;
                                        default:
                                                $value_type = 'string';
                                                break;
@@ -600,19 +603,22 @@
                        {
                                foreach ($this->location_info['fields'] as 
$field)
                                {
-                               switch ($field['type'])
-                               {
-                                       case 'integer':
-                                       case 'int':
-                                               $value_type = 'int';
-                                               break;
-                                       case 'html':
-                                               $value_type = 'html';
-                                               break;
-                                       default:
-                                               $value_type = 'string';
-                                               break;
-                               }
+                                       switch ($field['type'])
+                                       {
+                                               case 'integer':
+                                               case 'int':
+                                                       $value_type = 'int';
+                                                       break;
+                                               case 'html':
+                                                       $value_type = 'html';
+                                                       break;
+                                               case 'date':
+                                                       $value_type = 'date';
+                                                       break;
+                                               default:
+                                                       $value_type = 'string';
+                                                       break;
+                                       }
                                        $values[$field['name']] = 
phpgw::clean_value($_POST['values'][$field['name']],$value_type);
                                }
 
@@ -687,6 +693,13 @@
                                {
                                        self::rich_text_editor($field['name']);
                                }
+                               else if($field['type'] == 'date')
+                               {
+                                       
$GLOBALS['phpgw']->jqcal->add_listener($field['name']);
+                                       $dateformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+                                       $field['value'] = 
$GLOBALS['phpgw']->common->show_date($field['value'], $dateformat);
+                               }
+
                                if (isset($field['values_def']))
                                {
                                        if ($field['values_def']['valueset'] && 
is_array($field['values_def']['valueset']))

Modified: trunk/property/setup/default_records.inc.php
===================================================================
--- trunk/property/setup/default_records.inc.php        2017-08-28 09:18:11 UTC 
(rev 17004)
+++ trunk/property/setup/default_records.inc.php        2017-08-28 15:35:24 UTC 
(rev 17005)
@@ -90,6 +90,8 @@
 
        $GLOBALS['phpgw']->locations->add('.report', 'Generic report', 
'property', $allow_grant = true);
 
+       $GLOBALS['phpgw']->locations->add('.location.exception', 'location 
exception', 'property');
+
        $GLOBALS['phpgw_setup']->oProc->query("DELETE from phpgw_config WHERE 
config_app='property'");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_config 
(config_app, config_name, config_value) VALUES ('property','meter_table', 
'fm_entity_1_1')");
 

Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang  2017-08-28 09:18:11 UTC (rev 17004)
+++ trunk/property/setup/phpgw_no.lang  2017-08-28 15:35:24 UTC (rev 17005)
@@ -2227,4 +2227,9 @@
 attribute groups       property        no      Attributtgrupper
 sms text       property        no      SMS-tekst
 character left property        no      Resterende tegn
-delivery address       property        no      Leveringsadresse
\ No newline at end of file
+delivery address       property        no      Leveringsadresse
+severity       property        no      Alvorlighetsgrad
+location exception     property        no      OBS varsel
+severity category      property        no      Kategori for alvorlighetsgrad
+severity category text property        no      Tekster for kategori for 
alvorlighetsgrad
+reference      property        no      Referanse
\ No newline at end of file

Modified: trunk/property/setup/setup.inc.php
===================================================================
--- trunk/property/setup/setup.inc.php  2017-08-28 09:18:11 UTC (rev 17004)
+++ trunk/property/setup/setup.inc.php  2017-08-28 15:35:24 UTC (rev 17005)
@@ -92,6 +92,10 @@
                'fm_location_type',
                'fm_location_config',
                'fm_location_contact',
+               'fm_location_exception',
+               'fm_location_exception_severity',
+               'fm_location_exception_category',
+               'fm_location_exception_category_text',
                'fm_building_part',
                'fm_b_account',
                'fm_b_account_category',

Modified: trunk/property/setup/tables_current.inc.php
===================================================================
--- trunk/property/setup/tables_current.inc.php 2017-08-28 09:18:11 UTC (rev 
17004)
+++ trunk/property/setup/tables_current.inc.php 2017-08-28 15:35:24 UTC (rev 
17005)
@@ -2893,5 +2893,57 @@
                        'fk' => array('fm_view_dataset' => array('dataset_id' 
=> 'id')),
                        'ix' => array(),
                        'uc' => array()
+               ),
+               'fm_location_exception_severity' => array(
+                       'fd' => array(
+                               'id' => array('type' => 'int', 'precision' => 
4, 'nullable' => False),
+                               'name' => array('type' => 'varchar', 
'precision' => 255, 'nullable' => False),
+                               ),
+                       'pk' => array('id'),
+                       'fk' => array(),
+                       'ix' => array(),
+                       'uc' => array()
+               ),
+               'fm_location_exception_category' => array(
+                       'fd' => array(
+                               'id' => array('type' => 'auto', 'precision' => 
4, 'nullable' => False),
+                               'name' => array('type' => 'varchar', 
'precision' => 255, 'nullable' => False),
+                               'parent_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => true),
+                               ),
+                       'pk' => array('id'),
+                       'fk' => array(),
+                       'ix' => array(),
+                       'uc' => array()
+               ),
+               'fm_location_exception_category_text' => array(
+                       'fd' => array(
+                               'id' => array('type' => 'auto', 'precision' => 
4, 'nullable' => False),
+                               'category_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => False),
+                               'content' => array('type' => 'text', 'nullable' 
=> True),
+                               ),
+                       'pk' => array('id'),
+                       'fk' => array('fm_location_exception_category' => 
array('category_id' => 'id')),
+                       'ix' => array(),
+                       'uc' => array()
+               ),
+               'fm_location_exception' => array(
+                       'fd' => array(
+                               'id' => array('type' => 'auto', 'precision' => 
4, 'nullable' => False),
+                               'location_code' => array('type' => 'varchar', 
'precision' => 20, 'nullable' => False),
+                               'severity_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => False),
+                               'category_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => False),
+                               'descr' => array('type' => 'text', 'nullable' 
=> True),
+                               'start_date' => array('type' => 'int', 
'precision' => 8, 'nullable' => False),
+                               'end_date' => array('type' => 'int', 
'precision' => 8, 'nullable' => true),
+                               'reference' => array('type' => 'text', 
'nullable' => True),
+                               'user_id' => array('type' => 'int', 'precision' 
=> 4, 'nullable' => False),
+                               'entry_date' => array('type' => 'int', 
'precision' => 4, 'nullable' => False),
+                               'modified_date' => array('type' => 'int', 
'precision' => 4, 'nullable' => False)
+                       ),
+                       'pk' => array('id'),
+                       'fk' => array('fm_location_exception_severity' => 
array('severity_id' => 'id'),
+                               'fm_location_exception_category' => 
array('category_id' => 'id')),
+                       'ix' => array(),
+                       'uc' => array()
                )
        );
\ No newline at end of file

Modified: trunk/property/setup/tables_update.inc.php
===================================================================
--- trunk/property/setup/tables_update.inc.php  2017-08-28 09:18:11 UTC (rev 
17004)
+++ trunk/property/setup/tables_update.inc.php  2017-08-28 15:35:24 UTC (rev 
17005)
@@ -9648,3 +9648,82 @@
                        return $GLOBALS['setup_info']['property']['currentver'];
                }
        }
+
+       /**
+       * Update property version from 0.9.17.714 to 0.9.17.715
+       *
+       */
+       $test[] = '0.9.17.714';
+
+       function property_upgrade0_9_17_714()
+       {
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+               $GLOBALS['phpgw_setup']->oProc->CreateTable(
+                       'fm_location_exception_severity',  array(
+                       'fd' => array(
+                               'id' => array('type' => 'int', 'precision' => 
4, 'nullable' => False),
+                               'name' => array('type' => 'varchar', 
'precision' => 255, 'nullable' => False),
+                               ),
+                       'pk' => array('id'),
+                       'fk' => array(),
+                       'ix' => array(),
+                       'uc' => array()
+               ));
+
+               $GLOBALS['phpgw_setup']->oProc->CreateTable(
+               'fm_location_exception_category',  array(
+                       'fd' => array(
+                               'id' => array('type' => 'auto', 'precision' => 
4, 'nullable' => False),
+                               'name' => array('type' => 'varchar', 
'precision' => 255, 'nullable' => False),
+                               'parent_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => true),
+                               ),
+                       'pk' => array('id'),
+                       'fk' => array(),
+                       'ix' => array(),
+                       'uc' => array()
+               ));
+
+               $GLOBALS['phpgw_setup']->oProc->CreateTable(
+               'fm_location_exception_category_text',  array(
+                       'fd' => array(
+                               'id' => array('type' => 'auto', 'precision' => 
4, 'nullable' => False),
+                               'category_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => False),
+                               'content' => array('type' => 'text', 'nullable' 
=> True),
+                               ),
+                       'pk' => array('id'),
+                       'fk' => array('fm_location_exception_category' => 
array('category_id' => 'id')),
+                       'ix' => array(),
+                       'uc' => array()
+               ));
+
+               $GLOBALS['phpgw_setup']->oProc->CreateTable(
+               'fm_location_exception',  array(
+                       'fd' => array(
+                               'id' => array('type' => 'auto', 'precision' => 
4, 'nullable' => False),
+                               'location_code' => array('type' => 'varchar', 
'precision' => 20, 'nullable' => False),
+                               'severity_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => False),
+                               'category_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => False),
+                               'descr' => array('type' => 'text', 'nullable' 
=> True),
+                               'start_date' => array('type' => 'int', 
'precision' => 8, 'nullable' => False),
+                               'end_date' => array('type' => 'int', 
'precision' => 8, 'nullable' => true),
+                               'reference' => array('type' => 'text', 
'nullable' => True),
+                               'user_id' => array('type' => 'int', 'precision' 
=> 4, 'nullable' => False),
+                               'entry_date' => array('type' => 'int', 
'precision' => 4, 'nullable' => False),
+                               'modified_date' => array('type' => 'int', 
'precision' => 4, 'nullable' => False)
+                       ),
+                       'pk' => array('id'),
+                       'fk' => array('fm_location_exception_severity' => 
array('severity_id' => 'id'),
+                               'fm_location_exception_category' => 
array('category_id' => 'id')),
+                       'ix' => array(),
+                       'uc' => array()
+               ));
+
+               $GLOBALS['phpgw']->locations->add('.location.exception', 
'location exception', 'property');
+
+               if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+               {
+                       $GLOBALS['setup_info']['property']['currentver'] = 
'0.9.17.715';
+                       return $GLOBALS['setup_info']['property']['currentver'];
+               }
+       }

Modified: trunk/property/templates/base/generic.xsl
===================================================================
--- trunk/property/templates/base/generic.xsl   2017-08-28 09:18:11 UTC (rev 
17004)
+++ trunk/property/templates/base/generic.xsl   2017-08-28 15:35:24 UTC (rev 
17005)
@@ -113,12 +113,12 @@
                                                                </label>
                                                                <xsl:choose>
                                                                        
<xsl:when test="type='text' or type='html'">
-                                                                               
<textarea cols="{//textareacols}" rows="{//textarearows}" name="values[{name}]" 
id="{name}">
+                                                                               
<textarea cols="{//textareacols}" rows="{//textarearows}" name="values[{name}]" 
id="{name}" class="pure-input-1-2" >
                                                                                
        <xsl:value-of select="value"/>
                                                                                
</textarea>
                                                                        
</xsl:when>
                                                                        
<xsl:when test="type='varchar'">
-                                                                               
<input type="text" name="values[{name}]" value="{value}" size="{size}">
+                                                                               
<input type="text" name="values[{name}]" value="{value}" size="{size}" 
class="pure-input-1-2" >
                                                                                
        <xsl:attribute name="title">
                                                                                
                <xsl:value-of select="$descr"/>
                                                                                
        </xsl:attribute>
@@ -131,6 +131,39 @@
                                                                                
        </xsl:choose>
                                                                                
</input>
                                                                        
</xsl:when>
+                                                                       
<xsl:when test="type='date'">
+                                                                               
<input type="text" id="{name}"  name="values[{name}]" value="{value}" size="12" 
maxlength="12" readonly="readonly">
+                                                                               
        <xsl:attribute name="title">
+                                                                               
                <xsl:value-of select="$descr"/>
+                                                                               
        </xsl:attribute>
+                                                                               
        <xsl:choose>
+                                                                               
                <xsl:when test="nullable!='1'">
+                                                                               
                        <xsl:attribute name="data-validation">
+                                                                               
                                <xsl:text>required</xsl:text>
+                                                                               
                        </xsl:attribute>
+                                                                               
                </xsl:when>
+                                                                               
        </xsl:choose>
+                                                                               
</input>
+                                                                       
</xsl:when>
+
+                                                                       
<xsl:when test="type='location'">
+                                                                               
<input type="hidden" id="location_code" name="values[{name}]" value="{value}" />
+                                                                               
<input type="text"  id="location_name" name="location_name" value="{value}" 
class="pure-input-1-2" >
+                                                                               
        <xsl:attribute name="title">
+                                                                               
                <xsl:value-of select="$descr"/>
+                                                                               
        </xsl:attribute>
+                                                                               
        <xsl:choose>
+                                                                               
                <xsl:when test="nullable!='1'">
+                                                                               
                        <xsl:attribute name="data-validation">
+                                                                               
                                <xsl:text>required</xsl:text>
+                                                                               
                        </xsl:attribute>
+                                                                               
                </xsl:when>
+                                                                               
        </xsl:choose>
+                                                                               
</input>
+                                                                               
<div id="location_container"/>
+                                                                       
</xsl:when>
+
+
                                                                        
<xsl:when test="type='integer' or type='int'">
                                                                                
<input data-validation="number" type="text" name="values[{name}]" 
value="{value}" size="{size}">
                                                                                
        <xsl:attribute name="title">
@@ -178,7 +211,7 @@
                                                                                
</xsl:choose>
                                                                        
</xsl:when>
                                                                        
<xsl:when test="type='select'">
-                                                                               
<select name="values[{name}]">
+                                                                               
<select name="values[{name}]" class="pure-input-1-2" >
                                                                                
        <xsl:choose>
                                                                                
                <xsl:when test="nullable!='1'">
                                                                                
                        <xsl:attribute name="data-validation">
@@ -200,7 +233,7 @@
                                                                                
</select>
                                                                        
</xsl:when>
                                                                        
<xsl:when test="type='multiple_select'">
-                                                                               
<select name="values[{name}][]" multiple="multiple">
+                                                                               
<select name="values[{name}][]" multiple="multiple" class="pure-input-1-2" >
                                                                                
        <xsl:choose>
                                                                                
                <xsl:when test="nullable!='1'">
                                                                                
                        <xsl:attribute name="data-validation">
@@ -219,7 +252,7 @@
                                                                                
</select>
                                                                        
</xsl:when>
                                                                        
<xsl:when test="type='link'">
-                                                                               
<input type="text" name="values[{name}]" value="{value}" size="30">
+                                                                               
<input type="text" name="values[{name}]" value="{value}" size="30" 
class="pure-input-1-2" >
                                                                                
        <xsl:choose>
                                                                                
                <xsl:when test="disabled!=''">
                                                                                
                        <xsl:attribute name="disabled">
@@ -274,4 +307,10 @@
                <form name="cancel_form" id="cancel_form" 
action="{$cancel_url}" method="post">
                </form>
        </div>
+       <script type="text/javascript">
+               var oArgs = {menuaction: 'property.bolocation.get_locations'};
+               var strURL = phpGWLink('index.php', oArgs, true);
+               JqueryPortico.autocompleteHelper(strURL, 'location_name', 
'location_code', 'location_container');
+       </script>
+
 </xsl:template>




reply via email to

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