[Fmsystem-commits] [12052] property: tweak calculation import

[Sigurd Nes]

Revision: 12052
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12052
Author:   sigurdne
Date:     2014-08-07 08:46:21 +0000 (Thu, 07 Aug 2014)
Log Message:
-----------
property: tweak calculation import

Modified Paths:
--------------
    trunk/property/inc/class.bowo_hour.inc.php
    trunk/property/inc/class.uidocument2.inc.php

Modified: trunk/property/inc/class.bowo_hour.inc.php
===================================================================
--- trunk/property/inc/class.bowo_hour.inc.php  2014-08-07 08:17:19 UTC (rev 
12051)
+++ trunk/property/inc/class.bowo_hour.inc.php  2014-08-07 08:46:21 UTC (rev 
12052)
@@ -423,10 +423,17 @@
                                {
                                        if((int)$entry[5] > 0)
                                        {
+                                               $descr  = $entry[1];
+
+                                               if(isset($entry[7]) && 
$entry[7])
+                                               {
+                                                       $descr  .= ": 
{$entry[7]}";
+                                               }
+
                                                $values = array
                                                (
                                                        'activity_num'          
=> $entry[0],
-                                                       'descr'                 
        => $entry[1],
+                                                       'descr'                 
        => $descr,
                                                        'unit'                  
        => $entry[2],
                                                        'cost'                  
        => $entry[6],
                                                        'quantity'              
        => $entry[5],

Modified: trunk/property/inc/class.uidocument2.inc.php
===================================================================
--- trunk/property/inc/class.uidocument2.inc.php        2014-08-07 08:17:19 UTC 
(rev 12051)
+++ trunk/property/inc/class.uidocument2.inc.php        2014-08-07 08:46:21 UTC 
(rev 12052)
@@ -27,10 +27,10 @@
         * @subpackage logistic
         * @version $Id: class.uidocument2.inc.php 11942 2014-05-04 19:43:36Z 
sigurdne $
         */
-       phpgw::import_class('phpgwapi.uicommon');
+       phpgw::import_class('phpgwapi.uicommon_jquery');
        phpgw::import_class('phpgwapi.jquery');
 
-       class property_uidocument2 extends phpgwapi_uicommon
+       class property_uidocument2 extends phpgwapi_uicommon_jquery
        {
 
                private $bo;
@@ -157,14 +157,17 @@
                                return;
                        }
 
+                       phpgwapi_jquery::load_widget('core');
+                       self::add_javascript('phpgwapi', 'DataTables', 
'media/js/jquery.dataTables.min.js');
+
                        if (phpgw::get_var('phpgw_return_as') == 'json')
                        {
                                return $this->query();
                        }
 
                        self::add_javascript('phpgwapi', 'yui3', 
'datatable.js');
-                       phpgwapi_yui::load_widget('datatable');
-                       phpgwapi_yui::load_widget('paginator');
+//                     phpgwapi_yui::load_widget('datatable');
+//                     phpgwapi_yui::load_widget('paginator');
 
                        $categories = $this->_get_categories();
                        $columns        = $this->_get_columns();
@@ -293,7 +296,7 @@
                                        );
                        }
 
-                       self::render_template_xsl('datatable_common', $data);
+                       self::render_template_xsl('datatable_jquery', $data);
                }