From 1a68e4b95bbd6e03bafc15e8bd54c69248aae831 Mon Sep 17 00:00:00 2001 From: Nikolai Kristiansen Date: Wed, 1 Oct 2014 17:37:08 +0200 Subject: [PATCH] PEP8 party 2 --- main/admin.py | 1 + main/forms.py | 6 ++ main/models.py | 154 ++++++++++++++++++++++++++----------------------- 3 files changed, 90 insertions(+), 71 deletions(-) diff --git a/main/admin.py b/main/admin.py index 457f583..08dd370 100644 --- a/main/admin.py +++ b/main/admin.py @@ -1,6 +1,7 @@ from django.contrib import admin from main.models import * + class ProductAdmin(admin.ModelAdmin): pass diff --git a/main/forms.py b/main/forms.py index c8d6b70..19902eb 100644 --- a/main/forms.py +++ b/main/forms.py @@ -7,6 +7,7 @@ from models import * import utils + class OrderForm(forms.ModelForm): def clean_customer(self): if self.cleaned_data['customer'].get_profile().balance <= 0: @@ -18,16 +19,19 @@ class OrderForm(forms.ModelForm): model = Order fields = ('customer',) + class OrderLineForm(forms.Form): product = forms.IntegerField(required=True) amount = forms.IntegerField(required=True) unit_price = forms.FloatField(required=True, localize=True) + class DepositForm(forms.ModelForm): class Meta: model = Transaction + class SimpleCreateUserForm(forms.Form): first_name = forms.CharField(required=True, label="Fornavn") last_name = forms.CharField(required=True, label="Etternavn") @@ -54,6 +58,7 @@ class SimpleCreateUserForm(forms.Form): return user + class InventoryTransactionForm(forms.ModelForm): unit_price = forms.FloatField(required=True, localize=True) @@ -66,6 +71,7 @@ class InventoryTransactionForm(forms.ModelForm): model = InventoryTransaction fields = ['product', 'amount', 'unit_price', 'comment'] + class DateRangeForm(forms.Form): start_time = forms.DateTimeField(required=False, label=_("Fra")) end_time = forms.DateTimeField(required=False, label=_("Til")) diff --git a/main/models.py b/main/models.py index b49a204..698076b 100755 --- a/main/models.py +++ b/main/models.py @@ -5,103 +5,115 @@ from django.dispatch import receiver from django.utils.translation import ugettext as _ from datetime import datetime + class Product(models.Model): - def __unicode__(self): - return self.name + def __unicode__(self): + return self.name - name = models.CharField(max_length=64) - sale_price_int = models.FloatField() - sale_price_ext = models.FloatField() - description = models.CharField(max_length=256, blank=True) - volume_liter = models.FloatField(null=True) - alcohol_percent = models.FloatField(null=True) - image = models.ImageField(upload_to='products', blank=True) - customer_support = models.CharField(max_length=32, blank=True) - inventory_amount = models.FloatField(default=0) - active = models.BooleanField(default=True) - created = models.DateTimeField(auto_now_add=True) - updated = models.DateTimeField(auto_now=True) + name = models.CharField(max_length=64) + sale_price_int = models.FloatField() + sale_price_ext = models.FloatField() + description = models.CharField(max_length=256, blank=True) + volume_liter = models.FloatField(null=True) + alcohol_percent = models.FloatField(null=True) + image = models.ImageField(upload_to='products', blank=True) + customer_support = models.CharField(max_length=32, blank=True) + inventory_amount = models.FloatField(default=0) + active = models.BooleanField(default=True) + created = models.DateTimeField(auto_now_add=True) + updated = models.DateTimeField(auto_now=True) - @property - def inventory_value(self): - return self.inventory_amount * self.sale_price_int + @property + def inventory_value(self): + return self.inventory_amount * self.sale_price_int + + class Meta: + ordering = ['name'] - class Meta: - ordering = ['name'] class Order(models.Model): - customer = models.ForeignKey(User) - order_sum = models.FloatField(db_column='sum') - created = models.DateTimeField(auto_now_add=True) + customer = models.ForeignKey(User) + order_sum = models.FloatField(db_column='sum') + created = models.DateTimeField(auto_now_add=True) + + def __unicode__(self): + return u"{0}: {1} kr".format(self.customer, self.order_sum) - def __unicode__(self): - return u"{0}: {1} kr".format(self.customer, self.order_sum) class OrderLine(models.Model): - order = models.ForeignKey('main.Order') - product = models.ForeignKey('main.Product', related_name='orderlines') - amount = models.IntegerField() - unit_price = models.FloatField(verbose_name=_('Enhetspris')) + order = models.ForeignKey('main.Order') + product = models.ForeignKey('main.Product', related_name='orderlines') + amount = models.IntegerField() + unit_price = models.FloatField(verbose_name=_('Enhetspris')) - @property - def price(self): - return self.amount * self.unit_price + @property + def price(self): + return self.amount * self.unit_price - def __unicode__(self): - return u"{0} {1} ({2} kr per)".format(self.amount, self.product, self.unit_price) + def __unicode__(self): + return u"{0} {1} ({2} kr per)".format(self.amount, self.product, self.unit_price) + + class Meta: + unique_together = ('order', 'product') - class Meta: - unique_together = ('order', 'product') class Transaction(models.Model): - """ Money """ - user = models.ForeignKey(User) - amount = models.FloatField() - created = models.DateTimeField(auto_now_add=True) + """ Money """ + user = models.ForeignKey(User) + amount = models.FloatField() + created = models.DateTimeField(auto_now_add=True) + + def __unicode__(self): + return u"{0}: {1}: {2}".format(self.id, self.user, self.amount) - def __unicode__(self): - return u"{0}: {1}: {2}".format(self.id, self.user, self.amount) class InventoryTransaction(models.Model): - """ Goods """ - user = models.ForeignKey(User) - product = models.ForeignKey('main.Product', related_name='transactions', verbose_name=_('Produkt')) - amount = models.FloatField(verbose_name=_('Antall')) - unit_price = models.FloatField(verbose_name=_('Enhetspris')) - comment = models.TextField(verbose_name=_('Kommentar'), blank=True) - created = models.DateTimeField(auto_now_add=True) + """ Goods """ + user = models.ForeignKey(User) + product = models.ForeignKey('main.Product', related_name='transactions', verbose_name=_('Produkt')) + amount = models.FloatField(verbose_name=_('Antall')) + unit_price = models.FloatField(verbose_name=_('Enhetspris')) + comment = models.TextField(verbose_name=_('Kommentar'), blank=True) + created = models.DateTimeField(auto_now_add=True) - @property - def price(self): - return self.amount * self.unit_price + @property + def price(self): + return self.amount * self.unit_price + + def __unicode__(self): + return u"{0}: {1}: {2} ({3} kr per)".format( + self.id, + self.user, + self.product, + self.amount, + self.unit_price) - def __unicode__(self): - return u"{0}: {1}: {2} ({3} kr per)".format(self.id, self.user, self.product, self.amount, self.unit_price) class UserProfile(models.Model): - user = models.OneToOneField(User) - balance = models.FloatField(default=0.0) - #image = models.ImageField(upload_to='users', blank=True) - image = models.URLField(blank=True) + user = models.OneToOneField(User) + balance = models.FloatField(default=0.0) + #image = models.ImageField(upload_to='users', blank=True) + image = models.URLField(blank=True) - def last_purchase(self): - if len(self.user.order_set.all()) == 0: - return None - return self.user.order_set.order_by('created').reverse()[0] + def last_purchase(self): + if len(self.user.order_set.all()) == 0: + return None + return self.user.order_set.order_by('created').reverse()[0] - def last_purchase_date(self): - last = self.last_purchase() - if last: - return last.created - else: - return datetime.min + def last_purchase_date(self): + last = self.last_purchase() + if last: + return last.created + else: + return datetime.min + + def __unicode__(self): + return u"{0}".format(self.user) - def __unicode__(self): - return u"{0}".format(self.user) # Create a new UserProfile object when we create a new User. @receiver(post_save, sender=User, dispatch_uid='randomz') def create_user_profile(sender, instance, created, **kwargs): - if created: - UserProfile.objects.create(user=instance) + if created: + UserProfile.objects.create(user=instance) \ No newline at end of file