[Fmsystem-commits] [16752]

[nelson . guerra]

Revision: 16752
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16752
Author:   nelson224
Date:     2017-05-19 00:21:05 -0400 (Fri, 19 May 2017)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind-2/property/inc/class.uireport.inc.php

Modified: branches/dev-syncromind-2/property/inc/class.uireport.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uireport.inc.php       
2017-05-18 12:31:54 UTC (rev 16751)
+++ branches/dev-syncromind-2/property/inc/class.uireport.inc.php       
2017-05-19 04:21:05 UTC (rev 16752)
@@ -47,6 +47,7 @@
                        'save_dataset' => true,
                        'delete_dataset' => true,
                        'get_column_preview' => true,
+                       'get_operators' => true,
                        'preview' => true,
                        'download' => true
                );
@@ -59,6 +60,24 @@
                        $this->bo = CreateObject('property.boreport', true);
                        $this->bocommon = & $this->bo->bocommon;
                        $this->acl = & $GLOBALS['phpgw']->acl;                  
+                       $this->operators = array(
+                               'equal' => '=', 
+                               'different' => '!=', 
+                               'less' => '<', 
+                               'less_equal' => '<=', 
+                               'higher' => '>', 
+                               'higher_equal' => '>=', 
+                               'between' => 'BETWEEN', 
+                               'like' => 'LIKE', 
+                               'not_like' => 'NOT LIKE', 
+                               'ilike' => 'ILIKE', 
+                               'not_ilike' => 'NOT ILIKE', 
+                               'in' => 'IN', 
+                               'not_in' => 'NOT IN', 
+                               'not_between' => 'NOT BETWEEN', 
+                               'is_null' => 'IS NULL', 
+                               'is_not_null' => 'IS NOT NULL'
+                       );
                }
 
                public function download()
@@ -334,6 +353,7 @@
                                'cancel_action' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uireport.index')),
                                'datasets' => array('options' => $list),
                                'report_definition' => 
$values['report_definition'],
+                               'operators' => json_encode($this->operators),
                                'report_id' => $values['id'],
                                'report_name' => $values['report_name'],
                                'msgbox_data' => 
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
@@ -360,7 +380,7 @@
                        $order_by = phpgw::get_var('order');
                        $aggregate = phpgw::get_var('aggregate');
                        $cbo_aggregate = phpgw::get_var('cbo_aggregate');
-       
+
                        $group = array($group_by => $group_by);
                        $order = array($order_by => $order_by);
                        
@@ -742,4 +762,27 @@
                        
                }
                
+               public function get_operators()
+               {
+                       $operators = array(
+                               'equal' => '=', 
+                               'different' => '!=', 
+                               'less' => '<', 
+                               'less_equal' => '<=', 
+                               'higher' => '>', 
+                               'higher_equal' => '>=', 
+                               'between' => 'BETWEEN', 
+                               'like' => 'LIKE', 
+                               'not_like' => 'NOT LIKE', 
+                               'ilike' => 'ILIKE', 
+                               'not_ilike' => 'NOT ILIKE', 
+                               'in' => 'IN', 
+                               'not_in' => 'NOT IN', 
+                               'not_between' => 'NOT BETWEEN', 
+                               'is_null' => 'IS NULL', 
+                               'is_not_null' => 'IS NOT NULL'
+                       );
+                       
+                       return $operators;
+               }
        }
\ No newline at end of file