',
]
options = self.render_options(choices, value)
@@ -138,7 +145,6 @@ def render_options(self, choices, selected_choices):
def render_option(self, selected_choices, option_value, option_label):
option_value = force_str(option_value)
if option_value in selected_choices:
-
return """
@@ -152,7 +158,7 @@ def render_option(self, selected_choices, option_value, option_label):
""" % {
'value': conditional_escape(force_str(option_label)),
'id': escape(option_value),
- 'div_id': uuid.uuid4()
+ 'div_id': uuid.uuid4(),
}
else:
@@ -165,6 +171,7 @@ class CheckboxChoiceInputTranslated(CheckboxInput):
This only translated the text for the select widgets
"""
+
input_type = 'checkbox'
def __init__(self, name, value, attrs, choice, index):
@@ -180,16 +187,18 @@ class CheckboxChoiceInputTranslatedOriginal(CheckboxInput):
This only translated the text for the select widgets, showing the original
string as well.
"""
+
input_type = 'checkbox'
def __init__(self, name, value, attrs, choice, index):
if _(choice[1]) != choice[1]:
- choice = (choice[0], "{0} ({1})".format(choice[1], _(choice[1])))
+ choice = (choice[0], '{0} ({1})'.format(choice[1], _(choice[1])))
else:
choice = (choice[0], _(choice[1]))
- super(CheckboxChoiceInputTranslatedOriginal,
- self).__init__(name, value, attrs, choice, index)
+ super(CheckboxChoiceInputTranslatedOriginal, self).__init__(
+ name, value, attrs, choice, index
+ )
class CheckboxFieldRendererTranslated(CheckboxSelectMultiple):
@@ -214,6 +223,7 @@ class TranslatedSelectMultiple(BootstrapSelectMultiple):
"""
A SelectMultiple widget that translates the options
"""
+
pass
@@ -223,6 +233,7 @@ class TranslatedOriginalSelectMultiple(BootstrapSelectMultipleTranslatedOriginal
string as well. This is currently only used in the muscle list, where the
translated muscles as well as the latin names are shown.
"""
+
pass
@@ -232,5 +243,6 @@ class TranslatedSelect(Select):
"""
def render_option(self, selected_choices, option_value, option_label):
- return super(TranslatedSelect,
- self).render_option(selected_choices, option_value, _(option_label))
+ return super(TranslatedSelect, self).render_option(
+ selected_choices, option_value, _(option_label)
+ )
diff --git a/wger/weight/api/serializers.py b/wger/weight/api/serializers.py
index d629f5eba..cd3854a22 100644
--- a/wger/weight/api/serializers.py
+++ b/wger/weight/api/serializers.py
@@ -26,6 +26,7 @@ class WeightEntrySerializer(serializers.ModelSerializer):
"""
Weight serializer
"""
+
user = serializers.PrimaryKeyRelatedField(
read_only=True, default=serializers.CurrentUserDefault()
)
diff --git a/wger/weight/api/views.py b/wger/weight/api/views.py
index 0240cd8b6..850ad9efb 100644
--- a/wger/weight/api/views.py
+++ b/wger/weight/api/views.py
@@ -27,6 +27,7 @@ class WeightEntryViewSet(viewsets.ModelViewSet):
"""
API endpoint for nutrition plan objects
"""
+
serializer_class = WeightEntrySerializer
is_private = True
@@ -38,7 +39,7 @@ def get_queryset(self):
Only allow access to appropriate objects
"""
# REST API generation
- if getattr(self, "swagger_fake_view", False):
+ if getattr(self, 'swagger_fake_view', False):
return WeightEntry.objects.none()
return WeightEntry.objects.filter(user=self.request.user)
diff --git a/wger/weight/forms.py b/wger/weight/forms.py
index 1dc29e487..7a3809b3f 100644
--- a/wger/weight/forms.py
+++ b/wger/weight/forms.py
@@ -50,6 +50,7 @@ class WeightCsvImportForm(Form):
"""
A helper form with only a textarea
"""
+
csv_input = CharField(widget=Textarea, label=_('Input'))
date_format = forms.ChoiceField(choices=CSV_DATE_FORMAT, label=_('Date format'))
@@ -58,8 +59,8 @@ def __init__(self, *args, **kwargs):
self.helper = FormHelper()
self.helper.layout = Layout(
- "csv_input",
- "date_format",
+ 'csv_input',
+ 'date_format',
)
self.helper.form_tag = False
diff --git a/wger/weight/helpers.py b/wger/weight/helpers.py
index b14e83ef0..e4a722b75 100644
--- a/wger/weight/helpers.py
+++ b/wger/weight/helpers.py
@@ -40,7 +40,6 @@
def parse_weight_csv(request, cleaned_data):
-
try:
dialect = csv.Sniffer().sniff(cleaned_data['csv_input'])
except csv.Error:
@@ -60,8 +59,9 @@ def parse_weight_csv(request, cleaned_data):
try:
parsed_date = datetime.datetime.strptime(row[0], cleaned_data['date_format'])
parsed_weight = decimal.Decimal(row[1].replace(',', '.'))
- duplicate_date_in_db = WeightEntry.objects.filter(date=parsed_date,
- user=request.user).exists()
+ duplicate_date_in_db = WeightEntry.objects.filter(
+ date=parsed_date, user=request.user
+ ).exists()
# within the list there are no duplicate dates
unique_among_csv = parsed_date not in entry_dates
@@ -130,7 +130,7 @@ def group_log_entries(user, year, month, day=None):
'date': entry.date,
'workout': entry.workout,
'session': entry.get_workout_session(),
- 'logs': OrderedDict()
+ 'logs': OrderedDict(),
}
if not out[entry.date]['logs'].get(entry.exercise_base):
@@ -145,7 +145,7 @@ def group_log_entries(user, year, month, day=None):
'date': entry.date,
'workout': entry.workout,
'session': entry,
- 'logs': {}
+ 'logs': {},
}
cache.set(cache_mapper.get_workout_log_list(log_hash), out)
@@ -165,7 +165,6 @@ def process_log_entries(logs):
# Group by date
for entry in logs:
-
if not entry_log.get(entry.date):
entry_log[entry.date] = []
entry_log[entry.date].append(entry)
@@ -195,11 +194,7 @@ def process_log_entries(logs):
entry_list[entry.reps]['seen'].append((entry.date, entry.reps, entry.weight))
entry_list[entry.reps]['list'].append(
- {
- 'date': entry.date,
- 'weight': entry.weight,
- 'reps': entry.reps
- }
+ {'date': entry.date, 'weight': entry.weight, 'reps': entry.reps}
)
for rep in entry_list:
chart_data.append(entry_list[rep]['list'])
diff --git a/wger/weight/management/commands/dummy-generator-body-weight.py b/wger/weight/management/commands/dummy-generator-body-weight.py
index b8978ef92..096f8be76 100644
--- a/wger/weight/management/commands/dummy-generator-body-weight.py
+++ b/wger/weight/management/commands/dummy-generator-body-weight.py
@@ -36,14 +36,13 @@ class Command(BaseCommand):
help = 'Dummy generator for weight entries'
def add_arguments(self, parser):
-
parser.add_argument(
'--nr-entries',
action='store',
default=40,
dest='nr_entries',
type=int,
- help='The number of measurement entries per category (default: 40)'
+ help='The number of measurement entries per category (default: 40)',
)
parser.add_argument(
'--user-id',
@@ -58,9 +57,9 @@ def handle(self, **options):
base_weight = 80
- users = [User.objects.get(pk=options['user_id'])] \
- if options['user_id'] \
- else User.objects.all()
+ users = (
+ [User.objects.get(pk=options['user_id'])] if options['user_id'] else User.objects.all()
+ )
print(f"** Generating {options['nr_entries']} weight entries per user")
@@ -72,13 +71,12 @@ def handle(self, **options):
# Weight entries
for i in range(options['nr_entries']):
-
creation_date = datetime.date.today() - datetime.timedelta(days=i)
if creation_date not in existing_entries:
entry = WeightEntry(
user=user,
weight=base_weight + 0.5 * i + random.randint(1, 3),
- date=creation_date
+ date=creation_date,
)
new_entries.append(entry)
diff --git a/wger/weight/management/commands/email-weight-reminder.py b/wger/weight/management/commands/email-weight-reminder.py
index 8df8cfcab..414390fc3 100644
--- a/wger/weight/management/commands/email-weight-reminder.py
+++ b/wger/weight/management/commands/email-weight-reminder.py
@@ -37,11 +37,9 @@ class Command(BaseCommand):
help = 'Send out automatic emails to remind the user to enter the weight'
def handle(self, **options):
-
profile_list = UserProfile.objects.filter(num_days_weight_reminder__gt=0)
for profile in profile_list:
-
# Only continue if the user has provided an email address.
# Checking it here so we check for NULL values and emtpy strings
if not profile.user.email:
@@ -74,14 +72,11 @@ def send_email(user, last_entry, datediff):
'site': Site.objects.get_current(),
'date': last_entry,
'days': datediff,
- 'user': user
+ 'user': user,
}
subject = _('You have to enter your weight')
message = loader.render_to_string('workout/email_weight_reminder.tpl', context)
mail.send_mail(
- subject,
- message,
- settings.WGER_SETTINGS['EMAIL_FROM'], [user.email],
- fail_silently=True
+ subject, message, settings.WGER_SETTINGS['EMAIL_FROM'], [user.email], fail_silently=True
)
diff --git a/wger/weight/migrations/0001_initial.py b/wger/weight/migrations/0001_initial.py
index 298c63856..120586698 100644
--- a/wger/weight/migrations/0001_initial.py
+++ b/wger/weight/migrations/0001_initial.py
@@ -6,7 +6,6 @@
class Migration(migrations.Migration):
-
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
@@ -19,7 +18,7 @@ class Migration(migrations.Migration):
'id',
models.AutoField(
verbose_name='ID', serialize=False, auto_created=True, primary_key=True
- )
+ ),
),
('creation_date', models.DateField(verbose_name='Date')),
(
@@ -30,15 +29,15 @@ class Migration(migrations.Migration):
decimal_places=2,
validators=[
django.core.validators.MinValueValidator(30),
- django.core.validators.MaxValueValidator(300)
- ]
- )
+ django.core.validators.MaxValueValidator(300),
+ ],
+ ),
),
(
'user',
models.ForeignKey(
verbose_name='User', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE
- )
+ ),
),
],
options={
@@ -46,7 +45,7 @@ class Migration(migrations.Migration):
'get_latest_by': 'creation_date',
'verbose_name': 'Weight entry',
},
- bases=(models.Model, ),
+ bases=(models.Model,),
),
migrations.AlterUniqueTogether(
name='weightentry',
diff --git a/wger/weight/migrations/0002_auto_20150604_2139.py b/wger/weight/migrations/0002_auto_20150604_2139.py
index 0caee53f6..34007a62d 100644
--- a/wger/weight/migrations/0002_auto_20150604_2139.py
+++ b/wger/weight/migrations/0002_auto_20150604_2139.py
@@ -4,7 +4,6 @@
class Migration(migrations.Migration):
-
dependencies = [
('weight', '0001_initial'),
]
@@ -12,11 +11,7 @@ class Migration(migrations.Migration):
operations = [
migrations.AlterModelOptions(
name='weightentry',
- options={
- 'verbose_name': 'Weight entry',
- 'get_latest_by': 'date',
- 'ordering': ['date']
- },
+ options={'verbose_name': 'Weight entry', 'get_latest_by': 'date', 'ordering': ['date']},
),
migrations.RenameField(
model_name='weightentry',
diff --git a/wger/weight/migrations/0003_auto_20160416_1030.py b/wger/weight/migrations/0003_auto_20160416_1030.py
index 8d605985c..0481e00c4 100644
--- a/wger/weight/migrations/0003_auto_20160416_1030.py
+++ b/wger/weight/migrations/0003_auto_20160416_1030.py
@@ -5,7 +5,6 @@
class Migration(migrations.Migration):
-
dependencies = [
('weight', '0002_auto_20150604_2139'),
]
@@ -19,9 +18,9 @@ class Migration(migrations.Migration):
verbose_name='Weight',
validators=[
django.core.validators.MinValueValidator(30),
- django.core.validators.MaxValueValidator(600)
+ django.core.validators.MaxValueValidator(600),
],
- max_digits=5
+ max_digits=5,
),
),
]
diff --git a/wger/weight/models.py b/wger/weight/models.py
index 0313c9ac6..4cc2c6ae7 100644
--- a/wger/weight/models.py
+++ b/wger/weight/models.py
@@ -29,12 +29,13 @@ class WeightEntry(models.Model):
"""
Model for a weight point
"""
+
date = models.DateField(verbose_name=_('Date'))
weight = models.DecimalField(
verbose_name=_('Weight'),
max_digits=5,
decimal_places=2,
- validators=[MinValueValidator(30), MaxValueValidator(600)]
+ validators=[MinValueValidator(30), MaxValueValidator(600)],
)
user = models.ForeignKey(
User,
@@ -55,18 +56,19 @@ class Meta:
"""
Metaclass to set some other properties
"""
+
verbose_name = _('Weight entry')
ordering = [
- "date",
+ 'date',
]
- get_latest_by = "date"
- unique_together = ("date", "user")
+ get_latest_by = 'date'
+ unique_together = ('date', 'user')
def __str__(self):
"""
Return a more human-readable representation
"""
- return "{0}: {1:.2f} kg".format(self.date, self.weight)
+ return '{0}: {1:.2f} kg'.format(self.date, self.weight)
def get_owner_object(self):
"""
diff --git a/wger/weight/tests/test_csv_import.py b/wger/weight/tests/test_csv_import.py
index 25eb8a6b7..ca303f0e1 100644
--- a/wger/weight/tests/test_csv_import.py
+++ b/wger/weight/tests/test_csv_import.py
@@ -52,11 +52,8 @@ def import_csv(self):
26.02.10 71,9 222
19.03.10 72 222"""
response = self.client.post(
- reverse('weight:import-csv'), {
- 'stage': 1,
- 'csv_input': csv_input,
- 'date_format': '%d.%m.%y'
- }
+ reverse('weight:import-csv'),
+ {'stage': 1, 'csv_input': csv_input, 'date_format': '%d.%m.%y'},
)
self.assertEqual(response.status_code, 200)
@@ -66,12 +63,8 @@ def import_csv(self):
# 2nd. step
response = self.client.post(
- reverse('weight:import-csv'), {
- 'stage': 2,
- 'hash': hash_value,
- 'csv_input': csv_input,
- 'date_format': '%d.%m.%y'
- }
+ reverse('weight:import-csv'),
+ {'stage': 2, 'hash': hash_value, 'csv_input': csv_input, 'date_format': '%d.%m.%y'},
)
count_after = WeightEntry.objects.count()
diff --git a/wger/weight/tests/test_email_weight_reminder.py b/wger/weight/tests/test_email_weight_reminder.py
index 4a2c70a40..a54c9b5b4 100644
--- a/wger/weight/tests/test_email_weight_reminder.py
+++ b/wger/weight/tests/test_email_weight_reminder.py
@@ -29,14 +29,13 @@
class EmailWeightReminderTestCase(WgerTestCase):
-
def test_without_email(self):
user = User.objects.get(pk=2)
user.email = ''
user.num_days_weight_reminder = 3
user.save()
- call_command("email-weight-reminder")
+ call_command('email-weight-reminder')
self.assertEqual(len(mail.outbox), 0)
def test_without_num_days_weight_reminder(self):
@@ -47,7 +46,7 @@ def test_without_num_days_weight_reminder(self):
user.userprofile.num_days_weight_reminder = 0
user.userprofile.save()
- call_command("email-weight-reminder")
+ call_command('email-weight-reminder')
self.assertEqual(len(mail.outbox), 0)
def test_with_num_days_weight_reminder(self):
@@ -58,7 +57,7 @@ def test_with_num_days_weight_reminder(self):
user.userprofile.num_days_weight_reminder = 3
user.userprofile.save()
- call_command("email-weight-reminder")
+ call_command('email-weight-reminder')
self.assertEqual(len(mail.outbox), 1)
def test_send_email(self):
@@ -73,7 +72,7 @@ def test_send_email(self):
user.userprofile.num_days_weight_reminder = 1
user.userprofile.save()
- call_command("email-weight-reminder")
+ call_command('email-weight-reminder')
self.assertEqual(len(mail.outbox), 1)
def test_send_email_zero_days_diff(self):
@@ -88,7 +87,7 @@ def test_send_email_zero_days_diff(self):
user.userprofile.num_days_weight_reminder = 1
user.userprofile.save()
- call_command("email-weight-reminder")
+ call_command('email-weight-reminder')
self.assertEqual(len(mail.outbox), 1)
def test_not_send_email(self):
@@ -103,5 +102,5 @@ def test_not_send_email(self):
user.userprofile.num_days_weight_reminder = 3
user.userprofile.save()
- call_command("email-weight-reminder")
+ call_command('email-weight-reminder')
self.assertEqual(len(mail.outbox), 0)
diff --git a/wger/weight/tests/test_entry.py b/wger/weight/tests/test_entry.py
index 87a5a4d5f..3c0761076 100644
--- a/wger/weight/tests/test_entry.py
+++ b/wger/weight/tests/test_entry.py
@@ -40,7 +40,7 @@ def test_representation(self):
"""
Test that the representation of an object is correct
"""
- self.assertEqual("{0}".format(WeightEntry.objects.get(pk=1)), '2012-10-01: 77.00 kg')
+ self.assertEqual('{0}'.format(WeightEntry.objects.get(pk=1)), '2012-10-01: 77.00 kg')
class AddWeightEntryTestCase(WgerAddTestCase):
@@ -54,7 +54,7 @@ class AddWeightEntryTestCase(WgerAddTestCase):
data = {
'weight': decimal.Decimal(81.1).quantize(TWOPLACES),
'date': datetime.date(2013, 2, 1),
- 'user': 1
+ 'user': 1,
}
@@ -91,6 +91,7 @@ class WeightEntryTestCase(api_base_test.ApiBaseResourceTestCase):
"""
Tests the weight entry overview resource
"""
+
pk = 3
resource = WeightEntry
private_resource = True
diff --git a/wger/weight/tests/test_generator.py b/wger/weight/tests/test_generator.py
index f0cf05a56..eac985acf 100644
--- a/wger/weight/tests/test_generator.py
+++ b/wger/weight/tests/test_generator.py
@@ -21,7 +21,6 @@
class WeightEntryGeneratorTestCase(WgerTestCase):
-
def test_generator(self):
# Arrange
WeightEntry.objects.all().delete()
diff --git a/wger/weight/views.py b/wger/weight/views.py
index 4aae1eecf..25d764896 100644
--- a/wger/weight/views.py
+++ b/wger/weight/views.py
@@ -59,6 +59,7 @@ class WeightAddView(WgerFormMixin, CreateView):
"""
Generic view to add a new weight entry
"""
+
model = WeightEntry
form_class = WeightForm
title = gettext_lazy('Add weight entry')
@@ -90,6 +91,7 @@ class WeightUpdateView(WgerFormMixin, LoginRequiredMixin, UpdateView):
"""
Generic view to edit an existing weight entry
"""
+
model = WeightEntry
form_class = WeightForm
diff --git a/wger/wsgi.py b/wger/wsgi.py
index 295ed61c1..182117400 100644
--- a/wger/wsgi.py
+++ b/wger/wsgi.py
@@ -20,7 +20,7 @@
from django.core.wsgi import get_wsgi_application
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'settings')
# This application object is used by any WSGI server configured to use this
# file. This includes Django's development server, if the WSGI_APPLICATION