[Fmsystem-commits] [8930] property: service agreement

[Sigurd Nes]

Revision: 8930
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8930
Author:   sigurdne
Date:     2012-02-20 10:19:21 +0000 (Mon, 20 Feb 2012)
Log Message:
-----------
property: service agreement

Modified Paths:
--------------
    trunk/property/inc/class.sos_agreement.inc.php
    trunk/property/inc/class.uis_agreement.inc.php
    trunk/property/js/yahoo/uisagreement.index.js

Modified: trunk/property/inc/class.sos_agreement.inc.php
===================================================================
--- trunk/property/inc/class.sos_agreement.inc.php      2012-02-20 09:16:13 UTC 
(rev 8929)
+++ trunk/property/inc/class.sos_agreement.inc.php      2012-02-20 10:19:21 UTC 
(rev 8930)
@@ -150,6 +150,7 @@
                        }
                        else
                        {
+                               $query = '';
                                $allrows=true;
                                $entity_table = 'fm_s_agreement_detail';
                                $location_id = 
$GLOBALS['phpgw']->locations->get_id('property', '.s_agreement.detail'); 
@@ -400,6 +401,7 @@
                                        }
 
                                        $query_arr[]= "location_code 
{$this->like} '$query%'";
+                                       $query_arr[]= "org_name {$this->like} 
'%$query%'";
 
                                        if (isset($query_arr[0]))
                                        {

Modified: trunk/property/inc/class.uis_agreement.inc.php
===================================================================
--- trunk/property/inc/class.uis_agreement.inc.php      2012-02-20 09:16:13 UTC 
(rev 8929)
+++ trunk/property/inc/class.uis_agreement.inc.php      2012-02-20 10:19:21 UTC 
(rev 8930)
@@ -198,17 +198,18 @@
                                                '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}',"
+                                       ."vendor_id: '{$this->vendor_id}',"
+                                       ."status_id: '{$this->status_id}',"
                                        ."filter:'{$this->filter}',"
                                        ."query:'{$this->query}',"
                                        ."p_num: '{$this->p_num}',"
                                        ."role:'{$this->role}',"
                                        ."member_id:'{$this->member_id}'";
-*/
+
                                $datatable['config']['allow_allrows'] = true;
 
                                $link_data = array

Modified: trunk/property/js/yahoo/uisagreement.index.js
===================================================================
--- trunk/property/js/yahoo/uisagreement.index.js       2012-02-20 09:16:13 UTC 
(rev 8929)
+++ trunk/property/js/yahoo/uisagreement.index.js       2012-02-20 10:19:21 UTC 
(rev 8930)
@@ -42,6 +42,29 @@
        {
                if(flag_particular_setting=='init')
                {
+                       //category
+                       index = 
locate_in_array_options(0,"value",path_values.member_id);
+                       if(index)
+                       {
+                               oMenuButton_0.set("label", ("<em>" + 
array_options[0][index][1] + "</em>"));
+                       }
+                       index = 
locate_in_array_options(1,"value",path_values.cat_id);
+                       if(index)
+                       {
+                               oMenuButton_1.set("label", ("<em>" + 
array_options[1][index][1] + "</em>"));
+                       }
+                       index = 
locate_in_array_options(2,"value",path_values.vendor_id);
+console.log(index);
+                       if(index)
+                       {
+                               oMenuButton_2.set("label", ("<em>" + 
array_options[2][index][1] + "</em>"));
+                       }
+                       index = 
locate_in_array_options(3,"value",path_values.status_id);
+console.log(path_values);
+                       if(index)
+                       {
+                               oMenuButton_3.set("label", ("<em>" + 
array_options[3][index][1] + "</em>"));
+                       }
                        //focus initial
                        oMenuButton_0.focus();
                }