[Fmsystem-commits] [17300] fix on placement in calendar

[erikhl]

Revision: 17300
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17300
Author:   erikhl
Date:     2017-11-13 06:09:33 -0500 (Mon, 13 Nov 2017)
Log Message:
-----------
fix on placement in calendar

Modified Paths:
--------------
    trunk/controller/inc/component/class.year_calendar.inc.php

Modified: trunk/controller/inc/component/class.year_calendar.inc.php
===================================================================
--- trunk/controller/inc/component/class.year_calendar.inc.php  2017-11-13 
09:49:03 UTC (rev 17299)
+++ trunk/controller/inc/component/class.year_calendar.inc.php  2017-11-13 
11:09:33 UTC (rev 17300)
@@ -147,6 +147,7 @@
                        $new_calendar_array2 = array();
                        $found = false;
                        $moved_control_dates = array();
+                       $moved_control_month = array();
                        foreach ($this->calendar_array as $cal)
                        {
                                if(is_array($cal))
@@ -154,7 +155,8 @@
                                        
if(isset($cal['info']['original_deadline_date_ts']) && 
$cal['info']['original_deadline_date_ts'] > 0)
                                        {
                                                $found = true;
-                                               $moved_control_dates[] = 
$cal['info']['original_deadline_date_ts'];
+//                                             $moved_control_dates[] = 
$cal['info']['original_deadline_date_ts'];
+                                               $moved_control_month[] = 
date('n', $cal['info']['original_deadline_date_ts']);
                                        }
                                }
                        }
@@ -167,7 +169,8 @@
                                        {
                                                if($cal2['info']['status'] == 
'CONTROL_NOT_DONE' || $cal2['info']['status'] == 'CONTROL_REGISTERED')
                                                {
-                                                       
if(in_array($cal2['info']['deadline_date_ts'], $moved_control_dates))
+//                                                     
if(in_array($cal2['info']['deadline_date_ts'], $moved_control_dates))
+                                                       if(in_array($m_cnt, 
$moved_control_month))
                                                        {
                                                                
$new_calendar_array[$m_cnt] = NULL;
                                                        }