[Fmsystem-commits] [15557]

[saul . huanay]

Revision: 15557
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15557
Author:   psaul
Date:     2016-09-01 00:26:01 +0000 (Thu, 01 Sep 2016)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind-2/rental/inc/class.socomposite.inc.php
    branches/dev-syncromind-2/rental/inc/class.uicomposite.inc.php

Modified: branches/dev-syncromind-2/rental/inc/class.socomposite.inc.php
===================================================================
--- branches/dev-syncromind-2/rental/inc/class.socomposite.inc.php      
2016-08-31 23:30:41 UTC (rev 15556)
+++ branches/dev-syncromind-2/rental/inc/class.socomposite.inc.php      
2016-09-01 00:26:01 UTC (rev 15557)
@@ -547,9 +547,45 @@
                        }
                        
/*----------------------------------------------------------------*/
 
-                       $contracts = 
rental_socontract::get_instance()->get($options['start_index'], 
$options['num_of_objects'], $options['sort_field'], $options['ascending'], 
$options['search_for'], $options['search_type'], $filters);
+//                     $contracts = 
rental_socontract::get_instance()->get($options['start_index'], 
$options['num_of_objects'], $options['sort_field'], $options['ascending'], 
$options['search_for'], $options['search_type'], $filters);
+// 29 Jun 2016
+// 01 Sep 2016
+            
+            $data = null;
+            $composite_obj = 
rental_socomposite::get_instance()->get($options['start_index'], 
$options['num_of_objects'], $options['sort_field'], $options['ascending'], 
$options['search_for'], $options['search_type'], $filters);
 
+            foreach ($composite_obj as $composite)
+            {
+                $contracts = $composite->get_contracts();
+                foreach ($contracts as $contract) {
+                    $contract = $contract->serialize();
+
+                    $contract_date_start = new DateTime(date('Y-m-d', 
phpgwapi_datetime::date_to_timestamp($contract['date_start'])));
+                               $contract_date_end = new DateTime(date('Y-m-d', 
phpgwapi_datetime::date_to_timestamp($contract['date_end'])));
+
+                    $data_contract = array();
+
+                    foreach ($days as $day)
+                    {
+                        if ($day >= $contract_date_start && $day <= 
$contract_date_end)
+                        {
+                            $data_contract[date_format($day, 'D')] = $contract;
+                        }
+                    }
+                    $data_contracts[] = $data_contract;
+                }
+            }
+
+            if (count($composite_obj) > 0)
+                       {
+                               $keys = array_keys($composite_obj);
+                               $composite = $composite_obj[$keys[0]];
+                       }
+
+            $contracts = $composite->get_contracts();
+
                        $data_contracts = array();
+
                        foreach ($contracts as $contract)
                        {
                                $contract = $contract->serialize();

Modified: branches/dev-syncromind-2/rental/inc/class.uicomposite.inc.php
===================================================================
--- branches/dev-syncromind-2/rental/inc/class.uicomposite.inc.php      
2016-08-31 23:30:41 UTC (rev 15556)
+++ branches/dev-syncromind-2/rental/inc/class.uicomposite.inc.php      
2016-09-01 00:26:01 UTC (rev 15557)
@@ -1136,15 +1136,15 @@
                        $filters = array();
                        $options = array();
 
-                       if (phpgw::get_var('composite_id'))
-                               $filters['composite_id'] = 
phpgw::get_var('composite_id');
+//                     if (phpgw::get_var('composite_id'))
+//                             $filters['composite_id'] = 
phpgw::get_var('composite_id');
+//
+//                     if (phpgw::get_var('contract_status'))
+//                             $filters['contract_status'] = 
phpgw::get_var('contract_status');
+//
+//                     if (phpgw::get_var('contract_type'))
+//                             $filters['contract_type'] = 
phpgw::get_var('contract_type');
 
-                       if (phpgw::get_var('contract_status'))
-                               $filters['contract_status'] = 
phpgw::get_var('contract_status');
-
-                       if (phpgw::get_var('contract_type'))
-                               $filters['contract_type'] = 
phpgw::get_var('contract_type');
-
                        $options['start_index'] = 0;
                        $options['num_of_objects'] = 
(phpgw::get_var('n_objects')) ? phpgw::get_var('n_objects') : 30;
                        $options['sort_field'] = '';