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

format files with black

Browse Source
This commit is contained in:
Aarni Halinen
2022-01-13 22:10:24 +02:00
parent a0f062c697
commit 11efcdd579
178 changed files with 3763 additions and 2324 deletions
Download Patch File Download Diff File Expand all files Collapse all files
members/forms.py
+25 -22
View File
@@ -23,7 +23,7 @@ class MemberForm(forms.ModelForm):
"""Meta for Member model form."""
model = Member
fields = ['first_name', 'last_name', 'email', 'POR', 'AYY', 'jas']
fields = ["first_name", "last_name", "email", "POR", "AYY", "jas"]
class ImportResult:
def __init__(self, members, payments):
@@ -32,22 +32,27 @@ class MemberForm(forms.ModelForm):
def _clean_boolean_field(self, key):
value = self.data.get(key, None)
if value in ['1', '0']:
if value in ["1", "0"]:
return bool(int(value))
else:
return value == 'on'
return value == "on"
def clean_jas(self):
return self._clean_boolean_field('jas')
return self._clean_boolean_field("jas")
def clean_AYY(self):
return self._clean_boolean_field('AYY')
return self._clean_boolean_field("AYY")
@staticmethod
def csv_to_models(data, payment_source='AYY', delimiter=','):
clean_data = data.strip().split('\n')
clean_data = [row.rstrip(',').rstrip('\r').strip() for row in clean_data]
csv_reader = csv.DictReader(clean_data, fieldnames=MemberForm.Meta.fields, delimiter=delimiter, quoting=csv.QUOTE_NONE)
def csv_to_models(data, payment_source="AYY", delimiter=","):
clean_data = data.strip().split("\n")
clean_data = [row.rstrip(",").rstrip("\r").strip() for row in clean_data]
csv_reader = csv.DictReader(
clean_data,
fieldnames=MemberForm.Meta.fields,
delimiter=delimiter,
quoting=csv.QUOTE_NONE,
)
members = []
payments = []
@@ -57,10 +62,10 @@ class MemberForm(forms.ModelForm):
line[key] = value.strip()
except AttributeError as ex:
logging.error('Invalid line in CSV: "{}"'.format(line))
logging.error('Delimiter: {}'.format(delimiter))
logging.error("Delimiter: {}".format(delimiter))
raise
email = line['email']
email = line["email"]
member_exists = False
if Member.objects.filter(email=email).exists():
member_exists = True
@@ -76,9 +81,9 @@ class MemberForm(forms.ModelForm):
else:
member = Member.objects.get(email=email)
payment_data = {
'source': payment_source,
'member': member.id,
'date': timezone.now(),
"source": payment_source,
"member": member.id,
"date": timezone.now(),
}
form = PaymentForm(payment_data)
if not form.is_valid():
@@ -95,17 +100,15 @@ class PaymentForm(forms.ModelForm):
member = forms.ModelChoiceField(
queryset=Member.objects.all(),
widget=autocomplete.ModelSelect2(url='member-autocomplete')
widget=autocomplete.ModelSelect2(url="member-autocomplete"),
)
class Meta:
"""Meta for Payment model form."""
model = Payment
fields = ['date', 'source', 'member']
labels = {
'member': _('Member')
}
fields = ["date", "source", "member"]
labels = {"member": _("Member")}
class ApplicationForm(forms.ModelForm):
@@ -115,13 +118,13 @@ class ApplicationForm(forms.ModelForm):
"""Meta for application model form."""
model = Request
fields = ['first_name', 'last_name', 'email', 'AYY', 'jas', 'POR']
fields = ["first_name", "last_name", "email", "AYY", "jas", "POR"]
def __init__(self, *args, **kwargs):
super(ApplicationForm, self).__init__(*args, **kwargs)
self.fields['AYY'].label = _("I'm a member of AYY")
self.fields['jas'].label = _("I want to receive a weekly newsletter")
self.fields["AYY"].label = _("I'm a member of AYY")
self.fields["jas"].label = _("I want to receive a weekly newsletter")
class UploadFileForm(forms.Form):