|
|
@@ -34,15 +34,15 @@ def home(request):
|
|
34
|
34
|
lastResets.append([counter.trigramme,(counter.lastReset.delta.total_seconds())/(24*3600)])
|
|
35
|
35
|
if (counter.lastReset.delta.total_seconds())/(24*3600) > maxJSS:
|
|
36
|
36
|
maxJSS = (counter.lastReset.delta.total_seconds())/(24*3600)
|
|
37
|
|
- counter.lastReset.formatted_delta = format_timedelta(counter.lastReset.delta,locale='fr')
|
|
|
37
|
+ counter.lastReset.formatted_delta = format_timedelta(counter.lastReset.delta,locale='fr',threshold=1)
|
|
38
|
38
|
counter.isHidden = "hidden"
|
|
39
|
39
|
counters = sorted(counters,key=lambda t: -t.lastReset.delta)
|
|
40
|
40
|
#Generate graph
|
|
41
|
41
|
lastResets.sort(key=lambda x: (x[1],x[0]))
|
|
42
|
42
|
lastResets.insert(0,['Trigramme','Jours sans seum'])
|
|
43
|
43
|
data = SimpleDataSource(lastResets)
|
|
44
|
|
- 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' }})
|
|
45
|
|
- return render(request,'counterTemplate.html', {'counters' : counters, 'chart' : chart})
|
|
|
44
|
+ chart = gchart.ColumnChart(data,options={'title' : '', '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' }})
|
|
|
45
|
+ return render(request,'homeTemplate.html', {'counters' : counters, 'chart' : chart})
|
|
46
|
46
|
|
|
47
|
47
|
def resetCounter(request):
|
|
48
|
48
|
#Update Form counter
|
|
|
@@ -50,7 +50,6 @@ def resetCounter(request):
|
|
50
|
50
|
# create a form instance and populate it with data from the request:
|
|
51
|
51
|
data = dict(request.POST)
|
|
52
|
52
|
counter = Counter.objects.get(pk=int(data['counter'][0]))
|
|
53
|
|
- print(counter)
|
|
54
|
53
|
reset = Reset()
|
|
55
|
54
|
reset.counter = counter
|
|
56
|
55
|
reset.reason = data['reason'][0]
|
|
|
@@ -58,3 +57,17 @@ def resetCounter(request):
|
|
58
|
57
|
reset.save()
|
|
59
|
58
|
# check whether it's valid
|
|
60
|
59
|
return HttpResponseRedirect('/')
|
|
|
60
|
+
|
|
|
61
|
+def counter(request, id_counter):
|
|
|
62
|
+ counter = Counter.objects.get(pk=id_counter)
|
|
|
63
|
+ lastReset = Reset.objects.filter(counter=counter).order_by('-timestamp')
|
|
|
64
|
+ if (lastReset.count() == 0):
|
|
|
65
|
+ counter.lastReset = Reset()
|
|
|
66
|
+ counter.lastReset.delta = timezero
|
|
|
67
|
+ counter.lastReset.noSeum = True
|
|
|
68
|
+ else:
|
|
|
69
|
+ counter.lastReset = lastReset[0]
|
|
|
70
|
+ counter.lastReset.noSeum = False
|
|
|
71
|
+ counter.lastReset.delta = datetime.now()-counter.lastReset.timestamp.replace(tzinfo=None)
|
|
|
72
|
+
|
|
|
73
|
+ return render(request,'counterTemplate.html', { 'counter' : counter})
|
