diff --git a/main/forms.py b/main/forms.py index c08d43b..12047b8 100644 --- a/main/forms.py +++ b/main/forms.py @@ -1,8 +1,7 @@ from django import forms -from django.forms.widgets import RadioSelect +from django.forms.widgets import RadioSelect, Textarea class TempUserForm(forms.Form): - who = forms.CharField(label='Hvem', required=True) RANGE_CHOICES = ( ('1', '1 dag'), ('2', '2 dager'), @@ -14,4 +13,14 @@ class TempUserForm(forms.Form): choices=RANGE_CHOICES, widget=RadioSelect, required=True) - why = forms.CharField(label='Hvorfor', required=True) + description = forms.CharField( + label='Hvem og hvorfor', + widget=Textarea, + max_length=255, + required=True) + count = forms.IntegerField( + label='Hvor mange', + initial=1, + required=True, + min_value=1, + max_value=30) diff --git a/main/models.py b/main/models.py index 013b6ac..4b291ae 100644 --- a/main/models.py +++ b/main/models.py @@ -2,9 +2,15 @@ from django.db import models from django.contrib.auth.models import User class TempUserLog(models.Model): - who = models.CharField(max_length=255) - why = models.CharField(max_length=255) - expires = models.DateTimeField() issued_by = models.ForeignKey(User) + description = models.TextField(max_length=255) + expires = models.DateTimeField() + count = models.IntegerField() + deleted = models.BooleanField(default=False) created = models.DateTimeField(auto_now_add=True) - # TODO username and pass + +class UserPass(models.Model): + username = models.CharField(max_length=50) + password = models.CharField(max_length=50) + log = models.ForeignKey(TempUserLog) + diff --git a/main/pdf.py b/main/pdf.py index 1d900ad..418c5df 100644 --- a/main/pdf.py +++ b/main/pdf.py @@ -3,6 +3,7 @@ # Ref: # - http://stackoverflow.com/questions/1377446/html-to-pdf-for-a-django-site # - http://stackoverflow.com/questions/2179958/django-pisa-adding-images-to-pdf-output ? +# - http://web.archive.org/web/20090413054650/http://www.xhtml2pdf.com/doc/pisa-en.html import cStringIO as StringIO import ho.pisa as pisa diff --git a/main/templates/pdf/new_temp_user.html b/main/templates/pdf/new_temp_user.html index 4c32080..cee5127 100644 --- a/main/templates/pdf/new_temp_user.html +++ b/main/templates/pdf/new_temp_user.html @@ -3,6 +3,9 @@