diff options
| author | Géry Debongnie <ged@odoo.com> | 2014-12-19 13:38:37 +0100 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2014-12-19 14:34:23 +0100 |
| commit | 2c08dc0ba610db61fe349d1602c12528ca8fc715 (patch) | |
| tree | 143cb7f61e45e027c63be321ee3d4031963df1e7 /addons/web/static/src/xml | |
| parent | 9f7a0c096f0d3deabf8baf7be33b108f5b7884b5 (diff) | |
[IMP] web: new pivot view, full rewrite of graph view
This commit is a split of the former graphview into a pivot view (the
tabular view) and graph view (the various charts). The code was fully
rewritten.
* pivot view should be faster (better underlying data structure and
better algorithm)
* better integration with the web client (use of sidebar, of menu buttons,
bettor style)
* new feature: pivot view can be sorted
* new feature: pivot view cells can be clicked to open a list view with
the corresponding domain
* web_graph addon was removed, and the graph view code has been moved
to the addon web.
* the interaction with the searchbar was changed (no more column facet)
* better and simpler code for graph view
* mary corner cases in graph charts have been corrected (for ex, pie
chart with positive and negative numbers)
* graph/pivot correctly save their state when added to dashboard/saved
(state such as current measure, chart mode, column groupbys, ...)
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 72 |
1 files changed, 64 insertions, 8 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index d37535cc8dc..e5b8286bdb9 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -508,7 +508,7 @@ </div> <div class="oe-view-manager-content"> <t t-foreach="widget.views" t-as="view"> - <div t-attf-class="oe-view-manager-view-#{view}"/> + <div t-attf-class="oe-view-manager-view-#{view} fade"/> </t> </div> </div> @@ -913,26 +913,82 @@ </label> </t> -<div t-name="PivotView" class="oe_pivot"/> +<t t-name="GraphView.buttons"> + <div class="btn-group btn-group-sm"> + <button class="btn btn-default fa fa-bar-chart-o oe-bar-mode" title="Bar Chart"></button> + <button class="btn btn-default fa fa-line-chart oe-line-mode" title="Line Chart"></button> + <button class="btn btn-default fa fa-pie-chart oe-pie-mode" title="Pie Chart"></button> + </div> + <div class="btn-group btn-group-sm"> + <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"> + Measure <span class="caret"/> + </button> + <ul class="oe-measure-list dropdown-menu"> + <li t-foreach="measures" t-as="measure" t-att-data-field="measure[0]"> + <a><t t-esc="measure[1].string"/></a> + </li> + <li class="divider"></li> + <li data-field="__count__"><a>Quantity</a></li> + </ul> + </div> +</t> + +<div t-name="GraphView.error" class="oe_view_nocontent" > + <div class="oe_empty_custom_dashboard"> + <p><b><t t-esc="title"/></b></p> + <p><t t-esc="description"/></p> + </div> +</div> + + +<div t-name="PivotView" class="oe_pivot"> + <div class="o-field-selection"/> + <div class="o-pivot-table"/> +</div> <t t-name="PivotView.buttons"> <div class="btn-group btn-group-sm"> - <button class="btn btn-default fa fa-expand oe-pivot-flip"></button> - <button class="btn btn-default fa fa-arrows-alt oe-pivot-expand-all"></button> - <button class="btn btn-default fa fa-download oe-pivot-download"></button> + <button class="btn btn-default fa fa-expand oe-pivot-flip" title="Flip axis"></button> + <button class="btn btn-default fa fa-arrows-alt oe-pivot-expand-all" title="Expand all"></button> </div> <div class="btn-group btn-group-sm"> <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"> Measures <span class="caret"/> </button> <ul class="oe-measure-list dropdown-menu"> - <li t-foreach="measures" t-as="measure" t-att-data-field="measure"> - <a><t t-esc="measures[measure].string"/></a> + <li t-foreach="measures" t-as="measure" t-att-data-field="measure[0]"> + <a><t t-esc="measure[1].string"/></a> </li> + <li class="divider"></li> + <li data-field="__count__"><a>Quantity</a></li> </ul> </div> </t> +<t t-name="PivotView.FieldSelection"> + <ul class="dropdown-menu multi-level o-field-menu" role="menu"> + <t t-foreach="fields" t-as="field"> + <t t-if="(field[1].type === 'date') || (field[1].type === 'datetime')"> + <li class="pivot-dropdown-submenu" t-att-data-field="field[0]"> + <a class="field-selection"> + <t t-esc="field[1].string"/> + </a> + <ul class="dropdown-menu"> + <li t-att-data-field="field[0]"><a t-att-data-interval="'day'">Day</a></li> + <li t-att-data-field="field[0]"><a t-att-data-interval="'week'">Week</a></li> + <li t-att-data-field="field[0]"><a t-att-data-interval="'month'">Month</a></li> + <li t-att-data-field="field[0]"><a t-att-data-interval="'quarter'">Quarter</a></li> + <li t-att-data-field="field[0]"><a t-att-data-interval="'year'">Year</a></li> + </ul> + </li> + </t> + <t t-if="(field[1].type !== 'date') && (field[1].type !== 'datetime')"> + <li t-att-data-field="field[0]"><a><t t-esc="field[1].string"/></a></li> + </t> + </t> + </ul> +</t> + <div t-name="PivotView.nodata" class="oe_view_nocontent" > <div class="oe_empty_custom_dashboard"> <p><b>No data to display.</b></p> @@ -1672,7 +1728,7 @@ <span><input type="checkbox"/>Use by default</span> </li> <li class="oe-save-name"> - <span><input type="checkbox"/>Share with all users</span> + <span class="oe-share-filter"><input type="checkbox"/>Share with all users</span> </li> <li class="oe-save-name"><button class="btn btn-default">Save</button></li> </ul> |
