[Fmsystem-commits] [17307] more on controller

[sigurdne]

Revision: 17307
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17307
Author:   sigurdne
Date:     2017-11-14 14:37:42 -0500 (Tue, 14 Nov 2017)
Log Message:
-----------
more on controller

Modified Paths:
--------------
    trunk/controller/inc/class.socontrol.inc.php
    trunk/controller/inc/class.uicomponent.inc.php

Modified: trunk/controller/inc/class.socontrol.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol.inc.php        2017-11-14 15:56:32 UTC 
(rev 17306)
+++ trunk/controller/inc/class.socontrol.inc.php        2017-11-14 19:37:42 UTC 
(rev 17307)
@@ -1597,10 +1597,10 @@
                {
                        $next_date = $start_date;
                        $now = time();
-
                        while ($next_date < $now)
                        {
-                               $interval_date = $start_date;
+                               $interval_date = $next_date;
+                               $return_date = $next_date;
 
                                if ($repeat_type == 0)
                                {
@@ -1627,9 +1627,12 @@
                                {
                                        $next_date = mktime(0, 0, 0, date("m", 
$interval_date), date("d", $interval_date), date("Y", $interval_date) + 
$repeat_interval);
                                }
+
+//                             $_next_date = date('d/m-Y', $next_date);
+
                        }
 
-                       return $next_date;
+                       return $return_date;
                }
 
                function add_controll_to_component_from_master( 
$master_component, $targets = array() )

Modified: trunk/controller/inc/class.uicomponent.inc.php
===================================================================
--- trunk/controller/inc/class.uicomponent.inc.php      2017-11-14 15:56:32 UTC 
(rev 17306)
+++ trunk/controller/inc/class.uicomponent.inc.php      2017-11-14 19:37:42 UTC 
(rev 17307)
@@ -834,16 +834,17 @@
 
                                foreach ($controls_at_component as $component)
                                {
-                                       $_control_relation = 
$component->get_control_relation();
+                                       $control_relation = 
$component->get_control_relation();
 
-                                       if 
(!$_control_relation['serie_enabled'])
+                                       if (!$control_relation['serie_enabled'])
                                        {
                                                //                              
        continue;
                                        }
-                                       $control_id = 
$_control_relation['control_id'];
+                                       $control_id = 
$control_relation['control_id'];
                                        $control = 
$so_control->get_single($control_id);
 
-                                       $repeat_type = 
$control->get_repeat_type();
+//                                     $repeat_type = 
$control->get_repeat_type();
+                                       $repeat_type = 
(int)$control_relation['repeat_type'];
 
                                        //FIXME: Not currently supported
                                        if ($repeat_type <= 
controller_control::REPEAT_TYPE_WEEK)
@@ -888,7 +889,7 @@
                                                /*
                                                 * start override control with 
data from serie
                                                 */
-                                               $control_relation = 
$component->get_control_relation();
+                                       //      $control_relation = 
$component->get_control_relation();
                                                if 
(isset($control_relation['start_date']) && $control_relation['start_date'])
                                                {
                                                        
$control->set_start_date($control_relation['start_date']);