Improved handling of no-seum cases and fixed a limit for JSS

counter/templates/counterTemplate.html

@@ -41,7 +41,13 @@
           <h2 class="panel-title">Timeline du seum</h2>
         </div>
         <div class="graphs timeline panel-body">
-          {{chart.as_html}}
+            {% if counter.lastReset.noSeum %}
+            <div class="text-center text-muted">
+                <p>Pas encore de timeline du seum...</p>
+            </div>
+            {% else %}
+            {{chart.as_html}}
+            {% endif %}
         </div>
       </div>
     </div>

counter/templates/homeTemplate.html

@@ -6,7 +6,7 @@
 	<div class="row">
 		{% for counter in counters %}
 		<div class="col-md-4 col-sm-6 col-lg-3">
-			<div class="panel panel-primary">
+			<div class="panel panel-{{counter.CSSclass}}">
 				<div class="panel-heading">
 					<a class="counter-link" href="{% url 'counter' id_counter=counter.id %}"><h2 class="panel-title">{{ counter.trigramme }} <small>{{ counter.name }}</small></h2></a>
 				</div>
@@ -45,7 +45,13 @@
 					<h2 class="panel-title">Graphe du seum</h2>
 				</div>
 				<div class="panel-body graphs">
+					{% if noGraph %}
+					<div class="text-center text-muted">
+						<p>Personne n'a le seum...</p>
+					</div>
+					{% else %}
 					{{ col_chart.as_html }}
+					{% endif %}
 				</div>
 			</div>
 		</div>
@@ -57,7 +63,13 @@
 					<h2 class="panel-title">Timeline du seum</h2>
 				</div>
 				<div class="panel-body timeline graphs">
+					{% if noTimeline %}
+					<div class="text-center text-muted">
+						<p>Pas de seum dans les dernières 24 heures...</p>
+					</div>
+					{% else %}
 					{{ line_chart.as_html }}
+					{% endif %}
 				</div>
 			</div>
 		</div>

counter/urls.py

@@ -4,7 +4,6 @@ from . import views
 
 urlpatterns = [
     url(r'^$', views.home,name="home"),
-    url(r'^/', views.home),
     url(r'^reset-counter/',views.resetCounter,name="reset-counter"),
     url(r'^counter/(?P<id_counter>\d+)$', views.counter, name="counter"),
 ]

counter/views.py

@@ -16,8 +16,9 @@ class resetCounterForm(forms.ModelForm):
         model = Reset
         fields = ['reason','counter']
 
-# Create your views here.
 def home(request):
+    #JSS above this limit will not be displayed on the col graph
+    JSS_limit = 7
     #Display counters
     counters = Counter.objects.all()
     lastResets = []
@@ -30,41 +31,83 @@ def home(request):
             counter.lastReset = Reset()
             counter.lastReset.delta = timezero
             counter.lastReset.noSeum = True
+            counter.CSSclass = "warning"
         else:
             counter.lastReset = lastReset[0]
             counter.lastReset.noSeum = False
             counter.lastReset.delta = datetime.now()-counter.lastReset.timestamp.replace(tzinfo=None)
-            lastResets.append([counter.trigramme,{'v' : (counter.lastReset.delta.total_seconds())/(24*3600), 'f' : str(round((counter.lastReset.delta.total_seconds())/(24*3600),1))} ])
-            if (counter.lastReset.delta.total_seconds())/(24*3600) > maxJSS:
-                maxJSS = (counter.lastReset.delta.total_seconds())/(24*3600)
-            counter.lastReset.formatted_delta = format_timedelta(counter.lastReset.delta,locale='fr',threshold=1)
+            if ((counter.lastReset.delta.total_seconds())/(24*3600)<JSS_limit):
+                #If more thant 7 JSS do not display on graph
+                lastResets.append([counter.trigramme,{'v' : (counter.lastReset.delta.total_seconds())/(24*3600), 'f' : str(round((counter.lastReset.delta.total_seconds())/(24*3600),1))} ])
+                counter.CSSclass = "primary"
+                if (counter.lastReset.delta.total_seconds())/(24*3600) > maxJSS:
+                    maxJSS = (counter.lastReset.delta.total_seconds())/(24*3600)
+                counter.lastReset.formatted_delta = format_timedelta(counter.lastReset.delta,locale='fr',threshold=1)
+            else:
+                counter.CSSclass = "danger"
         counter.isHidden = "hidden"
-    counters = sorted(counters,key=lambda t: -t.lastReset.delta)
+    counters = sorted(counters,key=lambda t: t.lastReset.delta)
     #Column graph
-    lastResets.sort(key=lambda x: x[1]['v'])
-    lastResets.insert(0,['Trigramme','Jours sans seum'])
-    col_data = SimpleDataSource(lastResets)
-    col_chart = gchart.ColumnChart(col_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' }})
+    if (len(lastResets) ==0):
+        noGraph = True
+        col_chart = None
+    else:
+        noGraph = False
+        lastResets.sort(key=lambda x: x[1]['v'])
+        lastResets.insert(0,['Trigramme','Jours sans seum'])
+        col_data = SimpleDataSource(lastResets)
+        col_chart = gchart.ColumnChart(col_data,options={
+            'title' : '',
+            'legend' : 'none',
+            'vAxis' : {
+                'viewWindow' : {
+                    'max' : max(maxJSS,1) ,
+                    'min' : 0
+                    },
+                'ticks' : [1,2,3,4,5,6,7],
+                'title' : 'Jours sans seum'
+                },
+            'hAxis' : {'title' : 'Trigramme' },
+        })
 
     ###Timeline graph
     #Data pre-processing
     resets = Reset.objects.filter(timestamp__gte=timezone.now() - timedelta(days=1))
-    for reset in resets:
-        reset.timestamp={'v' : reset.timestamp.timestamp(), 'f' : "Il y a "+format_timedelta(datetime.now()-reset.timestamp.replace(tzinfo=None),locale='fr',threshold=1) }
-        reset.Seum={'v' : 0, 'f' : reset.counter.trigramme+" : "+reset.reason}
-    #Drawing the graph
-    line_data = ModelDataSource(resets,fields=['timestamp','Seum'])
-    line_chart = gchart.LineChart(line_data, options={
-        'lineWidth' : 0,
-        'pointSize' : 10,
-        'title' : '',
-        'vAxis' : { 'ticks' : []},
-        'hAxis' : {'ticks' : [{'v' : (datetime.now() - timedelta(days=1)).timestamp(), 'f' : 'Il y a 24 h' }, { 'v' :datetime.now().timestamp(), 'f' : 'Présent'}]},
-        'legend' : 'none',
-        'height' : 90
-    })
+    if (resets.count() == 0):
+        noTimeline = True
+        line_chart = None
+    else:
+        noTimeline = False
+        for reset in resets:
+            reset.timestamp={
+                'v' : reset.timestamp.timestamp(),
+                'f' : "Il y a "+format_timedelta(datetime.now()-reset.timestamp.replace(tzinfo=None),locale='fr',threshold=1)
+                }
+            reset.Seum={'v' : 0, 'f' : reset.counter.trigramme+" : "+reset.reason}
+            #Drawing the graph
+            line_data = ModelDataSource(resets,fields=['timestamp','Seum'])
+            line_chart = gchart.LineChart(line_data, options={
+            'lineWidth' : 0,
+            'pointSize' : 10,
+            'title' : '',
+            'vAxis' : { 'ticks' : []},
+            'hAxis' : {
+                'ticks' : [
+                        {'v' : (datetime.now() - timedelta(days=1)).timestamp(), 'f' : 'Il y a 24 h' },
+                        { 'v' :datetime.now().timestamp(), 'f' : 'Présent'}
+                    ]
+                },
+            'legend' : 'none',
+            'height' : 90
+            })
 
-    return render(request,'homeTemplate.html', {'counters' : counters, 'col_chart' : col_chart, 'line_chart' : line_chart})
+    return render(request,'homeTemplate.html', {
+        'counters' : counters,
+        'col_chart' : col_chart,
+        'line_chart' : line_chart,
+        'noTimeline' : noTimeline,
+        'noGraph' : noGraph
+        })
 
 def resetCounter(request):
     #Update Form counter