diff --git a/mondumas/templates/devis/devis_view.pt b/mondumas/templates/devis/devis_view.pt
index c6b8e11..5351e02 100644
--- a/mondumas/templates/devis/devis_view.pt
+++ b/mondumas/templates/devis/devis_view.pt
@@ -135,7 +135,7 @@
@@ -80,41 +80,37 @@
var options_ca_12m = {
title: '${title}',
vAxis: {title: "Chiffre d'Affaires en €"},
- colors: ['#dc3912', 'ff9900', 'green', 'purple', '3366cc'],
isStacked: true
};
var options_ca_3y_1 = {
- title: '${title1}',
- colors: ['purple', 'ff9900', '#dc3912', '3366cc', 'green'],
+ title: 'CA groupe ${annee1}',
pieHole: 0.3,
};
var options_ca_3y_2 = {
- title: '${title2}',
- colors: ['purple', 'ff9900', '#dc3912', '3366cc', 'green'],
+ title: 'CA groupe ${annee2}',
pieHole: 0.3,
};
var options_ca_3y_3 = {
- title: '${title3}',
- colors: ['purple', 'ff9900', '#dc3912', '3366cc', 'green'],
+ title: 'CA groupe ${annee3}',
pieHole: 0.3,
};
var options_ca_3y_1_x = {
- title: '${title1}',
- colors: ['gray', 'green', '#3366cc', 'purple', 'ff9900', 'dc3912'],
+ title: 'CA global ${annee1}',
+ pieHole: 0.3,
};
var options_ca_3y_2_x = {
- title: '${title2}',
- colors: ['gray', 'green', '#3366cc', 'purple', 'ff9900', 'dc3912'],
+ title: 'CA global ${annee2}',
+ pieHole: 0.3,
};
var options_ca_3y_3_x = {
- title: '${title3}',
- colors: ['gray', 'green', '#3366cc', 'purple', 'ff9900', 'dc3912'],
+ title: 'CA global ${annee3}',
+ pieHole: 0.3,
};
var chart_ca_12m = new google.visualization.ColumnChart(document.getElementById('chart_ca_12m'));
diff --git a/mondumas/templates/stats/delais_pourcentage.pt b/mondumas/templates/stats/delais_pourcentage.pt
index 5a1537e..75d60ae 100644
--- a/mondumas/templates/stats/delais_pourcentage.pt
+++ b/mondumas/templates/stats/delais_pourcentage.pt
@@ -42,6 +42,7 @@
var options_delais_p = {
title: '${title}',
+ pieHole: 0.3,
};
var chart_delais_p = new google.visualization.PieChart(document.getElementById('chart_delais_p'));
diff --git a/mondumas/templates/stats/pourcentage_devis.pt b/mondumas/templates/stats/pourcentage_devis.pt
index 5c37c58..c895d82 100644
--- a/mondumas/templates/stats/pourcentage_devis.pt
+++ b/mondumas/templates/stats/pourcentage_devis.pt
@@ -57,28 +57,28 @@
var options_devis_y1 = {
title: '${title_devis1}',
- pieHole: 0.4,
+ pieHole: 0.3,
};
var options_devis_y2 = {
title: '${title_devis2}',
- pieHole: 0.4,
+ pieHole: 0.3,
};
var options_devis_y3 = {
title: '${title_devis3}',
- pieHole: 0.4,
+ pieHole: 0.3,
};
var options_fact_y1 = {
title: '${title_fact1}',
- pieHole: 0.4,
+ pieHole: 0.3,
};
var options_fact_y2 = {
title: '${title_fact2}',
- pieHole: 0.4,
+ pieHole: 0.3,
};
var options_fact_y3 = {
title: '${title_fact3}',
- pieHole: 0.4,
+ pieHole: 0.3,
};
var chart_devis_y1 = new google.visualization.PieChart(document.getElementById('chart_devis_y1'));
diff --git a/mondumas/views/stats.py b/mondumas/views/stats.py
index 49bf5e6..196c893 100644
--- a/mondumas/views/stats.py
+++ b/mondumas/views/stats.py
@@ -202,9 +202,6 @@ def ca_groupes(request):
chart_ca_3y_1.append(('Groupe', 'CA', { 'type':'string','role': 'tooltip'}))
chart_ca_3y_2.append(('Groupe', 'CA', { 'type':'string','role': 'tooltip'}))
chart_ca_3y_3.append(('Groupe', 'CA', { 'type':'string','role': 'tooltip'}))
- title1 = 'CA ' + str(thisyear - 2)
- title2 = 'CA ' + str(thisyear - 1)
- title3 = 'CA ' + str(thisyear)
for item in items:
# construire la liste pour donut cible
tooltip_y1 = item.groupe + ' \nCA: '+str(item.Annee1) + ' €\nDossiers: '+str(round(item.Count1))
@@ -227,9 +224,9 @@ def ca_groupes(request):
chart_ca_3y_1_x.append(('Groupe', 'CA', { 'type':'string','role': 'tooltip'}))
chart_ca_3y_2_x.append(('Groupe', 'CA', { 'type':'string','role': 'tooltip'}))
chart_ca_3y_3_x.append(('Groupe', 'CA', { 'type':'string','role': 'tooltip'}))
- title1 = 'CA ' + str(thisyear - 2)
- title2 = 'CA ' + str(thisyear - 1)
- title3 = 'CA ' + str(thisyear)
+ annee1 = str(thisyear - 2)
+ annee2 = str(thisyear - 1)
+ annee3 = str(thisyear)
for item in items:
# construire la liste pour donut cible
tooltip_y1 = item.groupe + ' \nCA: '+str(item.Annee1) + ' €\nDossiers: '+str(round(item.Count1))
@@ -255,9 +252,9 @@ def ca_groupes(request):
'chart_ca_3y_2_x': json.dumps(chart_ca_3y_2_x),
'chart_ca_3y_3_x': json.dumps(chart_ca_3y_3_x),
'title': title,
- 'title1': title1,
- 'title2': title2,
- 'title3': title3,
+ 'annee1': annee1,
+ 'annee2': annee2,
+ 'annee3': annee3,
'societes': societes,
'societe': societe,
}