TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix all pep8 and eslint errors :0

Browse Source
This commit is contained in:
Jan Tuomi
2017-05-21 16:28:47 +03:00
parent 4ab9c98b57
commit a2fb923220
32 changed files with 306 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files
members/apps.py
+1
View File
@@ -1,4 +1,5 @@
from django.apps import AppConfig
class MembersConfig(AppConfig):
name = 'members'
members/forms.py
+2 -1
View File
@@ -16,8 +16,9 @@ class PaymentForm(forms.ModelForm):
model = Payment
fields = ['date', 'source', 'member']
class ApplicationForm(forms.ModelForm):
class Meta:
model = Request
fields = ['first_name', 'last_name', 'email', 'AYY', 'jas', 'POR']
fields = ['first_name', 'last_name', 'email', 'AYY', 'jas', 'POR']
members/models.py
+1 -1
View File
@@ -109,4 +109,4 @@ class Member(BaseMember):
POR=array[3],
AYY=bool(array[4]),
jas=bool(array[5]),
)
)
members/permissions.py
-11
View File
@@ -1,11 +0,0 @@
from rest_framework import permissions
from django.contrib.auth.models import Permission, User
class HasRights(permissions.BasePermission):
message = "You need rights to access this content."
def has_permission(self, request, view):
if request.user.has_perm('members.change_member'):
return True
else:
return False
members/serializers.py
-68
View File
@@ -1,68 +0,0 @@
from rest_framework import serializers
from django.utils import timezone
from datetime import datetime
from members.models import Member, Request
from django.conf import settings
class MemberSerializer(serializers.Serializer):
id = serializers.IntegerField(read_only=True)
first_name = serializers.CharField(required=True, max_length=127)
last_name = serializers.CharField(required=True, max_length=127)
email = serializers.EmailField(min_length=None, max_length=None, required=True)
POR = serializers.CharField(max_length=255)
AYY = serializers.BooleanField(default=False)
jas = serializers.BooleanField(default=False)
created = serializers.DateTimeField(default=timezone.now)
paid = serializers.DateTimeField(default=datetime.fromtimestamp(0))
def create(self, validated_data):
'''
Create and return a new Member instance, given the validated data.
'''
return Member.objects.create(**validated_data)
def update(self, instance, validated_data):
'''
Update and return an existing Member instance given the validated data.
'''
instance.first_name = validated_data.get('first_name', instance.first_name)
instance.last_name = validated_data.get('last_name', instance.last_name)
instance.email = validated_data.get('email', instance.email)
instance.POR = validated_data.get('POR', instance.POR)
instance.AYY = validated_data.get('AYY', instance.AYY)
instance.jas = validated_data.get('jas', instance.jas)
instance.created = validated_data.get('created', instance.created)
instance.paid = validated_data.get('paid', instance.paid)
instance.save()
return instance
class MemberRequestSerializer(serializers.Serializer):
id = serializers.IntegerField(read_only=True)
submitted = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S")
first_name = serializers.CharField(required=True, max_length=127)
last_name = serializers.CharField(required=True, max_length=127)
email = serializers.EmailField(min_length=None, max_length=None, required=True)
POR = serializers.CharField(max_length=255)
AYY = serializers.BooleanField(default=False)
jas = serializers.BooleanField(default=False)
def created(self, validated_data):
'''
Create and return a new MemberRequest instance, given the validated data.
'''
return MemberRequest.objects.create(**validated_data)
def update(self, instance, validated_data):
'''
Update and return an existing Member request instance given the validated data.
'''
instance.submitted = validated_data.get('submitted', instance.submitted)
instance.first_name = validated_data.get('first_name', instance.first_name)
instance.last_name = validated_data.get('last_name', instance.last_name)
instance.email = validated_data.get('email', instance.email)
instance.POR = validated_data.get('POR', instance.POR)
instance.AYY = validated_data.get('AYY', instance.AYY)
instance.jas = validated_data.get('jas', instance.jas)
instance.save()
return instance
members/tables.py
+2 -2
View File
@@ -8,7 +8,7 @@ class MemberTable(tables.Table):
options = tables.TemplateColumn(
'<a class="data-table-button btn btn-primary" href="/members/edit/{{ record.id }}">' +
_('Edit') +
_('Edit') +
'</a>'
)
@@ -20,7 +20,7 @@ class PaymentTable(tables.Table):
options = tables.TemplateColumn(
'<a class="data-table-button btn btn-primary" href="/members/edit_payment/{{ record.id }}">' +
_('Edit') +
_('Edit') +
'</a>'
)
members/tests.py
+3 -1
View File
@@ -1,9 +1,11 @@
from django.test import TestCase, Client
from members.models import Member
from django.contrib.auth.models import User
import time
from members.models import Member
class MemberRegisterTestCase(TestCase):
def setUp(self):
members/throttles.py
-7
View File
@@ -1,7 +0,0 @@
from rest_framework.throttling import UserRateThrottle
class BurstRateThrottle(UserRateThrottle):
scope = 'burst'
class SustainedRateThrottle(UserRateThrottle):
scope = 'sustained'
members/urls.py
+49 -49
View File
@@ -2,8 +2,9 @@ from django.conf.urls import url
from django.views.generic.base import RedirectView
# members
from members.views import member_list, payment_add, payment_submit, application_delete_confirm, application_delete, \
application_accept, import_csv, export_csv
from members.views import member_list, payment_add, payment_submit
from members.views import application_delete_confirm, application_delete
from members.views import application_accept, import_csv, export_csv
from members.views import settings_page, payment_edit
from members.views import payment_delete_confirm
from members.views import payment_delete, payment_update
@@ -26,69 +27,68 @@ favicon_view = RedirectView.as_view(url='static/img/favicon.ico', permanent=True
urlpatterns = [
# landing page
url(r'^$', member_list),
url(r'^list$', member_list),
# landing page
url(r'^$', member_list),
url(r'^list$', member_list),
# add member form view
url(r'^add$', member_add),
# add member form view
url(r'^add$', member_add),
# add many members view
url(r'^add_many$', member_add_many),
# add many members view
url(r'^add_many$', member_add_many),
# edit member information view
url(r'^edit/(?P<index>\d+)$', member_edit),
# edit member information view
url(r'^edit/(?P<index>\d+)$', member_edit),
# delete confirmation view
url(r'^delete_member_confirm/(?P<index>\d+)$', member_delete_confirm),
# delete confirmation view
url(r'^delete_member_confirm/(?P<index>\d+)$', member_delete_confirm),
# list all member applications
url(r'^applications$', application_list),
# list all member applications
url(r'^applications$', application_list),
# edit member application
url(r'^edit_application/(?P<index>\d+)$', application_edit),
# edit member application
url(r'^edit_application/(?P<index>\d+)$', application_edit),
# post request targets
url(r'^submit_member$', member_submit),
url(r'^update_member$', member_update),
url(r'^delete_member$', member_delete),
url(r'^submit_payment$', payment_submit),
url(r'^update_payment$', payment_update),
url(r'^delete_payment$', payment_delete),
url(r'^accept_application$', application_accept),
url(r'^delete_application$', application_delete),
# post request targets
url(r'^submit_member$', member_submit),
url(r'^update_member$', member_update),
url(r'^delete_member$', member_delete),
url(r'^submit_payment$', payment_submit),
url(r'^update_payment$', payment_update),
url(r'^delete_payment$', payment_delete),
url(r'^accept_application$', application_accept),
url(r'^delete_application$', application_delete),
# the actual member application form
url(r'^application/$', application_form),
# the actual member application form
url(r'^application/$', application_form),
# success page for the application
url(r'^application/success$', application_form_success),
# success page for the application
url(r'^application/success$', application_form_success),
# delete confirmation view for applications
url(r'^delete_application_confirm/(?P<index>\d+)$', application_delete_confirm),
# delete confirmation view for applications
url(r'^delete_application_confirm/(?P<index>\d+)$', application_delete_confirm),
# list all payment events
url(r'^payments$', payment_list),
# list all payment events
url(r'^payments$', payment_list),
# add payment event
url(r'^add_payment$', payment_add),
# add payment event
url(r'^add_payment$', payment_add),
# edit payment event
url(r'^edit_payment/(?P<index>\d+)$', payment_edit),
# edit payment event
url(r'^edit_payment/(?P<index>\d+)$', payment_edit),
# delete confirmation view
url(r'^delete_payment_confirm/(?P<index>\d+)$', payment_delete_confirm),
# delete confirmation view
url(r'^delete_payment_confirm/(?P<index>\d+)$', payment_delete_confirm),
# settings page
url(r'^settings$', settings_page),
# settings page
url(r'^settings$', settings_page),
# send CSV member data by POST
url(r'^import_csv', import_csv),
# send CSV member data by POST
url(r'^import_csv', import_csv),
# download CSV member data
url(r'^export_csv', export_csv),
# download CSV member data
url(r'^export_csv', export_csv),
# favourite icon
url(r'^favicon\.ico$', favicon_view),
# favourite icon
url(r'^favicon\.ico$', favicon_view),
]
members/views.py
+14 -16
View File
@@ -47,13 +47,11 @@ def validate_recaptcha(response):
def send_mail_wrapper(subject, message):
send_mail(
subject,
message,
'no-reply@sahkoinsinoorikilta.fi',
['viestintamestari@sahkoinsinoorikilta.fi'],
fail_silently=False
)
send_mail(subject,
message,
'no-reply@sahkoinsinoorikilta.fi',
['viestintamestari@sahkoinsinoorikilta.fi'],
fail_silently=False)
def convert_table_to_html(table, request):
@@ -84,10 +82,10 @@ def member_list(request, *args, **kwargs):
members = Member.objects.all()
table = MemberTable(members,
request=request,
exclude=['id'],
attrs={'class': 'table table-bordered table-hover'},
)
request=request,
exclude=['id'],
attrs={'class': 'table table-bordered table-hover'})
table.paginate(page=request.GET.get('page', 1), per_page=25)
table_html = convert_table_to_html(table, request)
@@ -136,8 +134,8 @@ def member_submit(request, *args, **kwargs):
form.save()
memberlogger.info("Saved new member to member register with the following info: {}".format(form))
notification = "{} {} {}.".format(_("Successfully added member"),
form.cleaned_data['last_name'],
form.cleaned_data['first_name'])
form.cleaned_data['last_name'],
form.cleaned_data['first_name'])
return HttpResponseRedirect('/members/list?notification={}'.format(html.escape(notification)))
else:
@@ -299,9 +297,9 @@ def payment_list(request, *args, **kwargs):
payments = Payment.objects.all()
table = PaymentTable(payments,
request=request,
exclude=['id'],
attrs={'class': 'table table-bordered table-hover'})
request=request,
exclude=['id'],
attrs={'class': 'table table-bordered table-hover'})
table.paginate(page=request.GET.get('page', 1), per_page=25)
table_html = convert_table_to_html(table, request)