Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge branch 'master' into feature/flexible-routines

Roland Geider2535824f9017
diff --cc wger/manager/helpers.py
index bb3e0fe94,5bc2d5f86..a93b2255a
--- a/wger/manager/helpers.py
+++ b/wger/manager/helpers.py
@@@ -15,13 -15,7 +15,9 @@@
# You should have received a copy of the GNU Affero General Public License
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
- # Standard Library
- import datetime
- from calendar import HTMLCalendar
-
# Django
+from django.core.cache import cache
+from django.urls import reverse
from django.utils.translation import gettext as _
# Third Party
@@@ -191,93 -183,3 +187,12 @@@ def render_workout_day(day, nr_of_weeks
t._argW[2] = 3 * cm # Repetitions
return KeepTogether(t)
+
+
- class WorkoutCalendar(HTMLCalendar):
- """
- A calendar renderer, see this blog entry for details:
- * http://uggedal.com/journal/creating-a-flexible-monthly-calendar-in-django/
- """
-
- def __init__(self, workout_logs, *args, **kwargs):
- super(WorkoutCalendar, self).__init__(*args, **kwargs)
- self.workout_logs = workout_logs
-
- def formatday(self, day, weekday):
- # days belonging to last or next month are rendered empty
- if day == 0:
- return self.day_cell('noday', '&nbsp;')
-
- date_obj = datetime.date(self.year, self.month, day)
- cssclass = self.cssclasses[weekday]
- if datetime.date.today() == date_obj:
- cssclass += ' today'
-
- # There are no logs for this day, doesn't need special attention
- if date_obj not in self.workout_logs:
- return self.day_cell(cssclass, day)
-
- # Day with a log, set background and link
- entry = self.workout_logs.get(date_obj)
-
- # Note: due to circular imports we use can't import the workout session
- # model to access the impression values directly, so they are hard coded
- # here.
- if entry['session']:
- # Bad
- if entry['session'].impression == '1':
- background_css = 'btn-danger'
- # Good
- elif entry['session'].impression == '3':
- background_css = 'btn-success'
- # Neutral
- else:
- background_css = 'btn-warning'
-
- else:
- background_css = 'btn-warning'
-
- url = reverse('manager:log:log', kwargs={'pk': entry['workout'].id})
- formatted_date = date_obj.strftime('%Y-%m-%d')
- body = []
- body.append(
- f'<a href="{url}" '
- f'data-log="log-{formatted_date}" '
- f'class="btn btn-block {background_css} calendar-link">'
- )
- body.append(repr(day))
- body.append('</a>')
- return self.day_cell(cssclass, ''.join(body))
-
- def formatmonth(self, year, month):
- """
- Format the table header. This is basically the same code from python's
- calendar module but with additional bootstrap classes
- """
- self.year, self.month = year, month
- out = []
- out.append('<table class="month table table-bordered">\n')
- out.append(self.formatmonthname(year, month))
- out.append('\n')
- out.append(self.formatweekheader())
- out.append('\n')
- for week in self.monthdays2calendar(year, month):
- out.append(self.formatweek(week))
- out.append('\n')
- out.append('</table>\n')
- return ''.join(out)
-
- def day_cell(self, cssclass, body):
- """
- Renders a day cell
- """
- return f'<td class="{cssclass}" style="vertical-align: middle;">{body}</td>'
-
-
+def reset_routine_cache(instance: Routine):
+ """Resets all caches related to a routine"""
+ cache.delete(CacheKeyMapper.get_routine_date_sequence_key(instance.id))
+ cache.delete(CacheKeyMapper.get_routine_api_date_sequence_key(instance.id))
+ cache.delete(CacheKeyMapper.get_routine_api_current_iteration_display_key(instance.id))
+ cache.delete(CacheKeyMapper.get_routine_api_structure_key(instance.id))
+ cache.delete(CacheKeyMapper.get_routine_api_stats(instance.id))
diff --cc wger/manager/tests/test_weight_log.py
index fe84078b1,01e7c45f4..dae0227ce
--- a/wger/manager/tests/test_weight_log.py
+++ b/wger/manager/tests/test_weight_log.py
@@@ -75,31 -82,14 +75,14 @@@ class CalendarAccessTestCase(WgerTestCa
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
- self.user_login('test')
- response = self.client.get(url)
- self.assertEqual(response.status_code, 200)
-
- self.user_logout()
- response = self.client.get(url)
- self.assertEqual(response.status_code, 200)
-
def test_access_not_shared(self):
"""
- Test accessing the URL of a unshared calendar page
+ Test accessing the URL of an unshared calendar page
"""
- url = reverse('manager:workout:calendar', kwargs={'username': 'test'})
+ url = reverse('manager:workout:calendar')
- self.user_login('admin')
response = self.client.get(url)
- self.assertEqual(response.status_code, 404)
-
- self.user_login('test')
- response = self.client.get(url)
- self.assertEqual(response.status_code, 200)
-
- self.user_logout()
- response = self.client.get(url)
- self.assertEqual(response.status_code, 404)
+ self.assertEqual(response.status_code, 403)
class WeightLogOverviewAddTestCase(WgerTestCase):
diff --cc wger/manager/views/log.py
index fe5d4c262,8140a0810..ec8816158
--- a/wger/manager/views/log.py
+++ b/wger/manager/views/log.py
@@@ -15,43 -15,50 +15,25 @@@
# You should have received a copy of the GNU Affero General Public License
# Standard Library
--import datetime
import logging
--import uuid
# Django
from django.contrib.auth.mixins import LoginRequiredMixin
- from django.http import HttpResponseForbidden
-from django.forms.models import modelformset_factory
-from django.http import (
- HttpResponseForbidden,
- HttpResponseRedirect,
-)
--from django.shortcuts import (
-- get_object_or_404,
-- render,
--)
++from django.shortcuts import render
from django.urls import reverse
from django.utils.translation import gettext_lazy
from django.views.generic import (
DeleteView,
-- DetailView,
UpdateView,
)
# wger
-from wger.core.models import (
- RepetitionUnit,
- WeightUnit,
-)
-from wger.manager.forms import (
- HelperWorkoutSessionForm,
- WorkoutLogForm,
- WorkoutLogFormHelper,
-)
-from wger.manager.models import (
- Day,
- Workout,
- WorkoutLog,
- WorkoutSession,
-)
+from wger.manager.forms import WorkoutLogForm
- from wger.manager.helpers import WorkoutCalendar
- from wger.manager.models import (
- Schedule,
- Workout,
- WorkoutLog,
- WorkoutSession,
- )
++from wger.manager.models import WorkoutLog
from wger.utils.generic_views import (
WgerDeleteMixin,
WgerFormMixin,
)
- from wger.utils.helpers import check_access
- from wger.weight.helpers import (
- group_log_entries,
- process_log_entries,
- )
-from wger.weight.helpers import process_log_entries
logger = logging.getLogger(__name__)
@@@ -89,50 -96,138 +71,6 @@@ def add(request, pk)
Add a new workout log
"""
- # NOTE: This function is waaaay too complex and convoluted. While updating
- # to crispy forms, the template logic could be reduced a lot, but
- # there is still a lot of optimisations that could happen here.
-
- # Load the day and check ownership
- day = get_object_or_404(Day, pk=pk)
- if day.get_owner_object().user != request.user:
- return HttpResponseForbidden()
-
- # We need several lists here because we need to assign specific form to each
- # exercise: the entries for weight and repetitions have no indicator to which
- # exercise they belong besides the form-ID, from Django's formset
- counter = 0
- total_sets = 0
- exercise_list = {}
- form_to_exercise_base = {}
-
- for set_set in day.set_set.all():
- for exercise in set_set.exercise_bases:
- # Maximum possible values
- total_sets += int(set_set.sets)
- counter_before = counter
- counter = counter + int(set_set.sets) - 1
- form_id_range = range(counter_before, counter + 1)
-
- # Add to list
- exercise_list[exercise.id] = {
- 'obj': exercise,
- 'sets': int(set_set.sets),
- 'form_ids': form_id_range,
- }
-
- counter += 1
- # Helper mapping form-ID <--> Exercise base
- for id in form_id_range:
- form_to_exercise_base[id] = exercise
-
- # Define the formset here because now we know the value to pass to 'extra'
- WorkoutLogFormSet = modelformset_factory(
- WorkoutLog,
- form=WorkoutLogForm,
- exclude=('date', 'workout'),
- extra=total_sets,
- )
- # Process the request
- if request.method == 'POST':
- # Make a copy of the POST data and go through it. The reason for this is
- # that the form expects a value for the exercise which is not present in
- # the form (for space and usability reasons)
- post_copy = request.POST.copy()
-
- for form_id in form_to_exercise_base:
- if post_copy.get('form-%s-weight' % form_id) or post_copy.get('form-%s-reps' % form_id):
- post_copy['form-%s-exercise_base' % form_id] = form_to_exercise_base[form_id].id
-
- # Pass the new data to the forms
- formset = WorkoutLogFormSet(data=post_copy)
- session_form = HelperWorkoutSessionForm(data=post_copy)
-
- # If all the data is valid, save and redirect to log overview page
- if session_form.is_valid() and formset.is_valid():
- log_date = session_form.cleaned_data['date']
-
- if WorkoutSession.objects.filter(user=request.user, date=log_date).exists():
- session = WorkoutSession.objects.get(user=request.user, date=log_date)
- session_form = HelperWorkoutSessionForm(data=post_copy, instance=session)
-
- # Save the Workout Session only if there is not already one for this date
- log_instance = session_form.save(commit=False)
- if not WorkoutSession.objects.filter(user=request.user, date=log_date).exists():
- log_instance.date = log_date
- log_instance.user = request.user
- log_instance.workout = day.training
- else:
- session = WorkoutSession.objects.get(user=request.user, date=log_date)
- log_instance.instance = session
- log_instance.save()
-
- # Log entries (only the ones with actual content)
- log_instances = [i for i in formset.save(commit=False) if i.reps]
- for log_instance in log_instances:
- # Set the weight unit in kg
- if not hasattr(log_instance, 'weight_unit'):
- log_instance.weight_unit = WeightUnit.objects.get(pk=1)
-
- # Set the unit in reps
- if not hasattr(log_instance, 'repetition_unit'):
- log_instance.repetition_unit = RepetitionUnit.objects.get(pk=1)
-
- if not log_instance.weight:
- log_instance.weight = 0
-
- log_instance.user = request.user
- log_instance.workout = day.training
- log_instance.date = log_date
- log_instance.save()
-
- return HttpResponseRedirect(reverse('manager:log:log', kwargs={'pk': day.training_id}))
- else:
- # Initialise the formset with a queryset that won't return any objects
- # (we only add new logs here and that seems to be the fastest way)
- user_weight_unit = 1 if request.user.userprofile.use_metric else 2
- formset = WorkoutLogFormSet(
- queryset=WorkoutLog.objects.none(),
- initial=[
- {'weight_unit': user_weight_unit, 'repetition_unit': 1}
- for x in range(0, total_sets)
- ],
- )
-
- # Depending on whether there is already a workout session for today, update
- # the current one or create a new one (this will be the most usual case)
- if WorkoutSession.objects.filter(user=request.user, date=datetime.date.today()).exists():
- session = WorkoutSession.objects.get(user=request.user, date=datetime.date.today())
- session_form = HelperWorkoutSessionForm(instance=session)
- else:
- session_form = HelperWorkoutSessionForm()
-
- # Pass the correct forms to the exercise list
- for exercise in exercise_list:
- form_id_from = min(exercise_list[exercise]['form_ids'])
- form_id_to = max(exercise_list[exercise]['form_ids'])
- exercise_list[exercise]['forms'] = formset[form_id_from : form_id_to + 1]
-
- context = {
- 'day': day,
- 'exercise_list': exercise_list,
- 'formset': formset,
- 'helper': WorkoutLogFormHelper(),
- 'session_form': session_form,
- 'form': session_form,
- 'form_action': request.path,
- }
+ context = {}
return render(request, 'log/add.html', context)
-
-
- def calendar(request, username=None, year=None, month=None):
- """
- Show a calendar with all the workout logs
- """
- context = {}
- is_owner, user = check_access(request.user, username)
- year = int(year) if year else datetime.date.today().year
- month = int(month) if month else datetime.date.today().month
-
- (current_workout, schedule) = Schedule.objects.get_current_workout(user)
- grouped_log_entries = group_log_entries(user, year, month)
-
- context['calendar'] = WorkoutCalendar(grouped_log_entries).formatmonth(year, month)
- context['logs'] = grouped_log_entries
- context['current_year'] = year
- context['current_month'] = month
- context['current_workout'] = current_workout
- context['owner_user'] = user
- context['is_owner'] = is_owner
- context['impressions'] = WorkoutSession.IMPRESSION
- context['month_list'] = WorkoutLog.objects.filter(user=user).dates('date', 'month')
- return render(request, 'calendar/month.html', context)
-
-
- def day(request, username, year, month, day):
- """
- Show the logs for a single day
- """
- context = {}
- is_owner, user = check_access(request.user, username)
-
- try:
- date = datetime.date(int(year), int(month), int(day))
- except ValueError as e:
- logger.error(f'Error on date: {e}')
- return HttpResponseForbidden()
- context['logs'] = group_log_entries(user, date.year, date.month, date.day)
- context['date'] = date
- context['owner_user'] = user
- context['is_owner'] = is_owner
-
- return render(request, 'calendar/day.html', context)