Seum by other people

counter/models.py

@@ -4,25 +4,37 @@ from babel.dates import format_timedelta
 from django.contrib.auth.models import User
 
 # Create your models here.
+
+
 class Counter(models.Model):
-    name = models.CharField("Nom",max_length=60)
-    email = models.EmailField("Email",max_length=264,default="null@localhost")
+    name = models.CharField("Nom", max_length=60)
+    email = models.EmailField("Email", max_length=264,
+                              default="null@localhost")
     trigramme = models.CharField("Trigramme", max_length=3)
-    user = models.ForeignKey(User,blank=True,null=True)
+    user = models.ForeignKey(User, blank=True, null=True)
+    email_notifications = models.BooleanField(
+        "Notifications par email", default=False)
 
     def __str__(self):
-        return "%s (%s)" % (self.trigramme,self.name)
+        return "%s (%s)" % (self.trigramme, self.name)
 
     class Meta:
         verbose_name = "Compteur"
 
+
 class Reset(models.Model):
-    timestamp = models.DateTimeField("Date et heure",auto_now_add=True)
+    timestamp = models.DateTimeField("Date et heure", auto_now_add=True)
     reason = models.TextField("Raison")
-    counter = models.ForeignKey('Counter')
+    counter = models.ForeignKey('Counter', related_name='counter')
+    who = models.ForeignKey('Counter', related_name='who',
+                            blank=True, null=True, default=None)
 
     def __str__(self):
-        return "%s : %s (%s)" % (self.counter,format_timedelta(datetime.now()-self.timestamp.replace(tzinfo=None),locale='fr'),self.reason)
+        return "%s : %s (%s)" % (self.counter,
+                                 format_timedelta(
+                                     datetime.now() -
+                                     self.timestamp.replace(tzinfo=None),
+                                     locale='fr'), self.reason)
 
     class Meta:
         verbose_name = "Remise à zéro"

counter/templates/counterTemplate.html

@@ -15,7 +15,13 @@
           {% if counter.lastReset.noSeum %}
           <strong>N'a pas encore eu le seum.</strong>
           <br> {% else %}
-          <strong>N'a pas eu le seum depuis {{ counter.lastReset.formatted_delta }}.</strong>
+          <strong>
+          {% if counter.lastReset.selfSeum %}
+              A eu le seum il y a {{ counter.lastReset.formatted_delta }}.
+          {% else %}
+              {{ counter.lastReset.who.trigramme }} lui a foutu le seum il y a {{ counter.lastReset.formatted_delta }}.
+          {% endif %}
+          </strong>
           <br> {% endif %}
 
           <p>{{ counter.lastReset.reason }}</p>
@@ -30,6 +36,7 @@
             </div>
             <input type="hidden" name="counter" value="{{counter.id}}"></input>
             <input type="hidden" name="redirect" value="{% url 'counter' id_counter=counter.id %}"></input>
+            <input type="hidden" name="who" value="{{myCounter.id}}"></input>
             <div class="text-center">
               <button type="submit" class="btn btn-default btn-success">Foutre le seum</button>
             </div>
@@ -66,6 +73,7 @@
               <tr>
                 <th>Date</th>
                 <th>Motif</th>
+                <th>Fouteur de seum</th>
               </tr>
             </thead>
             <tbody>
@@ -73,6 +81,11 @@
               <tr>
                 <td>{{ reset.date }}</td>
                 <td>{{ reset.reason }}</td>
+                <td>
+                {% if not reset.selfSeum %}
+                    {{ reset.who.trigramme }}
+                {% endif %}
+                </td>
               </tr>
               {% endfor %}
             </tbody>

counter/templates/homeTemplate.html

@@ -17,7 +17,13 @@
 					{% if myCounter.lastReset.noSeum %}
 					<strong>N'a pas encore eu le seum.</strong>
 					<br> {% else %}
-					<strong>Je n'ai pas eu le seum depuis {{ myCounter.lastReset.formatted_delta }}.</strong>
+					<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 %}
 
 					<p>{{ myCounter.lastReset.reason }}</p>
@@ -32,6 +38,7 @@
 						</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>
@@ -55,7 +62,13 @@
 					{% if counter.lastReset.noSeum %}
 					<strong>N'a pas encore eu le seum.</strong>
 					<br> {% else %}
-					<strong>N'a pas eu le seum depuis {{ counter.lastReset.formatted_delta }}.</strong>
+					<strong>
+					{% if counter.lastReset.selfSeum %}
+						A eu le seum il y a {{ counter.lastReset.formatted_delta }}.
+					{% else %}
+						{{ counter.lastReset.who.trigramme }} lui a foutu le seum il y a {{ counter.lastReset.formatted_delta }}.
+					{% endif %}
+					</strong>
 					<br> {% endif %}
 
 					<p>{{ counter.lastReset.reason }}</p>
@@ -130,7 +143,7 @@
 	</div>
 </div>
 <div class="row text-center">
-		<a href="{% url 'logout' %}" class="btn btn-danger">Se déconnecter</a>
-		<a href="{% url 'password_change' %}" class="btn btn-warning">Changer de mot de passe</a>
+	<a href="{% url 'logout' %}" class="btn btn-danger">Se déconnecter</a>
+	<a href="{% url 'password_change' %}" class="btn btn-warning">Changer de mot de passe</a>
 </div>
 {% endblock %}

counter/templates/login.html

@@ -15,7 +15,7 @@
                     {% csrf_token %}
                     <div class="form-group">
                         <label for="id_username">Trigramme</label>
-                        <input id="id_username" maxlength="3" type="text" class="form-control text-uppercase" name="username" required />
+                        <input id="id_username" maxlength="3" type="text" class="text-uppercase form-control" name="username" onkeyup="javascript:this.value=this.value.toUpperCase();" required />
                     </div>
                     <div class="form-group">
                         <label for="id_username">Mot de passe</label>

counter/templates/passwordResetDone.html

@@ -0,0 +1,19 @@
+{% extends 'baseTemplate.html' %} {% block title %}Mail envoyé !{% endblock %}{% block content %}
+<div class="container">
+    <div class="row">
+        <div class="text-center">
+            <h1>SeumBook™</h1>
+        </div>
+    </div>
+    <div class="row">
+        <div class="panel panel-success">
+            <div class="panel-heading">
+                <h2 class="panel-title">Victoire !</h2>
+            </div>
+            <div class=" panel-body">
+                <p>Un mail t'as été envoyé, suis les instructions pour aller réinitialiser ton mot de passe.</p>
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}

counter/templates/seumEmail.txt

@@ -1,4 +1,8 @@
+{% if selfSeum %}
 {{name}} a le seum : {{reason}}
+{% else %}
+{{who.trigramme}} ({{who.name}}) a foutu le seum à {{name}} : {{reason}}
+{% endif %}
 --
 SeumBook™ - http://seum.merigoux.ovh
 

counter/urls.py

@@ -34,5 +34,9 @@ urlpatterns = [
         auth_views.password_reset_complete,
         {'template_name': 'passwordResetComplete.html'},
         name="password_reset_complete"),
+    url(r'^password/reset/done/$',
+        auth_views.password_reset_done,
+        {'template_name': 'passwordResetDone.html'},
+        name="password_reset_done"),
     url(r'^', RedirectView.as_view(pattern_name='home')),
 ]

counter/views.py

@@ -41,6 +41,11 @@ def home(request):
         else:
             myCounter.lastReset = lastReset[0]
             myCounter.lastReset.noSeum = False
+            if (myCounter.lastReset.who is None or
+                    myCounter.lastReset.who.id == myCounter.id):
+                myCounter.lastReset.selfSeum = True
+            else:
+                myCounter.lastReset.selfSeum = False
             myCounter.lastReset.delta = datetime.now(
             ) - myCounter.lastReset.timestamp.replace(tzinfo=None)
             myCounter.seumCount = Reset.objects.filter(
@@ -63,6 +68,11 @@ def home(request):
             counter.CSSclass = "warning"
         else:
             counter.lastReset = lastReset[0]
+            if (counter.lastReset.who is None or
+                    counter.lastReset.who.id == counter.id):
+                counter.lastReset.selfSeum = True
+            else:
+                counter.lastReset.selfSeum = False
             counter.lastReset.noSeum = False
             counter.lastReset.delta = datetime.now(
             ) - counter.lastReset.timestamp.replace(tzinfo=None)
@@ -222,18 +232,28 @@ def resetCounter(request):
         # 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]))
         reset = Reset()
         reset.counter = counter
+        reset.who = who
         reset.reason = data['reason'][0]
         reset.timestamp = datetime.now()
         reset.save()
-        # We send the emails only to those who have an email address
-        emails = [u[0] for u in Counter.objects.all().values_list('email')
-                  if u[0] != 'null@localhost']
+        # We send the emails only to those who want
+        emails = [u.email for u in Counter.objects.all()
+                  if u.email_notifications]
         # Now send emails to everyone
+        if (reset.who is None or
+                reset.who.id == counter.id):
+            selfSeum = True
+        else:
+            selfSeum = False
         text_of_email = render_to_string(
             'seumEmail.txt', {'reason': data['reason'][0],
-                              'name': counter.name})
+                              'name': counter.name,
+                              'who': reset.who,
+                              'selfSeum': selfSeum,
+                              })
         email_to_send = EmailMessage(
             '[SeumBook] ' + counter.trigramme + ' a le seum',
             text_of_email,
@@ -247,6 +267,11 @@ def resetCounter(request):
 @login_required
 def counter(request, id_counter):
 
+    try:
+        myCounter = Counter.objects.get(user__id=request.user.id)
+    except Counter.DoesNotExist:
+        return HttpResponseRedirect(reverse('login'))
+
     counter = Counter.objects.get(pk=id_counter)
     resets = Reset.objects.filter(counter=counter).order_by('-timestamp')
     firstReset = copy.copy(resets[len(resets) - 1])
@@ -260,6 +285,11 @@ def counter(request, id_counter):
     else:
         counter.lastReset = resets[0]
         counter.lastReset.noSeum = False
+        if (counter.lastReset.who is None or
+                counter.lastReset.who.id == counter.id):
+            counter.lastReset.selfSeum = True
+        else:
+            counter.lastReset.selfSeum = False
         counter.lastReset.delta = datetime.now(
         ) - counter.lastReset.timestamp.replace(tzinfo=None)
         counter.lastReset.formatted_delta = format_timedelta(
@@ -271,6 +301,11 @@ def counter(request, id_counter):
             counter.seumCount, locale='fr', threshold=1)
 
     for reset in resets:
+        if (reset.who is None or
+                reset.who.id == reset.counter.id):
+            reset.selfSeum = True
+        else:
+            reset.selfSeum = False
         reset.date = format_datetime(
             reset.timestamp, locale='fr',
             format="EEEE dd MMMM Y 'à' HH:mm").capitalize()
@@ -309,5 +344,6 @@ def counter(request, id_counter):
         'counter': counter,
         'chart': chart,
         'resets': resets,
-        'seumFrequency': seumFrequency
+        'seumFrequency': seumFrequency,
+        'myCounter': myCounter,
     })