Browse Source

Sorted graph

Denis Merigoux 9 years ago
parent
commit
dd20e8b691
1 changed files with 3 additions and 1 deletions
  1. 3 1
      counter/views.py

+ 3 - 1
counter/views.py

17
 def home(request):
17
 def home(request):
18
     #Display counters
18
     #Display counters
19
     counters = Counter.objects.all()
19
     counters = Counter.objects.all()
20
-    lastResets = [['Trigramme','Jours sans seum']]
20
+    lastResets = []
21
     #Calculates infos for each counter
21
     #Calculates infos for each counter
22
     maxJSS = 0
22
     maxJSS = 0
23
     for counter in counters:
23
     for counter in counters:
34
         counter.isHidden = "hidden"
34
         counter.isHidden = "hidden"
35
 
35
 
36
     #Generate graph
36
     #Generate graph
37
+    lastResets.sort(key=lambda x: (x[1],x[0]))
38
+    lastResets.insert(0,['Trigramme','Jours sans seum'])
37
     data = SimpleDataSource(lastResets)
39
     data = SimpleDataSource(lastResets)
38
     chart = gchart.ColumnChart(data,options={'title' : 'Graphe du seum', 'legend' : 'none','vAxis' : { 'viewWindow' : { 'max' : max(maxJSS,1) , 'min' : 0} , 'ticks' : [1,2,3,4,5,6,7,8,9,10,11,12,13,14],'title' : 'Jours sans seum' }, 'hAxis' : {'title' : 'Trigramme' }})
40
     chart = gchart.ColumnChart(data,options={'title' : 'Graphe du seum', 'legend' : 'none','vAxis' : { 'viewWindow' : { 'max' : max(maxJSS,1) , 'min' : 0} , 'ticks' : [1,2,3,4,5,6,7,8,9,10,11,12,13,14],'title' : 'Jours sans seum' }, 'hAxis' : {'title' : 'Trigramme' }})
39
     return render(request,'counterTemplate.html', {'counters' : counters, 'chart' : chart})
41
     return render(request,'counterTemplate.html', {'counters' : counters, 'chart' : chart})