move apps to own dir

apps/activity/__init__.py

@@ -0,0 +1,5 @@
+# -*- mode: python; coding: utf-8 -*-
+# Copyright (C) 2018-2019 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+default_app_config = 'activity.apps.ActivityConfig'

apps/activity/admin.py

@@ -0,0 +1,33 @@
+# -*- mode: python; coding: utf-8 -*-
+# Copyright (C) 2018-2019 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from django.contrib import admin
+
+from .models import Activity, ActivityType, Guest
+
+
+class ActivityAdmin(admin.ModelAdmin):
+    """
+    Admin customisation for Activity
+    """
+    list_display = ('name', 'activity_type', 'organizer')
+    list_filter = ('activity_type',)
+    search_fields = ['name', 'organizer__name']
+
+    # Organize activities by start date
+    date_hierarchy = 'date_start'
+    ordering = ['-date_start']
+
+
+class ActivityTypeAdmin(admin.ModelAdmin):
+    """
+    Admin customisation for ActivityType
+    """
+    list_display = ('name', 'can_invite', 'guest_entry_fee')
+
+
+# Register your models here.
+admin.site.register(Activity, ActivityAdmin)
+admin.site.register(ActivityType, ActivityTypeAdmin)
+admin.site.register(Guest)

apps/activity/apps.py

@@ -0,0 +1,11 @@
+# -*- mode: python; coding: utf-8 -*-
+# Copyright (C) 2018-2019 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _
+
+
+class ActivityConfig(AppConfig):
+    name = 'activity'
+    verbose_name = _('activity')

apps/activity/locale/fr/LC_MESSAGES/django.po

@@ -0,0 +1,74 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-07-16 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"
+
+#: apps.py:11 models.py:61
+msgid "activity"
+msgstr "activité"
+
+#: models.py:12 models.py:29
+msgid "name"
+msgstr "nom"
+
+#: models.py:16
+msgid "can invite"
+msgstr "peut inviter"
+
+#: models.py:19
+msgid "guest entry fee"
+msgstr "cotisation de l'entrée invité"
+
+#: models.py:23
+msgid "activity type"
+msgstr "type d'activité"
+
+#: models.py:24
+msgid "activity types"
+msgstr "types d'activité"
+
+#: models.py:33
+msgid "description"
+msgstr "description"
+
+#: models.py:39
+msgid "type"
+msgstr "type"
+
+#: models.py:45
+msgid "organizer"
+msgstr "organisateur"
+
+#: models.py:51
+msgid "attendees club"
+msgstr ""
+
+#: models.py:54
+msgid "start date"
+msgstr "date de début"
+
+#: models.py:57
+msgid "end date"
+msgstr "date de fin"
+
+#: models.py:62
+msgid "activities"
+msgstr "activités"
+
+#: models.py:88
+msgid "guest"
+msgstr "invité"
+
+#: models.py:89
+msgid "guests"
+msgstr "invités"

apps/activity/models.py

@@ -0,0 +1,92 @@
+# -*- mode: python; coding: utf-8 -*-
+# Copyright (C) 2018-2019 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from django.conf import settings
+from django.db import models
+from django.utils.translation import gettext_lazy as _
+
+
+class ActivityType(models.Model):
+    name = models.CharField(
+        verbose_name=_('name'),
+        max_length=255,
+    )
+    can_invite = models.BooleanField(
+        verbose_name=_('can invite'),
+    )
+    guest_entry_fee = models.PositiveIntegerField(
+        verbose_name=_('guest entry fee'),
+    )
+
+    class Meta:
+        verbose_name = _("activity type")
+        verbose_name_plural = _("activity types")
+
+    def __str__(self):
+        return self.name
+
+
+class Activity(models.Model):
+    name = models.CharField(
+        verbose_name=_('name'),
+        max_length=255,
+    )
+    description = models.TextField(
+        verbose_name=_('description'),
+    )
+    activity_type = models.ForeignKey(
+        ActivityType,
+        on_delete=models.PROTECT,
+        related_name='+',
+        verbose_name=_('type'),
+    )
+    organizer = models.ForeignKey(
+        'member.Club',
+        on_delete=models.PROTECT,
+        related_name='+',
+        verbose_name=_('organizer'),
+    )
+    attendees_club = models.ForeignKey(
+        'member.Club',
+        on_delete=models.PROTECT,
+        related_name='+',
+        verbose_name=_('attendees club'),
+    )
+    date_start = models.DateTimeField(
+        verbose_name=_('start date'),
+    )
+    date_end = models.DateTimeField(
+        verbose_name=_('end date'),
+    )
+
+    class Meta:
+        verbose_name = _("activity")
+        verbose_name_plural = _("activities")
+
+
+class Guest(models.Model):
+    activity = models.ForeignKey(
+        Activity,
+        on_delete=models.PROTECT,
+        related_name='+',
+    )
+    name = models.CharField(
+        max_length=255,
+    )
+    inviter = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.PROTECT,
+        related_name='+',
+    )
+    entry = models.DateTimeField(
+        null=True,
+    )
+    entry_transaction = models.ForeignKey(
+        'note.Transaction',
+        on_delete=models.PROTECT,
+    )
+
+    class Meta:
+        verbose_name = _("guest")
+        verbose_name_plural = _("guests")