[Fmsystem-commits] [11323] Fix setup: default values

[Sigurd Nes]

Revision: 11323
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11323
Author:   sigurdne
Date:     2013-09-25 14:57:45 +0000 (Wed, 25 Sep 2013)
Log Message:
-----------
Fix setup: default values

Modified Paths:
--------------
    trunk/catch/setup/default_records.inc.php
    trunk/property/setup/default_records.inc.php

Modified: trunk/catch/setup/default_records.inc.php
===================================================================
--- trunk/catch/setup/default_records.inc.php   2013-09-25 13:22:27 UTC (rev 
11322)
+++ trunk/catch/setup/default_records.inc.php   2013-09-25 14:57:45 UTC (rev 
11323)
@@ -68,12 +68,13 @@
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations (app_id, 
name, descr, allow_grant) VALUES ({$app_id}, '.catch.2', 'Shema category', 1)");
 //$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations (app_id, 
name, descr, allow_grant, allow_c_attrib,c_attrib_table) VALUES ({$app_id}, 
'.catch.2.1', 'Shema type 1', 1, 1, 'fm_catch_2_1')");
 
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_catch (id, name, descr) 
VALUES (1, 'Users and devices', 'Users and devices')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_catch (id, name, descr) 
VALUES (2, 'Shema type 1', 'Shema type 1')");
+$location_id = $GLOBALS['phpgw']->locations->get_id('catch', '.catch.1');
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_catch (location_id, id, 
name, descr) VALUES ({$location_id}, 1, 'Users and devices', 'Users and 
devices')");
+$location_id = $GLOBALS['phpgw']->locations->get_id('catch', '.catch.2');
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_catch (location_id, id, 
name, descr) VALUES ({$location_id}, 2, 'Shema type 1', 'Shema type 1')");
 
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_catch_category 
(entity_id, id, name, descr) VALUES (1, 1, 'Users and devices', 'Users and 
devices')");
-//$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_catch_category 
(entity_id, id, name, descr, fileupload) VALUES (2, 1, 'Shema type 1', 'Shema 
type 1', 1)");
+$location_id = $GLOBALS['phpgw']->locations->get_id('catch', '.catch.1.1');
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_catch_category 
(location_id, entity_id, id, name, descr) VALUES ({$location_id}, 1, 1, 'Users 
and devices', 'Users and devices')");
 
-$location_id = $GLOBALS['phpgw']->locations->get_id('catch', '.catch.1.1');
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute 
(location_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES 
($location_id, 1, 'unitid', 'UnitID', 'UnitID for device', 'V', 1, 1, NULL, 50, 
NULL, NULL, 'False')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute 
(location_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES 
($location_id, 2, 'user_', 'User', 'System user', 'user', 1, 2, NULL, NULL, 
NULL, NULL, 'False')");

Modified: trunk/property/setup/default_records.inc.php
===================================================================
--- trunk/property/setup/default_records.inc.php        2013-09-25 13:22:27 UTC 
(rev 11322)
+++ trunk/property/setup/default_records.inc.php        2013-09-25 14:57:45 UTC 
(rev 11323)
@@ -398,25 +398,28 @@
 # Dumping data for table fm_entity
 #
 
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity (id, name, descr, 
location_form, documentation) VALUES (1, 'Equipment', 'equipment', 1, 1)");
+$location_id = $GLOBALS['phpgw']->locations->get_id('property', '.entity.1');
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity (location_id, id, 
name, descr, location_form, documentation) VALUES ({$location_id}, 1, 
'Equipment', 'equipment', 1, 1)");
 //$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity (id, name, 
descr, location_form, documentation, lookup_entity) VALUES (2, 'Report', 
'report', 1, NULL, 'a:1:{i:0;s:1:"1";}')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity (id, name, descr, 
location_form, documentation, lookup_entity) VALUES (2, 'Report', 'report', 1, 
NULL, '')");
+$location_id = $GLOBALS['phpgw']->locations->get_id('property', '.entity.2');
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity (location_id, id, 
name, descr, location_form, documentation, lookup_entity) VALUES 
({$location_id}, 2, 'Report', 'report', 1, NULL, '')");
 
 #
 # Dumping data for table fm_entity_category
 #
 
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category 
(entity_id, id, name, descr, prefix, lookup_tenant, tracking, location_level) 
VALUES (1, 1, 'Meter', 'Meter', NULL, NULL, NULL, 3)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category 
(entity_id, id, name, descr, prefix, lookup_tenant, tracking, location_level) 
VALUES (1, 2, 'Elevator', 'Elevator', 'E', NULL, NULL, 3)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category 
(entity_id, id, name, descr, prefix, lookup_tenant, tracking, location_level) 
VALUES (1, 3, 'Fire alarm central', 'Fire alarm central', 'F', NULL, NULL, 3)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category 
(entity_id, id, name, descr, prefix, lookup_tenant, tracking, location_level) 
VALUES (2, 1, 'Report type 1', 'Report type 1', 'RA', 1, 1, 4)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category 
(entity_id, id, name, descr, prefix, lookup_tenant, tracking, location_level) 
VALUES (2, 2, 'Report type 2', 'Report type 2', 'RB', 1, 1, 4)");
 
 
+
+
+
+
 #
 # Dumping data for table fm_entity_attribute
 #
 $location_id = $GLOBALS['phpgw']->locations->get_id('property', '.entity.1.1');
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category 
(location_id, entity_id, id, name, descr, prefix, lookup_tenant, tracking, 
location_level) VALUES ({$location_id}, 1, 1, 'Meter', 'Meter', NULL, NULL, 
NULL, 3)");
+
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute 
(location_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES 
($location_id, 1, 'status', 'Status', 'Status', 'LB', NULL, 1, NULL, NULL, 
NULL, NULL, 'True')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute 
(location_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES 
($location_id, 2, 'category', 'Category', 'Category statustext', 'LB', NULL, 2, 
NULL, NULL, NULL, NULL, 'True')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute 
(location_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES 
($location_id, 3, 'ext_system_id', 'Ext system id', 'External system id', 'V', 
NULL, 3, NULL, 12, NULL, NULL, 'False')");
@@ -428,6 +431,7 @@
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_choice 
(location_id, attrib_id, id, value) VALUES ($location_id, 2, 2, 'Joint power 
meter')");
 
 $location_id = $GLOBALS['phpgw']->locations->get_id('property', '.entity.1.2');
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category 
(location_id, entity_id, id, name, descr, prefix, lookup_tenant, tracking, 
location_level) VALUES ({$location_id}, 1, 2, 'Elevator', 'Elevator', 'E', 
NULL, NULL, 3)");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute 
(location_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES 
($location_id, 1, 'status', 'Status', 'Status', 'LB', NULL, 1, NULL, NULL, 
NULL, NULL, 'True')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute 
(location_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES 
($location_id, 2, 'attribute1', 'Attribute 1', 'Attribute 1 statustext', 'V', 
NULL, 2, NULL, 12, NULL, NULL, 'True')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute 
(location_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES 
($location_id, 3, 'attribute2', 'Attribute 2', 'Attribute 2 status text', 'D', 
NULL, 3, NULL, NULL, NULL, NULL, 'True')");
@@ -442,6 +446,7 @@
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_choice 
(location_id, attrib_id, id, value) VALUES ($location_id, 5, 2, 'choice 2')");
 
 $location_id = $GLOBALS['phpgw']->locations->get_id('property', '.entity.1.3');
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category 
(location_id, entity_id, id, name, descr, prefix, lookup_tenant, tracking, 
location_level) VALUES ({$location_id}, 1, 3, 'Fire alarm central', 'Fire alarm 
central', 'F', NULL, NULL, 3)");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute 
(location_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES 
($location_id, 1, 'status', 'Status', 'Status', 'LB', NULL, 1, NULL, NULL, 
NULL, NULL, 'True')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute 
(location_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES 
($location_id, 2, 'attribute1', 'Attribute 1', 'Attribute 1 statustext', 'V', 
NULL, 2, NULL, 12, NULL, NULL, 'True')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute 
(location_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES 
($location_id, 3, 'attribute2', 'Attribute 2', 'Attribute 2 status text', 'D', 
NULL, 3, NULL, NULL, NULL, NULL, 'True')");
@@ -456,6 +461,7 @@
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_choice 
(location_id, attrib_id, id, value) VALUES ($location_id, 5, 2, 'choice 2')");
 
 $location_id = $GLOBALS['phpgw']->locations->get_id('property', '.entity.2.1');
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category 
(location_id, entity_id, id, name, descr, prefix, lookup_tenant, tracking, 
location_level) VALUES ({$location_id}, 2, 1, 'Report type 1', 'Report type 1', 
'RA', 1, 1, 4)");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute 
(location_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES 
($location_id, 1, 'status', 'Status', 'Status', 'LB', NULL, 1, NULL, NULL, 
NULL, NULL, 'True')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute 
(location_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES 
($location_id, 2, 'attribute1', 'Attribute 1', 'Attribute 1 statustext', 'V', 
NULL, 2, NULL, 12, NULL, NULL, 'True')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute 
(location_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES 
($location_id, 3, 'attribute2', 'Attribute 2', 'Attribute 2 status text', 'D', 
NULL, 3, NULL, NULL, NULL, NULL, 'True')");
@@ -470,6 +476,7 @@
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_choice 
(location_id, attrib_id, id, value) VALUES ($location_id, 5, 2, 'choice 2')");
 
 $location_id = $GLOBALS['phpgw']->locations->get_id('property', '.entity.2.2');
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category 
(location_id, entity_id, id, name, descr, prefix, lookup_tenant, tracking, 
location_level) VALUES ({$location_id}, 2, 2, 'Report type 2', 'Report type 2', 
'RB', 1, 1, 4)");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute 
(location_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES 
($location_id, 1, 'status', 'Status', 'Status', 'LB', NULL, 1, NULL, NULL, 
NULL, NULL, 'True')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute 
(location_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES 
($location_id, 2, 'attribute1', 'Attribute 1', 'Attribute 1 statustext', 'V', 
NULL, 2, NULL, 12, NULL, NULL, 'True')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute 
(location_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES 
($location_id, 3, 'attribute2', 'Attribute 2', 'Attribute 2 status text', 'D', 
NULL, 3, NULL, NULL, NULL, NULL, 'True')");