Merge branch 'kerl/clubs' into 'master'

Nouvelle app: clubs

See merge request klub-dev-ens/gestioCOF!372

.gitlab-ci.yml

@@ -52,9 +52,9 @@ linters:
         - pip install --upgrade black isort flake8
     script:
         - black --check .
-        - isort --recursive --check-only --diff bda bds cof events gestioncof kfet petitscours provisioning shared utils
+        - isort --recursive --check-only --diff bda bds clubs cof events gestioncof kfet petitscours provisioning shared utils
         # Print errors only
-        - flake8 --exit-zero bda bds cof events gestioncof kfet petitscours provisioning shared utils
+        - flake8 --exit-zero bda bds clubs cof events gestioncof kfet petitscours provisioning shared utils
     cache:
         key: linters
         paths:

CHANGELOG

@@ -2,6 +2,7 @@
 
 - Nouveau module de gestion des événements
 - Nouveau module BDS
+- Nouveau module clubs
 
 * Version 0.3.2 - 04/11/2019
 

clubs/admin.py

@@ -0,0 +1,5 @@
+from django.contrib import admin
+
+from clubs.models import Club
+
+admin.site.register(Club)

clubs/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class ClubsConfig(AppConfig):
+    name = "clubs"

clubs/migrations/0001_initial.py

@@ -0,0 +1,46 @@
+# Generated by Django 2.2.6 on 2019-10-06 17:57
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]
+
+    operations = [
+        migrations.CreateModel(
+            name="Club",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "name",
+                    models.CharField(
+                        max_length=1000, unique=True, verbose_name="nom du club"
+                    ),
+                ),
+                (
+                    "description",
+                    models.TextField(blank=True, verbose_name="description"),
+                ),
+                (
+                    "respos",
+                    models.ManyToManyField(
+                        blank=True,
+                        to=settings.AUTH_USER_MODEL,
+                        verbose_name="responsables du club",
+                    ),
+                ),
+            ],
+        )
+    ]

clubs/models.py

@@ -0,0 +1,16 @@
+from django.contrib.auth import get_user_model
+from django.db import models
+from django.utils.translation import gettext_lazy as _
+
+User = get_user_model()
+
+
+class Club(models.Model):
+    name = models.CharField(_("nom du club"), max_length=1000, unique=True)
+    description = models.TextField(_("description"), blank=True)
+    respos = models.ManyToManyField(
+        User, verbose_name=_("responsables du club"), blank=True
+    )
+
+    def __str__(self):
+        return self.name

cof/settings/dev.py

@@ -17,7 +17,7 @@ if TESTING:
 
 # As long as these apps are not ready for production, they are only available
 # in development mode
-INSTALLED_APPS += ["events", "bds"]
+INSTALLED_APPS += ["events", "bds", "clubs"]
 
 
 # ---

cof/settings/prod.py

@@ -13,7 +13,7 @@ DEBUG = False
 ALLOWED_HOSTS = ["cof.ens.fr", "www.cof.ens.fr", "dev.cof.ens.fr"]
 
 if TESTING:
-    INSTALLED_APPS.append("events")
+    INSTALLED_APPS += ["events", "clubs"]
 
 STATIC_ROOT = os.path.join(
     os.path.dirname(os.path.dirname(BASE_DIR)), "public", "gestion", "static"

setup.cfg

@@ -2,6 +2,7 @@
 source =
   bda
   bds
+  clubs
   cof
   events
   gestioncof
@@ -36,7 +37,7 @@ default_section = THIRDPARTY
 force_grid_wrap = 0
 include_trailing_comma = true
 known_django = django
-known_first_party = bda,bds,cof,events,gestioncof,kfet,petitscours,shared,utils
+known_first_party = bda,bds,clubs,cof,events,gestioncof,kfet,petitscours,shared,utils
 line_length = 88
 multi_line_output = 3
 not_skip = __init__.py