fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [7498] Merge 7495:7497 from trunk


From: Sigurd Nes
Subject: [Fmsystem-commits] [7498] Merge 7495:7497 from trunk
Date: Fri, 12 Aug 2011 08:52:29 +0000

Revision: 7498
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7498
Author:   sigurdne
Date:     2011-08-12 08:52:29 +0000 (Fri, 12 Aug 2011)
Log Message:
-----------
Merge 7495:7497 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/property/inc/class.bos_agreement.inc.php
    branches/Version-1_0-branch/property/inc/class.sos_agreement.inc.php
    branches/Version-1_0-branch/property/inc/class.uis_agreement.inc.php
    branches/Version-1_0-branch/property/js/yahoo/uisagreement.index.js

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497

Modified: branches/Version-1_0-branch/property/inc/class.bos_agreement.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bos_agreement.inc.php        
2011-08-12 08:48:52 UTC (rev 7497)
+++ branches/Version-1_0-branch/property/inc/class.bos_agreement.inc.php        
2011-08-12 08:52:29 UTC (rev 7498)
@@ -82,21 +82,24 @@
                        $allrows                        = 
phpgw::get_var('allrows', 'bool');
                        $role                           = 
phpgw::get_var('role');
                        $member_id                      = 
phpgw::get_var('member_id', 'int');
+                       $status_id      = phpgw::get_var('status_id', 'int');
 
                        $this->p_num            = phpgw::get_var('p_num');
 
                        $this->role                     = $role;
                        $this->so->role         = $role;
 
-                       $this->start            = $start ? $start : 0;
-                       $this->query            = isset($query) ? $query : 
$this->query;
-                       $this->sort                     = isset($sort) && $sort 
? $sort : '';
-                       $this->order            = isset($order) && $order ? 
$order : '';
-                       $this->filter           = isset($filter) && $filter ? 
$filter : '';
-                       $this->cat_id           = isset($cat_id) && $cat_id ? 
$cat_id : '';
-                       $this->member_id        = isset($member_id) && 
$member_id ? $member_id : '';
-                       $this->vendor_id        = isset($vendor_id) && 
$vendor_id ? $vendor_id : '';
-                       $this->allrows          = isset($allrows) && $allrows ? 
$allrows : '';
+                       $this->status_id                = 
isset($_REQUEST['status_id']) ? $status_id    : $this->status_id;
+                       $this->start                    = 
isset($_REQUEST['start'])     ? $start                : $this->start;
+                       $this->order                    = 
isset($_REQUEST['order'])     ? $order                : $this->order;
+                       $this->sort                             = 
isset($_REQUEST['sort'])              ? $sort                 : $this->sort;
+                       $this->query                    = 
isset($_REQUEST['query'])     ? $query                : $this->query;
+                       $this->vendor_id                = 
isset($_REQUEST['vendor_id']) ? $vendor_id    : $this->vendor_id;
+                       $this->member_id                = 
isset($_REQUEST['member_id']) ? $member_id    : $this->member_id;
+                       $this->cat_id                   = 
isset($_REQUEST['cat_id'])    ? $cat_id               : $this->cat_id;
+
+                       $this->filter                   = $filter ? $filter : 
'';
+                       $this->allrows                  = $allrows ? $allrows : 
'';
                }
 
                function save_sessiondata($data)
@@ -121,7 +124,7 @@
                        $this->cat_id   = isset($data['cat_id']) ? 
$data['cat_id'] : '';
                        $this->vendor_id= isset($data['vendor_id']) ? 
$data['vendor_id'] : '';
                        $this->member_id= isset($data['member_id']) ? 
$data['member_id'] : '';
-                       $this->allrows  = isset($data['allrows']) ? 
$data['allrows'] : '';
+                       $this->status_id= $data['status_id'];
                }
 
                function check_perms($has, $needed)
@@ -147,27 +150,54 @@
                        return $vendor_list;
                }
 
+               //FIXME
+               function select_status_list($format='',$selected='')
+               {
+                       $status_list = array();
+                       $attrib_data = $this->custom->find('property', 
'.s_agreement', 0, '', 'ASC', 'attrib_sort', true, true);
+                       foreach ( $attrib_data as $attrib )
+                       {
+                               if($attrib['datatype'] == 'LB' && 
$attrib['column_name'] == 'status')
+                               {
+                                       foreach($attrib['choice'] as $choice)
+                                       {
+                                               $status_list[]  = array
+                                               (
+                                                       'id'    => 
$choice['id'],
+                                                       'name'  => 
htmlspecialchars($choice['value'], ENT_QUOTES, 'UTF-8'),
+                                               );
+                                       }
+                               }
+                       }
+                       return $status_list;
+               }
+
                function read()
                {
-                       $s_agreement = $this->so->read(array('start' => 
$this->start,'query' => $this->query,'sort' => $this->sort,'order' => 
$this->order,
+                       $s_agreements = $this->so->read(array('start' => 
$this->start,'query' => $this->query,'sort' => $this->sort,'order' => 
$this->order,
                                'filter' => $this->filter,'cat_id' => 
$this->cat_id,'allrows'=>$this->allrows,'member_id'=>$this->member_id,
-                               'vendor_id'=>$this->vendor_id, 'p_num' => 
$this->p_num));
+                               'vendor_id'=>$this->vendor_id, 'p_num' => 
$this->p_num, 'status_id'=>$this->status_id));
                        $this->total_records = $this->so->total_records;
 
                        $this->uicols   = $this->so->uicols;
 
-                       for ($i=0; $i<count($s_agreement); $i++)
+                       foreach ($s_agreements as &$s_agreement)
                        {
-                               if($s_agreement[$i]['start_date'])
+                               if($s_agreement['start_date'])
                                {
-                                       $s_agreement[$i]['start_date']  = 
$GLOBALS['phpgw']->common->show_date($s_agreement[$i]['start_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+                                       $s_agreement['start_date']  = 
$GLOBALS['phpgw']->common->show_date($s_agreement['start_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
                                }
-                               if($s_agreement[$i]['end_date'])
+                               if($s_agreement['termination_date'])
                                {
-                                       $s_agreement[$i]['end_date']  = 
$GLOBALS['phpgw']->common->show_date($s_agreement[$i]['end_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+                                       $s_agreement['termination_date']  = 
$GLOBALS['phpgw']->common->show_date($s_agreement['termination_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
                                }
+
+                               if($s_agreement['end_date'])
+                               {
+                                       $s_agreement['end_date']  = 
$GLOBALS['phpgw']->common->show_date($s_agreement['end_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+                               }
                        }
-                       return $s_agreement;
+                       return $s_agreements;
                }
 
                function read_details($id)

Modified: branches/Version-1_0-branch/property/inc/class.sos_agreement.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sos_agreement.inc.php        
2011-08-12 08:48:52 UTC (rev 7497)
+++ branches/Version-1_0-branch/property/inc/class.sos_agreement.inc.php        
2011-08-12 08:52:29 UTC (rev 7498)
@@ -82,6 +82,7 @@
                                $s_agreement_id = 
isset($data['s_agreement_id'])?$data['s_agreement_id']:'';
                                $detail                 = 
isset($data['detail'])?$data['detail']:'';
                                $p_num                  = isset($data['p_num']) 
? $data['p_num'] : '';
+                               $status_id              = 
isset($data['status_id']) && $data['status_id'] ? (int)$data['status_id']:0;
                        }
 
                        $choice_table = 'phpgw_cust_choice';
@@ -133,6 +134,13 @@
                                $uicols['descr'][]                      = 
lang('start');
                                $uicols['statustext'][]         = lang('start 
date');
 
+                               $cols_return[]                          = 
'termination_date';
+                               $uicols['input_type'][]         = 'text';
+                               $uicols['name'][]                       = 
'termination_date';
+                               $uicols['descr'][]                      = 
lang('termination date');
+                               $uicols['statustext'][]         = 
lang('termination date');
+       //                      $uicols['datatype'][]           = 'D';
+
                                $cols_return[]                          = 
'end_date';
                                $uicols['input_type'][]         = 'text';
                                $uicols['name'][]                       = 
'end_date';
@@ -274,23 +282,27 @@
                                return;
                        }
 
-                       //_debug_array($cols_return_extra);
                        if ($order)
                        {
-                               if ($order=='id')
+                               switch ($order)
                                {
-                                       $ordermethod = " order by 
$entity_table.$order $sort";
+                                       case 'id':
+                                       case 'status':
+                                               $ordermethod = " ORDER BY 
{$entity_table}.{$order} {$sort}";
+                                               break;
+                                       case 'category':
+                                               $ordermethod = " ORDER BY 
{$category_table}.descr {$sort}";                                     
+                                               break;
+                                       default:
+                                               $ordermethod = " ORDER BY 
{$order} {$sort}";
                                }
-                               else
-                               {
-                                       $ordermethod = " order by $order $sort";
-                               }
                        }
                        else
                        {
-                               $ordermethod = " order by $entity_table.id 
DESC";
+                               $ordermethod = " ORDER BY {$entity_table}.id 
DESC";
                        }
 
+
                        $filtermethod = '';
                        $where= 'WHERE';
 
@@ -340,13 +352,13 @@
                                $where= 'AND';
                        }
 
-/*                     if ($status)
+                       if (!$detail && $status_id)
                        {
-                               $filtermethod .= " $where 
$entity_table.status='$status' ";
+                               $filtermethod .= " $where 
$entity_table.status='$status_id' ";
                                $where= 'AND';
                        }
- */
 
+
                        $querymethod = '';
                        if($query)
                        {
@@ -405,6 +417,7 @@
 
                        $contacts                       = 
CreateObject('phpgwapi.contacts');
 
+                       $s_agreement_list = array();
                        while ($this->db->next_record())
                        {
                                for ($i=0;$i<$n;$i++)

Modified: branches/Version-1_0-branch/property/inc/class.uis_agreement.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uis_agreement.inc.php        
2011-08-12 08:48:52 UTC (rev 7497)
+++ branches/Version-1_0-branch/property/inc/class.uis_agreement.inc.php        
2011-08-12 08:52:29 UTC (rev 7498)
@@ -90,6 +90,7 @@
                        $this->allrows                          = 
$this->bo->allrows;
                        $this->member_id                        = 
$this->bo->member_id;
                        $this->p_num                            = 
$this->bo->p_num;
+                       $this->status_id                        = 
$this->bo->status_id;
                }
 
                function save_sessiondata()
@@ -104,7 +105,8 @@
                                        'cat_id'        => $this->cat_id,
                                        'vendor_id'     => $this->vendor_id,
                                        'allrows'       => $this->allrows,
-                                       'member_id'     => $this->member_id
+                                       'member_id'     => $this->member_id,
+                                       'status_id'     => $this->status_id
                                );
                        $this->bo->save_sessiondata($data);
                }
@@ -177,6 +179,7 @@
                        
$GLOBALS['phpgw']->session->appsession('session_data','s_agreement_receipt','');
 
                        $datatable = array();
+                       $this->save_sessiondata();
 
                        if( phpgw::get_var('phpgw_return_as') != 'json' )
                        {
@@ -191,10 +194,12 @@
                                                'query'         =>$this->query,
                                                'role'          => $this->role,
                                                'member_id'     => 
$this->member_id,
-                                               'p_num'         => $this->p_num
+                                               'p_num'         => $this->p_num,
+                                               'status_id'             => 
$this->status_id
                                        ));
 
-                               $datatable['config']['base_java_url'] = 
"menuaction:'property.uis_agreement.index',"
+                               $datatable['config']['base_java_url'] = 
"menuaction:'property.uis_agreement.index'";
+/*
                                        ."sort:'{$this->sort}',"
                                        ."order:'{$this->order}',"
                                        ."cat_id: '{$this->cat_id}',"
@@ -203,7 +208,7 @@
                                        ."p_num: '{$this->p_num}',"
                                        ."role:'{$this->role}',"
                                        ."member_id:'{$this->member_id}'";
-
+*/
                                $datatable['config']['allow_allrows'] = true;
 
                                $link_data = array
@@ -215,7 +220,8 @@
                                                'filter'        =>$this->filter,
                                                'query'         =>$this->query,
                                                'role'          => $this->role,
-                                               'member_id'     => 
$this->member_id
+                                               'member_id'     => 
$this->member_id,
+                                               'status_id'     => 
$this->status_id
 
                                        );
 
@@ -231,6 +237,10 @@
                                $default_value = array 
('id'=>'','name'=>lang('no vendor'));
                                array_unshift 
($values_combo_box[2],$default_value);
 
+                               $values_combo_box[3]  = 
$this->bo->select_status_list('filter',$this->status_id);
+                               $default_value = array 
('id'=>'','name'=>lang('no status'));
+                               array_unshift 
($values_combo_box[3],$default_value);
+
                                $datatable['actions']['form'] = array
                                        (
                                                array
@@ -245,7 +255,8 @@
                                                                'filter'        
=>$this->filter,
                                                                'query'         
=>$this->query,
                                                                'role'          
=> $this->role,
-                                                               'member_id'     
=> $this->member_id
+                                                               'member_id'     
=> $this->member_id,
+                                                               'status_id'     
=> $this->status_id
                                                        )
                                                ),
                                                'fields'        => array
@@ -280,6 +291,15 @@
                                                                        
'tab_index' => 3
                                                                ),
                                                                array
+                                                               ( //boton       
STATUS
+                                                                       'id' => 
'btn_status_id',
+                                                                       'name' 
=> 'status_id',
+                                                                       'value' 
=> lang('status'),
+                                                                       'type' 
=> 'button',
+                                                                       'style' 
=> 'filter',
+                                                                       
'tab_index' => 4
+                                                               ),
+                                                               array
                                                                (
                                                                        'type'  
=> 'button',
                                                                        'id'    
=> 'btn_new',
@@ -316,6 +336,13 @@
                                                                        
))."','','width=300,height=600,scrollbars=1')",
                                                                        'value' 
=> lang('columns'),
                                                                        
'tab_index' => 9
+                                                               ),
+                                                               array
+                                                               (
+                                                                       'type'  
=> 'button',
+                                                                       'id'    
=> 'btn_export',
+                                                                       'value' 
=> lang('download'),
+                                                                       
'tab_index' => 10
                                                                )
                                                        ),
                                                        'hidden_value' => array
@@ -334,6 +361,11 @@
                                                                ( //div values  
combo_box_2
                                                                        'id' => 
'values_combo_box_2',
                                                                        'value' 
=> $this->bocommon->select2String($values_combo_box[2])
+                                                               ),
+                                                               array
+                                                               ( //div values  
combo_box_3
+                                                                       'id' => 
'values_combo_box_3',
+                                                                       'value' 
=> $this->bocommon->select2String($values_combo_box[3])
                                                                )
                                                        )
                                                )
@@ -485,17 +517,18 @@
                                        
$datatable['headers']['header'][$i]['text']                     = 
$uicols['descr'][$i];
                                        
$datatable['headers']['header'][$i]['visible']                  = true;
                                        
$datatable['headers']['header'][$i]['sortable']                 = false;
-                                       if($uicols['name'][$i]=='id' || 
$uicols['name'][$i]=='name' || $uicols['name'][$i]=='org_name' || 
$uicols['name'][$i]=='category' || $uicols['name'][$i]=='start_date' || 
$uicols['name'][$i]=='end_date' || $uicols['name'][$i]=='status')
+                                       if($uicols['name'][$i]=='id' || 
$uicols['name'][$i]=='name' || $uicols['name'][$i]=='org_name' || 
$uicols['name'][$i]=='category' || $uicols['name'][$i]=='start_date' || 
$uicols['name'][$i]=='end_date' || $uicols['name'][$i]=='status' || 
$uicols['name'][$i]=='termination_date')
                                        {
                                                
$datatable['headers']['header'][$i]['sortable']         = true;
                                                
$datatable['headers']['header'][$i]['sort_field']       = $uicols['name'][$i];
                                        }
-
+/*
                                        if($uicols['name'][$i]=='category')
                                        {
                                                
$datatable['headers']['header'][$i]['sortable']         = true;
                                                
$datatable['headers']['header'][$i]['sort_field']       = 'org_name';
                                        }
+*/
                                }
                        }
 
@@ -1590,7 +1623,14 @@
                                return;
                        }
                        $id     = phpgw::get_var('id', 'int');
-                       $list = $this->bo->read_details($id);
+                       if($id)
+                       {
+                               $list = $this->bo->read_details($id);
+                       }
+                       else
+                       {
+                               $list = $this->bo->read($id);
+                       }
                        $uicols         = $this->bo->uicols;
                        
$this->bocommon->download($list,$uicols['name'],$uicols['descr'],$uicols['input_type']);
                }

Modified: branches/Version-1_0-branch/property/js/yahoo/uisagreement.index.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/uisagreement.index.js 
2011-08-12 08:48:52 UTC (rev 7497)
+++ branches/Version-1_0-branch/property/js/yahoo/uisagreement.index.js 
2011-08-12 08:52:29 UTC (rev 7498)
@@ -1,76 +1,78 @@
-//--------------------------------------------------------
-// Declaration of location.index vars
-//--------------------------------------------------------
-       //define SelectButton
-       var oMenuButton_0, oMenuButton_1, oMenuButton_2;
-       var selectsButtons = [
-       {order:0, 
var_URL:'member_id',name:'btn_member_id',style:'categorybutton',dependiente:''},
-       {order:1, 
var_URL:'cat_id',name:'btn_cat_id',style:'districtbutton',dependiente:''},
-       {order:2, 
var_URL:'vendor_id',name:'btn_vendor_id',style:'partOFTownbutton',dependiente:''}
-       ];
-
-       // define buttons
-       var oNormalButton_0, oNormalButton_1;
-       var normalButtons = [
-       {order:0, name:'btn_search', funct:"onSearchClick"},
-       {order:1, name:'btn_new', funct:"onNewClick"}
-       ];
-
-       // define Text buttons
-       var textImput = [
-               {order:0, name:'query',id:'txt_query'}
-       ];
-
-       var toolTips =
-       [
-       ]
-
-       var linktoolTips =
-       [
-               {name:'btn_columns', title:'Columns', description:'Choose 
columns'}
-       ]
-
-       // define the hidden column in datatable
-       var config_values =
-       {
-               date_search : 0 //if search has link "Data search"
-       }
-
-       this.particular_setting = function()
-       {
-               if(flag_particular_setting=='init')
-               {
-                       //focus initial
-                       oMenuButton_0.focus();
-               }
-               else if(flag_particular_setting=='update')
-               {
-               }
-       }
-
-/****************************************************************************************/
-
-       this.myParticularRenderEvent = function()
-       {
-               //don't delete it
-       }
-
-
-//----------------------------------------------------------
-       YAHOO.util.Event.addListener(window, "load", function()
-       {
-               
YAHOO.util.Dom.getElementsByClassName('toolbar','div')[0].style.display = 
'none';
-
-               var loader = new YAHOO.util.YUILoader();
-               loader.addModule({
-                       name: "anyone", //module name; must be unique
-                       type: "js", //can be "js" or "css"
-                   fullpath: property_js //'property_js' have the path for 
property.js, is render in HTML
-                   });
-
-               loader.require("anyone");
-
-               //Insert JSON utility on the page
-
-           loader.insert();
-       });
+//--------------------------------------------------------
+// Declaration of location.index vars
+//--------------------------------------------------------
+       //define SelectButton
+       var oMenuButton_0, oMenuButton_1, oMenuButton_2, oMenuButton_3;
+       var selectsButtons = [
+       {order:0, 
var_URL:'member_id',name:'btn_member_id',style:'categorybutton',dependiente:''},
+       {order:1, 
var_URL:'cat_id',name:'btn_cat_id',style:'districtbutton',dependiente:''},
+       {order:2, 
var_URL:'vendor_id',name:'btn_vendor_id',style:'partOFTownbutton',dependiente:''},
+       {order:3, 
var_URL:'status_id',name:'btn_status_id',style:'partOFTownbutton',dependiente:''}
+       ];
+
+       // define buttons
+       var oNormalButton_0, oNormalButton_1, oNormalButton_2;
+       var normalButtons = [
+       {order:0, name:'btn_search', funct:"onSearchClick"},
+       {order:1, name:'btn_new', funct:"onNewClick"},
+       {order:2, name:'btn_export', funct:"onDownloadClick"}
+       ];
+
+       // define Text buttons
+       var textImput = [
+               {order:0, name:'query',id:'txt_query'}
+       ];
+
+       var toolTips =
+       [
+       ]
+
+       var linktoolTips =
+       [
+               {name:'btn_columns', title:'Columns', description:'Choose 
columns'}
+       ]
+
+       // define the hidden column in datatable
+       var config_values =
+       {
+               date_search : 0 //if search has link "Data search"
+       }
+
+       this.particular_setting = function()
+       {
+               if(flag_particular_setting=='init')
+               {
+                       //focus initial
+                       oMenuButton_0.focus();
+               }
+               else if(flag_particular_setting=='update')
+               {
+               }
+       }
+
+/****************************************************************************************/
+
+       this.myParticularRenderEvent = function()
+       {
+               //don't delete it
+       }
+
+
+//----------------------------------------------------------
+       YAHOO.util.Event.addListener(window, "load", function()
+       {
+               
YAHOO.util.Dom.getElementsByClassName('toolbar','div')[0].style.display = 
'none';
+
+               var loader = new YAHOO.util.YUILoader();
+               loader.addModule({
+                       name: "anyone", //module name; must be unique
+                       type: "js", //can be "js" or "css"
+                   fullpath: property_js //'property_js' have the path for 
property.js, is render in HTML
+                   });
+
+               loader.require("anyone");
+
+               //Insert JSON utility on the page
+
+           loader.insert();
+       });




reply via email to

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