Merge lp:~openerp-dev/openobject-server/trunk-graph-schemas-fixes-xmo into lp:openobject-server

[Xavier (Open ERP)]

Tighten the subset of view schemas for the graph view:

* Explicitly specify possible values for arguments of `graph`
* Remove @color, which is unused and unspecified
* Specify `graph/field` as a self-contained element instead of referring to the global catch-all `field`, and specify the possible values for `field/@operator` and `field/@group`.
* Removed value `**` from `field/@operator` (it does not really seem to have any point). `*` might also be on the chopping block, not sure what use it could be apart from a ghetto `and`.
* graph[not(@type="bar")][field[@group]] does not validate anymore (having a grouping field in a pie chart makes no sense)
* Pie charts can't have more than 2 fields anymore

Issue remaining, but I have not found a way to solve it: theoretically, a bar chart should only accept:
* A base field used as the main axis (for grouping on)
* An optional grouping field (field[@group="True"])
* 1..n aggregate fields (for the columns, with an optional @operator)

My idea was to handle the last two cases with interleave and write something like:

    (element field {
         attribute group { "True" },
         field-attributes }?
    & element field {
         attribute operator { "+" | "*" | "min" | "max" }?
         field-attributes }+)

but it turns out RNG has a restriction against this pattern: you can't interleave elements with the same name.

For now, I've just created a group field, but that means you can put multiple group fields and no aggregate field in a bar graph view, which is not quite optimal.

I have yet to find a solution short of imposing order (e.g. mandating that the grouping field be the last one or the first one in the sequence).

[lp:~openerp-dev/openobject-server/trunk-graph-schemas-fixes-xmo]

3412. By Xavier (Open ERP) on 2011-05-12

[IMP] there is already a named patterns for handling of access rights attribute(s)

3413. By Xavier (Open ERP) on 2011-05-13

[IMP] complete reimplementation of the graph schema, not perfect but hell of a lot better than the old one, methinks

[Vo Minh Thu (thu)]

Mmm... this is the kind of stuff that I would like to see merged but are quite hard to get right without looking through the source of the web client. The merge prop doesn't seem complete, for instance it lacks the graph type='line'.

Unmerged revisions

3413. By Xavier (Open ERP) on 2011-05-13

[IMP] complete reimplementation of the graph schema, not perfect but hell of a lot better than the old one, methinks

3412. By Xavier (Open ERP) on 2011-05-12

[IMP] there is already a named patterns for handling of access rights attribute(s)

3411. By Xavier (Open ERP) on 2011-05-12

[FIX] forgot @groups

3410. By Xavier (Open ERP) on 2011-05-12

[IMP] extract field definition for graphs, to correctly restrict attribute values

3409. By Xavier (Open ERP) on 2011-05-12

[REM] graph/html: unspecified, not clear where how it's supposed to rendering, unused. Reintroduce (correctly specified) if needed

3408. By Xavier (Open ERP) on 2011-05-12

[IMP] better specify range of values for graph/@orientation and graph/@type

3407. By Xavier (Open ERP) on 2011-05-12

[REM] @color attribute on graph view: unused and unusable

=== modified file 'openerp/addons/base/rng/view.rng'
--- openerp/addons/base/rng/view.rng	2010-12-27 10:41:55 +0000
+++ openerp/addons/base/rng/view.rng	2011-05-13 13:36:00 +0000
@@ -434,7 +434,6 @@
             <rng:optional><rng:attribute name="bold"/></rng:optional>
             <rng:optional><rng:attribute name="avg"/></rng:optional>
             <rng:optional><rng:attribute name="select"/></rng:optional>
-            <rng:optional><rng:attribute name="group"/></rng:optional>
             <rng:optional><rng:attribute name="operator"/></rng:optional>
             <rng:optional><rng:attribute name="colspan"/></rng:optional>
             <rng:optional><rng:attribute name="nolabel"/></rng:optional>
@@ -520,20 +519,104 @@
         </rng:element>
     </rng:define>
 
+    <rng:define name="graph-field-attrs">
+      <!-- attributes common to all graph fields -->
+      <rng:attribute name="name"/>
+      <rng:optional>
+        <rng:attribute name="string"/>
+      </rng:optional>
+      <rng:ref name="access_rights"/>
+    </rng:define>
+
+    <rng:define name="graph-field-aggregate">
+      <!-- Aggregate field, for building pie sections of individual columns -->
+        <rng:ref name="graph-field-attrs"/>
+        <rng:optional>
+          <rng:attribute name="operator">
+            <rng:choice>
+              <rng:value>+</rng:value>
+              <rng:value>*</rng:value>
+              <rng:value>min</rng:value>
+              <rng:value>max</rng:value>
+            </rng:choice>
+          </rng:attribute>
+        </rng:optional>
+    </rng:define>
+
     <rng:define name="graph">
-        <rng:element name="graph">
-            <rng:optional><rng:attribute name="string" /></rng:optional>
-            <rng:optional><rng:attribute name="orientation" /></rng:optional>
-            <rng:optional><rng:attribute name="type" /></rng:optional>
-            <rng:optional><rng:attribute name="color"/></rng:optional>
+      <rng:element name="graph">
+        <rng:attribute name="string"/>
+        <rng:choice>
+          <!-- pie and bar graph types don't make the same allowances
+               as far as fields go, build them into different patterns
+          -->
+          <rng:group>
+            <!-- pie chart -->
+            <rng:optional>
+              <rng:attribute name="type">
+                <rng:value>pie</rng:value>
+              </rng:attribute>
+            </rng:optional>
+            <rng:element name="field">
+              <rng:ref name="graph-field-attrs"/>
+            </rng:element>
+            <rng:element name="field">
+              <rng:ref name="graph-field-aggregate"/>
+            </rng:element>
+          </rng:group>
+          <rng:group>
+            <!-- bar chart -->
+            <rng:attribute name="type">
+              <rng:value>bar</rng:value>
+            </rng:attribute>
+            <rng:optional>
+              <rng:attribute name="orientation">
+                <rng:choice>
+                  <rng:value>vertical</rng:value>
+                  <rng:value>horizontal</rng:value>
+                </rng:choice>
+              </rng:attribute>
+            </rng:optional>
+            <rng:element name="field">
+              <rng:ref name="graph-field-attrs"/>
+            </rng:element>
+            <!-- the rest of the pattern should be an interleave of a
+                 single group field and 1..n aggregate fields, but
+                 this leads to a restriction error in the RNG
+                 execution: "Element or text conflicts in interleave"
+
+                 Two elements within the same <rng:interleave> can not
+                 share a name class (Jing yields the clearer error
+                 message 'overlapping element names in operands of
+                 "interleave"'), so it is not possible to interleave
+                 two "field" elements which only differ by their
+                 content (attribute content, at that), which is what
+                 we need here: (field {graph}? & field {aggregate}+)
+
+                 Instead, we'll go with a oneOrMore choice (which is
+                 not completely correct, as it allows both multiple
+                 group fields and no aggregate field at all).
+
+                 Need schematron.
+            -->
             <rng:oneOrMore>
-                <rng:ref name="field"/>
+              <rng:choice>
+                <rng:element name="field">
+                  <rng:ref name="graph-field-aggregate"/>
+                </rng:element>
+                <rng:element name="field">
+                  <rng:ref name="graph-field-attrs"/>
+                  <rng:attribute name="group">
+                    <rng:value>True</rng:value>
+                  </rng:attribute>
+                </rng:element>
+              </rng:choice>
             </rng:oneOrMore>
-            <rng:zeroOrMore>
-                <rng:ref name="html"/>
-            </rng:zeroOrMore>
-        </rng:element>
+          </rng:group>
+        </rng:choice>
+      </rng:element>
     </rng:define>
+    
 
     <rng:define name="button">
         <rng:element name="button">