|
|
@@ -9,6 +9,7 @@ from graphos.renderers import gchart
|
|
9
|
9
|
from graphos.sources.simple import SimpleDataSource
|
|
10
|
10
|
from graphos.sources.model import ModelDataSource
|
|
11
|
11
|
import random
|
|
|
12
|
+from django.utils import timezone
|
|
12
|
13
|
|
|
13
|
14
|
class resetCounterForm(forms.ModelForm):
|
|
14
|
15
|
class Meta:
|
|
|
@@ -47,7 +48,7 @@ def home(request):
|
|
47
|
48
|
|
|
48
|
49
|
###Timeline graph
|
|
49
|
50
|
#Data pre-processing
|
|
50
|
|
- resets = Reset.objects.filter(timestamp__gte=datetime.now() - timedelta(days=1))
|
|
|
51
|
+ resets = Reset.objects.filter(timestamp__gte=timezone.now() - timedelta(days=1))
|
|
51
|
52
|
for reset in resets:
|
|
52
|
53
|
reset.timestamp={'v' : reset.timestamp.timestamp(), 'f' : "Il y a "+format_timedelta(datetime.now()-reset.timestamp.replace(tzinfo=None),locale='fr',threshold=1) }
|
|
53
|
54
|
reset.Seum={'v' : 0, 'f' : reset.counter.trigramme+" : "+reset.reason}
|
|
|
@@ -77,7 +78,7 @@ def resetCounter(request):
|
|
77
|
78
|
reset.timestamp = datetime.now()
|
|
78
|
79
|
reset.save()
|
|
79
|
80
|
# check whether it's valid
|
|
80
|
|
- return HttpResponseRedirect('/'+data['redirect'][0])
|
|
|
81
|
+ return HttpResponseRedirect(data['redirect'][0])
|
|
81
|
82
|
|
|
82
|
83
|
def counter(request, id_counter):
|
|
83
|
84
|
|