[Fmsystem-commits] [15589]

[saul . huanay]

Revision: 15589
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15589
Author:   psaul
Date:     2016-09-05 19:40:52 +0000 (Mon, 05 Sep 2016)
Log Message:
-----------


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

Modified: branches/dev-syncromind-2/rental/inc/class.socomposite.inc.php
===================================================================
--- branches/dev-syncromind-2/rental/inc/class.socomposite.inc.php      
2016-09-05 19:30:49 UTC (rev 15588)
+++ branches/dev-syncromind-2/rental/inc/class.socomposite.inc.php      
2016-09-05 19:40:52 UTC (rev 15589)
@@ -517,139 +517,4 @@
 
                        return $uicols;
                }
-
-               public function get_schedule ($date, $filters, $options)
-               {
-                       //$date = new DateTime('2016-8-24');
-                       //$date = new DateTime(phpgw::get_var('date'));
-                       //$composite_id = (int)phpgw::get_var('id');
-
-                       if ($date->format('w') != 1)
-                       {
-                               $date->modify('last monday');
-                       }
-
-                       $prev_date = clone $date;
-                       $prev_date->modify('-1 week');
-                       $next_date = clone $date;
-                       $next_date->modify('+1 week');
-
-                       $composite1['date'] = $date->format('Y-m-d');
-                       $composite1['prev_date'] = $prev_date->format('Y-m-d');
-                       $composite1['next_date'] = $next_date->format('Y-m-d');
-
-                       $days = array();
-                       $date_to_array = clone $date;
-                       for ($i = 0; $i < 7; $i++)
-                       {
-                               $days[] = clone $date_to_array;
-                               $date_to_array->modify("+1 day");
-                       }
-                       
/*----------------------------------------------------------------*/
-
-//            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();
-//
-//                             $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;
-//                                     }
-//                             }
-//
-//                             if ($data_contract)
-//                             {
-//                                     $link = 
$GLOBALS['phpgw']->link('/index.php', array(
-//                                             'menuaction' => 
'rental.uicontract.view',
-//                                             'id' => $contract['id']
-//                                     ));
-//
-//                                     $data_contract['contract_link'] = $link;
-//                                     $data_contracts[] = $data_contract;
-//                             }
-//                     }
-
-// Mixtos K00006822 K00006853
-            $composites_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);
-            $composite_count = 
rental_socomposite::get_instance()->get_count($options['search_for'], 
$options['search_type'], $filters);
-
-            $composites = array();
-            $n = 0;
-            foreach ($composites_obj as $composite)
-            {
-                $contracts = $composite->get_contracts();
-                $composite = $composite->serialize();
-
-                if (count($contracts) > 0)
-                {
-                    foreach ($contracts as $contract)
-                    {
-                        $contract = $contract->serialize();
-
-                        if ($composites[$n-1]['id'] != $composite['id'])
-                        {
-                            $composites[$n]['id'] = $composite['id'];
-                        }
-                        
-                        $composites[$n]['name'] = $composite['name'];
-
-                        $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'])));
-
-                        foreach ($days as $day)
-                        {
-                            if ($day >= $contract_date_start && ($day <= 
$contract_date_end || $contract['date_end'] == ''))
-                            {
-                                $composites[$n]['contract_id'] = 
$contract['id'];
-                                $composites[$n]['old_contract_id'] = 
$contract['old_contract_id'];
-                                $composites[$n][date_format($day, 
'D')]['status'] = 'Ikke ledig';
-                            }
-                            else
-                            {
-                                $composites[$n][date_format($day, 
'D')]['status'] = 'Ledig';
-                            }
-                        }
-//                        $n++;
-                    }
-                }
-                else
-                {
-                    $composites[$n]['id'] = $composite['id'];
-                    $composites[$n]['name'] = $composite['name'];
-                    foreach ($days as $day)
-                    {
-                        $composites[$n][date_format($day, 'D')]['status'] = 
'Ledig';
-                    }
-//                    $n++;
-                }
-                $n++;
-            }
-
-//                     if (!(count($composites) > 0))
-//                     {
-//                             $composites[] = '';
-//                     }
-
-                       return array(
-                               'total_records' => $composite_count,
-                               'results' => $composites
-                       );
-               }
        }
\ No newline at end of file