diff --git a/volunteers/__init__.py b/volunteers/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/volunteers/admin.py b/volunteers/admin.py deleted file mode 100644 index 895e090..0000000 --- a/volunteers/admin.py +++ /dev/null @@ -1,12 +0,0 @@ -from django.contrib import admin - -from ponyconf.admin import SiteAdminMixin - -from .models import Activity - - -class ActivityAdmin(SiteAdminMixin, admin.ModelAdmin): - pass - - -admin.site.register(Activity, ActivityAdmin) diff --git a/volunteers/apps.py b/volunteers/apps.py deleted file mode 100644 index be1e32e..0000000 --- a/volunteers/apps.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.apps import AppConfig - - -class VolunteersConfig(AppConfig): - name = 'volunteers' diff --git a/volunteers/forms.py b/volunteers/forms.py deleted file mode 100644 index 7666d45..0000000 --- a/volunteers/forms.py +++ /dev/null @@ -1,23 +0,0 @@ -from django import forms - -from .models import Activity - - -class ActivityForm(forms.ModelForm): - class Meta: - model = Activity - fields=['name', 'description', 'participants'] - - -class VolunteerFilterForm(forms.Form): - activity = forms.MultipleChoiceField( - required=False, - widget=forms.CheckboxSelectMultiple, - choices=[], - ) - - def __init__(self, *args, **kwargs): - site = kwargs.pop('site') - super().__init__(*args, **kwargs) - activities = Activity.objects.filter(site=site) - self.fields['activity'].choices = activities.values_list('slug', 'name') diff --git a/volunteers/migrations/0001_initial.py b/volunteers/migrations/0001_initial.py deleted file mode 100644 index 4a7767a..0000000 --- a/volunteers/migrations/0001_initial.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.3 on 2017-01-13 10:49 -from __future__ import unicode_literals - -import autoslug.fields -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), - ('sites', '0002_alter_domain_unique'), - ] - - operations = [ - migrations.CreateModel( - name='Activity', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=256, verbose_name='Name')), - ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name')), - ('description', models.TextField(blank=True, verbose_name='Description')), - ('participants', models.ManyToManyField(blank=True, related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Participants')), - ('site', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sites.Site')), - ], - options={ - 'verbose_name_plural': 'Activities', - 'verbose_name': 'Activity', - }, - ), - migrations.AlterUniqueTogether( - name='activity', - unique_together=set([('site', 'name')]), - ), - ] diff --git a/volunteers/migrations/__init__.py b/volunteers/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/volunteers/models.py b/volunteers/models.py deleted file mode 100644 index fdfda77..0000000 --- a/volunteers/models.py +++ /dev/null @@ -1,23 +0,0 @@ -from django.db import models -from django.contrib.sites.models import Site -from django.utils.translation import ugettext_lazy as _ -from django.contrib.auth.models import User - -from autoslug import AutoSlugField - - -class Activity(models.Model): - - site = models.ForeignKey(Site, on_delete=models.CASCADE) - name = models.CharField(max_length=256, verbose_name=_('Name')) - slug = AutoSlugField(populate_from='name') - description = models.TextField(blank=True, verbose_name=_('Description')) - participants = models.ManyToManyField(User, blank=True, related_name='activities', verbose_name=_('Participants')) - - class Meta: - unique_together = ('site', 'name') - verbose_name = _('Activity') - verbose_name_plural = _('Activities') - - def __str__(self): - return self.name diff --git a/volunteers/templates/volunteers/volunteer_enrole.html b/volunteers/templates/volunteers/volunteer_enrole.html deleted file mode 100644 index 0a470ce..0000000 --- a/volunteers/templates/volunteers/volunteer_enrole.html +++ /dev/null @@ -1,31 +0,0 @@ -{% extends 'base.html' %} - -{% load accounts_tags i18n %} - -{% block volunteertab %} class="active"{% endblock %} - -{% block content %} - -
-
{{ activity.description }}
-- {% if request.user in activity.participants.all %} - {% trans "Sorry, I have a setback" %} - {% else %} - {% trans "I will be happy to help on that!" %} - {% endif %} -
- -{% trans "Username" %} | -{% trans "Fullname" %} | -{% trans "Activities" %} | -- |
---|---|---|---|
{{ volunteer.user.username }} | -{{ volunteer.user.get_full_name }} | -- {% for activity in volunteer.user.activities.all %} - {{ activity }} - {% endfor %} - | -- | - -