[Fmsystem-commits] [8572] property: get user responisbilities at locations

[Sigurd Nes]

Revision: 8572
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8572
Author:   sigurdne
Date:     2012-01-15 14:16:40 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
property: get user responisbilities at locations

Modified Paths:
--------------
    trunk/property/inc/class.solocation.inc.php
    trunk/property/setup/default_records.inc.php
    trunk/property/setup/tables_update.inc.php

Modified: trunk/property/inc/class.solocation.inc.php
===================================================================
--- trunk/property/inc/class.solocation.inc.php 2012-01-15 13:46:27 UTC (rev 
8571)
+++ trunk/property/inc/class.solocation.inc.php 2012-01-15 14:16:40 UTC (rev 
8572)
@@ -538,6 +538,18 @@
                                        $paranthesis .='(';
                                        $joinmethod .= " {$this->join} 
fm_responsibility_role ON ( fm_responsibility.id = 
fm_responsibility_role.responsibility_id))";
                                        $paranthesis .='(';
+
+                                       $cols.= ',fm_responsibility_role.id as 
role_id';
+                                       $cols_return[]  = 'role_id';
+                                       $uicols['input_type'][]         = 
'hidden';
+                                       $uicols['name'][]                       
= 'role_id';
+                                       $uicols['descr'][]                      
= 'dummy';
+                                       $uicols['statustext'][]         = 
'dummy';
+                                       $uicols['exchange'][]           = false;
+                                       $uicols['align'][]                      
= '';
+                                       $uicols['datatype'][]           = '';
+                                       $uicols['formatter'][]          = '';
+
                                }
 
                                $from = " FROM {$paranthesis} 
fm_location{$type_id} ";
@@ -730,8 +742,15 @@
                                $time = time() +1;
                                $filtermethod .= " {$where} active_from < 
{$time} AND (active_to > {$time} OR active_to = 0)"
                                        ." AND expired_on IS NULL AND 
fm_responsibility_role.id ={$role_id} AND contact_id = 
{$filter_role_on_contact}";
-                               $where= 'AND';                  
+                               $where= 'AND';
                        }
+                       else if ($filter_role_on_contact)
+                       {
+                               $time = time() +1;
+                               $filtermethod .= " {$where} active_from < 
{$time} AND (active_to > {$time} OR active_to = 0)"
+                                       ." AND expired_on IS NULL AND 
contact_id = {$filter_role_on_contact}";
+                               $where= 'AND';  
+                       }
 
                        $_querymethod = array();
                        $__querymethod = array();

Modified: trunk/property/setup/default_records.inc.php
===================================================================
--- trunk/property/setup/default_records.inc.php        2012-01-15 13:46:27 UTC 
(rev 8571)
+++ trunk/property/setup/default_records.inc.php        2012-01-15 14:16:40 UTC 
(rev 8572)
@@ -308,12 +308,13 @@
 # Data-ark for tabell fm_idgenerator
 #
 
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_idgenerator (name, 
value, descr) VALUES ('Bilagsnummer', '2003100000', 'Bilagsnummer')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_idgenerator (name, 
value, descr) VALUES ('Ecobatchid', '1', 'Ecobatchid')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_idgenerator (name, 
value, descr) VALUES ('project', '1000', 'project')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_idgenerator (name, 
value, descr) VALUES ('Statuslog', '1', 'Statuslog')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_idgenerator (name, 
value, descr) VALUES ('workorder', '1000', 'workorder')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_idgenerator (name, 
value, descr) VALUES ('request', '1000', 'request')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_idgenerator (name, 
value, descr) VALUES ('Bilagsnummer', '2003100000', 
'Bilagsnummer')",__LINE__,__FILE__);
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_idgenerator (name, 
value, descr) VALUES ('bilagsnr_ut', 0, 'Bilagsnummer 
utgående')",__LINE__,__FILE__);
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_idgenerator (name, 
value, descr) VALUES ('Ecobatchid', '1', 'Ecobatchid')",__LINE__,__FILE__);
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_idgenerator (name, 
value, descr) VALUES ('project', '1000', 'project')",__LINE__,__FILE__);
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_idgenerator (name, 
value, descr) VALUES ('Statuslog', '1', 'Statuslog')",__LINE__,__FILE__);
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_idgenerator (name, 
value, descr) VALUES ('workorder', '1000', 'workorder')",__LINE__,__FILE__);
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_idgenerator (name, 
value, descr) VALUES ('request', '1000', 'request')",__LINE__,__FILE__);
 
 #
 # Dumping data for table fm_location_config

Modified: trunk/property/setup/tables_update.inc.php
===================================================================
--- trunk/property/setup/tables_update.inc.php  2012-01-15 13:46:27 UTC (rev 
8571)
+++ trunk/property/setup/tables_update.inc.php  2012-01-15 14:16:40 UTC (rev 
8572)
@@ -5786,6 +5786,7 @@
        function property_upgrade0_9_17_631()
        {
                $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+               $GLOBALS['phpgw_setup']->oProc->query("DELETE FROM fm_cache");
                
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_ecobilagoverf','manual_record',array('type'
 => 'int','precision' => 2,'nullable' => True));
                if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
                {