diff --git a/rowers/templates/workouts_export_email.html b/rowers/templates/workouts_export_email.html deleted file mode 100644 index 42ced93d..00000000 --- a/rowers/templates/workouts_export_email.html +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "emailbase.html" %} -{% block body %} -

    - You can download the file {{ filename }} from the following link: {{ download_url }}. The file will be deleted after downloading, so please make sure to download it as soon as possible. -

    - - -

    - Best Regards, the Rowsandall Team -

    -{% endblock %} diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index badd3b34ad1d668d4b5cbe5e09887b9468fa7fb7..a3ba1af581198d9007d1bb0452bee681985a3c3a 100644 GIT binary patch delta 16 XcmbO#KUJPxzMF$1Z<5 delta 16 XcmbO#KUJPxzMF$%$*0vD+57kbE(`_0 diff --git a/rowers/urls.py b/rowers/urls.py index b6e01143..3289b01d 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -432,10 +432,6 @@ urlpatterns = [ views.graphs_view, name='graphs_view'), re_path(r'^createmarkerworkouts/user/(?P\d+)/$', views.create_marker_workouts_view, name='create_marker_workouts_view'), - re_path(r'^workouts/alluserworkouts/$', views.export_all_workouts_zip_view, - name='workout_export_all_workouts_zip_view'), - re_path(r'^workouts/download/$', views.download_zip_file_view, - name='download_zip_file_view'), re_path(r'^createmarkerworkouts/$', views.create_marker_workouts_view, name='create_marker_workouts_view'), re_path(r'^goldmedalscores/$', views.goldmedalscores_view, diff --git a/rowers/views/exportviews.py b/rowers/views/exportviews.py index e2aa4a00..0a4a0151 100644 --- a/rowers/views/exportviews.py +++ b/rowers/views/exportviews.py @@ -252,53 +252,6 @@ def workout_csvemail_view(request, id=0): return response -import io - -# Export all workouts as ZIP file with individual CSV files -@login_required() -def export_all_workouts_zip_view(request): - from datetime import datetime - r = getrower(request.user) - - if request.method == 'GET': - form = DateRangeForm() - elif request.method == 'POST': - form = DateRangeForm(request.POST) - if not form.is_valid(): - messages.error(request, "Invalid date range. Please try again.") - return render(request, "export_workouts_daterange.html", {'form': form}) - - startdate = form.cleaned_data['startdate'] - enddate = form.cleaned_data['enddate'] - - myqueue(queuehigh, email_all_user_workouts_zip, r, startdate, enddate) - - successmessage = "A download link will be sent to you per email" - messages.info(request, successmessage) - - # return to export settings view - return render(request, "export_workouts_daterange.html", {'form': form}) - -def download_zip_file_view(request): - # This view would be called when the user clicks the download link in the email - zip_file_path = request.GET.get('file') - print("Requested ZIP file path:", zip_file_path) # Debugging statement - # add media folder - zip_file_path = os.path.join(settings.MEDIA_ROOT, zip_file_path) - - if not zip_file_path or not os.path.exists(zip_file_path): - messages.error(request, "The requested file does not exist.") - return HttpResponseRedirect(reverse('workouts_view')) - - with open(zip_file_path, 'rb') as f: - response = HttpResponse(f.read(), content_type='application/zip') - response['Content-Disposition'] = f'attachment; filename="{os.path.basename(zip_file_path)}"' - - # remove the file after sending - os.remove(zip_file_path) - - return response - # Get Workout CSV file and send it to user's email address @login_required() @@ -323,5 +276,3 @@ def workout_csvtoadmin_view(request, id=0): # pragma: no cover response = HttpResponseRedirect(url) return response - - diff --git a/rowers/views/statements.py b/rowers/views/statements.py index b0e8528e..84a62fdb 100644 --- a/rowers/views/statements.py +++ b/rowers/views/statements.py @@ -254,7 +254,6 @@ from rowers.rows import handle_uploaded_file, handle_uploaded_image from rowers.plannedsessions import * from rowers.tasks import handle_makeplot, handle_otwsetpower, handle_sendemailtcx, handle_sendemailcsv from rowers.tasks import ( - email_all_user_workouts_zip, handle_intervals_updateworkout, handle_post_workout_api, handle_sendemail_newftp,