diff --git a/app/forms/account.py b/app/forms/account.py index 5abe4ae..103b669 100644 --- a/app/forms/account.py +++ b/app/forms/account.py @@ -51,7 +51,6 @@ class AdminUpdateAccountForm(FlaskForm): description="L'ancien mot de passe ne pourra pas être récupéré !", validators=[Optional(), vd.password]) xp = DecimalField('XP', validators=[Optional()]) - innovation = DecimalField('Innovation', validators=[Optional()]) birthday = DateField('Anniversaire', validators=[Optional()]) signature = TextAreaField('Signature', validators=[Optional()]) biography = TextAreaField('Présentation', validators=[Optional()]) diff --git a/app/models/users.py b/app/models/users.py index eb91af5..d975e3a 100644 --- a/app/models/users.py +++ b/app/models/users.py @@ -98,7 +98,6 @@ class Member(User, db.Model): email = db.Column(db.Unicode(120), index=True, unique=True) password_hash = db.Column(db.String(255)) xp = db.Column(db.Integer) - innovation = db.Column(db.Integer) register_date = db.Column(db.Date, default=date.today) # Avatars # TODO: rendre ça un peu plus propre @@ -108,8 +107,7 @@ class Member(User, db.Model): @property def level(self): - xp = self.xp + 2 * self.innovation - level = math.asinh(xp / 1000) * (100 / math.asinh(10)) + level = math.asinh(self.xp / 1000) * (100 / math.asinh(10)) return int(level), int(level * 100) % 100 # Groups and related privileges @@ -137,7 +135,6 @@ class Member(User, db.Model): self.email = email self.set_password(password) self.xp = 0 - self.innovation = 0 self.bio = "" self.signature = "" @@ -212,15 +209,12 @@ class Member(User, db.Model): # For admins only if "xp" in data: self.xp = data["xp"] - if "innovation" in data: - self.innovation = data["innovation"] def get_public_data(self): """Returns the public information of the member.""" return { "name": self.name, "xp": self.xp, - "innovation": self.innovation, "register_date": self.register_date, "bio": self.bio, "signature": self.signature, @@ -232,14 +226,7 @@ class Member(User, db.Model): Reward xp to a member. If [amount] is negative, the xp total of the member will decrease, down to zero. """ - self.xp_points = max(self.xp_points + amount, 0) - - def add_innovation(self, amount): - """ - Reward innovation points to a member. If [amount] is negative, the - innovation points total will decrease, down to zero. - """ - self.innovation = max(self.innovation + amount, 0) + self.xp_points = min(max(self.xp_points + amount, 0), 1000000000) def set_password(self, password): """ diff --git a/app/routes/admin.py b/app/routes/admin.py index f3c6389..69af2fb 100644 --- a/app/routes/admin.py +++ b/app/routes/admin.py @@ -105,7 +105,6 @@ def adm_edit_account(user_id): bio=form.biography.data, newsletter=form.newsletter.data, xp=form.xp.data or None, - innovation=form.innovation.data or None ) db.session.merge(user) db.session.commit() diff --git a/app/templates/admin/edit_account.html b/app/templates/admin/edit_account.html index b55c6f7..dfc8f44 100644 --- a/app/templates/admin/edit_account.html +++ b/app/templates/admin/edit_account.html @@ -55,13 +55,6 @@ {{ error }} {% endfor %} -