Skip to content

Commit 1694a41

Browse files
committed
flake8 --max-line-length=119 applied.
1 parent 736bbb0 commit 1694a41

File tree

8 files changed

+425
-383
lines changed

8 files changed

+425
-383
lines changed

src/barsystem/admin.py

+11-2
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,43 @@
22
from .models import Person, Product, ProductCategory, Journal, Token, VendingMachineProduct
33
from .functions import money_display
44

5+
56
@admin.register(Person)
67
class PersonAdmin(admin.ModelAdmin):
7-
list_display = ('id', 'nick_name', 'active', 'member', 'special', 'first_name', 'last_name', 'amount', 'balance_limit', 'type')
8+
list_display = ('id', 'nick_name', 'active', 'member', 'special', 'first_name',
9+
'last_name', 'amount', 'balance_limit', 'type')
810
ordering = ('id',)
911

12+
1013
@admin.register(Product)
1114
class ProductAdmin(admin.ModelAdmin):
12-
list_display = ('name', 'active', 'special', 'type', 'category', 'member_price_', 'standard_price_')
15+
list_display = ('name', 'active', 'special', 'type', 'category', 'member_price_',
16+
'standard_price_')
1317
ordering = ('id',)
1418

1519
def member_price_(self, obj):
1620
return money_display(obj.member_price)
21+
1722
def standard_price_(self, obj):
1823
return money_display(obj.standard_price)
1924

25+
2026
@admin.register(ProductCategory)
2127
class ProductCategoryAdmin(admin.ModelAdmin):
2228
pass
2329

30+
2431
@admin.register(Journal)
2532
class JournalAdmin(admin.ModelAdmin):
2633
list_display = ('moment', 'sender', 'recipient', 'product', 'items', 'amount')
2734
date_hierarchy = 'moment'
2835

36+
2937
@admin.register(Token)
3038
class TokenAdmin(admin.ModelAdmin):
3139
list_display = ('person', 'type', 'value')
3240

41+
3342
@admin.register(VendingMachineProduct)
3443
class VendingMachineProductAdmin(admin.ModelAdmin):
3544
list_display = ('code', 'product', 'virtual')

src/barsystem/cart.py

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from django.utils import timezone
55
from django.db import transaction
66

7+
78
class Cart(dict):
89
def __init__(self, data=None, person=None):
910
if data:
@@ -34,6 +35,7 @@ def can_checkout(self):
3435
return self.person.balance - total >= self.person.balance_limit
3536

3637
return True
38+
3739
def checkout(self, test=False):
3840
if not self.can_checkout():
3941
return False

src/barsystem/functions.py

+23-21
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,21 @@
22
from django.core.mail import send_mail
33
from django.conf import settings
44

5+
56
def money_display(value):
6-
if value is None:
7-
return str(None)
8-
min_digits = 2
9-
max_digits = 4
10-
negative = False
11-
if value < 0:
12-
value *= -1
13-
negative = True
14-
var = floatformat(value, 4)
15-
if var[-1] == '0': var = var[:-1]
16-
if var[-1] == '0': var = var[:-1]
17-
return '{}{}{}'.format('-' if negative else '', '€ ', var)
7+
if value is None:
8+
return str(None)
9+
negative = False
10+
if value < 0:
11+
value *= -1
12+
negative = True
13+
# Make sure precision is 4 digits, but strip up to 2 trailing zeroes.
14+
var = floatformat(value, 4)
15+
if var[-1] == '0':
16+
var = var[:-1]
17+
if var[-1] == '0':
18+
var = var[:-1]
19+
return '{}{}{}'.format('-' if negative else '', '€ ', var)
1820

1921

2022
EMAIL_OVERDRAWN_SUBJECT = 'Barsystem: {nickname} is over spending limit!'
@@ -33,12 +35,12 @@ def money_display(value):
3335

3436

3537
def send_overdrawn_mail(naughty_person, transaction_amount):
36-
person_name = '{} ({} {})'.format(naughty_person.nick_name, naughty_person.first_name, naughty_person.last_name)
37-
values = {
38-
'nickname': naughty_person.nick_name,
39-
'transaction_amount': money_display(transaction_amount),
40-
'balance': money_display(naughty_person.amount),
41-
}
42-
subject = EMAIL_OVERDRAWN_SUBJECT.format(**values)
43-
message = EMAIL_OVERDRAWN_BODY.format(**values)
44-
send_mail(subject, message, settings.EMAIL_HOST_USER, settings.EMAIL_TARGET, fail_silently=True)
38+
# person_name = '{} ({} {})'.format(naughty_person.nick_name, naughty_person.first_name, naughty_person.last_name)
39+
values = {
40+
'nickname': naughty_person.nick_name,
41+
'transaction_amount': money_display(transaction_amount),
42+
'balance': money_display(naughty_person.amount),
43+
}
44+
subject = EMAIL_OVERDRAWN_SUBJECT.format(**values)
45+
message = EMAIL_OVERDRAWN_BODY.format(**values)
46+
send_mail(subject, message, settings.EMAIL_HOST_USER, settings.EMAIL_TARGET, fail_silently=True)

src/barsystem/gui/__init__.py

-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
def persons_import(filename):
2-
with open(filename, 'r') as f:
3-
lines = f.readlines()
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from django import template
2-
from django.template.defaultfilters import floatformat
32
import barsystem.functions
43

54
register = template.Library()
65

6+
77
@register.filter
88
def money_display(value, *args, **kwargs):
9-
return barsystem.functions.money_display(value)
9+
return barsystem.functions.money_display(value)

src/barsystem/gui/urls.py

+13-12
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
from django.conf.urls import include, url
1+
from django.conf.urls import url
22

33
from barsystem.gui import views
44

5+
56
urlpatterns = [
6-
url(r'^people/$', views.PeopleView.as_view(), name='people'),
7-
url(r'^people/set/(?P<person_id>\d+)/$', views.PeopleSetView.as_view(), name='people_set'),
8-
url(r'^cart/add/', views.AddToCartView.as_view(), name='add_to_cart'),
9-
url(r'^products/$', views.ProductsView.as_view(), name='products'),
10-
url(r'^products/get/$', views.ProductsGetView.as_view(), name='products_get'),
11-
url(r'^products/confirm/$', views.ProductsConfirmView.as_view(), name='products_confirm'),
12-
url(r'^transactions/$', views.TransactionsView.as_view(), name='transactions'),
13-
url(r'^create_account/$', views.CreateAccountView.as_view(), name='create_account'),
14-
url(r'^delete_account/$', views.DeleteAccountView.as_view(), name='delete_account'),
15-
url(r'^$', views.IndexView.as_view(), name='index'),
16-
]
7+
url(r'^people/$', views.PeopleView.as_view(), name='people'),
8+
url(r'^people/set/(?P<person_id>\d+)/$', views.PeopleSetView.as_view(), name='people_set'),
9+
url(r'^cart/add/', views.AddToCartView.as_view(), name='add_to_cart'),
10+
url(r'^products/$', views.ProductsView.as_view(), name='products'),
11+
url(r'^products/get/$', views.ProductsGetView.as_view(), name='products_get'),
12+
url(r'^products/confirm/$', views.ProductsConfirmView.as_view(), name='products_confirm'),
13+
url(r'^transactions/$', views.TransactionsView.as_view(), name='transactions'),
14+
url(r'^create_account/$', views.CreateAccountView.as_view(), name='create_account'),
15+
url(r'^delete_account/$', views.DeleteAccountView.as_view(), name='delete_account'),
16+
url(r'^$', views.IndexView.as_view(), name='index'),
17+
]

0 commit comments

Comments
 (0)