pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP]: olap: code optimization and apply doc string

Browse Source 
bzr revid: ksa@tinyerp.co.in-20100316140230-fl6bloz1sieipnbp
This commit is contained in:
ksa (Open ERP)
2010-03-16 19:32:30 +05:30
parent 0a46449d0a
commit 5b77ed421c
7 changed files with 301 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/olap/data/olap_cube_view.xml
+37 -96
View File
@@ -2,11 +2,8 @@
<openerp>
<data>
<!--
<!-- Wizard view for the load data -->
Wizard view for the load data
-->
<record id="bi_load_db_form" model="ir.ui.view">
<field name="name">bi.load.db.form</field>
<field name="model">bi.load.db.wizard</field>
@@ -37,9 +34,8 @@ Wizard view for the load data
</record>
<!--
Wizard For Olap Warehouse
-->
<!-- Wizard For Olap Warehouse -->
<record id="view_warehouse_bi" model="ir.ui.view">
<field name="name">Olap Warehouse</field>
<field name="model">olap.warehouse.wizard</field>
@@ -69,10 +65,8 @@ Wizard For Olap Warehouse
sequence="51"
parent="base.next_id_50"
/>
<!--
Wizard View for the parameters wizard
-->
<!-- Wizard View for the parameters wizard -->
<record id="view_config_bi" model="ir.ui.view">
<field name="name">Parameters Configuration</field>
@@ -116,11 +110,7 @@ Wizard View for the parameters wizard
</record>
<!--
Wizard view for the Auto Configuring the data
-->
<!-- Wizard view for the Auto Configuring the data -->
<record id="bi_auto_configure_form" model="ir.ui.view">
<field name="name">bi.auto.configure.form</field>
@@ -176,20 +166,25 @@ Wizard view for the Auto Configuring the data
<field name="loaded" colspan="3"/>
<button name="%(act_bi_load_db_wizard)d" string="Reload Structure" type="action" states="done"/>
<field name="configure" colspan="3"/>
<button name="%(bi_load_configuration_table)d" string="ReConfigure Structure" type="action" states="done"/>
<!-- <button string="Configure Manually" name="dbconfigure" states="dbload" target="new"/>-->
<button name="%(bi_load_configuration_table)d"
string="ReConfigure Structure" type="action"
states="done" />
<field name="ready" select="2" colspan="3"/>
<field name="note" colspan="4"/>
<field name="state" select="2" colspan="2" />
<group colspan="2">
<button string="Connect to Database" name="dbconnect" states="none"/>
<button string="Load Database Structure" name="%(act_bi_load_db_wizard)d" type="action" states="dbconnect" target="new" />
<button string="Load Database Structure"
name="%(act_bi_load_db_wizard)d" type="action"
states="dbconnect" target="new" />
<button string="Configure Manually" name="dbconfigure" states="dbload"/>
<button string="Mark as Configured" name="dbready" states="dbconfigure"/>
</group>
<separator string="Auto Application Configuration" colspan="4"/>
<field name="app_detect" nolabel="1" colspan="3"/>
<button string="Configure Automatically " name="%(act_bi_auto_configure)d" type="action" states="dbload" target="new"/>
<button string="Configure Automatically "
name="%(act_bi_auto_configure)d" type="action"
states="dbload" target="new" />
</form>
</field>
</record>
@@ -228,13 +223,16 @@ Wizard view for the Auto Configuring the data
<field name="field_id"/>
</tree>
</field>
<field name="available_table_ids" colspan="4" nolabel="1" readonly="0" domain="[('available_table_ids','in',available_table_ids)]" context="{'flag':True,'master_dim':context.get('d_id',False),'master_schema':context.get('parent_schema_id',False),'link_col':column_link_id}">
<tree string="Database Tables">
<field name="related_to" string="Joined Table"/>
<field name="name"/>
<field name="table_id" />
<field name="primary_key" />
</tree>
<field name="available_table_ids" colspan="4"
nolabel="1" readonly="0"
domain="[('available_table_ids','in',available_table_ids)]"
context="{'flag':True,'master_dim':context.get('d_id',False),'master_schema':context.get('parent_schema_id',False),'link_col':column_link_id}">
<tree string="Database Tables">
<field name="related_to" string="Joined Table" />
<field name="name" />
<field name="table_id" />
<field name="primary_key" />
</tree>
</field>
</form>
</field>
@@ -276,11 +274,6 @@ Wizard view for the Auto Configuring the data
<field name="schema_id" select="1" attrs="{'readonly':[('schema_id','!=','')]}"/>
<field name="query_log" select="2"/>
<field name="table_id" colspan="4" context="{'parent_schema_id':schema_id}"/>
<!--<separator colspan="4" string="Dimensions"/>
<field name="dimension_ids" colspan="4" nolabel="1"/>
<separator colspan="4" string="Measures"/>
<field name="measure_ids" colspan="4" nolabel="1"/>-->
</form>
</field>
</record>
@@ -319,19 +312,6 @@ Wizard view for the Auto Configuring the data
<form string="Olap dimension">
<field name="name" select="1"/>
<field name="cube_id" select="1" attrs="{'readonly':[('cube_id','!=','')]}"/>
<!-- <field name="cube_id" on_change="onchange_cube_id(cube_id)" select="1" attrs="{'readonly':[('cube_id','!=','')]}"/>
<field name="foreign_key_table" select="2"/>
<field name="foreign_key" select="2"/>
<separator colspan="4" string="Select In These Tables For Foreign Keys"/>
<field name="available_foreign_table_ids" nolabel="1" colspan="4" readonly="0">
<tree string="Database Tables">
<button string="Mark as Foreign Table" name="mark_foreign" context="{'parent_id':parent.id,'parent_name':parent.name,'parent_cube':parent.cube_id,'reload':1}" type="object"/>
<field name="table_id" />
<field name="name" string="Link Column"/>
</tree>
</field>
<separator colspan="4" string="Hierarchies"/>
<field name="hierarchy_ids" colspan="4" nolabel="1"/>-->
</form>
</field>
</record>
@@ -418,12 +398,13 @@ Wizard view for the Auto Configuring the data
<field name="arch" type="xml">
<form string="Olap level">
<field name="name" select="1" colspan="4"/>
<field name="column_name" select="1" on_change="onchange_column_name(column_name)" context="{'filter_cols_hier':hierarchy_id}"/>
<field name="column_name" select="1"
on_change="onchange_column_name(column_name)"
context="{'filter_cols_hier':hierarchy_id}" />
<field name="column_id_name" select="1"/>
<field name="type" select="1"/>
<field name="table_name" select="1"/>
<field name="sequence"/>
<!-- <field name="hierarchy_id" select="1"/>-->
<field name="hierarchy_id" select="1" attrs="{'readonly':[('hierarchy_id','!=','')]}"/>
</form>
</field>
@@ -466,21 +447,6 @@ Wizard view for the Auto Configuring the data
<field name="value_column_id_name" invisible="True"/>
<field name="table_name" invisible="True"/>
<field name="measure_type"/>
<!-- <notebook colspan="4">
<page string="Fact Table Column" >
<newline/>
<field name="value_column" select="1" on_change="onchange_measure_name(value_column)" context="{'filter_cols_cube':cube_id}"/>
<field name="agregator" select="2"/>
<field name="formatstring" select="2"/>
</page>
<page string="SQL Expression" attrs="{'invisible':[('measure_type','!=','sql_expr')]}">
<field name="value_sql" colspan="4" select="2"/>
<field name="datatype" select="2"/>
</page>
</notebook>
-->
<group colspan="4" attrs="{'invisible':[('measure_type','!=','fact_column')]}">
<newline/>
<field name="value_column" select="1" attrs="{'required':[('measure_type','=','fact_column')]}" on_change="onchange_measure_name(value_column)" context="{'filter_cols_cube':cube_id}"/>
@@ -489,7 +455,8 @@ Wizard view for the Auto Configuring the data
</group>
<group colspan="4" attrs="{'invisible':[('measure_type','!=','sql_expr')]}">
<newline/>
<field name="value_sql" colspan="4" select="2" attrs="{'required':[('measure_type','=','sql_expr')]}"/>
<field name="value_sql" colspan="4" select="2"
attrs="{'required':[('measure_type','=','sql_expr')]}" />
<field name="datatype" select="2"/>
</group>
</form>
@@ -569,11 +536,7 @@ Wizard view for the Auto Configuring the data
action="action_olap_saved_query_form"
id="menu_action_olap_saved_query_form"/>
<!--
All Logs
-->
<!-- All Logs -->
<record model="ir.ui.view" id="view_olap_query_logs_tree">
<field name="name">olap.query.logs</field>
@@ -608,22 +571,14 @@ All Logs
<field name="res_model">olap.query.logs</field>
<field name="view_type">form</field>
</record>
<menuitem
name="All Logs"
action="action_olap_query_logs_form"
id="menu_action_olap_query_logs_form"
parent="menu_bi_conf_tools"/>
<!--
All Logs / My logs
-->
<!-- All Logs / My logs -->
<record model="ir.ui.view" id="view_olap_query_logs_my_tree">
<field name="name">olap.query.logs</field>
@@ -649,6 +604,9 @@ All Logs / My logs
</tree>
</field>
</record>
<!-- Query Logs -->
<record model="ir.ui.view" id="view_olap_query_logs_my_form">
<field name="name">olap.query.logs.form</field>
<field name="model">olap.query.logs</field>
@@ -656,8 +614,6 @@ All Logs / My logs
<field name="arch" type="xml">
<form string="My Logs">
<field name="user_id" select="1" readonly="True"/>
<!-- domain="[('uid','=',uid)]"
/> -->
<field name="query" select="1" readonly="True"/>
<field name="time" select="2" readonly="True"/>
<field name="result_size" select="2" readonly="True"/>
@@ -666,8 +622,8 @@ All Logs / My logs
</form>
</field>
</record>
<record model="ir.actions.act_window" id="action_olap_query_logs_my_form">
<field name="name">My Logs</field>
<field name="res_model">olap.query.logs</field>
@@ -675,27 +631,12 @@ All Logs / My logs
<field name="view_mode">tree,form,mdx</field>
<field name="domain">[('user_id','=',uid)]</field>
</record>
<menuitem
name="My Logs"
action="action_olap_query_logs_my_form"
id="menu_action_olap_query_logs_my_form"
parent="menu_action_olap_query_logs_form"/>
<!--
Clear All Logs
-->
<!--
Clear My logs
-->
</data>
</openerp>
addons/olap/data/olap_view.xml
+12 -9
View File
@@ -2,22 +2,19 @@
<openerp>
<data>
<!-- <menuitem-->
<!-- name="Businesss Intelligence"-->
<!-- id="menu_bi"-->
<!-- icon="terp-account" parent="base.next_id_50"/>-->
<menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting" sequence="8"/>
<menuitem
id="base.next_id_50"
name="Configuration"
parent="base.reporting_menu"
groups="base.group_system"
sequence="3"/>
<menuitem
name="Custom Reports" id="base.menu_custom_reports"
parent="base.reporting_menu" sequence="1"/>
<menuitem
name="Businesss Intelligence Configuration"
id="menu_bi_configuration"
@@ -49,18 +46,24 @@
<menuitem name="Clear Logs" action="action_view_olap_query_logs_clear" icon="STOCK_EXECUTE"
id="menu_bi_clear_logs" sequence="30" parent="menu_bi_conf_tools"/>
<record model="ir.actions.url" id="menu_url_cube_browser">
<field name="name">name_menu_url_cube_browser</field>
<field name="url">http://localhost:8080/browser</field>
</record>
<menuitem name="Cube Browser" id="menu_browser_url" type="url" action="menu_url_cube_browser" parent="base.menu_custom_reports" sequence="1"/>
<menuitem name="Cube Browser" id="menu_browser_url" type="url"
action="menu_url_cube_browser" parent="base.menu_custom_reports"
sequence="1" />
<record model="ir.actions.url" id="menu_url_cube_designer">
<field name="name">name_menu_url_cube_designer</field>
<field name="url">http://localhost:8080/designer</field>
</record>
<menuitem name="Cube Designer" sequence="60" action="menu_url_cube_designer" type="url" id="menu_designer_url" parent="base.next_id_50"/>
<menuitem name="Cube Designer" sequence="60"
action="menu_url_cube_designer" type="url" id="menu_designer_url"
parent="base.next_id_50" />
</data>
</openerp>
addons/olap/olap.py
+237 -282
View File
File diff suppressed because it is too large Load Diff
addons/olap/wizard/olap_load_column.py
+3 -3
View File
@@ -28,7 +28,6 @@
from osv import fields, osv
class olap_load_column(osv.osv_memory):
""" Load Database Column """
_name = "olap.load.column"
_description = "Olap Load Column"
@@ -38,11 +37,12 @@ class olap_load_column(osv.osv_memory):
@param cr: the current row, from the database cursor,
@param uid: the current user\'s ID for security checks,
@param ids: List of load column,
@return : dictionary of database columns window on give id
@return: dictionary of database columns window on give id
"""
data = context and context.get('active_id', False) or False
ids_cols = self.pool.get('olap.database.columns').search(cr, uid,\
([('table_id','=',context['active_id'])]),context={})
([('table_id','=',data)]),context={})
model_data_ids = self.pool.get('ir.model.data').search(cr,uid,\
[('model','=','ir.ui.view'),\
('name','=','view_olap_database_columns_form')],context={})
addons/olap/wizard/olap_load_column_view.xml
+4 -1
View File
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- Open Column -->
<record id="view_olap_load_column" model="ir.ui.view">
<field name="name">Create Logs</field>
<field name="name">Open Columns</field>
<field name="model">olap.load.column</field>
<field name="type">form</field>
<field name="arch" type="xml">
addons/olap/wizard/olap_query_logs_clear.py
+2 -1
View File
@@ -28,7 +28,6 @@
from osv import fields, osv
class olap_query_logs_clear(osv.osv_memory):
""" Clear the Logs for Given User """
_name = "olap.query.logs.clear"
_description = "Olap Query Logs Clear"
_columns = {
@@ -69,6 +68,7 @@ class olap_query_logs_clear(osv.osv_memory):
olap_query_logs_clear()
class olap_query_logs_clear_msg(osv.osv_memory):
""" Display clear log message """
_name = "olap.query.logs.clear.msg"
@@ -77,4 +77,5 @@ class olap_query_logs_clear_msg(osv.osv_memory):
}
olap_query_logs_clear_msg()
# vim: ts=4 sts=4 sw=4 si et
addons/olap/wizard/olap_query_logs_clear_view.xml
+6 -3
View File
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- Create Logs -->
<record id="view_olap_query_logs_clear" model="ir.ui.view">
<field name="name">Create Logs</field>
<field name="name">Clear Logs</field>
<field name="model">olap.query.logs.clear</field>
<field name="type">form</field>
<field name="arch" type="xml">
@@ -19,7 +22,7 @@
</record>
<record id="action_view_olap_query_logs_clear" model="ir.actions.act_window">
<field name="name">Create Logs </field>
<field name="name">Clear Logs </field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">olap.query.logs.clear</field>
<field name="view_type">form</field>
@@ -28,7 +31,7 @@
</record>
<record id="view_olap_query_logs_clear_msg" model="ir.ui.view">
<field name="name">Create Logs Message</field>
<field name="name">Clear Logs Message</field>
<field name="model">olap.query.logs.clear.msg</field>
<field name="type">form</field>
<field name="arch" type="xml">