Denis Merigoux %!s(int64=9) %!d(string=hai) anos
pai
achega
dd20e8b691
Modificáronse 1 ficheiros con 3 adicións e 1 borrados
  1. 3 1
      counter/views.py

+ 3 - 1
counter/views.py

@@ -17,7 +17,7 @@ class resetCounterForm(forms.ModelForm):
17 17
 def home(request):
18 18
     #Display counters
19 19
     counters = Counter.objects.all()
20
-    lastResets = [['Trigramme','Jours sans seum']]
20
+    lastResets = []
21 21
     #Calculates infos for each counter
22 22
     maxJSS = 0
23 23
     for counter in counters:
@@ -34,6 +34,8 @@ def home(request):
34 34
         counter.isHidden = "hidden"
35 35
 
36 36
     #Generate graph
37
+    lastResets.sort(key=lambda x: (x[1],x[0]))
38
+    lastResets.insert(0,['Trigramme','Jours sans seum'])
37 39
     data = SimpleDataSource(lastResets)
38 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 41
     return render(request,'counterTemplate.html', {'counters' : counters, 'chart' : chart})