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

[FIX] sales_team,*: improve dashboard graph layout

Browse Source 
Remove graph title, lower padding, bigger bar charts.

odoo task:
https://www.odoo.com/web#id=30866&view_type=form&model=project.task&menu_id=
This commit is contained in:
Denis Vermylen
2017-01-23 10:55:41 +01:00
parent e530a31d66
commit e83a40f38b
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/models/crm_team.py
+1 -1
View File
@@ -188,5 +188,5 @@ class Team(models.Model):
def _graph_title_and_key(self):
if self.dashboard_graph_model == 'pipeline':
return [_('Pipeline'), _('Expected Revenue')]
return ['', _('Expected Revenue')] # no more title
return super(Team, self)._graph_title_and_key()
addons/pos_sale/models/crm_team.py
+1 -1
View File
@@ -113,5 +113,5 @@ class CrmTeam(models.Model):
def _graph_title_and_key(self):
if self.team_type == 'pos':
return [_('Sales'), _('Untaxed Amount')]
return ['', _('Untaxed Amount')] # no more title
return super(CrmTeam, self)._graph_title_and_key()
addons/sale/models/sales_team.py
+2 -2
View File
@@ -94,9 +94,9 @@ class CrmTeam(models.Model):
def _graph_title_and_key(self):
if self.dashboard_graph_model == 'sales':
return [_('Sales'), _('Untaxed Total')]
return ['', _('Untaxed Total')] # no more title
elif self.dashboard_graph_model == 'invoices':
return [_('Invoices'), _('Untaxed Total')]
return ['', _('Untaxed Total')]
return super(CrmTeam, self)._graph_title_and_key()
def _compute_dashboard_button_name(self):
addons/sales_team/static/src/less/sales_team_dashboard.less
+4 -4
View File
@@ -9,21 +9,21 @@
min-width: 450px;
}
.o_kanban_card_upper_content {
margin-bottom: @odoo-horizontal-padding*3 + @o-kanban-progressbar-height + 85px;
margin-bottom: @odoo-horizontal-padding*2 + @o-kanban-progressbar-height + 85px;
}
.o_sales_team_kanban_graph_section {
margin-bottom: @odoo-horizontal-padding*2 + @o-kanban-progressbar-height;
.o-position-absolute(@bottom: 0, @left: 0, @right: 0);
.o_graph_linechart {
> svg {
height: 75px;
height: 80px;
// X axis
g.nv-x.nv-axis {
// move the labels up, so they aren't hidden below the graph, and the lines back down.
transform: translateY(50px);
line {
transform: translateY(25px);
transform: translateY(30px);
}
.nv-axislabel{
transform:translateY(-78px);
@@ -63,7 +63,7 @@
}
.o_graph_barchart {
> svg {
height: 75px;
height: 95px;
overflow: visible;
g.nv-barsWrap {
g.nv-group.nv-series-0 {
addons/sales_team/views/sales_team_dashboard.xml
+1 -1
View File
@@ -27,7 +27,7 @@
<div class="col-xs-6 o_kanban_primary_left" name="to_replace_in_sale_crm">
<button type="object" class="btn btn-primary" name="action_primary_channel_button"><field name="dashboard_button_name"/></button>
</div>
<div class="col-xs-6 o_kanban_primary_right">
<div class="col-xs-6 o_kanban_primary_right" style="padding-bottom:0;">
<t name="first_options"/>
<t name="second_options"/>
<t name="third_options"/>