Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into feature/remove-calendar
Roland Geiderd353136ffaf5
diff --cc wger/manager/views/log.pyindex 8cf06321a,ba15750af..a8648708e--- a/wger/manager/views/log.py+++ b/wger/manager/views/log.py@@@ -58,9 -66,13 +58,8 @@@ from wger.utils.generic_views importWgerDeleteMixin,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__)@@@ -218,7 -230,7 +217,7 @@@ def add(request, pk)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]++ exercise_list[exercise]['forms'] = formset[form_id_from: form_id_to + 1]context = {'day': day,@@@ -231,71 -243,47 +230,3 @@@}return render(request, 'log/add.html', context)----- class WorkoutLogDetailView(DetailView, LoginRequiredMixin):-def calendar(request, username=None, year=None, month=None):-- """- An overview of the workout's log- Show a calendar with all the workout logs-- """-- model = Workout- template_name = 'workout/log.html'- context_object_name = 'workout'- owner_user = None-- def get_context_data(self, **kwargs):- # Call the base implementation first to get a context- context = super(WorkoutLogDetailView, self).get_context_data(**kwargs)- is_owner = self.owner_user == self.request.user-- # Prepare the entries for rendering and the D3 chart- workout_log = {}-- for day_obj in self.object.day_set.all():- day_id = day_obj.id- workout_log[day_id] = {}- for set_obj in day_obj.set_set.all():- exercise_log = {}- for base_obj in set_obj.exercise_bases:- exercise_base_id = base_obj.id- exercise_log[exercise_base_id] = []-- # Filter the logs for user and exclude all units that are not weight- logs = base_obj.workoutlog_set.filter(- user=self.owner_user,- weight_unit__in=(1, 2),- repetition_unit=1,- workout=self.object,- )- entry_log, chart_data = process_log_entries(logs)- if entry_log:- exercise_log[base_obj.id].append(entry_log)-- if exercise_log:- workout_log[day_id][exercise_base_id] = {}- workout_log[day_id][exercise_base_id]['log_by_date'] = entry_log- workout_log[day_id][exercise_base_id]['div_uuid'] = 'div-' + str(- uuid.uuid4()- )- workout_log[day_id][exercise_base_id]['chart_data'] = chart_data- 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--- context['workout_log'] = workout_log- context['owner_user'] = self.owner_user- context['is_owner'] = is_owner- (current_workout, schedule) = Schedule.objects.get_current_workout(user)- grouped_log_entries = group_log_entries(user, year, month)--- return context- 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 dispatch(self, request, *args, **kwargs):- """- Check for ownership- """--- workout = get_object_or_404(Workout, pk=kwargs['pk'])- self.owner_user = workout.user- is_owner = request.user == self.owner_user-def day(request, username, year, month, day):- """- Show the logs for a single day- """- context = {}- is_owner, user = check_access(request.user, username)--- if not is_owner and not self.owner_user.userprofile.ro_access:- return HttpResponseForbidden()- 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--- # Dispatch normally- return super(WorkoutLogDetailView, self).dispatch(request, *args, **kwargs)- return render(request, 'calendar/day.html', context)