From c92337fb4dd9d9732d472313ff8f0f0d08cef6d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20H=C3=A1la?= Date: Wed, 24 Jan 2024 19:52:37 +0100 Subject: [PATCH] Further improvements --- backend/locale/cs/LC_MESSAGES/django.po | 26 +- category/forms.py | 11 +- category/locale/cs/LC_MESSAGES/django.po | 66 ++++-- category/models.py | 6 +- category/templates/category/add.html | 19 ++ category/templates/category/list.html | 10 +- category/urls.py | 2 + category/views.py | 50 +++- pdf/generate.py | 3 +- pdf/locale/cs/LC_MESSAGES/django.po | 224 ++++++++++-------- ...er_pdffile_options_alter_pdffile_locale.py | 27 +++ pdf/models/__init__.py | 4 + pdf/models/file.py | 1 + pdf/templates/pdf/requests/list.html | 24 +- pdf/templates/pdf/requests/wait.html | 32 ++- pdf/views.py | 11 +- tenants/menus.py | 4 - tenants/migrations/0004_alter_tenant_icon.py | 15 +- 18 files changed, 363 insertions(+), 172 deletions(-) create mode 100644 pdf/migrations/0028_alter_pdffile_options_alter_pdffile_locale.py diff --git a/backend/locale/cs/LC_MESSAGES/django.po b/backend/locale/cs/LC_MESSAGES/django.po index 3e786b4..da54e2d 100644 --- a/backend/locale/cs/LC_MESSAGES/django.po +++ b/backend/locale/cs/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-26 14:31+0000\n" +"POT-Creation-Date: 2024-02-11 18:00+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -104,53 +104,53 @@ msgstr "Jste si jisti že chcete smazat písničku" msgid "Confirm" msgstr "Potvrdit" -#: backend/templates/songs/index.html:25 +#: backend/templates/songs/index.html:27 msgid "Hide chords" msgstr "Skrýt akordy" -#: backend/templates/songs/index.html:31 +#: backend/templates/songs/index.html:33 msgid "Prevent sleep" msgstr "Zabránit uspání" -#: backend/templates/songs/index.html:37 +#: backend/templates/songs/index.html:39 msgid "Single page" msgstr "Bez stránek" -#: backend/templates/songs/index.html:62 +#: backend/templates/songs/index.html:64 msgid "Actions" msgstr "Akce" -#: backend/templates/songs/index.html:67 +#: backend/templates/songs/index.html:69 msgid "Edit" msgstr "Editor" -#: backend/templates/songs/index.html:70 +#: backend/templates/songs/index.html:72 msgid "Delete" msgstr "Smazat" -#: backend/templates/songs/index.html:84 +#: backend/templates/songs/index.html:86 msgid "Transpose" msgstr "Transponovat" -#: backend/templates/songs/index.html:103 +#: backend/templates/songs/index.html:105 msgid "Search" msgstr "Vyhledávání" -#: backend/templates/songs/index.html:105 +#: backend/templates/songs/index.html:107 msgid "Number, text or author" msgstr "Číslo, text nebo autor" -#: backend/views.py:92 +#: backend/views.py:101 #, python-format msgid "Song %(name)s was successfully created" msgstr "Písnička %(name)s byla úspěšně přidána" -#: backend/views.py:115 +#: backend/views.py:124 #, python-format msgid "Song %(name)s was successfully updated" msgstr "Písnička %(name)s byla úspěšně upravena" -#: backend/views.py:131 +#: backend/views.py:140 #, python-format msgid "Song %s was successfully deleted" msgstr "Písnička %s byla úspěšně odstraněna" diff --git a/category/forms.py b/category/forms.py index 88fc1a4..3fa2624 100644 --- a/category/forms.py +++ b/category/forms.py @@ -4,6 +4,7 @@ from django.utils.translation import gettext_lazy as _ from category.models import Category +from pdf.models import PDFRequest from tenants.models import Tenant @@ -14,7 +15,15 @@ class CategoryForm(ModelForm): class Meta: model = Category - fields = "__all__" + fields = ["name", "slug", "generate_pdf", "tenant"] + + +class CategoryRequestForm(ModelForm): + """Form used for modifying category PDF generation options""" + + class Meta: + model = PDFRequest + fields = ["public", "locale", "title", "show_date", "image", "margin", "link"] class NameForm(Form): diff --git a/category/locale/cs/LC_MESSAGES/django.po b/category/locale/cs/LC_MESSAGES/django.po index 751ca52..032c697 100644 --- a/category/locale/cs/LC_MESSAGES/django.po +++ b/category/locale/cs/LC_MESSAGES/django.po @@ -3,12 +3,11 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-26 14:31+0000\n" +"POT-Creation-Date: 2024-02-11 19:44+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n " "<= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n" -#: category/admin.py:21 category/forms.py:43 +#: category/admin.py:21 category/forms.py:39 msgid "Tenant" msgstr "Do Zpěvníku" @@ -27,28 +26,28 @@ msgstr "Do Zpěvníku" msgid "Move Category to a different Tenant" msgstr "Přesunout Kategorie do jiného Zpěvníku" -#: category/models.py:14 category/templates/category/list.html:11 +#: category/models.py:16 category/templates/category/list.html:11 msgid "Name" msgstr "Jméno" -#: category/models.py:15 category/templates/category/list.html:12 +#: category/models.py:17 category/templates/category/list.html:12 msgid "URL pattern" msgstr "URL vzor" -#: category/models.py:17 category/templates/category/list.html:13 +#: category/models.py:24 category/templates/category/list.html:13 msgid "PDF generation" -msgstr "Automatické Generování PDF" +msgstr "Automatické generování PDF souboru" -#: category/models.py:18 +#: category/models.py:25 msgid "Should the PDF file be automatically generated when a song changes?" msgstr "" "Má být vygenerován pdf soubor když se nějaká písnička z kategorie změní?" -#: category/models.py:25 +#: category/models.py:32 msgid "Category" msgstr "Kategorie" -#: category/models.py:26 category/templates/admin/category/migrate.html:6 +#: category/models.py:33 category/templates/admin/category/migrate.html:6 #: category/templates/category/list.html:4 #: category/templates/category/list.html:5 msgid "Categories" @@ -63,11 +62,19 @@ msgstr "Přesun kategorii do jiného Zpěvníku" msgid "To Tenant" msgstr "Do Tenanta" -#: category/templates/category/add.html:4 #: category/templates/category/add.html:5 +#: category/templates/category/add.html:6 msgid "Category Editor" msgstr "Editor Kategorie" +#: category/templates/category/add.html:13 +msgid "PDF Options" +msgstr "Nastavení PDF" + +#: category/templates/category/add.html:15 +msgid "Submit" +msgstr "Odeslat" + #: category/templates/category/confirm_delete.html:5 #: category/templates/category/confirm_delete.html:6 msgid "Please confirm removal" @@ -93,7 +100,7 @@ msgstr "Jazyk" #: category/templates/category/list.html:15 msgid "Actions" -msgstr "" +msgstr "Akce" #: category/templates/category/list.html:27 msgid "Edit" @@ -101,45 +108,58 @@ msgstr "Upravit" #: category/templates/category/list.html:29 msgid "Toggle Dropdown" -msgstr "" +msgstr "Rozbalovací menu" #: category/templates/category/list.html:34 +#: category/templates/category/list.html:36 msgid "Already in queue" msgstr "Již ve frontě" -#: category/templates/category/list.html:36 -msgid "Regenerate" -msgstr "Přegenerovat" +#: category/templates/category/list.html:38 +#| msgid "Regenerate" +msgid "Generate PDF" +msgstr "Vygenerovat PDF" -#: category/templates/category/list.html:39 +#: category/templates/category/list.html:41 msgid "Delete" msgstr "Smazat" -#: category/templates/category/list.html:48 +#: category/templates/category/list.html:50 msgid "Add Category" msgstr "Přidat Kategorii" -#: category/views.py:36 +#: category/views.py:42 #, python-format msgid "Category with url /%(slug)s does not exist" msgstr "Kategorie s url /%(slug)s neexistuje" -#: category/views.py:65 +#: category/views.py:75 #, python-format msgid "Category %(name)s was successfully created" msgstr "Kategorie %(name)s byla úspěšně vytvořena" -#: category/views.py:82 +#: category/views.py:105 #, python-format msgid "Category %(name)s was successfully updated" msgstr "Kategorie %(name)s byla úspěšně upravena" -#: category/views.py:103 +#: category/views.py:138 #, python-format msgid "Category %s was successfully staged for PDF generation" msgstr "PDF pro Kategorii %s bylo přidáno do fronty" -#: category/views.py:114 +#: category/views.py:149 #, python-format msgid "Category %(name)s was successfully deleted" msgstr "Kategorie %(name)s byla úspěšně smazána" + +#: category/views.py:240 +#, python-format +msgid "Category %(name)s PDF generation is already pending " +msgstr "PDF pro Kategorie %(name)s je už naplánované" + +#: category/views.py:246 +#, python-format +#| msgid "Category %s was successfully staged for PDF generation" +msgid "Category %(name)s was scheduled for generation" +msgstr "PDF pro %(name)s bylo přidána do fronty" diff --git a/category/models.py b/category/models.py index 6754d3e..3d10540 100644 --- a/category/models.py +++ b/category/models.py @@ -5,8 +5,7 @@ from django.dispatch import receiver from django.utils.translation import gettext_lazy as _ -from pdf.models import PDFRequest -from pdf.models.request import RequestType +from pdf.models import PDFRequest, RequestType from tenants.models import Tenant @@ -35,8 +34,9 @@ class Meta: unique_together = [["tenant", "slug"], ["tenant", "name"]] +# pylint: disable=unused-argument @receiver(post_save, sender=Category) -def create_pdf_request(_, instance, created, **kwargs): +def create_pdf_request(signal, instance, created, **kwargs): """Generates a new PDFRequest for new category if not present""" if created: if not hasattr(instance, "request"): diff --git a/category/templates/category/add.html b/category/templates/category/add.html index 3e24aff..2548bdd 100644 --- a/category/templates/category/add.html +++ b/category/templates/category/add.html @@ -1,5 +1,24 @@ {% extends "base/form.html" %} {% load i18n %} +{% load django_bootstrap5 %} {% block title %} {% trans "Category Editor" %} {% endblock %} {% block header %} {% trans "Category Editor" %} {% endblock %} + +{% block framed_body %} +
+ {% csrf_token %} + {% bootstrap_form form layout='horizontal' %} +
+

{% trans "PDF Options" %}

+ {% bootstrap_form request_form layout='horizontal' %} + {% bootstrap_button _("Submit") button_type="submit" %} +
+ {{ form.media }} + +{% endblock %} \ No newline at end of file diff --git a/category/templates/category/list.html b/category/templates/category/list.html index 72ff30e..041e543 100644 --- a/category/templates/category/list.html +++ b/category/templates/category/list.html @@ -21,7 +21,7 @@ {{ category.name }} {% url "category:index" slug=category.slug %} {% if category.generate_pdf %}{% trans "Yes" %}{% else %}{% trans "No" %}{% endif %} - {{ category.locale }} + {{ category.request.locale }}
{% trans "Edit" %} @@ -30,10 +30,12 @@
  • - {% if category.id in already_staged %} - {% trans "Already in queue" %} + {% if category.request.status == "SC" %} + {% trans "Already in queue" %} ({{ category.request.scheduled_at|time }}) + {% elif category.request.status == "QU" %} + {% trans "Already in queue" %} {% else %} - {% trans "Regenerate" %} + {% trans "Generate PDF" %} {% endif %}
  • {% trans "Delete" %}
    • diff --git a/category/urls.py b/category/urls.py index f4e2851..da6d11c 100644 --- a/category/urls.py +++ b/category/urls.py @@ -10,6 +10,7 @@ CategoryDeleteView, CategoryRegeneratePDFView, CategoryMoveView, + CategoryGenerateView, ) urlpatterns = [ @@ -20,4 +21,5 @@ path("regenerate/", CategoryRegeneratePDFView.as_view(), name="regenerate"), path("move", CategoryMoveView.as_view(), name="move"), path("", CategorySongsListView.as_view(), name="index"), + path("generate/", CategoryGenerateView.as_view, name="generate"), ] diff --git a/category/views.py b/category/views.py index 72145eb..873e534 100644 --- a/category/views.py +++ b/category/views.py @@ -20,6 +20,8 @@ from backend.mixins import RegenerateViewMixin, LocalAdminRequired, SuperAdminRequired from category.forms import CategoryForm, NameForm, ChooseTenantForm from category.models import Category +from pdf.forms import RequestForm +from pdf.generate import generate_pdf_job from pdf.models.request import PDFRequest, RequestType, Status from pdf.utils import request_pdf_regeneration @@ -59,7 +61,7 @@ def get_context_data(self, *, object_list=None, **kwargs): ctx = super().get_context_data(object_list=object_list, **kwargs) ctx["already_staged"] = PDFRequest.objects.filter( type=RequestType.EVENT, status__in=[Status.QUEUED, Status.SCHEDULED], tenant=self.request.tenant - ).values_list("category_id", flat=True) + ).values_list("category__id", flat=True) return ctx @@ -75,6 +77,19 @@ class CategoryCreateView(LocalAdminRequired, SuccessMessageMixin, CreateView): def get_initial(self): return {"tenant": self.request.tenant} + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context["request_form"] = RequestForm(prefix="category") + return context + + def form_valid(self, form): + request_form = RequestForm(data=self.request.POST, prefix="category") + if not request_form.is_valid(): + return self.form_invalid(form) + request_form.save() + form.instance.request = request_form.instance + return super().form_valid(form) + def get_success_message(self, cleaned_data): cache.delete(settings.CATEGORY_CACHE_KEY) return super().get_success_message(cleaned_data) @@ -89,6 +104,18 @@ class CategoryUpdateView(LocalAdminRequired, SuccessMessageMixin, RegenerateView success_url = reverse_lazy("category:list") success_message = _("Category %(name)s was successfully updated") + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context["request_form"] = RequestForm(instance=self.object.request, prefix="category") + return context + + def form_valid(self, form): + request_form = RequestForm(data=self.request.POST, instance=self.object.request, prefix="category") + if not request_form.is_valid(): + return self.form_invalid(form) + request_form.save() + return super().form_valid(form) + def post(self, request, *args, **kwargs): response = super().post(request, *args, **kwargs) if self.regenerate: @@ -197,3 +224,24 @@ def post(self, request, *args, **kwargs): self.action(tenant, ids) return redirect("admin:index") return self.render_to_response({"form": form, "formset": formset}) + + +class CategoryGenerateView(LocalAdminRequired, View, SingleObjectMixin): + """Regenerates PDF request for this category""" + + model = Category + + # pylint: disable=invalid-name, unused-argument + def get(self, request, pk): + """Processes the request""" + category = self.get_object() + obj = category.request + if obj.status in (Status.QUEUED, Status.SCHEDULED): + messages.error(request, _("Category %(name)s PDF generation is already pending ") % {"name": category.name}) + return redirect("category:list") + obj.status = Status.QUEUED + obj.save() + generate_pdf_job(obj) + + messages.success(request, _("Category %(name)s was scheduled for generation") % {"name": category.name}) + return redirect("category:list") diff --git a/pdf/generate.py b/pdf/generate.py index 6d4b835..be59643 100644 --- a/pdf/generate.py +++ b/pdf/generate.py @@ -26,8 +26,7 @@ from weasyprint.logger import PROGRESS_LOGGER from pdf.locales import changed_locale, lang_to_locale -from pdf.models import PDFFile -from pdf.models.request import PDFRequest, Status +from pdf.models import PDFRequest, Status, PDFFile logger = logging.getLogger(__name__) logger.setLevel(logging.INFO) diff --git a/pdf/locale/cs/LC_MESSAGES/django.po b/pdf/locale/cs/LC_MESSAGES/django.po index e72fb61..b80848f 100644 --- a/pdf/locale/cs/LC_MESSAGES/django.po +++ b/pdf/locale/cs/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-26 14:31+0000\n" +"POT-Creation-Date: 2024-02-11 19:44+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,110 +45,114 @@ msgstr "PDF požadavky" msgid "Files" msgstr "Soubory" -#: pdf/models/__init__.py:14 -msgid "Filename of the generated PDF, please do not include .pdf" -msgstr "Název vygenerovaného PDF, prosím piště bez přípony .pdf" - -#: pdf/models/__init__.py:15 -msgid "File name" -msgstr "Název souboru" - -#: pdf/models/__init__.py:19 +#: pdf/models/file.py:43 pdf/models/request.py:65 msgid "True, if the file should be public" msgstr "Zaškrkněte, pokud chcete aby byl PDF soubor veřejně viditelný" -#: pdf/models/__init__.py:20 +#: pdf/models/file.py:44 pdf/models/request.py:66 msgid "Public file" msgstr "Veřejný soubor" -#: pdf/models/__init__.py:24 +#: pdf/models/file.py:48 pdf/models/request.py:70 msgid "Language" msgstr "Jazyk" -#: pdf/models/__init__.py:26 +#: pdf/models/file.py:50 pdf/models/request.py:72 msgid "Language to be used in the generated PDF" msgstr "Jazyk pro použití ve vygenerovaných PDF" -#: pdf/models/__init__.py:31 +#: pdf/models/file.py:59 pdf/models/file.py:60 +msgid "PDFFile" +msgstr "Soubor" + +#: pdf/models/request.py:35 pdf/templates/pdf/requests/list.html:29 +msgid "Automated" +msgstr "Automaticky" + +#: pdf/models/request.py:36 pdf/templates/pdf/requests/list.html:26 +msgid "Manual" +msgstr "Manuální" + +#: pdf/models/request.py:42 +msgid "Queued" +msgstr "Ve frontě" + +#: pdf/models/request.py:43 +msgid "Scheduled" +msgstr "Naplánováno" + +#: pdf/models/request.py:44 +msgid "In progress" +msgstr "Generuje se" + +#: pdf/models/request.py:45 +msgid "Done" +msgstr "Hotovo" + +#: pdf/models/request.py:46 +msgid "Failed" +msgstr "Selhalo" + +#: pdf/models/request.py:60 +msgid "Filename of the generated PDF, please do not include .pdf" +msgstr "Název vygenerovaného PDF, prosím piště bez přípony .pdf" + +#: pdf/models/request.py:61 +msgid "File name" +msgstr "Název souboru" + +#: pdf/models/request.py:77 msgid "Name to be used on the title page of the PDF" msgstr "Jméno pro titulní stranu pdf souboru" -#: pdf/models/__init__.py:32 pdf/templates/pdf/requests/list.html:36 -#: pdf/templates/pdf/requests/wait.html:74 +#: pdf/models/request.py:78 pdf/templates/pdf/requests/list.html:38 +#: pdf/templates/pdf/requests/list.html:100 +#: pdf/templates/pdf/requests/wait.html:99 msgid "Title" msgstr "Titulek" -#: pdf/models/__init__.py:36 +#: pdf/models/request.py:82 msgid "Show date" msgstr "Vložit datum" -#: pdf/models/__init__.py:37 +#: pdf/models/request.py:83 msgid "True, if the date should be included in the final PDF" msgstr "Zaškrkněte, pokud chcete aby v PDF souboru bylo datum" -#: pdf/models/__init__.py:40 +#: pdf/models/request.py:86 msgid "Title Image" msgstr "Úvodní obrázek" -#: pdf/models/__init__.py:41 +#: pdf/models/request.py:87 msgid "Optional title image of the songbook" msgstr "Volitelný obrázek na úvodní stránku " -#: pdf/models/__init__.py:47 +#: pdf/models/request.py:93 msgid "Title Image margins" msgstr "Odsazení úvodního obrázku" -#: pdf/models/__init__.py:48 +#: pdf/models/request.py:94 msgid "Margins for title image, might be needed for some printers" msgstr "" "Odsazení obrázku na titulní stránce, může být nutné pro některé tiskárny" -#: pdf/models/__init__.py:54 +#: pdf/models/request.py:100 msgid "Link to include in the PDF" msgstr "Odkaz, který bude v PDF" -#: pdf/models/__init__.py:55 pdf/templates/pdf/requests/list.html:41 -#: pdf/templates/pdf/requests/wait.html:91 +#: pdf/models/request.py:101 pdf/templates/pdf/requests/wait.html:115 msgid "Link" msgstr "Odkaz" -#: pdf/models/request.py:36 pdf/templates/pdf/requests/list.html:23 -msgid "Automated" -msgstr "Automaticky" - -#: pdf/models/request.py:37 pdf/templates/pdf/requests/list.html:20 -msgid "Manual" -msgstr "Manuální" - -#: pdf/models/request.py:43 -msgid "Queued" -msgstr "Ve frontě" - -#: pdf/models/request.py:44 -msgid "Scheduled" -msgstr "Naplánováno" - -#: pdf/models/request.py:45 -msgid "In progress" -msgstr "Generuje se" - -#: pdf/models/request.py:46 -msgid "Done" -msgstr "Hotovo" - -#: pdf/models/request.py:47 -msgid "Failed" -msgstr "Selhalo" - -#: pdf/models/request.py:78 pdf/templates/admin/pdf/migrate.html:6 +#: pdf/models/request.py:153 pdf/templates/admin/pdf/migrate.html:6 msgid "PDFRequest" msgstr "PDF požadavek" -#: pdf/models/request.py:79 +#: pdf/models/request.py:154 msgid "PDFRequests" msgstr "PDF požadavky" -#: pdf/models/request.py:101 +#: pdf/models/request.py:178 msgid "Song number" msgstr "Číslo písničky" @@ -161,7 +165,7 @@ msgstr "Přesouvání PDF požadavků do Tenant" msgid "To Tenant" msgstr "Do Tenanta" -#: pdf/templates/pdf/index.html:45 +#: pdf/templates/pdf/file.html:45 msgid "Table of Contents" msgstr "Obsah" @@ -187,30 +191,34 @@ msgstr "Seřadit podle jména" msgid "Finish" msgstr "Dokončit" -#: pdf/templates/pdf/requests/list.html:28 +#: pdf/templates/pdf/requests/list.html:20 #: pdf/templates/pdf/requests/select.html:21 msgid "Search" msgstr "Hledat" -#: pdf/templates/pdf/requests/list.html:30 +#: pdf/templates/pdf/requests/list.html:22 #: pdf/templates/pdf/requests/select.html:23 msgid "Insert query" msgstr "Vložte text" -#: pdf/templates/pdf/requests/list.html:37 +#: pdf/templates/pdf/requests/list.html:39 +#: pdf/templates/pdf/requests/list.html:101 msgid "Last updated" msgstr "Naposledy změněno" -#: pdf/templates/pdf/requests/list.html:39 -msgid "Type" -msgstr "Typ" - #: pdf/templates/pdf/requests/list.html:40 -#: pdf/templates/pdf/requests/wait.html:87 +#: pdf/templates/pdf/requests/list.html:102 +#: pdf/templates/pdf/requests/wait.html:111 msgid "Status" msgstr "Status" +#: pdf/templates/pdf/requests/list.html:41 +#: pdf/templates/pdf/requests/list.html:103 +msgid "Last File" +msgstr "Poslední soubor" + #: pdf/templates/pdf/requests/list.html:42 +#: pdf/templates/pdf/requests/list.html:104 msgid "Time elapsed" msgstr "Trvání" @@ -219,31 +227,41 @@ msgid "Category" msgstr "Kategorie" #: pdf/templates/pdf/requests/list.html:44 +#: pdf/templates/pdf/requests/list.html:105 msgid "Actions" msgstr "Akce" -#: pdf/templates/pdf/requests/list.html:59 -#: pdf/templates/pdf/requests/list.html:67 +#: pdf/templates/pdf/requests/list.html:55 +#: pdf/templates/pdf/requests/list.html:63 +#: pdf/templates/pdf/requests/list.html:116 +#: pdf/templates/pdf/requests/list.html:123 msgid "None" msgstr "Nic" #: pdf/templates/pdf/requests/list.html:73 -msgid "Regenerate" -msgstr "Přegenerovat" - #: pdf/templates/pdf/requests/list.html:75 +#: pdf/templates/pdf/requests/list.html:130 +#: pdf/templates/pdf/requests/list.html:132 msgid "Already in queue" msgstr "Již ve frontě" -#: pdf/templates/pdf/requests/list.html:78 +#: pdf/templates/pdf/requests/list.html:77 +#: pdf/templates/pdf/requests/list.html:134 +#| msgid "Create PDF" +msgid "Generate PDF" +msgstr "Vytvořit PDF" + +#: pdf/templates/pdf/requests/list.html:81 +#: pdf/templates/pdf/requests/list.html:137 msgid "Toggle Dropdown" msgstr "Otevřít menu" -#: pdf/templates/pdf/requests/list.html:83 +#: pdf/templates/pdf/requests/list.html:85 +#: pdf/templates/pdf/requests/list.html:142 msgid "Delete File" msgstr "Odstranit soubor" -#: pdf/templates/pdf/requests/list.html:85 +#: pdf/templates/pdf/requests/list.html:144 msgid "No file present" msgstr "Nemá soubor" @@ -263,85 +281,97 @@ msgstr "Zrušit výběr" msgid "Finish selecting" msgstr "Dokončit výběr" -#: pdf/templates/pdf/requests/wait.html:6 #: pdf/templates/pdf/requests/wait.html:7 +#: pdf/templates/pdf/requests/wait.html:8 #, python-format msgid "Waiting for render of %(filename)s.pdf" msgstr "Čekání na vygenerování %(filename)s.pdf" -#: pdf/templates/pdf/requests/wait.html:12 +#: pdf/templates/pdf/requests/wait.html:13 msgid "HTML Generation" msgstr "Tvorba HTML" -#: pdf/templates/pdf/requests/wait.html:13 +#: pdf/templates/pdf/requests/wait.html:14 msgid "Parsing HTML" msgstr "Zpracovávání HTML" -#: pdf/templates/pdf/requests/wait.html:14 +#: pdf/templates/pdf/requests/wait.html:15 msgid "Parsing CSS" msgstr "Zpracovávání CSS" -#: pdf/templates/pdf/requests/wait.html:15 +#: pdf/templates/pdf/requests/wait.html:16 msgid "Applying CSS" msgstr "Aplikace CSS pravidel" -#: pdf/templates/pdf/requests/wait.html:16 +#: pdf/templates/pdf/requests/wait.html:17 msgid "Creating formatting structure" msgstr "Vytváření formátovací struktury" -#: pdf/templates/pdf/requests/wait.html:17 +#: pdf/templates/pdf/requests/wait.html:18 msgid "Generating layout" msgstr "Generování rozložení" -#: pdf/templates/pdf/requests/wait.html:18 +#: pdf/templates/pdf/requests/wait.html:19 msgid "Creating PDF" msgstr "Vytvořit PDF" -#: pdf/templates/pdf/requests/wait.html:19 +#: pdf/templates/pdf/requests/wait.html:20 msgid "Adding PDF metadata" msgstr "Přidávání metadat do PDF" -#: pdf/templates/pdf/requests/wait.html:73 +#: pdf/templates/pdf/requests/wait.html:38 +msgid "Waiting for work to start" +msgstr "Čekání na záčátek generování" + +#: pdf/templates/pdf/requests/wait.html:46 +#, python-format +msgid "Scheduled at %%datetime." +msgstr "Naplánováno na %%datetime." + +#: pdf/templates/pdf/requests/wait.html:48 +msgid "" +"Generation should have already started, please contact server administrator" +msgstr "Generování mělo už začít, prosím kontaktujte administrátora serveru" + +#: pdf/templates/pdf/requests/wait.html:98 msgid "No title" msgstr "Bez nadpisu" -#: pdf/templates/pdf/requests/wait.html:78 +#: pdf/templates/pdf/requests/wait.html:103 msgid "Progress" msgstr "Postup" -#: pdf/utils.py:67 -msgid "songbook" -msgstr "zpevnik" - -#: pdf/views.py:45 +#: pdf/views.py:51 #, python-format msgid "Request %(id)s is already in queue" msgstr "Požadavek %(id)s je již ve frontě" -#: pdf/views.py:51 +#: pdf/views.py:57 #, python-format -msgid "Request %(id)s was scheduled for regeneration" -msgstr "Požadavek %(id)s byl označen k přegenerování" +#| msgid "Request %(id)s was scheduled for regeneration" +msgid "Request %(id)s was scheduled for PDF generation" +msgstr "Tvorba PDF z Požadavku %(id)s byla naplánována" -#: pdf/views.py:67 +#: pdf/views.py:73 #, python-format msgid "Unable to remove file from request %(id)s that doesn't have one" msgstr "Nepodařilo se odstranit soubor z požadavku %(id)s, protože žádný nemá" -#: pdf/views.py:74 +#: pdf/views.py:80 #, python-format msgid "File %(name)s was successfully deleted" msgstr "Soubor %(name)s byl úspěšně odstraněn" -#: pdf/views.py:111 +#: pdf/views.py:117 msgid "Required parameters not found" msgstr "Požadované parametry nenalezeny" -#: pdf/views.py:116 +#: pdf/views.py:122 msgid "You need to select at least one song" msgstr "Musíte vybrat alespoň jednu písničku" -#: pdf/views.py:141 +#: pdf/views.py:147 #, python-format msgid "PDF Request with id %(id)s was successfully created" msgstr "PDF požadavek se id %(id)s byl úspěšně vytvořen" + diff --git a/pdf/migrations/0028_alter_pdffile_options_alter_pdffile_locale.py b/pdf/migrations/0028_alter_pdffile_options_alter_pdffile_locale.py new file mode 100644 index 0000000..43126e6 --- /dev/null +++ b/pdf/migrations/0028_alter_pdffile_options_alter_pdffile_locale.py @@ -0,0 +1,27 @@ +# Generated by Django 5.0.2 on 2024-02-11 19:08 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("pdf", "0027_constraints"), + ] + + operations = [ + migrations.AlterModelOptions( + name="pdffile", + options={"verbose_name": "PDFFile", "verbose_name_plural": "PDFFile"}, + ), + migrations.AlterField( + model_name="pdffile", + name="locale", + field=models.CharField( + choices=[("en", "English"), ("cs", "Česky")], + help_text="Language to be used in the generated PDF", + max_length=5, + verbose_name="Language", + ), + ), + ] diff --git a/pdf/models/__init__.py b/pdf/models/__init__.py index e69de29..3523efd 100644 --- a/pdf/models/__init__.py +++ b/pdf/models/__init__.py @@ -0,0 +1,4 @@ +"""Root module for PDF related models""" + +from .request import PDFRequest, Status, RequestType +from .file import PDFFile diff --git a/pdf/models/file.py b/pdf/models/file.py index a13e3c2..d67fef9 100644 --- a/pdf/models/file.py +++ b/pdf/models/file.py @@ -1,4 +1,5 @@ """Module containing file wrapper database objects""" + import os from datetime import datetime diff --git a/pdf/templates/pdf/requests/list.html b/pdf/templates/pdf/requests/list.html index 8be2f84..e9c918b 100644 --- a/pdf/templates/pdf/requests/list.html +++ b/pdf/templates/pdf/requests/list.html @@ -69,23 +69,23 @@
    - {% if request.status != "QU" and requests.status != "SC" %} - {% trans "Regenerate" %} + {% if request.status == "SC" %} + {% trans "Already in queue" %} ({{ request.scheduled_at|time }}) + {% elif request.status == "QU" %} + {% trans "Already in queue" %} {% else %} - + {% trans "Generate PDF" %} {% endif %} + {% if request.file %} + {% endif %}
    @@ -100,7 +100,7 @@ {% trans "Title" %} {% trans "Last updated" %} {% trans "Status" %} - {% trans "Link" %} + {% trans "Last File" %} {% trans "Time elapsed" %} {% trans "Actions" %} @@ -126,10 +126,12 @@ {{ request.get_latest.time_elapsed|default_if_none:0 }} s
    - {% if request.status != "QU" and requests.status != "SC" %} - {% trans "Regenerate" %} + {% if request.status == "SC" %} + {% trans "Already in queue" %} ({{ request.scheduled_at|time }}) + {% elif request.status == "QU" %} + {% trans "Already in queue" %} {% else %} - + {% trans "Generate PDF" %} {% endif %}