phpgroupware-cvs
[Top][All Lists]
Advanced

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

[Phpgroupware-cvs] property/class.sos_agreement.php, 1.1.2.2


From: nomail
Subject: [Phpgroupware-cvs] property/class.sos_agreement.php, 1.1.2.2
Date: Wed, 23 Jun 2004 22:09:31 +0200

Update of /property
Modified Files:
        Branch: proposal-branch
          class.sos_agreement.php

date: 2004/06/23 20:09:31;  author: sigurdne;  state: Exp;  lines: +22 -0

Log Message:
no message
=====================================================================
Index: property/class.sos_agreement.php
diff -u property/class.sos_agreement.php:1.1.2.1 
property/class.sos_agreement.php:1.1.2.2
--- property/class.sos_agreement.php:1.1.2.1    Sun Jun 20 09:04:46 2004
+++ property/class.sos_agreement.php    Wed Jun 23 20:09:31 2004
@@ -48,6 +48,21 @@
                        return $categories;
                }
 
+               function select_vendor_list()
+               {
+                       $table = 'fm_s_agreement';
+                       $dbresult = $GLOBALS['phpgw']->db->Execute("SELECT 
vendor_id,org_name FROM $table $this->join fm_vendor on 
fm_s_agreement.vendor_id=fm_vendor.id ORDER BY org_name ");
+
+                       $i = 0;
+                       while (!$dbresult->EOF)
+                       {
+                               $vendor[$i]['id']                               
= $dbresult->fields['vendor_id'];
+                               $vendor[$i]['name']                             
= stripslashes($dbresult->fields['org_name']);
+                               $i++;
+                               $dbresult->MoveNext();
+                       }
+                       return $vendor;
+               }
                function read($data)
                {
                        if(is_array($data))
@@ -58,6 +73,7 @@
                                $sort                   = 
(isset($data['sort'])?$data['sort']:'DESC');
                                $order                  = 
(isset($data['order'])?$data['order']:'');
                                $cat_id                 = 
(isset($data['cat_id'])?$data['cat_id']:'');
+                               $vendor_id              = 
(isset($data['vendor_id'])?$data['vendor_id']:'');
                                $allrows                = 
(isset($data['allrows'])?$data['allrows']:'');
                                $member_id              = 
(isset($data['member_id'])?$data['member_id']:0);
                                $s_agreement_id = 
(isset($data['s_agreement_id'])?$data['s_agreement_id']:'');
@@ -266,6 +282,12 @@
                                $where= 'AND';
                        }
 
+                       if ($vendor_id)
+                       {
+                               $filtermethod .= " $where 
$entity_table.vendor_id='$vendor_id' ";
+                               $where= 'AND';
+                       }
+
                        if ($member_id>0)
                        {
                                $filtermethod .= " $where 
$entity_table.member_of LIKE '%,$member_id,%' ";




reply via email to

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