Added QuickSeum form

counter/templates/baseTemplate.html

@@ -7,7 +7,7 @@
 	<meta name="keywords" content="seum compteur" />
 	<meta name="description" content="Ça fout le seum" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<link rel="shortcut icon" type="image/png" href="{{STATIC_URL}}/favicon.ico"/>
+	<link rel="shortcut icon" type="image/png" href="{{STATIC_URL}}/favicon.ico" />
 	<title>SeumBook™ – {% block title %}{% endblock %}</title>
 
 	{# Load the tag library #} {% load bootstrap3 %} {# Load CSS and JavaScript #} {% bootstrap_css %} {# Display django.contrib.messages as Bootstrap alerts #} {% bootstrap_messages %}
@@ -22,6 +22,13 @@
 			overflow: auto;
 		}
 
+		.primary-counter {
+			height: 215px;
+			overflow: auto;
+			display: flex;
+			align-items: center;
+		}
+
 		.timeline {
 			height: 125px;
 		}
@@ -29,14 +36,18 @@
 		.graphs {
 			overflow-y: hidden;
 		}
-		.graphs > div {
+
+		.graphs>div {
 			display: block;
 			margin: 0 auto;
 		}
 
-		.counter-link, .counter-link:hover {
-  			color: inherit; /* blue colors for links too */
-  			text-decoration: inherit; /* no underline */
+		.counter-link,
+		.counter-link:hover {
+			color: inherit;
+			/* blue colors for links too */
+			text-decoration: inherit;
+			/* no underline */
 		}
 	</style>
 
@@ -47,10 +58,9 @@
 		});
 
 		function revealSeumForm(counterID) {
-			document.getElementById('counter'+counterID).style.display='inline';
-			document.getElementById('button'+counterID).style.display='none';
-			document.getElementById('reason'+counterID).focus();
-			document.getElementById('container'+counterID).style.height='200px';
+			document.getElementById('counter' + counterID).style.display = 'inline';
+			document.getElementById('button' + counterID).style.display = 'none';
+			document.getElementById('reason' + counterID).focus();
 		}
 	</script>
 </head>

counter/templates/homeTemplate.html

@@ -4,7 +4,7 @@
 </div>
 <div class="container-fluid">
 	<div class="row" id="my-counter">
-		<div class="col-sm-12">
+		<div class="col-sm-6">
 			<div class="panel panel-primary">
 				<div class="panel-heading">
 					<a class="counter-link" href="{% url 'counter' id_counter=myCounter.id %}">
@@ -13,35 +13,68 @@
 						</h2>
 					</a>
 				</div>
-				<div class="seum-counter panel-body" id="container{{myCounter.id}}" style="height:125px">
-					{% if myCounter.lastReset.noSeum %}
-					<strong>N'a pas encore eu le seum.</strong>
-					<br> {% else %}
-					<strong>
+				<div class="primary-counter panel-body" id="container{{myCounter.id}}">
+					<div style="width:100%;">
+						{% if myCounter.lastReset.noSeum %}
+						<strong>N'a pas encore eu le seum.</strong>
+						<br> {% else %}
+						<strong>
 						{% if myCounter.lastReset.selfSeum %}
 						J'ai eu le seum il y a {{ myCounter.lastReset.formatted_delta }}.
 						{% else %}
 						{{myCounter.lastReset.who.trigramme}} m'a foutu le seum il y a {{ myCounter.lastReset.formatted_delta }}.
 						{% endif %}
 					</strong>
-					<br> {% endif %}
+						<br> {% endif %}
 
-					<p>{{ myCounter.lastReset.reason }}</p>
-					<div class="text-center" id="button{{myCounter.id}}">
-						<button class="btn btn-default btn-danger" type="button" onclick="revealSeumForm({{myCounter.id}})">Remettre à zéro</button>
+						<p>{{ myCounter.lastReset.reason }}</p>
+						<div class="text-center" id="button{{myCounter.id}}">
+							<button class="btn btn-default btn-danger" type="button" onclick="revealSeumForm({{myCounter.id}})">Remettre à zéro</button>
+						</div>
+						<form style="display:none" id="counter{{myCounter.id}}" action="{% url 'reset-counter' %}" method="post">
+							{% csrf_token %}
+							<div class="form-group">
+								<label for="reason">Motif du seum</label>
+								<input id="reason{{myCounter.id}}" type="text" class="form-control" name="reason"></input>
+							</div>
+							<input type="hidden" name="counter" value="{{myCounter.id}}"></input>
+							<input type="hidden" name="redirect" value="{% url 'home' %}"></input>
+							<input type="hidden" name="who" value="{{myCounter.id}}"></input>
+							<div class="text-center">
+								<button type="submit" class="btn btn-default btn-success">J'ai le seum</button>
+							</div>
+						</form>
 					</div>
-					<form style="display:none" id="counter{{myCounter.id}}" action="{% url 'reset-counter' %}" method="post">
+				</div>
+			</div>
+		</div>
+		<div class="col-sm-6">
+			<div class="panel panel-primary">
+				<div class="panel-heading">
+					<h2 class="panel-title">QuickSeum™ <small>Brise le mur du seum</small></h2>
+				</div>
+				<div class="primary-counter panel-body">
+					<form class="form-horizontal" action="{% url 'reset-counter'%}" method="POST">
 						{% csrf_token %}
 						<div class="form-group">
-							<label for="reason">Motif du seum :</label>
-							<input id="reason{{myCounter.id}}" type="text" class="form-control" name="reason"></input>
+							<label for="id_quicktrigramme" class="col-sm-3 control-label">Trigramme</label>
+							<div class="col-sm-9">
+								<input id="id_quicktrigramme" maxlength="3" type="text" class="form-control text-uppercase" name="trigramme" onkeyup="this.value=this.value.toUpperCase();" required />
+							</div>
+						</div>
+						<div class="form-group">
+							<label for="id_quickreason" class="col-sm-3 control-label">Motif</label>
+							<div class="col-sm-9">
+								<input type="text" class="form-control" id="id_quickreason" name="reason" />
+							</div>
+						</div>
+						<div class="form-group">
+							<div class="col-sm-offset-3 col-sm-9">
+								<button type="submit" class="btn btn-danger">Foutre le seum</button>
+							</div>
 						</div>
 						<input type="hidden" name="counter" value="{{myCounter.id}}"></input>
 						<input type="hidden" name="redirect" value="{% url 'home' %}"></input>
-						<input type="hidden" name="who" value="{{myCounter.id}}"></input>
-						<div class="text-center">
-							<button type="submit" class="btn btn-default btn-success">J'ai le seum</button>
-						</div>
 					</form>
 				</div>
 			</div>

counter/views.py

@@ -241,13 +241,25 @@ def resetCounter(request):
     if (request.method == 'POST'):
         # create a form instance and populate it with data from the request:
         data = dict(request.POST)
+
         counter = Counter.objects.get(pk=int(data['counter'][0]))
-        who = Counter.objects.get(pk=int(data['who'][0]))
+        if 'who' in data.keys():
+            who = Counter.objects.get(pk=int(data['who'][0]))
+        else:
+            try:
+                who = Counter.objects.get(trigramme=data['trigramme'][0])
+            except Counter.DoesNotExist:
+                return HttpResponseRedirect(data['redirect'][0])
         reset = Reset()
         reset.counter = counter
         reset.who = who
         reset.reason = data['reason'][0]
         reset.timestamp = datetime.now()
+
+        # we check that the seumer is the autenticated user
+        if reset.counter.id != request.user.id:
+            return HttpResponseRedirect(data['redirect'][0])
+
         reset.save()
         # We send the emails only to those who want
         emails = [u.email for u in Counter.objects.all()
@@ -269,7 +281,7 @@ def resetCounter(request):
             text_of_email,
             'SeumMan <seum@merigoux.ovh>', emails, [],
             reply_to=emails)
-    email_to_send.send(fail_silently=True)
+        email_to_send.send(fail_silently=True)
 
     return HttpResponseRedirect(data['redirect'][0])