[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17291] FDV-247: Placement in calendar is controlled
From: |
erikhl |
Subject: |
[Fmsystem-commits] [17291] FDV-247: Placement in calendar is controlled by planned date or completed date when displaying control calendar. |
Date: |
Fri, 10 Nov 2017 05:24:46 -0500 (EST) |
Revision: 17291
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17291
Author: erikhl
Date: 2017-11-10 05:24:46 -0500 (Fri, 10 Nov 2017)
Log Message:
-----------
FDV-247: Placement in calendar is controlled by planned date or completed date
when displaying control calendar.
Modified Paths:
--------------
trunk/controller/inc/component/class.date_generator.inc.php
trunk/controller/inc/component/class.year_calendar.inc.php
Modified: trunk/controller/inc/component/class.date_generator.inc.php
===================================================================
--- trunk/controller/inc/component/class.date_generator.inc.php 2017-11-10
06:00:43 UTC (rev 17290)
+++ trunk/controller/inc/component/class.date_generator.inc.php 2017-11-10
10:24:46 UTC (rev 17291)
@@ -143,10 +143,12 @@
}
else if ($this->repeat_type == 3)
{
- $trail_period_start_date = mktime(0, 0,
0, date("m", $trail_period_start_date), date("d", $trail_period_start_date),
date("Y", $trail_period_start_date) + $this->repeat_interval);
+ //set end date on year-control to last
day of the year -> 12/31/<year>
+// $trail_period_start_date = mktime(0, 0,
0, date("m", $trail_period_start_date), date("d", $trail_period_start_date),
date("Y", $trail_period_start_date) + $this->repeat_interval);
+ $trail_period_start_date = mktime(0, 0,
0, 12, 31, date("Y", $trail_period_start_date) + $this->repeat_interval);
}
}
-
+
return $trail_period_start_date;
}
Modified: trunk/controller/inc/component/class.year_calendar.inc.php
===================================================================
--- trunk/controller/inc/component/class.year_calendar.inc.php 2017-11-10
06:00:43 UTC (rev 17290)
+++ trunk/controller/inc/component/class.year_calendar.inc.php 2017-11-10
10:24:46 UTC (rev 17291)
@@ -97,8 +97,8 @@
{
foreach ($check_lists_array as $check_list)
{
- $has_planned_date = FALSE;
- $has_completed_date = FALSE;
+ $has_planned_date = false;
+ $has_completed_date = false;
if (isset($this->control_relation['serie_id'])
&& $check_list->get_serie_id() != $this->control_relation['serie_id'])
{
continue;
@@ -111,15 +111,15 @@
if($check_list_status_info->get_planned_date_ts() &&
$check_list_status_info->get_planned_date_ts() > 0)
{
$month_nr_planned = date("n",
$check_list_status_info->get_planned_date_ts());
- $has_planned_date = TRUE;
+ $has_planned_date = true;
}
if($check_list_status_info->get_completed_date_ts() &&
$check_list_status_info->get_completed_date_ts() > 0)
{
- $has_completed_date = TRUE;
+ $has_completed_date = true;
$month_nr_completed = date("n",
$check_list_status_info->get_completed_date_ts());
}
- var_dump('planned: ' . $month_nr_planned .
'-completed: ' . $month_nr_completed . '->' .
$check_list_status_info->get_completed_date_ts());
+ //var_dump('planned: ' . $month_nr_planned .
'-completed: ' . $month_nr_completed . '->' .
$check_list_status_info->get_completed_date_ts());
$repeat_type = $check_list->get_repeat_type();
// if(
!isset($this->calendar_array[ $month_nr ]) || $repeat_type >
$this->calendar_array[ $month_nr ]['repeat_type'])
@@ -149,7 +149,7 @@
$new_calendar_array = array();
$new_calendar_array2 = array();
$found = false;
- $moved_control_dates = NULL;
+ $moved_control_dates = array();
foreach ($this->calendar_array as $cal)
{
if(is_array($cal))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17291] FDV-247: Placement in calendar is controlled by planned date or completed date when displaying control calendar.,
erikhl <=