From: Sven Arnold Date: Wed, 10 Feb 2016 21:03:38 +0000 (+0100) Subject: introduced person lease relation X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=HEAD;p=urtebook.git introduced person lease relation --- diff --git a/project/books/migrations/0003_auto_20160208_1923.py b/project/books/migrations/0003_auto_20160208_1923.py new file mode 100644 index 0000000..05734af --- /dev/null +++ b/project/books/migrations/0003_auto_20160208_1923.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +import books.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('books', '0002_auto_20160208_1741'), + ] + + operations = [ + migrations.AddField( + model_name='lease', + name='leased', + field=models.DateField(auto_now_add=True, default=books.models.leased_default), + preserve_default=True, + ), + migrations.AddField( + model_name='lease', + name='returned', + field=models.DateField(null=True), + preserve_default=True, + ), + ] diff --git a/project/books/models.py b/project/books/models.py index 0abba86..2edce55 100644 --- a/project/books/models.py +++ b/project/books/models.py @@ -1,4 +1,5 @@ from django.db import models +import datetime class Book(models.Model): title = models.CharField(max_length = 200) @@ -10,9 +11,15 @@ class Person(models.Model): def __str__(self): return self.name +def leased_default(): + return datetime.date() + class Lease(models.Model): + leased = models.DateField(auto_now_add=True, default=leased_default) + returned = models.DateField(null=True) book = models.ForeignKey(Book, on_delete=models.CASCADE) leasee = models.ForeignKey(Person, on_delete=models.CASCADE) def __str__(self): - return "%s (%s)" % (self.book, self.leasee) + return "%s (%s [%s - %s])" % (self.book, self.leasee, self.leased, self.returned) +