diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..912ad38
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,18 @@
+# https://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = tab
+
+[*.py]
+indent_style = space
+indent_size = 4
+
+# 2 spaces in YAML
+[*.{yaml,yml}]
+indent_style = space
+indent_size = 2
diff --git a/events/admin.py b/events/admin.py
index 8c38f3f..a1d2300 100644
--- a/events/admin.py
+++ b/events/admin.py
@@ -1,3 +1,6 @@
from django.contrib import admin
-# Register your models here.
+from .models import Event, EventRegistration
+
+admin.site.register(Event)
+admin.site.register(EventRegistration)
diff --git a/events/migrations/0001_initial.py b/events/migrations/0001_initial.py
deleted file mode 100644
index 046f480..0000000
--- a/events/migrations/0001_initial.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Generated by Django 3.0.8 on 2020-07-22 00:49
-
-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='Event',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('date', models.DateTimeField()),
- ('capacity', models.IntegerField()),
- ],
- ),
- migrations.CreateModel(
- name='EventRegistration',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('state', models.CharField(choices=[('I', 'Interested'), ('A', 'Admitted'), ('D', 'Denied')], max_length=1)),
- ('event_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='events.Event')),
- ('user_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
- ],
- ),
- ]
diff --git a/events/models.py b/events/models.py
index 54cc830..92c3b59 100644
--- a/events/models.py
+++ b/events/models.py
@@ -4,19 +4,32 @@ from users.models import CustomUser
class Event(models.Model):
- date = models.DateTimeField()
- capacity = models.IntegerField()
+ MORNING, AFTERNOON, EVENING = range(3)
+ TIME_SLOTS = {
+ MORNING: "Voormiddag",
+ AFTERNOON: "Namiddag",
+ EVENING: "Avond",
+ }
+ date = models.DateField()
+ time = models.IntegerField(choices=TIME_SLOTS.items(), default=MORNING)
+ capacity = models.IntegerField(default=6)
+
+ def __str__(self):
+ return f"{self.date} {self.TIME_SLOTS[self.time]}"
class EventRegistration(models.Model):
+ INTERESTED = "I"
+ ADMITTED = "A"
+ DENIED = "D"
REGISTRATION_STATE = (
- ('I', 'Interested'),
- ('A', 'Admitted'),
- ('D', 'Denied'),
+ (INTERESTED, "Interested"),
+ (ADMITTED, "Admitted"),
+ (DENIED, "Denied"),
)
event = models.ForeignKey(Event, on_delete=models.CASCADE)
user = models.ForeignKey(CustomUser, on_delete=models.CASCADE)
state = models.CharField(max_length=1, choices=REGISTRATION_STATE)
def __str__(self):
- return f'Reservation[{self.user.username}:{self.event.date}:{self.state}]'
+ return f"Reservation[{self.user.username}:{self.event.date}:{self.state}]"
diff --git a/events/templates/events/detail.html b/events/templates/events/detail.html
new file mode 100644
index 0000000..1a144a8
--- /dev/null
+++ b/events/templates/events/detail.html
@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+
+{% block content %}
+ {{ event.date }} (maximum {{ event.capacity }} mensen)
+
+ {% for regi in event.registration %}
+ {{ regi.user.username }}: {{regi.state}}
+ {% endfor %}
+
+{% endblock %}
diff --git a/events/templates/events/index.html b/events/templates/events/index.html
new file mode 100644
index 0000000..2a03009
--- /dev/null
+++ b/events/templates/events/index.html
@@ -0,0 +1,19 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+ {% for event in events %}
+ - {{ event.date }} {{ event.time }} (maximum {{ event.capacity }} mensen)
+
+
+
+ {% endfor %}
+
+{% endblock %}
diff --git a/events/urls.py b/events/urls.py
index 16cdbc2..5a20749 100644
--- a/events/urls.py
+++ b/events/urls.py
@@ -2,7 +2,9 @@ from django.urls import path
from . import views
+app_name = "events"
urlpatterns = [
- path('', views.index, name='index'),
- path('test/', views.view_score_stuff, name='score_stuff'),
+ path("", views.index, name="index"),
+ path("/", views.register, name="register"),
+ path("test/", views.view_score_stuff, name="score_stuff"),
]
diff --git a/events/views.py b/events/views.py
index f351714..049f6d9 100644
--- a/events/views.py
+++ b/events/views.py
@@ -1,17 +1,32 @@
-from django.shortcuts import render
+from django.http import HttpResponseRedirect
+from django.shortcuts import render, get_object_or_404
+from django.utils import timezone
+from django.urls import reverse
+import datetime
-# Create your views here.
-from django.http import HttpResponse
+from .models import Event, EventRegistration, CustomUser
from events.tasks import assign_reservations
def index(request):
- return HttpResponse(
+ events = Event.objects.filter(date__gte=timezone.now().date()).order_by("date")[:20]
+ return render(request, "events/index.html", {"events": events})
- )
def view_score_stuff(request):
return HttpResponse(
assign_reservations()
)
+
+
+def register(request, event_id):
+ if request.method == "POST":
+ event = get_object_or_404(Event, id=event_id)
+
+ # registration = Event.entry_set.create(
+ # state=EventRegistration.INTERESTED,
+ # event=event,
+ # user=CustomUser.objects.get(),
+ # )
+ return HttpResponseRedirect(reverse("events:index", args=(event.id,)))
diff --git a/templates/base.html b/templates/base.html
new file mode 100644
index 0000000..1babc4b
--- /dev/null
+++ b/templates/base.html
@@ -0,0 +1,12 @@
+
+
+
+
+
+ Zeus WPI Kelderregistratiesysteem™
+
+
+ Zeus WPI Kelderregistratiesysteem™
+ {% block content %}{% endblock %}
+
+