diff --git a/equipement/__init__.py b/equipement/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/equipement/admin.py b/equipement/admin.py deleted file mode 100644 index 8c38f3f..0000000 --- a/equipement/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/equipement/apps.py b/equipement/apps.py deleted file mode 100644 index 7d172de..0000000 --- a/equipement/apps.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.apps import AppConfig - - -class EquipementConfig(AppConfig): - name = 'equipement' diff --git a/equipement/models.py b/equipement/models.py deleted file mode 100644 index 70ad3e8..0000000 --- a/equipement/models.py +++ /dev/null @@ -1,73 +0,0 @@ -from django.db import models -from django.utils.translation import ugettext_lazy as _ - -from event.models import Event, Activity - - -class AbstractEquipement(models.Model): - name = models.CharField( - _("Nom du matériel"), - max_length=200, - ) - stock = models.PositieSmallIntegerField(_("Quantité disponible")) - description = models.TextField(_("Description")) - - class Meta: - verbose_name = _("matériel abstrait") - verbose_name_plural = _("matériels abstraits") - - def __str__(self): - return self.name - - -class Equipement(AbstractEquipement): - class Meta: - verbose_name = _("matériel permanent") - verbose_name_plural = _("matériels permanents") - - -class TemporaryEquipement(AbstractEquipement): - event = models.ForeignKey( - Event, - related_name="specific_equipement", - help_text=_("Évènement pour lequel le matériel " - "a été loué ou empreinté ou apporté"), - ) - - class Meta: - verbose_name = _("matériel temporaire") - verbose_name_plural = _("matériels temporaires") - - -class EquipementAttribution(models.Model): - equipement = models.ForeignKey(AbstractEquipement) - activity = models.ForeignKey(Activity) - amount = models.PositiveSmallIntegerField(_("Quantité attribuée")) - remarks = models.TextField("Remarques concernant l'attribution") - - class Meta: - verbose_name = _("attribution de matériel") - verbose_name_plural = _("attributions de matériel") - - def __str__(self): - return self.equipement.name +\ - " (" + self.amout + ") " +\ - " -> " + self.activity.get_herited('title') - - -class EquipementRemark(models.Model): - remark = models.TextField("Remarque sur le matériel") - equipement = models.ForeignKey( - AbstractEquipement, - related_name="remarks", - help_text=_("Matériel concerné par la remarque"), - ) - is_broken = models.BooleanField() - is_lost = models.BooleanField() - - class Meta: - verbose_name = _("remarque sur matériel") - verbose_name_plural = _("remarques sur le matériel") - - def __str__(self): - return self.equipement.name + " : " + self.remark diff --git a/equipement/tests.py b/equipement/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/equipement/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/equipement/views.py b/equipement/views.py deleted file mode 100644 index 91ea44a..0000000 --- a/equipement/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. diff --git a/evenementiel/settings_dev.py b/evenementiel/settings_dev.py index 3f52bfc..4c798b5 100644 --- a/evenementiel/settings_dev.py +++ b/evenementiel/settings_dev.py @@ -31,6 +31,7 @@ ALLOWED_HOSTS = [] # Application definition INSTALLED_APPS = [ + 'equipment.apps.EquipmentConfig', 'event.apps.EventConfig', 'django.contrib.admin', 'django.contrib.auth', @@ -43,6 +44,7 @@ INSTALLED_APPS = [ ] MIDDLEWARE_CLASSES = [ + 'debug_toolbar.middleware.DebugToolbarMiddleware', 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', @@ -131,6 +133,7 @@ USE_TZ = True STATIC_URL = '/static/' + def show_toolbar(request): """ On ne veut pas la vérification de INTERNAL_IPS faite par la debug-toolbar