Merge branch 'master' of https://git.fet.at/bofh/fet2020

Readme.md

@@ -96,6 +96,8 @@ docker build -t django-nginx-image -f nginx/Dockerfile ./nginx
 
 ### Start docker container
 
+Add email password for 'Verleih' account to EMAIL_HOST_PASSWORD in the docker compose file!
+
 Build the docker containers:
 
 ```bash
@@ -134,6 +136,10 @@ ckeditor -> django-prose-editor
 
 ## Version History
 
+2.2.1
+
+* Fix rental (view, pdf file, sending mail)
+
 2.2.0
 
 * Add rental

docker-compose.yml

@@ -25,6 +25,8 @@ services:
       MYSQL_USER: "user"
       MYSQL_PASSWORD: "hgu"
       ETHERPAD_GROUP: "g.snlbqn7S6ksRbom3"
+      EMAIL_HOST_USER: "verleih@fet.at"
+      EMAIL_HOST_PASSWORD: ""
     depends_on:
       mysql:
         condition: service_healthy

fet2020/fet2020/__init__.py

@@ -1,6 +1,6 @@
 from django.utils.version import get_version
 
-VERSION = (2, 2, 0, "final", 0)
+VERSION = (2, 2, 1, "final", 0)
 BUILD = 0
 
 __version__ = get_version(VERSION)

fet2020/fet2020/settings.py

@@ -18,6 +18,8 @@ env = environ.Env(
     ETHERPAD_GROUP=(str, ""),
     GALLERY_PATH=(str, "uploads/gallery"),
     MC_MASTERPASSWORD=(str, ""),
+    EMAIL_HOST_USER=(str, ""),
+    EMAIL_HOST_PASSWORD=(str, ""),
 )
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
@@ -103,6 +105,8 @@ else:
 EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
 EMAIL_HOST = "buran.htu.tuwien.ac.at"
 EMAIL_PORT = 587
+EMAIL_HOST_USER = env("EMAIL_HOST_USER")
+EMAIL_HOST_PASSWORD = env("EMAIL_HOST_PASSWORD")
 EMAIL_USE_TLS = True
 
 

fet2020/rental/admin.py

@@ -42,7 +42,7 @@ class RentalAdmin(admin.ModelAdmin):
                     ("date_start", "date_end"),
                     "reason",
                     "rentalitems",
-                    "total_disposit",
+                    ("total_disposit", "intern"),
                 ),
             },
         ),
@@ -93,13 +93,10 @@ class RentalAdmin(admin.ModelAdmin):
         obj.author = request.user
         super().save_model(request, obj, form, change)
 
-    @admin.display(description="Kaution (EUR)")
+    @admin.display(description="Kaution insgesamt")
     def total_disposit(self, obj):
-        total_disposit = 0
-        for elem in obj.rentalitems.all():
-            total_disposit += elem.deposit
-
-        return f"{total_disposit}"
+        total_disposit = obj.calc_total_deposit()
+        return f"{total_disposit} €"
 
 
 @admin.register(RentalItem)

fet2020/rental/forms.py

@@ -51,6 +51,13 @@ class RentalAdminForm(forms.ModelForm):
 
         widgets = {"rentalitems": forms.CheckboxSelectMultiple()}
 
+        help_texts = {
+            "status": (
+                "Wird der Status auf 'Verleih genehmigt' oder 'Verleih abgelehnt' gesetzt, wird "
+                "eine E-Mail gesendet."
+            ),
+        }
+
 
 class RentalItemAdminForm(forms.ModelForm):
     class Meta:

fet2020/rental/mails.py

@@ -1,28 +1,28 @@
 import logging
 
+from django.conf import settings
 from django.core.mail import EmailMessage
 
-RENTAL_EMAIL = "verleih@fet.at"
+RENTAL_EMAIL = settings.EMAIL_HOST_USER
 logger = logging.getLogger(__name__)
 
 
 def send_mail_approved(obj):
     subject = f"FET-Verleih #{obj.id}: {obj.get_status_display()}"
-
-    total_deposit = 0
-    for rentalitem in obj.rentalitems.all():
-        total_deposit += rentalitem.deposit
+    total_deposit = obj.calc_total_deposit()
 
     message = (
-        f"Hallo {obj.firstname},\n"
+        f"Hallo {obj.firstname},\n\n"
         f"deine Verleihanfrage mit der Nummer #{obj.id} wurde erfolgreich genehmigt. Die "
         f"Gegenstände können am {obj.date_start.strftime('%d.%m.%Y')} während der Beratungszeit "
-        "(Montag - Donnerstag: 09:00 - 14:00, Freitag: 09:00 - 12:00) abgeholt werden. Bitte bring "
-        f"den Gesamtpfand in Höhe von {total_deposit} € in bar mit.\n"
-        "Liebe Grüße,\n"
-        "das Verleih-Team"
+        "(Montag - Donnerstag: 09:00 - 14:00, Freitag: 09:00 - 12:00) abgeholt werden.\n"
     )
 
+    if total_deposit > 0:
+        message += f"Bitte bring den Gesamtpfand in Höhe von {total_deposit} € in bar mit.\n"
+
+    message += "\nLiebe Grüße,\ndas Verleih-Team"
+
     email = EmailMessage(
         subject, message, from_email=RENTAL_EMAIL, to=[obj.email], cc=[RENTAL_EMAIL]
     )
@@ -30,15 +30,15 @@ def send_mail_approved(obj):
     try:
         email.send()
     except Exception as exc:
-        logger.error("Failed to send approval email for rental #%s. Error: %s", obj.id, exc)
+        logger.info("Failed to send approval email for rental #%s. Error: %s", obj.id, exc)
 
 
 def send_mail_rejected(obj):
     subject = f"FET-Verleih #{obj.id}: {obj.get_status_display()}"
 
     message = (
-        f"Hallo {obj.firstname},\n"
-        f"deine Verleihanfrage mit der Nummer #{obj.id} wurde abgelehnt.\n"
+        f"Hallo {obj.firstname},\n\n"
+        f"deine Verleihanfrage mit der Nummer #{obj.id} wurde abgelehnt.\n\n"
         "Liebe Grüße,\n"
         "das Verleih-Team"
     )
@@ -50,4 +50,4 @@ def send_mail_rejected(obj):
     try:
         email.send()
     except Exception as exc:
-        logger.error("Failed to send rejection email for rental #%s. Error: %s", obj.id, exc)
+        logger.info("Failed to send rejection email for rental #%s. Error: %s", obj.id, exc)

fet2020/rental/managers.py

@@ -0,0 +1,6 @@
+from django.db import models
+
+
+class RentalItemsManager(models.Manager):
+    def get_queryset(self):
+        return super().get_queryset().order_by("name")

fet2020/rental/migrations/0001_initial.py

@@ -0,0 +1,55 @@
+# Generated by Django 5.2.7 on 2025-10-30 12:05
+
+import django.core.validators
+import rental.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='RentalItem',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=128, verbose_name='Name')),
+                ('description', models.CharField(blank=True, default='', max_length=128, verbose_name='Beschreibung')),
+                ('deposit', models.DecimalField(decimal_places=2, default=0, max_digits=6, verbose_name='Kaution (EUR)')),
+                ('image', models.ImageField(blank=True, null=True, upload_to='rentalitems', verbose_name='Bild')),
+                ('induction', models.BooleanField(default=False, verbose_name='Einschulung notwendig')),
+                ('location', models.CharField(blank=True, default='', max_length=128, verbose_name='Standort')),
+            ],
+            options={
+                'verbose_name': 'Verleihgegenstand',
+                'verbose_name_plural': 'Verleihgegenstände',
+            },
+        ),
+        migrations.CreateModel(
+            name='Rental',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('firstname', models.CharField(max_length=128, verbose_name='Vorname')),
+                ('surname', models.CharField(max_length=128, verbose_name='Nachname')),
+                ('matriculation_number', models.CharField(max_length=8, verbose_name='Matrikelnummer')),
+                ('email', models.EmailField(max_length=254, verbose_name='E-Mail')),
+                ('phone', models.CharField(max_length=32, validators=[rental.validators.PhoneNumberValidator()], verbose_name='Telefonnummer')),
+                ('organization', models.CharField(max_length=128, verbose_name='Organisation')),
+                ('date_start', models.DateField(verbose_name='Abholdatum')),
+                ('date_end', models.DateField(verbose_name='Rückgabedatum')),
+                ('reason', models.TextField(max_length=500, verbose_name='Grund der Ausleihe')),
+                ('comment', models.TextField(blank=True, default='', max_length=500, verbose_name='Kommentar')),
+                ('file_field', models.FileField(blank=True, null=True, upload_to='uploads/rental/rental/', validators=[django.core.validators.FileExtensionValidator(['pdf'])], verbose_name='Verleihformular')),
+                ('status', models.CharField(choices=[('S', 'Eingereicht'), ('A', 'Verleih genehmigt'), ('J', 'Verleih abgelehnt'), ('I', 'Verleihgegenstände ausgegeben'), ('R', 'Verleihgegenstände zurückgegeben')], default='S', max_length=1, verbose_name='Status')),
+                ('rentalitems', models.ManyToManyField(to='rental.rentalitem', verbose_name='Verleihgegenstände')),
+            ],
+            options={
+                'verbose_name': 'Verleih',
+                'verbose_name_plural': 'Verleih',
+            },
+        ),
+    ]

fet2020/rental/migrations/0002_rental_intern.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.7 on 2025-10-30 14:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rental', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='rental',
+            name='intern',
+            field=models.BooleanField(default=False, verbose_name='Interner Verleih'),
+        ),
+    ]

fet2020/rental/models.py

@@ -3,6 +3,7 @@ from django.db import models
 from django.forms import ValidationError
 
 from .mails import send_mail_approved, send_mail_rejected
+from .managers import RentalItemsManager
 from .validators import PhoneNumberValidator
 
 
@@ -22,6 +23,8 @@ class RentalItem(models.Model):
 
     location = models.CharField(verbose_name="Standort", max_length=128, blank=True, default="")
 
+    objects = RentalItemsManager()
+
     class Meta:
         verbose_name = "Verleihgegenstand"
         verbose_name_plural = "Verleihgegenstände"
@@ -41,6 +44,7 @@ class Rental(models.Model):
     )
 
     organization = models.CharField(verbose_name="Organisation", max_length=128)
+    intern = models.BooleanField(verbose_name="Interner Verleih", default=False)
 
     date_start = models.DateField(verbose_name="Abholdatum")
     date_end = models.DateField(verbose_name="Rückgabedatum")
@@ -107,3 +111,12 @@ class Rental(models.Model):
 
         if self.date_start > self.date_end:
             raise ValidationError("Das Abholdatum muss vor dem Rückgabedatum liegen.")
+
+    def calc_total_deposit(self) -> int:
+        total_deposit = 0
+
+        if not self.intern:
+            for item in self.rentalitems.all():
+                total_deposit += item.deposit
+
+        return total_deposit

fet2020/rental/urls.py

@@ -10,7 +10,7 @@ urlpatterns = [
     path("overview/", RentalListView.as_view(), name="index"),
     path("request-rental/", RentalCreateView.as_view(), name="rental_create"),
     path(
-        "request-rental/<int:pk>/done/",
+        "request-rental/done/",
         RentalCreateDoneView.as_view(),
         name="rental_create_done",
     ),

fet2020/rental/utils.py

@@ -1,6 +1,6 @@
 import io
-from pathlib import Path
 
+from django.contrib.staticfiles import finders
 from django.core.files import File
 from pypdf import PdfReader, PdfWriter
 
@@ -27,27 +27,21 @@ def generate_rental_pdf(rental: Rental) -> bool:
         },
     )
 
-    total_deposit = 0
-
     for i, item in enumerate(rental.rentalitems.all(), start=1):
-        total_deposit += item.deposit
         data.update(
             {
                 f"Produkt Row{i}": item.name,
                 f"Menge Row{i}": "1",
-                f"Kaution Row{i}": item.deposit,
+                f"Kaution Row{i}": (str(item.deposit) if not rental.intern else "0"),
             },
         )
 
-    data.update(
-        {
-            "Gesamtkaution": total_deposit,
-        },
-    )
+    total_deposit = rental.calc_total_deposit()
+    data.update({"Gesamtkaution": str(total_deposit)})
 
     # Write data in pdf
-    pdf_path = Path(Path(__file__).parent) / "static/rental/Verleihformular.pdf"
-    reader = PdfReader(pdf_path)
+    pdf_path_str = finders.find("rental/Verleihformular.pdf")
+    reader = PdfReader(pdf_path_str)
     writer = PdfWriter()
     writer.append(reader)
 
@@ -58,6 +52,7 @@ def generate_rental_pdf(rental: Rental) -> bool:
 
     with io.BytesIO() as bytes_stream:
         writer.write(bytes_stream)
+        bytes_stream.seek(0)
 
         # Save pdf in rental
         rental_name = f"Verleihformular-{str(rental.pk).zfill(4)}.pdf"

fet2020/rental/views.py

@@ -1,7 +1,9 @@
 import calendar
 import datetime
+from datetime import date
 
 from django.db.models import Q
+from django.http import HttpResponseRedirect
 from django.shortcuts import render
 from django.urls import reverse
 from django.views.generic import ListView, TemplateView
@@ -11,88 +13,161 @@ from django.views.generic.edit import CreateView
 from .forms import RentalCreateForm
 from .models import Rental, RentalItem
 
+# Maximum number of rental items per rental entry because of table size limitations in PDF file
+RENTAL_ITEMS_MAX = 5
+
+
+def _calc_days_from_current_month(month: date) -> list:
+    last_day_of_month = month.replace(day=calendar.monthrange(month.year, month.month)[1])
+
+    return [month + datetime.timedelta(days=i) for i in range((last_day_of_month - month).days + 1)]
+
+
+def _calc_days_from_prev_month(month: date) -> list:
+    days_of_prev_period = []
+
+    if month.weekday() != calendar.MONDAY:
+        for i in range(1, 7):
+            day = month + datetime.timedelta(days=-i)
+            days_of_prev_period.append(day)
+            if day.weekday() == calendar.MONDAY:
+                break
+
+    return sorted(days_of_prev_period)
+
+
+def _calc_days_from_next_month(month: date) -> list:
+    last_day_of_month = month.replace(day=calendar.monthrange(month.year, month.month)[1])
+    days_of_next_period = []
+
+    if last_day_of_month.weekday() != calendar.SUNDAY:
+        for i in range(1, 7):
+            day = last_day_of_month + datetime.timedelta(days=i)
+            days_of_next_period.append(day)
+            if day.weekday() == calendar.SUNDAY:
+                break
+
+    return days_of_next_period
+
+
+def _get_display_period(view_type: str, period: str) -> date:
+    display_date: date = None
+
+    # Handle week view
+    if view_type == "week":
+        try:
+            # Parse the requested calendar week
+            display_date = (
+                datetime.datetime.strptime(f"{period}-1", "%G-KW%V-%u")
+                .replace(tzinfo=datetime.UTC)
+                .date()
+            )
+        except Exception:
+            # Get first day of the current week
+            today = datetime.datetime.now(tz=datetime.UTC).date()
+            display_date = today - datetime.timedelta(days=today.weekday())
+
+    # Handle month view
+    else:
+        try:
+            # Parse the requested month
+            display_date = (
+                datetime.datetime.strptime(period, "%Y-%m").replace(tzinfo=datetime.UTC).date()
+            )
+        except Exception:
+            # Get the first day of the current month
+            display_date = datetime.datetime.now(tz=datetime.UTC).date().replace(day=1)
+
+    return display_date
+
 
 class RentalListView(ListView):
     model = Rental
     template_name = "rental/calendar.html"
 
-    # Month is the month displayed in the calendar (and should be the first day of the month)
-    month = None
-    # Rental items to filter
-    rentalitem_filters = []
+    def __init__(self):
+        super().__init__()
+        # Current display period and view settings
+        self.display_period = None
+        self.view_type = "month"  # Default view
+        self.rentalitem_filters = []
 
     def get(self, request, *args, **kwargs):
-        # Get the rental items from the filter (max. 4)
-        self.rentalitem_filters = request.GET.getlist("rentalitems", [])[:4]
-        if not self.rentalitem_filters:
-            for rentalitem in RentalItem.objects.all()[:4]:
-                self.rentalitem_filters.append(rentalitem.name)
+        # Get view parameters from request
+        _view_type = request.GET.get("view_type", "week")
+        _period = request.GET.get("period_value", "")
+        _prev_period = request.GET.get("prev_period", "")
+        _next_period = request.GET.get("next_period", "")
 
-        # Get the displayed month from the request
-        _date_str = request.GET.get("month", "")
-        if _date_str:
-            self.month = (
-                datetime.datetime.strptime(_date_str, "%Y-%m").replace(tzinfo=datetime.UTC).date()
-            )
-        else:
-            self.month = datetime.datetime.now(tz=datetime.UTC).date().replace(day=1)
+        if _prev_period:
+            _period = _prev_period
+        elif _next_period:
+            _period = _next_period
+
+        self.view_type = _view_type
+        self.display_period = _get_display_period(_view_type, _period)
+
+        self.rentalitem_filters = request.GET.getlist("rentalitems", [])
+        if not self.rentalitem_filters:
+            items = RentalItem.objects.all()
+            self.rentalitem_filters = [item.name for item in items]
+
+        # Update request.GET
+        _request_get_list = request.GET.copy()
+        _request_get_list.pop("prev_period", None)
+        _request_get_list.pop("next_period", None)
+        _request_get_list["period_value"] = _period
+        request.GET = _request_get_list
 
         return super().get(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
-        # Calculate the day of the previous month from Monday
-        days_of_prev_month = []
+        if self.view_type != "week":
+            # Add the displayed, previous and next month
+            context["view_period"] = self.display_period
+            context["prev_period"] = self.display_period + datetime.timedelta(days=-1)
+            context["next_period"] = self.display_period + datetime.timedelta(
+                days=calendar.monthrange(self.display_period.year, self.display_period.month)[1] + 1
+            )
 
-        if self.month.weekday() != calendar.MONDAY:
-            for i in range(1, 7):
-                day = self.month + datetime.timedelta(days=-i)
-                days_of_prev_month.append(day)
-                if day.weekday() == calendar.MONDAY:
-                    break
+            # Add the days of the displayed, previous and next month
+            days_of_view_period = _calc_days_from_current_month(self.display_period)
+            context["days_of_view_period"] = days_of_view_period
+            context["days_of_prev_period"] = _calc_days_from_prev_month(self.display_period)
+            context["days_of_next_period"] = _calc_days_from_next_month(self.display_period)
 
-        # Calculate the days of the next month until Sunday
-        last_day_of_month = self.month.replace(
-            day=calendar.monthrange(self.month.year, self.month.month)[1]
-        )
-        days_of_next_month = []
+            context["view_type"] = "month"
 
-        if last_day_of_month.weekday() != calendar.SUNDAY:
-            for i in range(1, 7):
-                day = last_day_of_month + datetime.timedelta(days=i)
-                days_of_next_month.append(day)
-                if day.weekday() == calendar.SUNDAY:
-                    break
+            context["week_num"] = None
 
-        # Calculate the days of the displayed month
-        days_of_month = [
-            self.month + datetime.timedelta(days=i)
-            for i in range((last_day_of_month - self.month).days + 1)
-        ]
+        else:
+            # Current week
+            year, week_num, _ = self.display_period.isocalendar()
+            context["view_period"] = f"{year}-KW{week_num:02d}"  # formats as "2025-KW02"
 
-        # Create a dictionary with the rental items for each day
-        rental_dict = {}
-        for rental in self.get_queryset():
-            for day in days_of_month:
-                if rental["date_start"] <= day and rental["date_end"] >= day:
-                    if day not in rental_dict:
-                        rental_dict[day] = []
+            # Calculate previous week
+            prev_week = self.display_period - datetime.timedelta(days=7)
+            prev_year, prev_week_num, _ = prev_week.isocalendar()
+            context["prev_period"] = f"{prev_year}-KW{prev_week_num:02d}"
 
-                    if rental["rentalitems__name"] not in rental_dict[day]:
-                        rental_dict[day].append(rental["rentalitems__name"])
+            # Calculate next week
+            next_week = self.display_period + datetime.timedelta(days=7)
+            next_year, next_week_num, _ = next_week.isocalendar()
+            context["next_period"] = f"{next_year}-KW{next_week_num:02d}"
 
-        # Add the displayed, previous and next month
-        context["month"] = self.month
-        context["prev_month"] = self.month + datetime.timedelta(days=-1)
-        context["next_month"] = self.month + datetime.timedelta(
-            days=calendar.monthrange(self.month.year, self.month.month)[1] + 1
-        )
+            # Add days of week (7 days starting from first_day_of_week)
+            days_of_view_period = [
+                self.display_period + datetime.timedelta(days=i) for i in range(7)
+            ]
+            context["days_of_view_period"] = days_of_view_period
+            context["days_of_prev_period"] = []
+            context["days_of_next_period"] = []
 
-        # Add the days of the displayed, previous and next month
-        context["days_of_month"] = days_of_month
-        context["days_of_prev_month"] = sorted(days_of_prev_month)
-        context["days_of_next_month"] = days_of_next_month
+            context["view_type"] = "week"
+
+            context["week_num"] = week_num
 
         # Get the current date for the calendar
         context["today"] = datetime.datetime.now(tz=datetime.UTC).date()
@@ -103,7 +178,18 @@ class RentalListView(ListView):
         # Add the selected rental items to the context for the filter
         context["rentalitem_filters"] = {"rentalitems": self.rentalitem_filters}
 
-        context["rental_dict"] = rental_dict
+        # Create a dictionary with the rental items for each day
+        rental_dict = {}
+        for rental in self.get_queryset():
+            for day in days_of_view_period:
+                if rental["date_start"] <= day and rental["date_end"] >= day:
+                    if day not in rental_dict:
+                        rental_dict[day] = []
+
+                    if rental["rentalitems__name"] not in rental_dict[day]:
+                        rental_dict[day].append(rental["rentalitems__name"])
+
+        context["rental_dict"] = {k: sorted(v, key=str.casefold) for k, v in rental_dict.items()}
 
         return context
 
@@ -118,20 +204,22 @@ class RentalListView(ListView):
             )
         )
 
-        last_day_of_month = self.month.replace(
-            day=calendar.monthrange(self.month.year, self.month.month)[1]
-        )
+        if self.view_type == "week":
+            qs_date_end = self.display_period + datetime.timedelta(days=6)
+        else:
+            qs_date_end = self.display_period.replace(
+                day=calendar.monthrange(self.display_period.year, self.display_period.month)[1]
+            )
 
         # Filter by date
-        qs_new = qs.filter(date_start__gte=self.month, date_start__lte=last_day_of_month)
-        qs_new |= qs.filter(date_end__gte=self.month, date_end__lte=last_day_of_month)
+        if self.display_period and qs_date_end:
+            qs_new = qs.filter(date_start__gte=self.display_period, date_start__lte=qs_date_end)
+            qs_new |= qs.filter(date_end__gte=self.display_period, date_end__lte=qs_date_end)
 
         # Filter by rental items
         qs = qs.filter(rentalitems__name__in=self.rentalitem_filters).distinct()
 
-        qs = qs.values("id", "date_start", "date_end", "rentalitems__name").distinct()
-
-        return qs
+        return qs.values("id", "date_start", "date_end", "rentalitems__name").distinct()
 
 
 class RentalCreateView(CreateView):
@@ -139,6 +227,35 @@ class RentalCreateView(CreateView):
     model = Rental
     template_name = "rental/create.html"
 
+    def form_valid(self, form):
+        # Get unsaved base Rental with all form data
+        base_rental = form.save(commit=False)
+        items = list(form.cleaned_data["rentalitems"])
+        selected_items = sorted(items, key=lambda x: x.name.lower())
+
+        for i in range(0, len(selected_items), RENTAL_ITEMS_MAX):
+            batch = selected_items[i:i + RENTAL_ITEMS_MAX]
+
+            # Clone base_rental — copying all its field values
+            new_rental = Rental.objects.create(
+                firstname=base_rental.firstname,
+                surname=base_rental.surname,
+                matriculation_number=base_rental.matriculation_number,
+                email=base_rental.email,
+                phone=base_rental.phone,
+                organization=base_rental.organization,
+                date_start=base_rental.date_start,
+                date_end=base_rental.date_end,
+                reason=base_rental.reason,
+                comment=base_rental.comment,
+                status=base_rental.status,
+            )
+
+            # Important: Add M2M relations after the object has been saved
+            new_rental.rentalitems.add(*batch)
+
+        return HttpResponseRedirect(self.get_success_url())
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
@@ -147,26 +264,11 @@ class RentalCreateView(CreateView):
         return context
 
     def get_success_url(self):
-        return reverse("rental:rental_create_done", kwargs={"pk": self.object.pk})
-
+        return reverse("rental:rental_create_done")
 
 class RentalCreateDoneView(TemplateView):
     template_name = "rental/create_done.html"
 
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-
-        obj = Rental.objects.get(pk=self.kwargs["pk"])
-
-        total_deposit = 0
-        for elem in obj.rentalitems.all():
-            total_deposit += elem.deposit
-
-        context["object"] = obj
-        context["total_deposit"] = total_deposit
-
-        return context
-
 
 class RentalItemDetailView(DetailView):
     model = RentalItem
@@ -175,7 +277,7 @@ class RentalItemDetailView(DetailView):
 
 def rental_calendar(request):
     """
-    ICS-calendar for outlook, google calender, ...
+    ICS-calendar for Outlook, Google Calendar, etc.
     """
     rentals = Rental.objects.all()
 

fet2020/templates/rental/calendar.html

@@ -14,17 +14,27 @@
     </p>
 
     {% if user.is_authenticated %}
-      <a href="{% url 'rental:calendar' %}" class="block btn btn-secondary max-w-xs mx-auto sm:w-max sm:mr-0 sm:ml-auto my-6"><i class="fa-solid fa-calendar-days mr-2"></i>Verleih-Kalender abonnieren</a>
+      <a
+        href="{% url 'rental:calendar' %}"
+        class="block btn btn-secondary max-w-xs mx-auto sm:w-max sm:mr-0 sm:ml-auto my-6"
+        title="Kalender im iCal-Format abonnieren"
+      >
+        <i class="fa-solid fa-calendar-days mr-2"></i>Verleih-Kalender abonnieren
+      </a>
     {% endif %}
 
-    <a href="{% url 'rental:rental_create' %}" class="page-subtitle block btn-small btn-primary max-w-xs mx-auto sm:w-max sm:mr-0 sm:ml-auto">
+    <a
+      href="{% url 'rental:rental_create' %}"
+      class="page-subtitle block btn-small btn-primary max-w-xs mx-auto sm:w-max sm:mr-0 sm:ml-auto"
+      title="Neue Verleihanfrage erstellen"
+    >
       <i class="fa-solid fa-plus mr-1"></i> Verleih anfragen
     </a>
   </section>
 
   <form action="" method="GET">
     <section>
-      <div class="grid grid-cols-1 gap-x-6 gap-y-6 lg:grid-cols-6 sm:grid-cols-3 pb-6">
+      <div class="grid grid-cols-1 gap-x-6 gap-y-6 xl:grid-cols-6 sm:grid-cols-3 pb-6">
         <button
           id="filterDropdownButton"
           data-dropdown-toggle="filterDropdown"
@@ -36,83 +46,137 @@
           <i class="-mr-1 ml-1.5 mt-1 w-5 h-5 fa-solid fa-chevron-down"></i>
         </button>
         <div id="filterDropdown" class="z-10 hidden w-56 p-3 bg-white rounded-lg shadow dark:bg-gray-700">
-            <h6 class="mb-3 text-sm font-medium text-gray-900 dark:text-white">Verleihgegenstände</h6>
-            <ul class="space-y-2 text-sm" aria-labelledby="filterDropdownButton">
-                {% for item in rentalitems %}
-                  <li class="flex items-center">
-                      <input 
-                        id="item_{{ item.id }}"
-                        type="checkbox"
-                        name="rentalitems"
-                        value="{{ item.name }}"
-                          {% for key, value in rentalitem_filters.items %}
-                            {% if key == "rentalitems" and item.name in value %}
-                              checked
-                            {% endif %}
-                          {% endfor %}
-                        class="w-4 h-4 bg-gray-100 border-gray-300 rounded text-primary-600 focus:ring-primary-500 dark:focus:ring-primary-600 dark:ring-offset-gray-700 focus:ring-2 dark:bg-gray-600 dark:border-gray-500"
-                      >
-                      <label for="item_{{ item.id }}" class="ml-2 text-sm font-medium text-gray-900 dark:text-gray-100">{{ item.name }}</label>
-                  </li>
-                {% endfor %}
-            </ul>
+          <h6 class="mb-3 text-sm font-medium text-gray-900 dark:text-white">Verleihgegenstände</h6>
+          <ul class="space-y-2 text-sm" aria-labelledby="filterDropdownButton">
+            {% for item in rentalitems %}
+              <li class="flex items-center">
+                <input 
+                  id="item_{{ item.id }}"
+                  type="checkbox"
+                  name="rentalitems"
+                  value="{{ item.name }}"
+                    {% for key, value in rentalitem_filters.items %}
+                      {% if key == "rentalitems" and item.name in value %}
+                        checked
+                      {% endif %}
+                    {% endfor %}
+                  class="w-4 h-4 bg-gray-100 border-gray-300 rounded text-primary-600 focus:ring-primary-500 dark:focus:ring-primary-600 dark:ring-offset-gray-700 focus:ring-2 dark:bg-gray-600 dark:border-gray-500"
+                >
+                <label for="item_{{ item.id }}" class="ml-2 text-sm font-medium text-gray-900 dark:text-gray-100">{{ item.name }}</label>
+              </li>
+            {% endfor %}
+          </ul>
         </div>
 
-        <button type="submit" class="block btn btn-primary" name="" value="Submit">Filter anwenden</button>
+        <div class="flex w-full md:w-auto items-center justify-center py-2 px-4 border border-gray-200 rounded-sm dark:border-gray-700">
+          <input
+            {% if view_type == 'month' %}checked{% endif %}
+            id="bordered-radio-1"
+            type="radio"
+            value="month"
+            name="view_type"
+            title="Zur Monatsansicht wechseln"
+            class="ml-2 mr-2 w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"
+          >
+          <label for="bordered-radio-1" class="w-full ms-2 text-sm font-medium text-gray-900 dark:text-gray-300">Monatsansicht</label>
+        </div>
+        <div class="flex w-full md:w-auto items-center justify-center py-2 px-4 border border-gray-200 rounded-sm dark:border-gray-700">
+          <input
+            {% if view_type == 'week' %}checked{% endif %}
+            id="bordered-radio-2"
+            type="radio"
+            value="week"
+            name="view_type"
+            title="Zur Wochenansicht wechseln"
+            class="ml-2 mr-2 w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"
+          >
+          <label for="bordered-radio-2" class="w-full ms-2 text-sm font-medium text-gray-900 dark:text-gray-300">Wochenansicht</label>
+        </div>
+
+        <input
+          type="hidden" name="period_value"
+          value="{% if view_type == 'month' %}{{ view_period|date:'Y-m' }}{% else %}{{ view_period }}{% endif %}"
+        >
+
+        <button
+          type="submit"
+          class="block btn btn-primary"
+          title="Filter anwenden und Kalender aktualisieren"
+        >
+          Filter anwenden
+        </button>
       </div>
     </section>
 
     <section class="text-center">
       <div class="wrapper mx-auto bg-white rounded shadow max-w-full">
         <div class="header flex justify-between border-b p-2">
-          <span class="text-lg font-bold">{{ month|date:'F Y' }}</span>
+          <span class="text-lg font-bold">
+          {% if view_type == 'month' %}
+            {{ view_period|date:'F Y' }}
+          {% else %}
+            {% if days_of_view_period.0.month != days_of_view_period.6.month %}
+              KW{{ week_num|stringformat:"02d" }} - {{ days_of_view_period.0|date:'F' }} / {{ days_of_view_period.6|date:'F Y' }}
+            {% else %}
+              KW{{ week_num|stringformat:"02d" }} - {{ days_of_view_period.0|date:'F Y' }}
+            {% endif %}
+          {% endif %}
+          </span>
 
-            <div class="buttons">
-              <button type="submit" class="p-1" name="month" value="{{ prev_month|date:'Y-m' }}">
-                <i class="fa-regular fa-circle-left"></i>
-              </button>
-              <button type="submit" class="p-1" name="month" value="{{ next_month|date:'Y-m' }}">
-                <i class="fa-regular fa-circle-right"></i>
-              </button>
-            </div>
+          <div class="buttons">
+            <button
+              type="submit" class="p-1" name="prev_period"
+              title="{% if view_type == 'month' %}Zum vorherigen Monat{% else %}Zur vorherigen Woche{% endif %}"
+              value="{% if view_type == 'month' %}{{ prev_period|date:'Y-m' }}{% else %}{{ prev_period }}{% endif %}"
+            >
+              <i class="fa-regular fa-circle-left"></i>
+            </button>
+            <button
+              type="submit" class="p-1" name="next_period"
+              title="{% if view_type == 'month' %}Zum nächsten Monat{% else %}Zur nächsten Woche{% endif %}"
+              value="{% if view_type == 'month' %}{{ next_period|date:'Y-m' }}{% else %}{{ next_period }}{% endif %}"
+            >
+              <i class="fa-regular fa-circle-right"></i>
+            </button>
+          </div>
         </div>
 
         <table class="table-fixed w-full mx-auto">
           <thead>
             <tr>
               <th class="p-2 border-r h-10 xl:text-sm text-xs">
-                <span class="xl:block lg:block md:block sm:block hidden">Monday</span>
-                <span class="xl:hidden lg:hidden md:hidden sm:hidden block">Mon</span>
+                <span class="xl:block lg:block md:block sm:block hidden">Montag</span>
+                <span class="xl:hidden lg:hidden md:hidden sm:hidden block">Mo</span>
               </th>
               <th class="p-2 border-r h-10 xl:text-sm text-xs">
-                <span class="xl:block lg:block md:block sm:block hidden">Tuesday</span>
-                <span class="xl:hidden lg:hidden md:hidden sm:hidden block">Tue</span>
+                <span class="xl:block lg:block md:block sm:block hidden">Dienstag</span>
+                <span class="xl:hidden lg:hidden md:hidden sm:hidden block">Di</span>
               </th>
               <th class="p-2 border-r h-10 xl:text-sm text-xs">
-                <span class="xl:block lg:block md:block sm:block hidden">Wednesday</span>
-                <span class="xl:hidden lg:hidden md:hidden sm:hidden block">Wed</span>
+                <span class="xl:block lg:block md:block sm:block hidden">Mittwoch</span>
+                <span class="xl:hidden lg:hidden md:hidden sm:hidden block">Mi</span>
               </th>
               <th class="p-2 border-r h-10 xl:text-sm text-xs">
-                <span class="xl:block lg:block md:block sm:block hidden">Thursday</span>
-                <span class="xl:hidden lg:hidden md:hidden sm:hidden block">Thu</span>
+                <span class="xl:block lg:block md:block sm:block hidden">Donnerstag</span>
+                <span class="xl:hidden lg:hidden md:hidden sm:hidden block">Do</span>
               </th>
               <th class="p-2 border-r h-10 xl:text-sm text-xs">
-                <span class="xl:block lg:block md:block sm:block hidden">Friday</span>
-                <span class="xl:hidden lg:hidden md:hidden sm:hidden block">Fri</span>
+                <span class="xl:block lg:block md:block sm:block hidden">Freitag</span>
+                <span class="xl:hidden lg:hidden md:hidden sm:hidden block">Fr</span>
               </th>
               <th class="p-2 border-r h-10 xl:text-sm text-xs">
-                <span class="xl:block lg:block md:block sm:block hidden">Saturday</span>
-                <span class="xl:hidden lg:hidden md:hidden sm:hidden block">Sat</span>
+                <span class="xl:block lg:block md:block sm:block hidden">Samstag</span>
+                <span class="xl:hidden lg:hidden md:hidden sm:hidden block">Sa</span>
               </th>
               <th class="p-2 border-r h-10 xl:text-sm text-xs">
-                <span class="xl:block lg:block md:block sm:block hidden">Sunday</span>
-                <span class="xl:hidden lg:hidden md:hidden sm:hidden block">Sun</span>
+                <span class="xl:block lg:block md:block sm:block hidden">Sonntag</span>
+                <span class="xl:hidden lg:hidden md:hidden sm:hidden block">So</span>
               </th>
             </tr>
           </thead>
 
           <tbody>
-            {% for day in days_of_prev_month %}
+            {% for day in days_of_prev_period %}
               {% if day.weekday == 0 %}
                 <tr class="text-center h-20">
               {% endif %}
@@ -127,13 +191,15 @@
               </td>
             {% endfor %}
 
-            {% for day in days_of_month %}
+            {% for day in days_of_view_period %}
               {% if day.weekday == 0 %}
-                <tr class="text-center h-20">
+                <tr class="text-center h-40">
               {% endif %}
 
-              <td class="border p-1 h-40">
-                <div class="flex flex-col h-40">
+              <td class="border p-1 h-full">
+                <div
+                  class="flex flex-col{% if view_type == 'month' %} h-40{% else %} h-full{% endif %}"
+                >
                   <div class="top h-5 w-full">
                     {% if day == today %}
                       <span class="text-gray-100 dark:text-gray-900 border-2 border-blue-900 dark:border-blue-100 rounded-full bg-blue-900 dark:bg-blue-100">{{ day.day }}</span>
@@ -144,20 +210,43 @@
 
                   {% for key, names in rental_dict.items %}
                     {% if key == day %}
-                      {% for name in names %}
-                        <div class="bottom h-30 py-1 w-full">
-                          <div class="event bg-purple-400 text-white rounded p-1 text-sm">
-                            <span class="event-name whitespace-nowrap 2xl:block xl:hidden lg:hidden md:hidden sm:hidden hidden">{{ name|truncatechars:26 }}</span>
-                            <span class="event-name whitespace-nowrap 2xl:hidden xl:block lg:hidden md:hidden sm:hidden hidden">{{ name|truncatechars:20 }}</span>
-                            <span class="event-name whitespace-nowrap 2xl:hidden xl:hidden lg:block md:hidden sm:hidden hidden">{{ name|truncatechars:15 }}</span>            
-                            <span class="event-name whitespace-nowrap 2xl:hidden xl:hidden lg:hidden md:block sm:hidden hidden">{{ name|truncatechars:10 }}</span>            
-                            <span class="event-name whitespace-nowrap 2xl:hidden xl:hidden lg:hidden md:hidden sm:block hidden">{{ name|truncatechars:6 }}</span>            
-                            <span class="event-name whitespace-nowrap 2xl:hidden xl:hidden lg:hidden md:hidden sm:hidden block">{{ name|truncatechars:3 }}</span>            
+                      {% if view_type == 'month' %}
+                        {% for name in names|slice:":3" %}
+                          <div class="bottom h-30 py-1 w-full">
+                            <div class="event bg-purple-400 text-white rounded p-1 text-sm" title="{{ name }}">
+                              <span class="event-name whitespace-nowrap 2xl:block xl:hidden lg:hidden md:hidden sm:hidden hidden">{{ name|truncatechars:26 }}</span>
+                              <span class="event-name whitespace-nowrap 2xl:hidden xl:block lg:hidden md:hidden sm:hidden hidden">{{ name|truncatechars:20 }}</span>
+                              <span class="event-name whitespace-nowrap 2xl:hidden xl:hidden lg:block md:hidden sm:hidden hidden">{{ name|truncatechars:15 }}</span>
+                              <span class="event-name whitespace-nowrap 2xl:hidden xl:hidden lg:hidden md:block sm:hidden hidden">{{ name|truncatechars:10 }}</span>
+                              <span class="event-name whitespace-nowrap 2xl:hidden xl:hidden lg:hidden md:hidden sm:block hidden">{{ name|truncatechars:6 }}</span>
+                              <span class="event-name whitespace-nowrap 2xl:hidden xl:hidden lg:hidden md:hidden sm:hidden block">{{ name|truncatechars:3 }}</span>
+                            </div>
                           </div>
-                        </div>
-                        {% empty %}
-                        <div class="bottom flex-grow h-30 py-1 w-full"></div>
                         {% endfor %}
+                        {% if names|length > 3 %}
+                          <div class="bottom h-30 py-1 w-full">
+                            <a href="?view_type=week&period_value={{ day|date:'o-\K\WW' }}" 
+                              class="event bg-gray-300 hover:bg-gray-400 text-gray-700 rounded p-1 text-sm hover:underline block cursor-pointer"
+                              title="Alle Verleihgegenstände in der Wochenansicht anzeigen">
+                              <span class="event-name whitespace-nowrap sm:block hidden">+{{ names|length|add:"-3" }} weitere</span>
+                              <span class="event-name whitespace-nowrap sm:hidden block">+{{ names|length|add:"-3" }}</span>
+                            </a>
+                          </div>
+                        {% endif %}
+                      {% else %}
+                        {% for name in names %}
+                          <div class="bottom h-30 py-1 w-full">
+                            <div class="event bg-purple-400 text-white rounded p-1 text-sm" title="{{ name }}">
+                              <span class="event-name whitespace-nowrap 2xl:block xl:hidden lg:hidden md:hidden sm:hidden hidden">{{ name|truncatechars:26 }}</span>
+                              <span class="event-name whitespace-nowrap 2xl:hidden xl:block lg:hidden md:hidden sm:hidden hidden">{{ name|truncatechars:20 }}</span>
+                              <span class="event-name whitespace-nowrap 2xl:hidden xl:hidden lg:block md:hidden sm:hidden hidden">{{ name|truncatechars:15 }}</span>
+                              <span class="event-name whitespace-nowrap 2xl:hidden xl:hidden lg:hidden md:block sm:hidden hidden">{{ name|truncatechars:10 }}</span>
+                              <span class="event-name whitespace-nowrap 2xl:hidden xl:hidden lg:hidden md:hidden sm:block hidden">{{ name|truncatechars:6 }}</span>
+                              <span class="event-name whitespace-nowrap 2xl:hidden xl:hidden lg:hidden md:hidden sm:hidden block">{{ name|truncatechars:3 }}</span>
+                            </div>
+                          </div>
+                        {% endfor %}
+                      {% endif %}
                     {% endif %}
                   {% endfor %}
                 </div>
@@ -168,7 +257,7 @@
               {% endif %}
             {% endfor %}
 
-            {% for day in days_of_next_month %}
+            {% for day in days_of_next_period %}
               <td class="border p-1 h-40">
                 <div class="flex flex-col h-40">
                   <div class="top h-5 w-full">

fet2020/templates/rental/create.html

@@ -52,28 +52,30 @@
                 
                 <div id="{{ form.rentalitems.auto_id }}" class="col-span-full">
                 {% for elem in form.rentalitems %}
-                    <div class="col-span-2 mb-2">
+                  <div class="col-span-2 mb-2">
+                    <label for="{{ elem.data.value }}">
+                      <input
+                        type="checkbox"
+                        id="{{ elem.data.value }}"
+                        name="{{ form.rentalitems.html_name }}"
+                        value="{{ elem.data.value }}"
+                        {% if elem.data.selected %}checked{% endif %}
+                        class="rounded border-gray-300 dark:border-none text-proprietary shadow-sm focus:border-blue-300 focus:ring focus:ring-offset-0 focus:ring-blue-200 dark:focus:ring-sky-700 focus:ring-opacity-50"
+                      >
+                      <a
+                        href="{% url 'rental:rentalitem_detail' elem.data.value %}"
+                        class="text-gray-700 dark:text-gray-200 underline hover:text-blue-700 dark:hover:text-blue-300"
+                        title="Details zu {{ elem.choice_label }}"
+                        aria-label="Details zu {{ elem.choice_label }}"                        
+                      >{{ elem.choice_label }}</a>
+                    </label>
               
-                        <label for="{{ elem.id_for_label }}">
-                            <input
-                                type="checkbox"
-                                id="{{ elem.id_for_label }}"
-                                name="{{ form.rentalitems.html_name }}"
-                                value="{{ elem.data.value }}"
-                                class="rounded border-gray-300 dark:border-none text-proprietary shadow-sm focus:border-blue-300 focus:ring focus:ring-offset-0 focus:ring-blue-200 dark:focus:ring-sky-700 focus:ring-opacity-50"
-                            >
-                            <a
-                                href="{% url 'rental:rentalitem_detail' elem.data.value %}"
-                                class="text-gray-700 dark:text-gray-200 underline hover:text-blue-700 dark:hover:text-blue-300"
-                            >{{ elem.choice_label }}</a>
-                        </label>
-                
-                        {% for item in rentalitems_addinfo %}
-                            {% if item.name == elem.choice_label and item.induction %}
-                                <p class="text-xs text-gray-700 dark:text-gray-200">Einschulung erforderlich!</p>
-                            {% endif %}
-                        {% endfor %}
-                    </div>
+                    {% for item in rentalitems_addinfo %}
+                      {% if item.name == elem.choice_label and item.induction %}
+                        <p class="text-xs text-gray-700 dark:text-gray-200">Einschulung erforderlich!</p>
+                      {% endif %}
+                    {% endfor %}
+                  </div>
                 {% endfor %}
                 </div>
             </div>

fet2020/templates/rental/create_done.html

@@ -5,13 +5,18 @@
 {% block content %}
 <!-- Main Content -->
 <main class="container mx-auto w-full px-4 my-8 flex-1 max-w-2xl">
-    <section class="block w-full">
-        <p class="mt-6 text-gray-900 dark:text-gray-100 hyphens-auto" lang="de">
-            Deine Verleihanfrage mit der Nummer #{{ pk }} wurde erfolgreich eingereicht. Die Gegenstände können am {{ object.date_start }} während der Beratungszeit (Montag - Donnerstag: 09:00 - 14:00, Freitag: 09:00 - 12:00) abgeholt werden. Bitte bring den Gesamtpfand in Höhe von {{ total_deposit }} € in bar mit.
-        </p>
-        <div class="mt-10 flex items-center justify-center">
-            <a href="{% url 'home' %}" type="submit" class="block btn btn-primary">Zur Startseite</a>
-        </div>
-    </section>
+  <section class="block w-full">
+    <p class="mt-6 text-gray-900 dark:text-gray-100 hyphens-auto" lang="de">
+      Deine Verleihanfrage ist eingegangen - danke dir! 🎉
+      Wir kümmern uns jetzt darum und melden uns per E-Mail mit den nächsten Schritten.
+    </p>
+    <p class="mt-6 text-gray-900 dark:text-gray-100 hyphens-auto" lang="de">
+      Kleiner Hinweis: Bevor du die Sachen abholen kannst, wird deine Anfrage kurz geprüft und freigegeben.
+      Sobald alles genehmigt ist, bekommst du von uns eine Mail.
+    </p>
+    <div class="mt-10 flex items-center justify-center">
+      <a href="{% url 'home' %}" type="submit" class="block btn btn-primary">Zur Startseite</a>
+    </div>
+  </section>
 </main>
 {% endblock content %}