PEP8 party 2
This commit is contained in:
1 parent
4b3ffeda3c
commit
1a68e4b95b
3 files changed
+20
-1
No files matched your search
@@ -1,6 +1,7 @@
|
|||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from main.models import *
|
from main.models import *
|
||||||
|
|
||||||
|
|
||||||
class ProductAdmin(admin.ModelAdmin):
|
class ProductAdmin(admin.ModelAdmin):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ from models import *
|
|||||||
|
|
||||||
import utils
|
import utils
|
||||||
|
|
||||||
|
|
||||||
class OrderForm(forms.ModelForm):
|
class OrderForm(forms.ModelForm):
|
||||||
def clean_customer(self):
|
def clean_customer(self):
|
||||||
if self.cleaned_data['customer'].get_profile().balance <= 0:
|
if self.cleaned_data['customer'].get_profile().balance <= 0:
|
||||||
@@ -18,16 +19,19 @@ class OrderForm(forms.ModelForm):
|
|||||||
model = Order
|
model = Order
|
||||||
fields = ('customer',)
|
fields = ('customer',)
|
||||||
|
|
||||||
|
|
||||||
class OrderLineForm(forms.Form):
|
class OrderLineForm(forms.Form):
|
||||||
product = forms.IntegerField(required=True)
|
product = forms.IntegerField(required=True)
|
||||||
amount = forms.IntegerField(required=True)
|
amount = forms.IntegerField(required=True)
|
||||||
unit_price = forms.FloatField(required=True, localize=True)
|
unit_price = forms.FloatField(required=True, localize=True)
|
||||||
|
|
||||||
|
|
||||||
class DepositForm(forms.ModelForm):
|
class DepositForm(forms.ModelForm):
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Transaction
|
model = Transaction
|
||||||
|
|
||||||
|
|
||||||
class SimpleCreateUserForm(forms.Form):
|
class SimpleCreateUserForm(forms.Form):
|
||||||
first_name = forms.CharField(required=True, label="Fornavn")
|
first_name = forms.CharField(required=True, label="Fornavn")
|
||||||
last_name = forms.CharField(required=True, label="Etternavn")
|
last_name = forms.CharField(required=True, label="Etternavn")
|
||||||
@@ -54,6 +58,7 @@ class SimpleCreateUserForm(forms.Form):
|
|||||||
|
|
||||||
return user
|
return user
|
||||||
|
|
||||||
|
|
||||||
class InventoryTransactionForm(forms.ModelForm):
|
class InventoryTransactionForm(forms.ModelForm):
|
||||||
unit_price = forms.FloatField(required=True, localize=True)
|
unit_price = forms.FloatField(required=True, localize=True)
|
||||||
|
|
||||||
@@ -66,6 +71,7 @@ class InventoryTransactionForm(forms.ModelForm):
|
|||||||
model = InventoryTransaction
|
model = InventoryTransaction
|
||||||
fields = ['product', 'amount', 'unit_price', 'comment']
|
fields = ['product', 'amount', 'unit_price', 'comment']
|
||||||
|
|
||||||
|
|
||||||
class DateRangeForm(forms.Form):
|
class DateRangeForm(forms.Form):
|
||||||
start_time = forms.DateTimeField(required=False, label=_("Fra"))
|
start_time = forms.DateTimeField(required=False, label=_("Fra"))
|
||||||
end_time = forms.DateTimeField(required=False, label=_("Til"))
|
end_time = forms.DateTimeField(required=False, label=_("Til"))
|
||||||
|
|||||||
+13
-1
@@ -5,6 +5,7 @@ from django.dispatch import receiver
|
|||||||
from django.utils.translation import ugettext as _
|
from django.utils.translation import ugettext as _
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
|
|
||||||
class Product(models.Model):
|
class Product(models.Model):
|
||||||
|
|
||||||
def __unicode__(self):
|
def __unicode__(self):
|
||||||
@@ -30,6 +31,7 @@ class Product(models.Model):
|
|||||||
class Meta:
|
class Meta:
|
||||||
ordering = ['name']
|
ordering = ['name']
|
||||||
|
|
||||||
|
|
||||||
class Order(models.Model):
|
class Order(models.Model):
|
||||||
customer = models.ForeignKey(User)
|
customer = models.ForeignKey(User)
|
||||||
order_sum = models.FloatField(db_column='sum')
|
order_sum = models.FloatField(db_column='sum')
|
||||||
@@ -38,6 +40,7 @@ class Order(models.Model):
|
|||||||
def __unicode__(self):
|
def __unicode__(self):
|
||||||
return u"{0}: {1} kr".format(self.customer, self.order_sum)
|
return u"{0}: {1} kr".format(self.customer, self.order_sum)
|
||||||
|
|
||||||
|
|
||||||
class OrderLine(models.Model):
|
class OrderLine(models.Model):
|
||||||
order = models.ForeignKey('main.Order')
|
order = models.ForeignKey('main.Order')
|
||||||
product = models.ForeignKey('main.Product', related_name='orderlines')
|
product = models.ForeignKey('main.Product', related_name='orderlines')
|
||||||
@@ -54,6 +57,7 @@ class OrderLine(models.Model):
|
|||||||
class Meta:
|
class Meta:
|
||||||
unique_together = ('order', 'product')
|
unique_together = ('order', 'product')
|
||||||
|
|
||||||
|
|
||||||
class Transaction(models.Model):
|
class Transaction(models.Model):
|
||||||
""" Money """
|
""" Money """
|
||||||
user = models.ForeignKey(User)
|
user = models.ForeignKey(User)
|
||||||
@@ -63,6 +67,7 @@ class Transaction(models.Model):
|
|||||||
def __unicode__(self):
|
def __unicode__(self):
|
||||||
return u"{0}: {1}: {2}".format(self.id, self.user, self.amount)
|
return u"{0}: {1}: {2}".format(self.id, self.user, self.amount)
|
||||||
|
|
||||||
|
|
||||||
class InventoryTransaction(models.Model):
|
class InventoryTransaction(models.Model):
|
||||||
""" Goods """
|
""" Goods """
|
||||||
user = models.ForeignKey(User)
|
user = models.ForeignKey(User)
|
||||||
@@ -77,7 +82,13 @@ class InventoryTransaction(models.Model):
|
|||||||
return self.amount * self.unit_price
|
return self.amount * self.unit_price
|
||||||
|
|
||||||
def __unicode__(self):
|
def __unicode__(self):
|
||||||
return u"{0}: {1}: {2} ({3} kr per)".format(self.id, self.user, self.product, self.amount, self.unit_price)
|
return u"{0}: {1}: {2} ({3} kr per)".format(
|
||||||
|
self.id,
|
||||||
|
self.user,
|
||||||
|
self.product,
|
||||||
|
self.amount,
|
||||||
|
self.unit_price)
|
||||||
|
|
||||||
|
|
||||||
class UserProfile(models.Model):
|
class UserProfile(models.Model):
|
||||||
user = models.OneToOneField(User)
|
user = models.OneToOneField(User)
|
||||||
@@ -100,6 +111,7 @@ class UserProfile(models.Model):
|
|||||||
def __unicode__(self):
|
def __unicode__(self):
|
||||||
return u"{0}".format(self.user)
|
return u"{0}".format(self.user)
|
||||||
|
|
||||||
|
|
||||||
# Create a new UserProfile object when we create a new User.
|
# Create a new UserProfile object when we create a new User.
|
||||||
@receiver(post_save, sender=User, dispatch_uid='randomz')
|
@receiver(post_save, sender=User, dispatch_uid='randomz')
|
||||||
def create_user_profile(sender, instance, created, **kwargs):
|
def create_user_profile(sender, instance, created, **kwargs):
|
||||||
|
|||||||
Reference in new issue
Block a user