[Phpgroupware-cvs] projects/setup setup.inc.php, 1.57 tables_update.inc.php, 1.53

[ceb]

Update of projects/setup

Modified Files:
     Branch: MAIN
            setup.inc.php lines: +2 -2
            tables_update.inc.php lines: +81 -8

Log Message:
update

====================================================
Index: projects/setup/setup.inc.php
diff -u projects/setup/setup.inc.php:1.56 projects/setup/setup.inc.php:1.57
--- projects/setup/setup.inc.php:1.56   Mon Mar 14 17:39:39 2005
+++ projects/setup/setup.inc.php        Fri Apr  1 23:52:28 2005
@@ -11,7 +11,7 @@
   /* $Id$ */

        $setup_info['projects']['name']      = 'projects';
-       $setup_info['projects']['version']   = '0.8.7.048';
+       $setup_info['projects']['version']   = '0.8.7.049';
        $setup_info['projects']['app_order'] = 13;
        $setup_info['projects']['enable']    = 1;


====================================================
Index: projects/setup/tables_update.inc.php
diff -u projects/setup/tables_update.inc.php:1.52 
projects/setup/tables_update.inc.php:1.53
--- projects/setup/tables_update.inc.php:1.52   Mon Mar 14 17:39:39 2005
+++ projects/setup/tables_update.inc.php        Fri Apr  1 23:52:28 2005
@@ -988,7 +988,7 @@
        $test[] = '0.8.7.043';
        function projects_upgrade0_8_7_043()
        {
-               
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_p_ttracker','billable',array('type'
 => 'char','precision' => 1,'nullable' => false));
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_p_ttracker','billable',array('type'
 => 'char','precision' => 1,'nullable' => False));

                $GLOBALS['setup_info']['projects']['currentver'] = '0.8.7.044';
                return $GLOBALS['setup_info']['projects']['currentver'];
@@ -1007,8 +1007,8 @@
                $GLOBALS['phpgw_setup']->oProc->query("update phpgw_p_hours set 
t_journey=FLOOR(t_journey)*60 + 
(t_journey-FLOOR(t_journey))*100",__LINE__,__FILE__);
                $GLOBALS['phpgw_setup']->oProc->query("update phpgw_p_ttracker 
set t_journey=FLOOR(t_journey)*60 + 
(t_journey-FLOOR(t_journey))*100",__LINE__,__FILE__);

-               
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_p_hours','t_journey',array('type'
 => 'int','precision' => 4,'default' => 0,'nullable' => true));
-               
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_p_ttracker','t_journey',array('type'
 => 'int','precision' => 4,'default' => 0,'nullable' => true));
+               
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_p_hours','t_journey',array('type'
 => 'int','precision' => 4,'default' => 0,'nullable' => True));
+               
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_p_ttracker','t_journey',array('type'
 => 'int','precision' => 4,'default' => 0,'nullable' => True));

                $GLOBALS['setup_info']['projects']['currentver'] = '0.8.7.045';
                return $GLOBALS['setup_info']['projects']['currentver'];
@@ -1017,7 +1017,7 @@
        $test[] = '0.8.7.045';
        function projects_upgrade0_8_7_045()
        {
-               $GLOBALS['phpgw_setup']->db->query("SELECT project_id, 
start_date, end_date, psdate, pedate FROM phpgw_p_projects");
+               $GLOBALS['phpgw_setup']->db->query('SELECT project_id, 
start_date, end_date, psdate, pedate FROM phpgw_p_projects');
                while($GLOBALS['phpgw_setup']->db->next_record())
                {
                        $pro_id   = 
intval($GLOBALS['phpgw_setup']->db->f('project_id'));
@@ -1059,11 +1059,84 @@
        $test[] = '0.8.7.047';
        function projects_upgrade0_8_7_047()
        {
-               
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_p_projects','time_planned_childs',array('type'
 => 'int','precision' => 4,'default' => 0,'nullable' => false));
-               
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_p_projects','budget_childs',array('type'
 => 'decimal','precision' => 20,'scale' => 2,'default' => 0,'nullable' => 
false));
-               
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_p_projects','e_budget_childs',array('type'
 => 'decimal','precision' => 20,'scale' => 2,'default' => 0,'nullable' => 
true));
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_p_projects','time_planned_childs',array('type'
 => 'int','precision' => 4,'default' => 0,'nullable' => False));
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_p_projects','budget_childs',array('type'
 => 'decimal','precision' => 20,'scale' => 2,'default' => 0,'nullable' => 
False));
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_p_projects','e_budget_childs',array('type'
 => 'decimal','precision' => 20,'scale' => 2,'default' => 0,'nullable' => 
True));

                $GLOBALS['setup_info']['projects']['currentver'] = '0.8.7.048';
                return $GLOBALS['setup_info']['projects']['currentver'];
        }
+
+       $test[] = '0.8.7.048';
+       function projects_upgrade0_8_7_048()
+       {
+               $i = 0;
+               $GLOBALS['phpgw_setup']->db->query("SELECT account_id FROM 
phpgw_p_projectmembers where type='aa' or type='ma'");
+               while($GLOBALS['phpgw_setup']->db->next_record())
+               {
+                       $uadmins[$i] = 
$GLOBALS['phpgw_setup']->db->f('account_id');
+                       ++$i;
+               }
+
+               $i = 0;
+               $GLOBALS['phpgw_setup']->db->query("SELECT account_id FROM 
phpgw_p_projectmembers where type='ag' or type='mg'");
+               while($GLOBALS['phpgw_setup']->db->next_record())
+               {
+                       $gadmins[$i] = 
$GLOBALS['phpgw_setup']->db->f('account_id');
+                       ++$i;
+               }
+
+               $i = 0;
+               $GLOBALS['phpgw_setup']->db->query("SELECT account_id FROM 
phpgw_p_projectmembers where type='sa'");
+               while($GLOBALS['phpgw_setup']->db->next_record())
+               {
+                       $suser[$i] = 
$GLOBALS['phpgw_setup']->db->f('account_id');
+                       ++$i;
+               }
+
+               $i = 0;
+               $GLOBALS['phpgw_setup']->db->query("SELECT account_id FROM 
phpgw_p_projectmembers where type='sg'");
+               while($GLOBALS['phpgw_setup']->db->next_record())
+               {
+                       $sgroup[$i] = 
$GLOBALS['phpgw_setup']->db->f('account_id');
+                       ++$i;
+               }
+
+               if(is_array($uadmins))
+               {
+                       foreach($uadmins as $null => $aa)
+                       {
+                               $GLOBALS['phpgw_setup']->db->query("INSERT into 
phpgw_acl values ('project_admin','user'," . $aa . ',1)',__LINE__,__FILE__);
+                       }
+               }
+
+               if(is_array($gadmins))
+               {
+                       foreach($gadmins as $null => $ag)
+                       {
+                               $GLOBALS['phpgw_setup']->db->query("INSERT into 
phpgw_acl values ('project_admin','group'," . $ag . ',1)',__LINE__,__FILE__);
+                       }
+               }
+
+               if(is_array($suser))
+               {
+                       foreach($suser as $null => $su)
+                       {
+                               $GLOBALS['phpgw_setup']->db->query("INSERT into 
phpgw_acl values ('project_salesman','user'," . $su . ',1)',__LINE__,__FILE__);
+                       }
+               }
+
+               if(is_array($sgroup))
+               {
+                       foreach($sgroup as $null => $sg)
+                       {
+                               $GLOBALS['phpgw_setup']->db->query("INSERT into 
phpgw_acl values ('project_salesman','group'," . $sg . ',1)',__LINE__,__FILE__);
+                       }
+               }
+
+               $GLOBALS['phpgw_setup']->db->query("DELETE from 
phpgw_p_projectmembers where type='aa' or type='ag' or type='ma' or type='mg' 
or type='sa' or type='sg'",__LINE__,__FILE__);
+
+               $GLOBALS['setup_info']['projects']['currentver'] = '0.8.7.049';
+               return $GLOBALS['setup_info']['projects']['currentver'];
+       }
 ?>