Merge branch 'qwann/k-fet/home' into qwann/k-fet/kfet_open

kfet/models.py

@@ -18,6 +18,7 @@ from django.db.models import F
 from django.core.cache import cache
 from datetime import date, timedelta
 import re
+import hashlib
 
 def choices_length(choices):
     return reduce(lambda m, choice: max(m, len(choice[0])), choices, 0)
@@ -154,6 +155,7 @@ class Account(models.Model):
     # - Enregistre User, CofProfile à partir de "data"
     # - Enregistre Account
     def save(self, data = {}, *args, **kwargs):
+
         if self.pk and data:
             # Account update
 
@@ -200,6 +202,11 @@ class Account(models.Model):
             self.cofprofile = cof
         super(Account, self).save(*args, **kwargs)
 
+    def change_pwd(self, pwd):
+        pwd_sha256 = hashlib.sha256(pwd.encode('utf-8'))\
+                            .hexdigest()
+        self.password = pwd_sha256
+
     # Surcharge de delete
     # Pas de suppression possible
     # Cas à régler plus tard
@@ -331,6 +338,10 @@ class ArticleCategory(models.Model):
 class Article(models.Model):
     name     = models.CharField(max_length = 45)
     is_sold  = models.BooleanField(default = True)
+    hidden   = models.BooleanField(default=False,
+                                   help_text="Si oui, ne sera pas affiché "
+                                             "au public ; par exemple "
+                                             "sur la carte.")
     price    = models.DecimalField(
         max_digits = 6, decimal_places = 2,
         default = 0)
@@ -505,6 +516,10 @@ class OperationGroup(models.Model):
         related_name = "+",
         blank = True, null = True, default = None)
 
+    def __str__(self):
+        return ', '.join(map(str, self.opes.all()))
+
+
 class Operation(models.Model):
     PURCHASE = 'purchase'
     DEPOSIT  = 'deposit'
@@ -549,6 +564,18 @@ class Operation(models.Model):
         max_digits = 6, decimal_places = 2,
         blank = True, null = True, default = None)
 
+    def __str__(self):
+        templates = {
+                self.PURCHASE: "{nb} {article.name} ({amount}€)",
+                self.DEPOSIT: "charge ({amount})",
+                self.WITHDRAW: "retrait ({amount})",
+                self.INITIAL: "initial ({amount})",
+            }
+        return templates[self.type].format(nb=self.article_nb,
+                                           article=self.article,
+                                           amount=self.amount)
+
+
 class GlobalPermissions(models.Model):
     class Meta:
         managed = False