[Fmsystem-commits] [14343]

[Nelson Guerra]

Revision: 14343
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14343
Author:   nelson224
Date:     2015-11-13 00:12:59 +0000 (Fri, 13 Nov 2015)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/frontend/inc/class.uicontract_documents.inc.php

Modified: 
branches/dev-syncromind/frontend/inc/class.uicontract_documents.inc.php
===================================================================
--- branches/dev-syncromind/frontend/inc/class.uicontract_documents.inc.php     
2015-11-13 00:12:25 UTC (rev 14342)
+++ branches/dev-syncromind/frontend/inc/class.uicontract_documents.inc.php     
2015-11-13 00:12:59 UTC (rev 14343)
@@ -47,9 +47,11 @@
                {
                    $this->contract_state_identifier_doc = "contract_state_in";
                    $this->contracts_per_location_identifier_doc = 
"contracts_in_per_location";
-                   $this->form_url_doc = 
"index.php?menuaction=frontend.uicontract_documents.index";
+                       $this->location_id                      = 
phpgw::get_var('location_id', 'int', 'REQUEST', 0);
+                   $this->form_url_doc = 
$GLOBALS['phpgw']->link('/',array('menuaction' => 
'frontend.uicontract_documents.index', 'location_id' => $this->location_id));
                        
phpgwapi_cache::session_set('frontend','tab',$GLOBALS['phpgw']->locations->get_id('frontend','.document.contracts'));
                        parent::__construct();
+                       
                        $this->location_code = 
$this->header_state['selected_location'];
 //                     $this->location_code = '1102-01';
                }
@@ -87,7 +89,7 @@
                $contracts_per_location_all = 
phpgwapi_cache::session_get('frontend', 
$this->contracts_per_location_identifier_doc);
                $contracts_for_selection = array();
                $number_of_valid_contracts = 0;
-                $contracts_per_location = 
$contracts_per_location_all[$org_unit];
+            $contracts_per_location = $contracts_per_location_all[$org_unit];
                
foreach($contracts_per_location[$this->header_state['selected_location']] as 
$contract)
                {
                        if(     ($this->contract_filter_doc == 'active' && 
$contract->is_active()) ||
@@ -169,64 +171,35 @@
                                        );      
                                }
                        }
-                       $datavalues[0] = array
-                       (
-                               'name'                                  => "0",
-                               'values'                                => 
json_encode($content),
-                               'total_records'                 => 
count($content),
-                               'edit_action'                   => 
isset($entry) && $entry->get_id() ? 
json_encode($GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'rental.uidocument.view', 'id' => $entry->get_id()))):'' ,
-                               'is_paginator'                  => 1,
-                               'footer'                                => 0
+                       
+                       $datatable_def[] = array
+                               (
+                               'container'      => 'datatable-container_0',
+                               'requestUrl' => "''",
+                               'ColumnDefs' => 
array(array('key'=>'document_name', 'label'=>lang('filename'), 
'sortable'=>true, 'formatter'=>'JqueryPortico.formatLink'),
+                                                                               
        array('key'=>'document_id', 'label'=>lang('filename'), 
'sortable'=>false, 'hidden'=>true),
+                                                                               
        array('key'=>'title', 'label'=>lang('name'),'sortable'=>true),
+                                                                               
        array('key'=>'description', 'label'=>lang('description'), 
'sortable'=>true),
+                                                                               
        array('key'=>'doc_type', 'label'=>'Type', 'sortable'=>true)),
+                               'data'           => json_encode($content)       
                        
                        );
 
-
-                       $myColumnDefs[0] = array
-                       (
-                               'name'          => "0",
-                               'values'        =>      json_encode(array(      
array('key' => 
'document_name','label'=>lang('filename'),'sortable'=>true,'resizeable'=>true,'formatter'=>'YAHOO.widget.DataTable.formatLink'),
-                                                                               
                        array('key' => 
'document_id','label'=>lang('filename'),'sortable'=>false,'hidden' => true),
-                                                                               
                        array('key' => 
'title','label'=>lang('name'),'sortable'=>true,'resizeable'=>true),
-                                                                               
                        array('key' => 
'description','label'=>lang('description'),'sortable'=>true,'resizeable'=>true),
-                                                                               
                        array('key' => 
'doc_type','label'=>'Type','sortable'=>true,'resizeable'=>true)
-                                                                               
                        ))
-                       );
-
-                       
//----------------------------------------------datatable settings--------
-
-
-                       $datatable = array
-                       (
-                               'property_js'                   => 
json_encode($GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property2.js"),
-                               'datatable'                             => 
$datavalues,
-                               'myColumnDefs'                  => $myColumnDefs
-                       );
-
                        $data = array
                        (
                                'header'                                => 
$this->header_state,
-                               'tabs'                                  => 
$this->tabs,
                        'contract_data' =>      array (
-                               'select' => $contracts_for_selection, 
-                               'selected_contract' =>  
$this->contract_state_doc['selected'], 
-                               'contract'      => 
isset($this->contract_state_doc['contract']) ? 
$this->contract_state_doc['contract']->serialize() : array(),
-                               'contract_filter' => $this->contract_filter_doc,
-                               'form_url' => $this->form_url_doc
-                           ),
-                               'documents'                             => 
array('datatable' => $datatable)
+                                       'datatable_def'                 => 
$datatable_def, 
+                                       'tabs'                                  
=> $this->tabs, 
+                                       'location_id'                   => 
$this->location_id,
+                               'select'                                => 
$contracts_for_selection, 
+                               'selected_contract'             => 
$this->contract_state_doc['selected'],
+                               'contract'                              => 
isset($this->contract_state_doc['contract']) ? 
$this->contract_state_doc['contract']->serialize() : array(),
+                               'contract_filter'               => 
$this->contract_filter_doc,
+                               'form_url'                              => 
$this->form_url_doc
+                           )
                        );
-                       
-               $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('app_data' => 
$data));
-               
$GLOBALS['phpgw']->xslttpl->add_file(array('frontend','document'));
-                       $GLOBALS['phpgw']->js->validate_file( 'yahoo', 
'drawing.list', 'frontend' );
 
-                       phpgwapi_yui::load_widget('dragdrop');
-                       phpgwapi_yui::load_widget('datatable');
-                       phpgwapi_yui::load_widget('connection');
-                       phpgwapi_yui::load_widget('loader');
-                       phpgwapi_yui::load_widget('paginator');
-
-                       
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/datatable/assets/skins/sam/datatable.css');
-                       
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/paginator/assets/skins/sam/paginator.css');
+                       self::render_template_xsl(array('document', 
'datatable_inline', 'frontend'), array('data' => $data));
                }
                
                public function query() {}