diff --git a/biscuit/apps/chronos/urls.py b/biscuit/apps/chronos/urls.py index e807a489f04da32e78cdc4cb3018b48a14301ef4..8018e9a9d7387a8a5d4ad7f696cd8605e3a77c71 100755 --- a/biscuit/apps/chronos/urls.py +++ b/biscuit/apps/chronos/urls.py @@ -22,8 +22,8 @@ try: path('substitutions/', views.substitutions, name='timetable_substitutions'), path('substitutions/<int:year>/<int:month>/<int:day>/', views.substitutions, name='timetable_substitutions_date'), - path('class.pdf', views.sub_pdf, name="timetable_substitutions_pdf"), - path('<str:plan_date>-class.pdf', views.sub_pdf, name="timetable_substitutions_pdf_date") + path('aktuell.pdf', views.sub_pdf, name="timetable_substitutions_pdf"), + path('<str:plan_date>-aktuell.pdf', views.sub_pdf, name="timetable_substitutions_pdf_date") ] except (Terms.DoesNotExist, Schoolyear.DoesNotExist): @@ -45,5 +45,5 @@ except (Terms.DoesNotExist, Schoolyear.DoesNotExist): path('substitutions/', fallback_view.fallback, name='timetable_substitutions'), path('substitutions/<int:year>/<int:month>/<int:day>/', fallback_view.fallback, name='timetable_substitutions_date'), - path('class.pdf', fallback_view.fallback, name="timetable_substitutions_pdf") + path('aktuell.pdf', fallback_view.fallback, name="timetable_substitutions_pdf") ] diff --git a/biscuit/apps/chronos/views.py b/biscuit/apps/chronos/views.py index 319e374d48e522ce57267aa824801fde99876bc6..d9062d5fdde91f42e301a57d9959fbebee0944eb 100755 --- a/biscuit/apps/chronos/views.py +++ b/biscuit/apps/chronos/views.py @@ -338,13 +338,13 @@ def sub_pdf(request, plan_date=None): # Merge PDFs try: merger = PdfFileMerger() - class0 = open(os.path.join(BASE_DIR, "latex", "class0.pdf"), "rb") - class1 = open(os.path.join(BASE_DIR, "latex", "class1.pdf"), "rb") + class0 = open(os.path.join(BASE_DIR, "latex", "aktuell0.pdf"), "rb") + class1 = open(os.path.join(BASE_DIR, "latex", "aktuell1.pdf"), "rb") merger.append(fileobj=class0) merger.append(fileobj=class1) - # Write merged PDF to class.pdf - output = open(os.path.join(BASE_DIR, "latex", "class.pdf"), "wb") + # Write merged PDF to aktuell.pdf + output = open(os.path.join(BASE_DIR, "latex", "aktuell.pdf"), "wb") merger.write(output) output.close() @@ -355,7 +355,7 @@ def sub_pdf(request, plan_date=None): register_traceback("merge_class", "pypdf2") # Read and response PDF - file = open(os.path.join(BASE_DIR, "latex", "class.pdf"), "rb") + file = open(os.path.join(BASE_DIR, "latex", "aktuell.pdf"), "rb") return FileResponse(file, content_type="application/pdf")