[Fmsystem-commits] [17311] controller: optional set deadline to end of year

[sigurdne]

Revision: 17311
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17311
Author:   sigurdne
Date:     2017-11-15 14:55:12 -0500 (Wed, 15 Nov 2017)
Log Message:
-----------
controller: optional set deadline to end of year

Modified Paths:
--------------
    trunk/controller/inc/component/class.date_generator.inc.php
    trunk/controller/setup/phpgw_no.lang
    trunk/controller/templates/base/config.tpl

Modified: trunk/controller/inc/component/class.date_generator.inc.php
===================================================================
--- trunk/controller/inc/component/class.date_generator.inc.php 2017-11-15 
14:13:59 UTC (rev 17310)
+++ trunk/controller/inc/component/class.date_generator.inc.php 2017-11-15 
19:55:12 UTC (rev 17311)
@@ -13,9 +13,19 @@
                private $repeat_type;
                private $repeat_interval;
                private $calendar_array = array();
+               private $deadline_end_of_year;
 
                public function __construct( $start_date, $end_date, 
$period_start_date, $period_end_date, $repeat_type, $repeat_interval )
                {
+                       static $config = array();
+
+                       if(!$config)
+                       {
+                               $config = CreateObject('phpgwapi.config', 
'controller')->read();
+                       }
+
+                       $this->deadline_end_of_year = 
empty($config['deadline_end_of_year']) ? false : true;
+
                        $this->start_date = $start_date;
                        $this->end_date = $end_date;
                        $this->period_start_date = $period_start_date;
@@ -155,8 +165,15 @@
                                else if ($this->repeat_type == 3)
                                {
                                        //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);
+
+                                       if($this->deadline_end_of_year)
+                                       {
+                                               $trail_period_start_date = 
mktime(0, 0, 0, 12, 31, date("Y", $trail_period_start_date) + 
$this->repeat_interval);
+                                       }
+                                       else
+                                       {
+                                               $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);
+                                       }
                                }
                        }
                

Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang        2017-11-15 14:13:59 UTC (rev 
17310)
+++ trunk/controller/setup/phpgw_no.lang        2017-11-15 19:55:12 UTC (rev 
17311)
@@ -406,4 +406,5 @@
 CONTROL_CANCELED       controller      no      Kontroll kansellert
 document types controller      no      Dokumenttyper
 Do not edit archived version   controller      no      Du kan ikke endre 
arkiverte versjoner
-choose a location      controller      no      Velg en lokasjon
\ No newline at end of file
+choose a location      controller      no      Velg en lokasjon
+deadline end of year   controller      no      Frist på slutten av året for 
årskontroller
\ No newline at end of file

Modified: trunk/controller/templates/base/config.tpl
===================================================================
--- trunk/controller/templates/base/config.tpl  2017-11-15 14:13:59 UTC (rev 
17310)
+++ trunk/controller/templates/base/config.tpl  2017-11-15 19:55:12 UTC (rev 
17311)
@@ -52,6 +52,15 @@
                                </select>
                        </td>
                </tr>
+               <tr class="row_on">
+                       <td>{lang_deadline_end_of_year}</td>
+                       <td>
+                               <select 
name="newsettings[deadline_end_of_year]">
+                                       <option value="" 
{selected_deadline_end_of_year_}>{lang_no}</option>
+                                       <option value="1" 
{selected_deadline_end_of_year_1}>{lang_yes}</option>
+                               </select>
+                       </td>
+               </tr>
                <tr class="row_off">
                        <td>{lang_control_mandatory_location}</td>
                        <td>