[Fmsystem-commits] [10945] property: table handling

[Sigurd Nes]

Revision: 10945
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10945
Author:   sigurdne
Date:     2013-03-01 13:21:53 +0000 (Fri, 01 Mar 2013)
Log Message:
-----------
property: table handling

Modified Paths:
--------------
    trunk/property/inc/class.uiproject.inc.php
    trunk/property/js/yahoo/project.edit.js
    trunk/property/js/yahoo/property2.js
    trunk/property/js/yahoo/workorder.edit.js

Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php  2013-03-01 10:05:36 UTC (rev 
10944)
+++ trunk/property/inc/class.uiproject.inc.php  2013-03-01 13:21:53 UTC (rev 
10945)
@@ -1782,15 +1782,14 @@
                                $lang_active = lang('Check to activate period');
                                $values['sum'] = 0;
 
-                               $_year_count = array();
-                               foreach ($content_budget as $key => $row)
+                               if($content_budget && 
$values['periodization_id'])
                                {
-                                       $_year_count[$row['year']]  +=1;
-                                       $rows_per_page = 
$_year_count[$row['year']];
-                               }
-
-                               if($content_budget)
-                               {
+                                       $_year_count = array();
+                                       foreach ($content_budget as $key => 
$row)
+                                       {
+                                               $_year_count[$row['year']]  +=1;
+                                               $rows_per_page = 
$_year_count[$row['year']];
+                                       }
                                        $initial_page = 
floor(count($content_budget)/$rows_per_page);
                                }
 
@@ -1845,6 +1844,9 @@
                        if( isset($values['project_type_id']) && 
$values['project_type_id']==3)
                        {
 
+                               $rows_per_page = 10;
+                               $initial_page = 1;
+
                                $myColumnDefs[0] = array
                                (
                                        'name'          => "0",
@@ -1917,6 +1919,8 @@
                                        'total_records'                 => 
count($content_orders),
                                        'edit_action'                   => 
json_encode($GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'property.uiworkorder.edit'))),
                                        'is_paginator'                  => 1,
+                                       'rows_per_page'                 => 10,
+                                       'initial_page'                  => 1,
                                        'footer'                                
=> 0
                                );
 
@@ -1978,6 +1982,8 @@
                                        'total_records'                 => 
count($content_invoice),
                                        'edit_action'                   => 
json_encode($GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'property.uiinvoice.index'))),
                                        'is_paginator'                  => 1,
+                                       'rows_per_page'                 => 10,
+                                       'initial_page'                  => 1,
                                        'footer'                                
=> 0
                                );
 

Modified: trunk/property/js/yahoo/project.edit.js
===================================================================
--- trunk/property/js/yahoo/project.edit.js     2013-03-01 10:05:36 UTC (rev 
10944)
+++ trunk/property/js/yahoo/project.edit.js     2013-03-01 13:21:53 UTC (rev 
10945)
@@ -178,7 +178,7 @@
                tmp_sum1 = getTotalSum_active('budget',0,paginator,datatable);
  //            tmp_sum2 = 
getTotalSum_active('sum_orders',0,paginator,datatable);
                tmp_sum3 = 
getTotalSum_active('sum_oblications',0,paginator,datatable);
-               tmp_sum4 = getTotalSum('actual_cost',0,paginator,datatable);
+               tmp_sum4 = 
getTotalSum_active('actual_cost',0,paginator,datatable);
                tmp_sum5 = getTotalSum_active('diff',0,paginator,datatable);
                tmp_sum6 = 
getTotalSum_active('deviation',0,paginator,datatable);
 

Modified: trunk/property/js/yahoo/property2.js
===================================================================
--- trunk/property/js/yahoo/property2.js        2013-03-01 10:05:36 UTC (rev 
10944)
+++ trunk/property/js/yahoo/property2.js        2013-03-01 13:21:53 UTC (rev 
10945)
@@ -374,7 +374,7 @@
 
                if(data[0]["is_paginator"]==1)
                {
-                       var rows_per_page = 0;
+                       var rows_per_page = 10;
                        if(typeof(data[0]['rows_per_page'])!= 'undefined' && 
data[0]['rows_per_page'])
                        {
                                rows_per_page = data[0]['rows_per_page'];

Modified: trunk/property/js/yahoo/workorder.edit.js
===================================================================
--- trunk/property/js/yahoo/workorder.edit.js   2013-03-01 10:05:36 UTC (rev 
10944)
+++ trunk/property/js/yahoo/workorder.edit.js   2013-03-01 13:21:53 UTC (rev 
10945)
@@ -176,7 +176,7 @@
                tmp_sum1 = getTotalSum_active('budget',0,paginator,datatable);
                tmp_sum2 = 
getTotalSum_active('sum_orders',0,paginator,datatable);
                tmp_sum3 = 
getTotalSum_active('sum_oblications',0,paginator,datatable);
-               tmp_sum4 = getTotalSum('actual_cost',0,paginator,datatable);
+               tmp_sum4 = 
getTotalSum_active('actual_cost',0,paginator,datatable);
                tmp_sum5 = getTotalSum_active('diff',0,paginator,datatable);
                tmp_sum6 = 
getTotalSum_active('deviation',0,paginator,datatable);