Added graph of seum activity

.gitignore

@@ -66,3 +66,4 @@ target/
 
 #Custom
 python3/
+seum/settings.py

counter/templates/homeTemplate.html

@@ -46,7 +46,23 @@
 		<div class="col-sm-12">
 			<div class="panel panel-default">
 				<div class="panel-heading">
-					<h2 class="panel-title">Graphe du seum</h2>
+					<h2 class="panel-title">Timeline des 24 heures 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>
+	</div>
+	<div class="row">
+		<div class="col-sm-12">
+			<div class="panel panel-default">
+				<div class="panel-heading">
+					<h2 class="panel-title">Graphe des jours sans seum</h2>
 				</div>
 				<div class="panel-body graphs">
 					{% if noGraph %}
@@ -62,14 +78,14 @@
 		<div class="col-sm-12">
 			<div class="panel panel-default">
 				<div class="panel-heading">
-					<h2 class="panel-title">Timeline du seum</h2>
+					<h2 class="panel-title">Meilleurs seumeurs</h2>
 				</div>
-				<div class="panel-body timeline graphs">
-					{% if noTimeline %}
+				<div class="panel-body graphs">
+					{% if noBestSeum %}
 					<div class="text-center text-muted">
-						<p>Pas de seum dans les dernières 24 heures...</p>
+						<p>Personne n'a eu le seum...</p>
 					</div>
-					{% else %} {{ line_chart.as_html }} {% endif %}
+					{% else %} {{ best_chart.as_html }} {% endif %}
 				</div>
 			</div>
 		</div>
@@ -78,14 +94,14 @@
 		<div class="col-sm-12">
 			<div class="panel panel-default">
 				<div class="panel-heading">
-					<h2 class="panel-title">Meilleurs seumeurs</h2>
+					<h2 class="panel-title">Activité seumesque</h2>
 				</div>
 				<div class="panel-body graphs">
-					{% if noBestSeum %}
+					{% if noSeumActivity %}
 					<div class="text-center text-muted">
 						<p>Personne n'a eu le seum...</p>
 					</div>
-					{% else %} {{ best_chart.as_html }} {% endif %}
+					{% else %} {{ activity_chart.as_html }} {% endif %}
 				</div>
 			</div>
 		</div>

counter/views.py

@@ -151,15 +151,44 @@ def home(request):
             'vAxis': {'title': 'Nombre de seums'},
             'hAxis': {'title': 'Trigramme'},
         })
+    # Graph of seum activity
+    resets = Reset.objects.filter(
+        timestamp__gte=timezone.now() - timedelta(days=365))
+    months = {}
+    for reset in resets:
+        monthDate = datetime(reset.timestamp.year, reset.timestamp.month, 1)
+        months[monthDate] = months.get(monthDate, 0) + 1
+
+    monthList = sorted(months.items(), key=lambda t: t[0])
+    seumActivity = []
+    for month in monthList:
+        seumActivity.append(
+            [format_datetime(month[0], locale='fr',
+                             format="MMM Y").capitalize(), month[1]])
+    if (len(seumActivity) == 0):
+        noSeumActivity = True
+        activity_chart = None
+    else:
+        noSeumActivity = False
+        seumActivity.insert(0, ['Mois', 'Nombre de seums'])
+        activity_data = SimpleDataSource(seumActivity)
+        activity_chart = gchart.ColumnChart(activity_data, options={
+            'title': '',
+            'legend': 'none',
+            'vAxis': {'title': 'Nombre de seums'},
+            'hAxis': {'title': 'Mois'},
+        })
 
     return render(request, 'homeTemplate.html', {
         'counters': counters,
         'col_chart': col_chart,
         'line_chart': line_chart,
         'best_chart': best_chart,
+        'activity_chart': activity_chart,
         'noTimeline': noTimeline,
         'noGraph': noGraph,
-        'noBestSeum': noBestSeum
+        'noBestSeum': noBestSeum,
+        'noSeumActivity': noSeumActivity,
     })
 
 

seum/settings.py

@@ -23,7 +23,7 @@ STATIC_ROOT = os.path.join(BASE_DIR, "static/")
 SECRET_KEY = '(#lovv#uky9unr9azzqy14gktpf0(d&+cp@++l95*y4e%m%_ex'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
+DEBUG = True
 
 ALLOWED_HOSTS = ['seum.merigoux.ovh']
 

seum/settings.py.default

@@ -0,0 +1,134 @@
+"""
+Django settings for seum project.
+
+Generated by 'django-admin startproject' using Django 1.9.4.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.9/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/1.9/ref/settings/
+"""
+
+import os
+
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+STATIC_ROOT = os.path.join(BASE_DIR, "static/")
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/1.9/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = '(#lovv#uky9unr9azzqy14gktpf0(d&+cp@++l95*y4e%m%_ex'
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+ALLOWED_HOSTS = ['seum.merigoux.ovh']
+
+
+# Application definition
+
+INSTALLED_APPS = [
+    'babel',
+    'graphos',
+    'bootstrap3',
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    'counter'
+]
+
+MIDDLEWARE_CLASSES = [
+    'django.middleware.security.SecurityMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+]
+
+ROOT_URLCONF = 'seum.urls'
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
+WSGI_APPLICATION = 'seum.wsgi.application'
+
+
+# Database
+# https://docs.djangoproject.com/en/1.9/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    }
+}
+
+
+# Password validation
+# https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators
+
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    },
+]
+
+
+# Internationalization
+# https://docs.djangoproject.com/en/1.9/topics/i18n/
+
+LANGUAGE_CODE = 'en-US'
+
+TIME_ZONE = 'UTC'
+
+USE_I18N = True
+
+USE_L10N = True
+
+USE_TZ = True
+
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/1.9/howto/static-files/
+
+STATIC_URL = '/static/'
+
+#Emailing
+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+EMAIL_HOST = 'localhost'
+EMAIL_PORT = 25
+EMAIL_HOST_USER = ''
+EMAIL_HOST_PASSWORD = ''
+EMAIL_USE_TLS = False
+DEFAULT_FROM_EMAIL = 'SeumMan <seum@merigoux.ovh>'