[Fmsystem-commits] [12532] property: alter default_filter_year

[Sigurd Nes]

Revision: 12532
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12532
Author:   sigurdne
Date:     2015-01-05 13:12:40 +0000 (Mon, 05 Jan 2015)
Log Message:
-----------
property: alter default_filter_year

Modified Paths:
--------------
    trunk/property/inc/class.boproject.inc.php
    trunk/property/inc/class.boworkorder.inc.php
    trunk/property/inc/hook_settings.inc.php

Modified: trunk/property/inc/class.boproject.inc.php
===================================================================
--- trunk/property/inc/class.boproject.inc.php  2015-01-05 09:48:53 UTC (rev 
12531)
+++ trunk/property/inc/class.boproject.inc.php  2015-01-05 13:12:40 UTC (rev 
12532)
@@ -71,8 +71,25 @@
 
 
 
-                       $default_filter_year    = 
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['default_project_filter_year'])
 && 
$GLOBALS['phpgw_info']['user']['preferences']['property']['default_project_filter_year']
 == 'current_year' ? date('Y') : 'all';
+                       $default_filter_year=  'all';
 
+                       
if(isset($GLOBALS['phpgw_info']['user']['preferences']['property']['default_project_filter_year']))
+                       {
+                               $_last_year = date('Y') -1;
+                               
switch($GLOBALS['phpgw_info']['user']['preferences']['property']['default_project_filter_year'])
+                               {
+                                       case 'current_year':
+                                                $default_filter_year = 
date('Y');
+                                               break;
+                                       case "{$_last_year}":
+                                                $default_filter_year = 
$_last_year;
+                                               break;
+                                       default:
+                                                $default_filter_year = 'all';
+                                               break;
+                               }
+                       }
+
                        $start                                  = 
phpgw::get_var('start', 'int', 'REQUEST', 0);
                        $query                                  = 
phpgw::get_var('query');
                        $sort                                   = 
phpgw::get_var('sort');

Modified: trunk/property/inc/class.boworkorder.inc.php
===================================================================
--- trunk/property/inc/class.boworkorder.inc.php        2015-01-05 09:48:53 UTC 
(rev 12531)
+++ trunk/property/inc/class.boworkorder.inc.php        2015-01-05 13:12:40 UTC 
(rev 12532)
@@ -70,8 +70,25 @@
                                $this->use_session = true;
                        }
 
-                       $default_filter_year    = 
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['default_project_filter_year'])
 && 
$GLOBALS['phpgw_info']['user']['preferences']['property']['default_project_filter_year']
 == 'current_year' ? date('Y') : 'all';
+                       $default_filter_year=  'all';
 
+                       
if(isset($GLOBALS['phpgw_info']['user']['preferences']['property']['default_project_filter_year']))
+                       {
+                               $_last_year = date('Y') -1;
+                               
switch($GLOBALS['phpgw_info']['user']['preferences']['property']['default_project_filter_year'])
+                               {
+                                       case 'current_year':
+                                                $default_filter_year = 
date('Y');
+                                               break;
+                                       case "{$_last_year}":
+                                                $default_filter_year = 
$_last_year;
+                                               break;
+                                       default:
+                                                $default_filter_year = 'all';
+                                               break;
+                               }
+                       }
+
                        $start                          = 
phpgw::get_var('start', 'int', 'REQUEST', 0);
                        $query                          = 
phpgw::get_var('query');
                        $sort                           = 
phpgw::get_var('sort');

Modified: trunk/property/inc/hook_settings.inc.php
===================================================================
--- trunk/property/inc/hook_settings.inc.php    2015-01-05 09:48:53 UTC (rev 
12531)
+++ trunk/property/inc/hook_settings.inc.php    2015-01-05 13:12:40 UTC (rev 
12532)
@@ -249,6 +249,7 @@
 
        $default_project_filter_year =array
        (
+               (date('Y') -1)  => (date('Y')-1),
                'current_year'  => lang('current year'),
                'all'                   => lang('all'),
        );