[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.8,1.9 setup.inc.php,1.6,1.7 tables_update.inc.php,1.6,1.7

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/setup
In directory subversions:/tmp/cvs-serv14643/setup

Modified Files:
        tables_current.inc.php setup.inc.php tables_update.inc.php 
Log Message:
no message

Index: tables_current.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/setup/tables_current.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** tables_current.inc.php      7 Sep 2002 13:38:02 -0000       1.8
--- tables_current.inc.php      9 Sep 2002 17:45:18 -0000       1.9
***************
*** 701,705 ****
                                'c_user_gratification' => array('type' => 
'int', 'precision' => 4,'nullable' => True),
                                'c_residential_environment' => array('type' => 
'int', 'precision' => 4,'nullable' => True),
!                               'authorities_demands' => array('type' => 'int', 
'precision' => 4,'nullable' => True)
                        ),
                        'pk' => array('id'),
--- 701,706 ----
                                'c_user_gratification' => array('type' => 
'int', 'precision' => 4,'nullable' => True),
                                'c_residential_environment' => array('type' => 
'int', 'precision' => 4,'nullable' => True),
!                               'authorities_demands' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
!                               'score' => array('type' => 'int', 'precision' 
=> 4,'nullable' => True)
                        ),
                        'pk' => array('id'),
***************
*** 1052,1055 ****
--- 1053,1072 ----
                        ),
                        'pk' => array('objekt_id','bygg_id','index_count' ),
+                       'fk' => array(),
+                       'ix' => array(),
+                       'uc' => array()
+               ),
+               'fm_request_priority_key', array(
+                       'fd' => array(
+                               'id' => array('type' => 'int','precision' => 
4,'nullable' => False),
+                               'safety' => array('type' => 'int','precision' 
=> 4,'nullable' => True),
+                               'aesthetics' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
+                               'indoor_climate' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
+                               'consequential_damage' => array('type' => 
'int', 'precision' => 4,'nullable' => True),
+                               'user_gratification' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
+                               'residential_environment' => array('type' => 
'int', 'precision' => 4,'nullable' => True),
+                               'authorities_demands' => array('type' => 'int', 
'precision' => 4,'nullable' => True)
+                       ),
+                       'pk' => array('id'),
                        'fk' => array(),
                        'ix' => array(),

Index: setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/setup/setup.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** setup.inc.php       7 Sep 2002 00:35:16 -0000       1.6
--- setup.inc.php       9 Sep 2002 17:45:18 -0000       1.7
***************
*** 10,14 ****
        $setup_info['property']['name']      = 'property';
        $setup_info['property']['title']     = 'Property';
!       $setup_info['property']['version']   = '0.1.1.006';
        $setup_info['property']['app_order'] = 14;
        $setup_info['property']['enable']    = 1;
--- 10,14 ----
        $setup_info['property']['name']      = 'property';
        $setup_info['property']['title']     = 'Property';
!       $setup_info['property']['version']   = '0.1.1.007';
        $setup_info['property']['app_order'] = 14;
        $setup_info['property']['enable']    = 1;
***************
*** 50,53 ****
--- 50,54 ----
                'fm_request',
                'fm_request_attrib',
+               'fm_request_priority_key',
                'fm_request_status',
                'fm_request_type',
***************
*** 57,61 ****
                'fm_wo_chapter',
                'fm_wo_ns3420',
!               'fm_building_value_index',
                'phpgw_fm_tts_tickets',
                'phpgw_fm_tts_views',
--- 58,62 ----
                'fm_wo_chapter',
                'fm_wo_ns3420',
!               'fm_property_value',
                'phpgw_fm_tts_tickets',
                'phpgw_fm_tts_views',

Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/setup/tables_update.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** tables_update.inc.php       7 Sep 2002 13:38:02 -0000       1.6
--- tables_update.inc.php       9 Sep 2002 17:45:18 -0000       1.7
***************
*** 66,70 ****
                        'fm_admin', array(
                                'fd' => array(
!                               'account_id' => array('type' => 
'int','precision' => 4,'default' => 0,'nullable' => False),
                                'type' => array('type' => 'varchar','precision' 
=> 2,'nullable' => True),
                                'sub_module' => array('type' => 
'varchar','precision' => 15,'nullable' => False),
--- 66,70 ----
                        'fm_admin', array(
                                'fd' => array(
!                               'account_id' => array('type' => 
'int','precision' => 4,'nullable' => False),
                                'type' => array('type' => 'varchar','precision' 
=> 2,'nullable' => True),
                                'sub_module' => array('type' => 
'varchar','precision' => 15,'nullable' => False),
***************
*** 162,169 ****
  
                $phpgw_setup->oProc->CreateTable(
!                       'fm_building_value_index', array(
                        'fd' => array(
!                               'objekt_id' => array('type' => 
'char','precision' => 4,'default' => 0,'nullable' => False),
!                               'bygg_id' => array('type' => 'char','precision' 
=> 2,'nullable' => False),
                                'index_count' => array('type' => 'int', 
'precision' => 4,'nullable' => False),
                                'current_index' => array('type' => 'int', 
'precision' => 2,'nullable' => True),
--- 162,169 ----
  
                $phpgw_setup->oProc->CreateTable(
!                       'fm_property_value', array(
                        'fd' => array(
!                               'objekt_id' => array('type' => 
'char','precision' => 4,'nullable' => False),
!                               'cost_id' => array('type' => 'int','precision' 
=> 4,'nullable' => False),
                                'index_count' => array('type' => 'int', 
'precision' => 4,'nullable' => False),
                                'current_index' => array('type' => 'int', 
'precision' => 2,'nullable' => True),
***************
*** 181,184 ****
--- 181,215 ----
  
                $setup_info['property']['currentver'] = '0.1.1.006';
+               return $setup_info['property']['currentver'];
+       }
+ 
+       $test[] = '0.1.1.006';
+       function property_upgrade0_1_1_006()
+       {
+               global $setup_info, $phpgw_setup;
+ 
+               $phpgw_setup->oProc->CreateTable(
+                       'fm_request_priority_key', array(
+                       'fd' => array(
+                               'id' => array('type' => 'int','precision' => 
4,'nullable' => False),
+                               'safety' => array('type' => 'int','precision' 
=> 4,'nullable' => True),
+                               'aesthetics' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
+                               'indoor_climate' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
+                               'consequential_damage' => array('type' => 
'int', 'precision' => 4,'nullable' => True),
+                               'user_gratification' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
+                               'residential_environment' => array('type' => 
'int', 'precision' => 4,'nullable' => True),
+                               'authorities_demands' => array('type' => 'int', 
'precision' => 4,'nullable' => True)
+                       ),
+                       'pk' => array('id'),
+                       'fk' => array(),
+                       'ix' => array(),
+                       'uc' => array()
+ 
+                       )
+               );
+ 
+               $phpgw_setup->oProc->AddColumn('fm_request','score', 
array('type' => 'int', 'precision' => 2,'nullable' => True));
+ 
+               $setup_info['property']['currentver'] = '0.1.1.007';
                return $setup_info['property']['currentver'];
        }