Clean up master

adherents/locale/fr/LC_MESSAGES/django.po

+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-07-08 13:45+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: models.py:26
+msgid "phone number"
+msgstr "numéro de téléphone"
+
+#: models.py:30
+msgid "section"
+msgstr "section"
+
+#: models.py:31
+msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\""
+msgstr "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\""
+
+#: models.py:35 models.py:36
+msgid "user profile"
+msgstr "profil utilisateur"
+
+#: models.py:52
+msgid "date"
+msgstr "date"
+
+#: models.py:57
+msgid "amount"
+msgstr "montant"
+
+#: models.py:61
+msgid "membership fee"
+msgstr "cotisation"
+
+#: models.py:62
+msgid "membership fees"
+msgstr "cotisations"

adherents/migrations/0001_initial.py

+# Generated by Django 2.2.3 on 2019-07-08 11:48
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Profile',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('phone_number', models.CharField(max_length=255, verbose_name='phone number')),
+                ('section', models.CharField(help_text='e.g. "1A0", "9A♥", "SAPHIRE"', max_length=255, verbose_name='section')),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'user profile',
+                'verbose_name_plural': 'user profile',
+            },
+        ),
+        migrations.CreateModel(
+            name='MembershipFee',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('date', models.DateField(max_length=255, verbose_name='date')),
+                ('amount', models.DecimalField(decimal_places=2, max_digits=5, verbose_name='amount')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'membership fee',
+                'verbose_name_plural': 'membership fees',
+            },
+        ),
+    ]

note_adherents/models.py → adherents/models.py

@@ -41,25 +41,25 @@ class Profile(models.Model):
 
 class MembershipFee(models.Model):
     """
-    TODO
+    User can become member by paying a membership fee
     """
     user = models.ForeignKey(
         settings.AUTH_USER_MODEL,
         on_delete=models.PROTECT,
     )
-    date = models.CharField(
+    date = models.DateField(
         max_length=255,
-        verbose_name=_('phone number'),
+        verbose_name=_('date'),
     )
-    amount = models.CharField(
-        max_length=255,
-        verbose_name=_('section'),
-        help_text=_('e.g. "1A0", "9A♥", "SAPHIRE"'),
+    amount = models.DecimalField(
+        max_digits=5, # Max 999.99 €
+        decimal_places=2,
+        verbose_name=_('amount'),
     )
 
     class Meta:
-        verbose_name = _('user profile')
-        verbose_name_plural = _('user profile')
+        verbose_name = _('membership fee')
+        verbose_name_plural = _('membership fees')
 
     def __str__(self):
         return self.user.get_username()

note_kfet/settings.py

@@ -31,7 +31,10 @@ ALLOWED_HOSTS = []
 # Application definition
 
 INSTALLED_APPS = [
-    'note_theme',
+    # Theme overrides Django Admin templates
+    'theme',
+
+    # Django contrib
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.auth',
@@ -40,6 +43,9 @@ INSTALLED_APPS = [
     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+
+    # Note apps
+    'adherents',
 ]
 
 MIDDLEWARE = [

note_theme/locale/fr/LC_MESSAGES/django.po → theme/locale/fr/LC_MESSAGES/django.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-06-30 16:26+0200\n"
+"POT-Creation-Date: 2019-07-08 13:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: templates/admin/base_site.html:22 templates/base.html:48
+#: templates/admin/base_site.html:22
 msgid "Welcome,"
 msgstr ""
 
@@ -22,7 +22,6 @@ msgid "View site"
 msgstr "Retour au site"
 
 #: templates/admin/base_site.html:32 templates/admin/base_site.html:51
-#: templates/base.html:52
 msgid "View admin"
 msgstr "Administration"
 
@@ -30,15 +29,10 @@ msgstr "Administration"
 msgid "Documentation"
 msgstr ""
 
-#: templates/admin/base_site.html:53 templates/base.html:56
+#: templates/admin/base_site.html:53
 msgid "Log out"
 msgstr ""
 
-#: templates/base.html:62 templates/registration/login.html:9
-#: templates/registration/login.html:56
-msgid "Log in"
-msgstr ""
-
 #: templates/registration/logged_out.html:9
 #: templates/registration/password_change_done.html:9
 #: templates/registration/password_change_form.html:9
@@ -49,25 +43,6 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: templates/registration/login.html:14
-msgid "Please correct the error below."
-msgstr ""
-
-#: templates/registration/login.html:15
-msgid "Please correct the errors below."
-msgstr ""
-
-#: templates/registration/login.html:31
-#, python-format
-msgid ""
-"You are authenticated as %(username)s, but are not authorized to access this "
-"page. Would you like to login to a different account?"
-msgstr ""
-
-#: templates/registration/login.html:52
-msgid "Forgotten your password?"
-msgstr "Mot de passe oublié ?"
-
 #: templates/registration/password_change_done.html:9
 #: templates/registration/password_change_form.html:9
 msgid "Password change"