Denis Merigoux лет назад: 9
Родитель
Сommit
b26a4dd714
3 измененных файлов с 18 добавлено и 5 удалено
  1. 1 1
      counter/templates/counterTemplate.html
  2. 16 3
      counter/views.py
  3. 1 1
      seum/settings.py

+ 1 - 1
counter/templates/counterTemplate.html

58
     <div class="col-sm-12">
58
     <div class="col-sm-12">
59
       <div class="panel panel-default">
59
       <div class="panel panel-default">
60
         <div class="panel-heading">
60
         <div class="panel-heading">
61
-          <h2 class="panel-title">Historique du seum</h2>
61
+          <h2 class="panel-title">Historique du seum <small class="pull-right">Temps moyen entre deux seums : {{seumFrequency}}</small></h2>
62
         </div>
62
         </div>
63
         <div class="panel-body">
63
         <div class="panel-body">
64
           <table class="table table-striped">
64
           <table class="table table-striped">

+ 16 - 3
counter/views.py

11
 from graphos.sources.model import ModelDataSource
11
 from graphos.sources.model import ModelDataSource
12
 import random
12
 import random
13
 import math
13
 import math
14
+import copy
14
 from django.utils import timezone
15
 from django.utils import timezone
15
 
16
 
16
 
17
 
195
 
196
 
196
     counter = Counter.objects.get(pk=id_counter)
197
     counter = Counter.objects.get(pk=id_counter)
197
     resets = Reset.objects.filter(counter=counter).order_by('-timestamp')
198
     resets = Reset.objects.filter(counter=counter).order_by('-timestamp')
199
+    firstReset = copy.copy(resets[len(resets) - 1])
198
     timezero = timedelta(0)
200
     timezero = timedelta(0)
199
     # Display
201
     # Display
200
     if (resets.count() == 0):
202
     if (resets.count() == 0):
201
         counter.lastReset = Reset()
203
         counter.lastReset = Reset()
202
         counter.lastReset.delta = timezero
204
         counter.lastReset.delta = timezero
203
         counter.lastReset.noSeum = True
205
         counter.lastReset.noSeum = True
206
+        seumFrequency = 'inconnu'
204
     else:
207
     else:
205
         counter.lastReset = resets[0]
208
         counter.lastReset = resets[0]
206
         counter.lastReset.noSeum = False
209
         counter.lastReset.noSeum = False
210
             counter.lastReset.delta, locale='fr', threshold=1)
213
             counter.lastReset.delta, locale='fr', threshold=1)
211
         counter.seumCount = Reset.objects.filter(
214
         counter.seumCount = Reset.objects.filter(
212
             counter=counter).count()
215
             counter=counter).count()
216
+        seumFrequency = format_timedelta((
217
+            datetime.now() - firstReset.timestamp.replace(tzinfo=None)) /
218
+            counter.seumCount, locale='fr', threshold=1)
213
 
219
 
214
     for reset in resets:
220
     for reset in resets:
215
         reset.date = format_datetime(
221
         reset.date = format_datetime(
234
         'title': '',
240
         'title': '',
235
         'vAxis': {'ticks': []},
241
         'vAxis': {'ticks': []},
236
         'hAxis': {'ticks': [{
242
         'hAxis': {'ticks': [{
237
-            'v': datetime(2016, 3, 9, 23, 0, 0, 0).timestamp(),
238
-            'f': 'ADD des X2013'
243
+            'v': firstReset.timestamp.timestamp(),
244
+            'f': 'Il y a ' + format_timedelta(
245
+                datetime.now() - firstReset.timestamp.replace(tzinfo=None),
246
+                locale='fr', threshold=1)
239
         }, {
247
         }, {
240
             'v': datetime.now().timestamp(),
248
             'v': datetime.now().timestamp(),
241
             'f': 'Présent'}
249
             'f': 'Présent'}
244
         'height': 90
252
         'height': 90
245
     })
253
     })
246
 
254
 
247
-    return render(request, 'counterTemplate.html', {'counter': counter, 'chart': chart, 'resets': resets})
255
+    return render(request, 'counterTemplate.html', {
256
+        'counter': counter,
257
+        'chart': chart,
258
+        'resets': resets,
259
+        'seumFrequency': seumFrequency
260
+    })

+ 1 - 1
seum/settings.py

23
 SECRET_KEY = '(#lovv#uky9unr9azzqy14gktpf0(d&+cp@++l95*y4e%m%_ex'
23
 SECRET_KEY = '(#lovv#uky9unr9azzqy14gktpf0(d&+cp@++l95*y4e%m%_ex'
24
 
24
 
25
 # SECURITY WARNING: don't run with debug turned on in production!
25
 # SECURITY WARNING: don't run with debug turned on in production!
26
-DEBUG = True
26
+DEBUG = False
27
 
27
 
28
 ALLOWED_HOSTS = ['seum.merigoux.ovh']
28
 ALLOWED_HOSTS = ['seum.merigoux.ovh']
29
 
29