From 754475760605f054a8348c2c25eb367659991b70 Mon Sep 17 00:00:00 2001
From: chirac <chirac@re2o-server.crans.org>
Date: Fri, 29 Jun 2018 18:20:25 +0200
Subject: [PATCH] Boolean compte mail actif/inactif

---
 .../0036_optionaluser_mail_accounts.py        | 20 +++++++++++++++++++
 preferences/models.py                         |  6 +++++-
 .../preferences/display_preferences.html      | 16 ++++++++++-----
 3 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 preferences/migrations/0036_optionaluser_mail_accounts.py

diff --git a/preferences/migrations/0036_optionaluser_mail_accounts.py b/preferences/migrations/0036_optionaluser_mail_accounts.py
new file mode 100644
index 00000000..c3bf4fa8
--- /dev/null
+++ b/preferences/migrations/0036_optionaluser_mail_accounts.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-06-29 16:01
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0035_optionaluser_mail_extension'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='optionaluser',
+            name='mail_accounts',
+            field=models.BooleanField(default=False, help_text='Activation des comptes mails pour les utilisateurs'),
+        ),
+    ]
diff --git a/preferences/models.py b/preferences/models.py
index 59b44111..0f4d21ba 100644
--- a/preferences/models.py
+++ b/preferences/models.py
@@ -103,11 +103,15 @@ class OptionalUser(AclMixin, PreferencesModel):
         blank=True,
         null=True
     )
+    mail_accounts = models.BooleanField(
+        default=False,
+        help_text="Activation des comptes mails pour les utilisateurs"
+    )
     mail_extension = models.CharField(
         max_length = 32,
         default = "@example.org",
         help_text="Extension principale pour les mails internes",
-    )
+        )
 
     class Meta:
         permissions = (
diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html
index 2e289858..1489c930 100644
--- a/preferences/templates/preferences/display_preferences.html
+++ b/preferences/templates/preferences/display_preferences.html
@@ -36,6 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	</a>
     <p>
     </p>
+    <h5>Généralités</h5>
     <table class="table table-striped">
         <tr>
             <th>Téléphone obligatoirement requis</th>
@@ -55,11 +56,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	    <th>Creations de clubs par tous</th>
 	    <td>{{ useroptions.all_can_create_club }}</td>
         </tr>
-
+    </table>
+    <h5>Gestion du solde {% if useroptions.user_solde %}<span class="label label-success">Activé{% else %}<span class="label label-danger"> Désactivé{% endif%}</span></h5>
+    <table class="table table-striped">
 	<tr>
             <th>Activation du solde pour les utilisateurs</th>
             <td>{{ useroptions.user_solde }}</td>
-	{% if useroptions.user_solde %}
+
 	    <th>Solde négatif</th>
 	    <td>{{ useroptions.solde_negatif }}</td>
         </tr>
@@ -69,14 +72,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	    <th>Montant minimal de rechargement en ligne</th>
 	    <td>{{ useroptions.min_online_payment }}</td>
 	</tr>
-	{% else %}
-	</tr>
-	{% endif%}
+    </table>
+    <h5>Comptes mails {% if useroptions.mail_accounts %}<span class="label label-success">Activé{% else %}<span class="label label-danger"> Désactivé{% endif%}</span></h5>
+    <table class="table table-striped">
 	<tr>
+		<th>Gestion des comptes mails</th>
+		<td>{{ useroptions.mail_accounts }}</td>
 		<th>Extension mail interne</th>
 		<td>{{ useroptions.mail_extension }}</td>
 	</tr>
     </table>
+
     <h4>Préférences machines</h4>
         <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:edit-options' 'OptionalMachine' %}">
             <i class="fa fa-edit"></i>