phuoc/dumas_gestion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mise en prod

Browse Source
This commit is contained in:
Phuoc
2021-08-15 16:11:18 +02:00
parent 15dc6603ba
commit 8efd6589bc
5 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mondumas/templates/devis/devis_view.pt
View File

@@ -135,7 +135,7 @@
<div class="col-xs-8">
<select class="form-control" id="motif" name="motif">
<option selected> </option>
<div tal:repeat="item motif">
<div tal:repeat="item motifs">
<option>${item.code} | ${item.libelle}</option>
</div>
</select>

24
mondumas/templates/stats/ca_groupes.pt
View File

@@ -37,7 +37,7 @@
</div>
</div>
<h2>Evolution du CA sur les 3 dernières années (global)</h2>
<h2>Evolution du CA global sur les 3 dernières années</h2>
<div class="row">
<!-- camembert 1 -->
<div class="col-sm-4">
@@ -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'));

1
mondumas/templates/stats/delais_pourcentage.pt
View File

@@ -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'));

12
mondumas/templates/stats/pourcentage_devis.pt
View File

@@ -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'));

15
mondumas/views/stats.py
View File

@@ -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,
}