[IMP]: olap: Minor change and improve in design of view

bzr revid: atp@tinyerp.co.in-20100412132936-pu6nc0rkfio44vky

diff --git a/addons/olap/data/olap_cube_view.xml b/addons/olap/data/olap_cube_view.xml
index 1725577..c3f43b8 100644 (file)
--- a/addons/olap/data/olap_cube_view.xml
+++ b/addons/olap/data/olap_cube_view.xml
@@ -176,7 +176,8 @@
                        string="ReConfigure Structure" type="action"
                        states="done" />
                      <field name="ready" select="2" colspan="3"/>
-                     <field name="note" colspan="4"/>
+                     <separator string="Schema description" colspan="4"/>
+                     <field name="note" colspan="4" nolabel="1"/>
                      <field name="state" select="2" colspan="2" />
                      <group colspan="2">
                        <button string="Connect to Database" name="dbconnect" states="none"/>
@@ -279,10 +280,10 @@
                <field name="type">form</field>
                <field name="arch" type="xml">
                    <form string="Olap cube">
-                       <field name="name" select="1" colspan="4"/>
-                       <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}"/>
+                       <field name="name" select="1" colspan="2"/>
+                       <field name="schema_id" select="1" attrs="{'readonly':[('schema_id','!=','')]}" colspan="2"/>
+                       <field name="table_id"   context="{'parent_schema_id':schema_id}" colspan="2"/>
+                       <field name="query_log" select="2" colspan="2"/>
                    </form>
                </field>
            </record>
@@ -362,10 +363,11 @@
                <field name="type">form</field>
                <field name="arch" type="xml">
                    <form string="Olap hierarchy">
-                       <field name="name" select="1" colspan="4"/>
-                       <field name="dimension_id" select="1" attrs="{'readonly':[('dimension_id','!=','')]}"/>
+                       <field name="name" select="1" colspan="2"/>
+                       <field name="sequence" colspan="2"/>
+                       <field name="dimension_id" select="1" attrs="{'readonly':[('dimension_id','!=','')]}" colspan="4"/>
        <!--                <field name="field_name" select="2"/>-->
-                       <field name="sequence"/>
+                       
                        <field name="table_id" select="2" colspan="4" context="{'d_id':dimension_id}"/>
        <!--                <separator string="Levels" colspan="4"/>
                        <field name="level_ids" colspan="4" nolabel="1"/>-->
@@ -474,8 +476,9 @@
                        </group>
                        <group colspan="4"  attrs="{'invisible':[('measure_type','!=','sql_expr')]}">
                            <newline/>
+                           <separator string="SQL Expression" colspan="4"/>
                            <field name="value_sql" colspan="4" select="2"
-                               attrs="{'required':[('measure_type','=','sql_expr')]}" />
+                               attrs="{'required':[('measure_type','=','sql_expr')]}" nolabel="1" />
                            <field name="datatype" select="2"/>
                        </group>
                    </form>
@@ -535,13 +538,18 @@
                <field name="type">form</field>
                <field name="arch" type="xml">
                    <form string="Olap Saved Query">
-                       <field name="name" select="1" readonly="True"/>
-                       <field name="query" select="1" colspan="4" readonly="True"/>
-                       <field name="user_id" readonly="True"/>
-                       <field name="cube_id" select="2" readonly="True"/>
-                       <field name="mdx_id" select="2" readonly="True"/>
-                       <field name="schema_id" select="2" readonly="True"/>
-                       <field name="axis_keys" readonly="True"/>
+                       <group colspan="4">
+                               <field name="user_id" readonly="True"/>
+                               <field name="cube_id" select="2" readonly="True"/>
+                               <field name="mdx_id" select="2" readonly="True"/>
+                               <field name="schema_id" select="2" readonly="True"/>
+                       </group>
+                               <separator string="Query Name" colspan="4"/>
+                               <field name="name" select="1" readonly="True" nolabel="1"/>
+                               <separator string="Query" colspan="4"/>
+                               <field name="query" select="1" colspan="4" readonly="True" nolabel="1"/>
+                               <separator string="Axis Keys" colspan="4"/>
+                               <field name="axis_keys" readonly="True" nolabel="1"/>
                    </form>
                </field>
            </record>
@@ -581,12 +589,13 @@
                <field name="type">form</field>
                <field name="arch" type="xml">
                    <form string="All Logs">
-                       <field name="query" colspan="4" select="1" readonly="True"/>
-                       <field name="time" select="2" readonly="True"/>
-                       <field name="result_size" select="2" readonly="True"/>
-                       <field name="cube_id" select="2" readonly="True"/>
-                       <field name="count" readonly="True"/>
-                       <field name="schema_id" readonly="True"/>
+                       <field name="cube_id" select="2" readonly="True" colspan="2"/>
+                       <field name="schema_id" readonly="True" colspan="2"/>
+                       <field name="time" select="2" readonly="True" colspan="4"/>
+                       <field name="result_size" select="2" readonly="True" colspan="2"/>
+                       <field name="count" readonly="True" colspan="2"/>
+                       <separator string="Query" colspan="4"/>
+                       <field name="query" colspan="4" select="1" readonly="True" nolabel="1"/>
                    </form>
                </field>
            </record>
@@ -640,7 +649,8 @@
                <field name="arch" type="xml">
                    <form string="My Logs">
                        <field name="user_id" select="1" readonly="True"/>
-                       <field name="query" colspan="4" select="1" readonly="True"/>
+                       <separator string="Query" colspan="4"/>
+                       <field name="query" colspan="4" select="1" readonly="True" nolabel="1"/>
                        <field name="time" select="2" readonly="True"/>
                        <field name="result_size" select="2" readonly="True"/>
                        <field name="cube_id" select="2" readonly="True"/>

diff --git a/addons/olap/data/olap_fact_view.xml b/addons/olap/data/olap_fact_view.xml
index 8d38949..0dc543a 100755 (executable)
--- a/addons/olap/data/olap_fact_view.xml
+++ b/addons/olap/data/olap_fact_view.xml
@@ -231,7 +231,8 @@
             <form string="Olap Application">
                 <newline/>
                        <field name="name" select="1" colspan="2"/>
-                       <field name="query" select="1" colspan="4"/>
+                       <separator colspan="4" string="Application query"/>
+                       <field name="query" select="1" colspan="4" nolabel="1"/>
                        <field name="table_ids" select="1" colspan="4" nolabel="1"/>
                        <field name="field_ids" select="1" colspan="4" nolabel="1" rowspan="1"/>
             </form>
@@ -274,8 +275,9 @@
                 <newline/>
                 <field name="name" select="1" colspan="2"/>
                 <field name="table_name" select="1" />
-                <field name="is_hidden" select="1" colspan="2" />
                 <field name="application_id" select="1" />
+                <field name="is_hidden" select="1" colspan="2" />
+                
             </form>
         </field>
     </record>

diff --git a/addons/olap/olap.py b/addons/olap/olap.py
index 5081619..3034b72 100644 (file)
--- a/addons/olap/olap.py
+++ b/addons/olap/olap.py
@@ -1249,7 +1249,7 @@ class olap_measure(osv.osv):
                              ('sql_expr', 'SQL Expression')],\
                              'Measure Type', required = True,\
                              help = "Select between auto column or sql expression for the measures"),
-        'value_sql': fields.char('SQL Expression', size = 200, help = "You can \
+        'value_sql': fields.text('SQL Expression', help = "You can \
                             provide valid sql expression. Make sure it have \
                          function with fully qualified column name like \
                          (sum,avg ...)(tablename.columnname (+,- ...) tablename.columnname)"),