[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16586] prepare for generic report
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [16586] prepare for generic report |
Date: |
Tue, 18 Apr 2017 05:22:13 -0400 (EDT) |
Revision: 16586
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16586
Author: sigurdne
Date: 2017-04-18 05:22:12 -0400 (Tue, 18 Apr 2017)
Log Message:
-----------
prepare for generic report
Modified Paths:
--------------
trunk/property/inc/class.menu.inc.php
trunk/property/setup/default_records.inc.php
trunk/property/setup/setup.inc.php
trunk/property/setup/tables_current.inc.php
trunk/property/setup/tables_update.inc.php
Modified: trunk/property/inc/class.menu.inc.php
===================================================================
--- trunk/property/inc/class.menu.inc.php 2017-04-18 08:40:12 UTC (rev
16585)
+++ trunk/property/inc/class.menu.inc.php 2017-04-18 09:22:12 UTC (rev
16586)
@@ -923,6 +923,16 @@
}
+ if ($acl->check('.report', PHPGW_ACL_READ, 'property'))
+ {
+ $menus['navigation']['report'] = array
+ (
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uireport.index')),
+ 'text' => lang('report'),
+ 'image' => array('property', 'report')
+ );
+ }
+
if ($acl->check('.ticket.order', PHPGW_ACL_ADD,
'property'))
{
$menus['navigation']['helpdesk']['children']['order_template'] = array
Modified: trunk/property/setup/default_records.inc.php
===================================================================
--- trunk/property/setup/default_records.inc.php 2017-04-18 08:40:12 UTC
(rev 16585)
+++ trunk/property/setup/default_records.inc.php 2017-04-18 09:22:12 UTC
(rev 16586)
@@ -88,6 +88,7 @@
$GLOBALS['phpgw']->locations->add("{$location}.category",
'Categories', 'property');
}
+ $GLOBALS['phpgw']->locations->add('.report', 'Generic report',
'property', $allow_grant = true);
$GLOBALS['phpgw_setup']->oProc->query("DELETE from phpgw_config WHERE
config_app='property'");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_config
(config_app, config_name, config_value) VALUES ('property','meter_table',
'fm_entity_1_1')");
Modified: trunk/property/setup/setup.inc.php
===================================================================
--- trunk/property/setup/setup.inc.php 2017-04-18 08:40:12 UTC (rev 16585)
+++ trunk/property/setup/setup.inc.php 2017-04-18 09:22:12 UTC (rev 16586)
@@ -11,7 +11,7 @@
* @version $Id$
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.710';
+ $setup_info['property']['version'] = '0.9.17.711';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
@@ -214,7 +214,9 @@
'fm_jasper_input',
'fm_custom_menu_items',
'fm_regulations',
- 'fm_generic_history'
+ 'fm_generic_history',
+ 'fm_view_dataset',
+ 'fm_view_dataset_report'
);
/* The hooks this app includes, needed for hooks registration */
Modified: trunk/property/setup/tables_current.inc.php
===================================================================
--- trunk/property/setup/tables_current.inc.php 2017-04-18 08:40:12 UTC (rev
16585)
+++ trunk/property/setup/tables_current.inc.php 2017-04-18 09:22:12 UTC (rev
16586)
@@ -2848,5 +2848,32 @@
'contact_id' => 'contact_id')),
'ix' => array(),
'uc' => array('contact_id', 'location_code')
+ ),
+ 'fm_view_dataset' => array(
+ 'fd' => array(
+ 'id' => array('type' => 'auto', 'precision' =>
4, 'nullable' => False),
+ 'view_name' => array('type' => 'varchar',
'precision' => 100, 'nullable' => False),
+ 'dataset_name' => array('type' => 'varchar',
'precision' => 100, 'nullable' => False),
+ 'owner_id' => array('type' => 'int',
'precision' => 4, 'nullable' => true),
+ 'entry_date' => array('type' => 'int',
'precision' => 4, 'nullable' => true),
+ ),
+ 'pk' => array('id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ ),
+ 'fm_view_dataset_report' => array(
+ 'fd' => array(
+ 'id' => array('type' => 'auto', 'precision' =>
4, 'nullable' => False),
+ 'dataset_id' => array('type' => 'int',
'precision' => 4, 'nullable' => False),
+ 'report_name' => array('type' => 'varchar',
'precision' => 100, 'nullable' => False),
+ 'report_definition' => array('type' => 'jsonb',
'nullable' => true),
+ 'owner_id' => array('type' => 'int',
'precision' => 4, 'nullable' => true),
+ 'entry_date' => array('type' => 'int',
'precision' => 4, 'nullable' => true),
+ ),
+ 'pk' => array('id'),
+ 'fk' => array('fm_view_dataset' => array('dataset_id'
=> 'id')),
+ 'ix' => array(),
+ 'uc' => array()
)
);
Modified: trunk/property/setup/tables_update.inc.php
===================================================================
--- trunk/property/setup/tables_update.inc.php 2017-04-18 08:40:12 UTC (rev
16585)
+++ trunk/property/setup/tables_update.inc.php 2017-04-18 09:22:12 UTC (rev
16586)
@@ -9457,3 +9457,54 @@
return $GLOBALS['setup_info']['property']['currentver'];
}
}
+
+ /**
+ * Update property version from 0.9.17.709 to 0.9.17.711
+ *
+ */
+ $test[] = '0.9.17.710';
+
+ function property_upgrade0_9_17_710()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+ $GLOBALS['phpgw']->locations->add('.report', 'Generic report',
'property', $allow_grant = true);
+
+ $GLOBALS['phpgw_setup']->oProc->CreateTable(
+ 'fm_view_dataset', array(
+ 'fd' => array(
+ 'id' => array('type' => 'auto',
'precision' => 4, 'nullable' => False),
+ 'view_name' => array('type' =>
'varchar', 'precision' => 100, 'nullable' => False),
+ 'dataset_name' => array('type' =>
'varchar', 'precision' => 100, 'nullable' => False),
+ 'owner_id' => array('type' => 'int',
'precision' => 4, 'nullable' => true),
+ 'entry_date' => array('type' => 'int',
'precision' => 4, 'nullable' => true),
+ ),
+ 'pk' => array('id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ )
+ );
+
+ $GLOBALS['phpgw_setup']->oProc->CreateTable(
+ 'fm_view_dataset_report', array(
+ 'fd' => array(
+ 'id' => array('type' => 'auto',
'precision' => 4, 'nullable' => False),
+ 'dataset_id' => array('type' => 'int',
'precision' => 4, 'nullable' => False),
+ 'report_name' => array('type' =>
'varchar', 'precision' => 100, 'nullable' => False),
+ 'report_definition' => array('type' =>
'jsonb', 'nullable' => true),
+ 'owner_id' => array('type' => 'int',
'precision' => 4, 'nullable' => true),
+ 'entry_date' => array('type' => 'int',
'precision' => 4, 'nullable' => true),
+ ),
+ 'pk' => array('id'),
+ 'fk' => array('fm_view_dataset' =>
array('dataset_id' => 'id')),
+ 'ix' => array(),
+ 'uc' => array()
+ )
+ );
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.711';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16586] prepare for generic report,
sigurdne <=