[Fmsystem-commits] [12430] add new definition of notify-table

[Sigurd Nes]

Revision: 12430
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12430
Author:   sigurdne
Date:     2014-12-10 12:08:40 +0000 (Wed, 10 Dec 2014)
Log Message:
-----------
add new definition of notify-table

Modified Paths:
--------------
    branches/dev-syncromind/property/inc/class.uiproject.inc.php
    branches/dev-syncromind/property/inc/class.uiworkorder.inc.php

Modified: branches/dev-syncromind/property/inc/class.uiproject.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiproject.inc.php        
2014-12-10 10:42:16 UTC (rev 12429)
+++ branches/dev-syncromind/property/inc/class.uiproject.inc.php        
2014-12-10 12:08:40 UTC (rev 12430)
@@ -26,7 +26,7 @@
        * @subpackage project
        * @version $Id$
        */
-
+     phpgw::import_class('phpgwapi.uicommon_jquery');
        phpgw::import_class('phpgwapi.yui');
 
        /**
@@ -39,7 +39,7 @@
         * @package property
         */
 
-       class property_uiproject
+       class property_uiproject extends phpgwapi_uicommon_jquery
        {
                var $grants;
                var $cat_id;
@@ -58,6 +58,7 @@
 
                var $public_functions = array
                        (
+                               'query'                                         
        => true,
                                'download'                                      
        => true,
                                'index'                                         
        => true,
                                'view'                                          
        => true,
@@ -73,8 +74,10 @@
                                'check_missing_project_budget'  => true
                        );
 
-               function property_uiproject()
+               function __construct()
                {
+                       parent::__construct();
+
                //      $GLOBALS['phpgw_info']['flags']['nonavbar'] = true; // 
menus added where needed via bocommon::get_menu
                        $GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
                        $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
'property::project';
@@ -232,6 +235,7 @@
                        {
                                $datatable['menu']                              
        = $this->bocommon->get_menu();
 
+
                                $datatable['config']['base_url'] = 
$GLOBALS['phpgw']->link('/index.php', array
                                        (
                                                'menuaction'                    
=> 'property.uiproject.index',
@@ -972,6 +976,11 @@
                        $GLOBALS['phpgw']->js->validate_file( 'yahoo', 
'project.index', 'property' );
                }
 
+
+        public function query()
+        {
+        }
+ 
                function date_search()
                {
                        //cramirez: necesary for windows.open . Avoid error JS
@@ -2068,6 +2077,31 @@
                                $myButtons[3]   = $notify_info['buttons'];
                        }
 
+                       /*
+                       * start new notify-table
+                       * Sigurd: this one is for the new notify-table
+                       */
+
+                       $notify_info = 
execMethod('property.notify.get_jquery_table_def',array
+                                                               (
+                                                                       
'location_id'           => $location_id,
+                                                                       
'location_item_id'      => $id,
+                                                                       'count' 
                        => count($datatable_def),//3
+                                                                       
'requestUrl'            => json_encode(self::link(array('menuaction' => 
'property.notify.update_data', 'location_id'=>$location_id, 
'location_item_id'=>$id,'action' 
=>'refresh_notify_contact','phpgw_return_as'=>'json'))),
+                                                               )
+                                                       );
+
+                       $datatable_def[] = array
+                       (
+                               'container'             => 
'datatable-container_3',
+                               'requestUrl'    => 
json_encode(self::link(array('menuaction' => 'property.notify.update_data', 
'location_id'=>$location_id, 'location_item_id'=>$id,'action' 
=>'refresh_notify_contact','phpgw_return_as'=>'json'))),
+                               'ColumnDefs'    => 
$notify_info['column_defs']['values'],
+                               'data'                  => json_encode(array()),
+                               'tabletools'    => $mode == 'edit' ? 
$notify_info['tabletools'] : ''
+                       );
+                       
+                       /* end new notify-table */
+
                        $datavalues[4] = array
                                (
                                        'name'                                  
=> "4",

Modified: branches/dev-syncromind/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiworkorder.inc.php      
2014-12-10 10:42:16 UTC (rev 12429)
+++ branches/dev-syncromind/property/inc/class.uiworkorder.inc.php      
2014-12-10 12:08:40 UTC (rev 12430)
@@ -67,7 +67,7 @@
 
                function __construct()
                {
-                    parent::__construct();
+                       parent::__construct();
                     
                        $GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
                        $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
'property::project::workorder';
@@ -1637,8 +1637,31 @@
                                $myButtons[]    = $notify_info['buttons'];
                        }
 
+                       /*
+                       * start new notify-table
+                       * Sigurd: this one is for the new notify-table
+                       */
 
+                       $notify_info = 
execMethod('property.notify.get_jquery_table_def',array
+                                                               (
+                                                                       
'location_id'           => $location_id,
+                                                                       
'location_item_id'      => $id,
+                                                                       'count' 
                        => count($datatable_def),//3
+                                                                       
'requestUrl'            => json_encode(self::link(array('menuaction' => 
'property.notify.update_data', 'location_id'=>$location_id, 
'location_item_id'=>$id,'action' 
=>'refresh_notify_contact','phpgw_return_as'=>'json'))),
+                                                               )
+                                                       );
 
+                       $datatable_def[] = array
+                       (
+                               'container'             => 
'datatable-container_3',
+                               'requestUrl'    => 
json_encode(self::link(array('menuaction' => 'property.notify.update_data', 
'location_id'=>$location_id, 'location_item_id'=>$id,'action' 
=>'refresh_notify_contact','phpgw_return_as'=>'json'))),
+                               'ColumnDefs'    => 
$notify_info['column_defs']['values'],
+                               'data'                  => json_encode(array()),
+                               'tabletools'    => $mode == 'edit' ? 
$notify_info['tabletools'] : ''
+                       );
+                       
+                       /* end new notify-table */
+
                        $myColumnDefs[] = array
                                (
                                        'name'          => "4",