arthexis 0.1.22__py3-none-any.whl → 0.1.24__py3-none-any.whl

pages/tests.py

@@ -109,6 +109,7 @@ from nodes.models import (
     NodeRole,
     NodeFeature,
     NodeFeatureAssignment,
+    NetMessage,
 )
 from django.contrib.auth.models import AnonymousUser
 
@@ -721,18 +722,36 @@ class AdminDashboardAppListTests(TestCase):
 
     def test_horologia_hidden_without_celery_feature(self):
         resp = self.client.get(reverse("admin:index"))
-        self.assertNotContains(resp, "5. Horologia MODELS")
+        self.assertNotContains(resp, "5. Horologia</a>")
 
     def test_horologia_visible_with_celery_feature(self):
         feature = NodeFeature.objects.create(slug="celery-queue", display="Celery Queue")
         NodeFeatureAssignment.objects.create(node=self.node, feature=feature)
         resp = self.client.get(reverse("admin:index"))
-        self.assertContains(resp, "5. Horologia MODELS")
+        self.assertContains(resp, "5. Horologia</a>")
 
     def test_horologia_visible_with_celery_lock(self):
         self.celery_lock.write_text("")
         resp = self.client.get(reverse("admin:index"))
-        self.assertContains(resp, "5. Horologia MODELS")
+        self.assertContains(resp, "5. Horologia</a>")
+
+    def test_dashboard_shows_last_net_message(self):
+        NetMessage.objects.all().delete()
+        NetMessage.objects.create(subject="Older", body="First body")
+        NetMessage.objects.create(subject="Latest", body="Signal ready")
+
+        resp = self.client.get(reverse("admin:index"))
+
+        self.assertContains(resp, gettext("Net message"))
+        self.assertContains(resp, "Latest — Signal ready")
+        self.assertNotContains(resp, gettext("No net messages available"))
+
+    def test_dashboard_shows_placeholder_without_net_message(self):
+        NetMessage.objects.all().delete()
+
+        resp = self.client.get(reverse("admin:index"))
+
+        self.assertContains(resp, gettext("No net messages available"))
 
 class AdminSidebarTests(TestCase):
     def setUp(self):
@@ -2083,7 +2102,7 @@ class ControlNavTests(TestCase):
 
     def test_readme_pill_visible(self):
         resp = self.client.get(reverse("pages:readme"))
-        self.assertContains(resp, 'href="/read/"')
+        self.assertContains(resp, 'href="/read/docs/cookbooks/install-start-stop-upgrade-uninstall"')
         self.assertContains(resp, 'badge rounded-pill text-bg-secondary">COOKBOOKS')
 
     def test_cookbook_pill_has_no_dropdown(self):
@@ -2099,7 +2118,7 @@ class ControlNavTests(TestCase):
 
         self.assertContains(
             resp,
-            '<a class="nav-link" href="/read/"><span class="badge rounded-pill text-bg-secondary">COOKBOOKS</span></a>',
+            '<a class="nav-link" href="/read/docs/cookbooks/install-start-stop-upgrade-uninstall"><span class="badge rounded-pill text-bg-secondary">COOKBOOKS</span></a>',
             html=True,
         )
         self.assertNotContains(resp, 'dropdown-item" href="/man/"')
@@ -2205,7 +2224,7 @@ class SatelliteNavTests(TestCase):
 
     def test_readme_pill_visible(self):
         resp = self.client.get(reverse("pages:readme"))
-        self.assertContains(resp, 'href="/read/"')
+        self.assertContains(resp, 'href="/read/docs/cookbooks/install-start-stop-upgrade-uninstall"')
         self.assertContains(resp, 'badge rounded-pill text-bg-secondary">COOKBOOKS')
 
 

pages/urls.py

@@ -17,6 +17,11 @@ urlpatterns = [
     path("sitemap.xml", views.sitemap, name="pages-sitemap"),
     path("release/", views.release_admin_redirect, name="release-admin"),
     path("client-report/", views.client_report, name="client-report"),
+    path(
+        "client-report/download/<int:report_id>/",
+        views.client_report_download,
+        name="client-report-download",
+    ),
     path("release-checklist", views.release_checklist, name="release-checklist"),
     path("login/", views.login_view, name="login"),
     path("authenticator/setup/", views.authenticator_setup, name="authenticator-setup"),

pages/views.py

@@ -16,6 +16,7 @@ from django.contrib import admin
 from django.contrib import messages
 from django.contrib.admin.views.decorators import staff_member_required
 from django.contrib.auth import get_user_model, login
+from django.contrib.auth.decorators import login_required
 from django.contrib.auth.tokens import default_token_generator
 from django.contrib.auth.views import LoginView
 from django import forms
@@ -23,7 +24,14 @@ from django.apps import apps as django_apps
 from utils.decorators import security_group_required
 from utils.sites import get_site
 from django.contrib.staticfiles import finders
-from django.http import FileResponse, Http404, HttpResponse, JsonResponse
+from django.http import (
+    FileResponse,
+    Http404,
+    HttpResponse,
+    HttpResponseForbidden,
+    HttpResponseRedirect,
+    JsonResponse,
+)
 from django.shortcuts import get_object_or_404, redirect, render
 from nodes.models import Node
 from nodes.utils import capture_screenshot, save_screenshot
@@ -58,6 +66,7 @@ from core.models import (
     SecurityGroup,
     Todo,
 )
+from ocpp.models import Charger
 
 try:  # pragma: no cover - optional dependency guard
     from graphviz import Digraph
@@ -1261,6 +1270,25 @@ class ClientReportForm(forms.Form):
         input_formats=["%Y-%m"],
         help_text=_("Generates the report for the calendar month that you select."),
     )
+    language = forms.ChoiceField(
+        label=_("Report language"),
+        choices=settings.LANGUAGES,
+        help_text=_("Choose the language used for the generated report."),
+    )
+    title = forms.CharField(
+        label=_("Report title"),
+        required=False,
+        max_length=200,
+        help_text=_("Optional heading that replaces the default report title."),
+    )
+    chargers = forms.ModelMultipleChoiceField(
+        label=_("Charge points"),
+        queryset=Charger.objects.filter(connector_id__isnull=True)
+        .order_by("display_name", "charger_id"),
+        required=False,
+        widget=forms.CheckboxSelectMultiple,
+        help_text=_("Choose which charge points are included in the report."),
+    )
     owner = forms.ModelChoiceField(
         queryset=get_user_model().objects.all(),
         required=False,
@@ -1280,10 +1308,10 @@ class ClientReportForm(forms.Form):
         initial=ClientReportSchedule.PERIODICITY_NONE,
         help_text=_("Defines how often the report should be generated automatically."),
     )
-    disable_emails = forms.BooleanField(
-        label=_("Disable email delivery"),
+    enable_emails = forms.BooleanField(
+        label=_("Enable email delivery"),
         required=False,
-        help_text=_("Generate files without sending emails."),
+        help_text=_("Send the report via email to the recipients listed above."),
     )
 
     def __init__(self, *args, request=None, **kwargs):
@@ -1291,6 +1319,13 @@ class ClientReportForm(forms.Form):
         super().__init__(*args, **kwargs)
         if request and getattr(request, "user", None) and request.user.is_authenticated:
             self.fields["owner"].initial = request.user.pk
+        self.fields["chargers"].widget.attrs["class"] = "charger-options"
+        language_initial = ClientReport.default_language()
+        if request:
+            language_initial = ClientReport.normalize_language(
+                getattr(request, "LANGUAGE_CODE", language_initial)
+            )
+        self.fields["language"].initial = language_initial
 
     def clean(self):
         cleaned = super().clean()
@@ -1340,6 +1375,10 @@ class ClientReportForm(forms.Form):
             emails.append(candidate)
         return emails
 
+    def clean_title(self):
+        title = self.cleaned_data.get("title")
+        return ClientReport.normalize_title(title)
+
 
 @live_update()
 def client_report(request):
@@ -1350,7 +1389,7 @@ def client_report(request):
         if not request.user.is_authenticated:
             form.is_valid()  # Run validation to surface field errors alongside auth error.
             form.add_error(
-                None, _("You must log in to generate client reports."),
+                None, _("You must log in to generate consumer reports."),
             )
         elif form.is_valid():
             throttle_seconds = getattr(settings, "CLIENT_REPORT_THROTTLE_SECONDS", 60)
@@ -1379,38 +1418,90 @@ def client_report(request):
                 form.add_error(
                     None,
                     _(
-                        "Client reports can only be generated periodically. Please wait before trying again."
+                        "Consumer reports can only be generated periodically. Please wait before trying again."
                     ),
                 )
             else:
                 owner = form.cleaned_data.get("owner")
                 if not owner and request.user.is_authenticated:
                     owner = request.user
+                enable_emails = form.cleaned_data.get("enable_emails", False)
+                disable_emails = not enable_emails
+                recipients = (
+                    form.cleaned_data.get("destinations") if enable_emails else []
+                )
+                chargers = list(form.cleaned_data.get("chargers") or [])
+                language = form.cleaned_data.get("language")
+                title = form.cleaned_data.get("title")
                 report = ClientReport.generate(
                     form.cleaned_data["start"],
                     form.cleaned_data["end"],
                     owner=owner,
-                    recipients=form.cleaned_data.get("destinations"),
-                    disable_emails=form.cleaned_data.get("disable_emails", False),
+                    recipients=recipients,
+                    disable_emails=disable_emails,
+                    chargers=chargers,
+                    language=language,
+                    title=title,
                 )
                 report.store_local_copy()
+                if chargers:
+                    report.chargers.set(chargers)
+                if enable_emails and recipients:
+                    delivered = report.send_delivery(
+                        to=recipients,
+                        cc=[],
+                        outbox=ClientReport.resolve_outbox_for_owner(owner),
+                        reply_to=ClientReport.resolve_reply_to_for_owner(owner),
+                    )
+                    if delivered:
+                        report.recipients = delivered
+                        report.save(update_fields=["recipients"])
+                        messages.success(
+                            request,
+                            _("Consumer report emailed to the selected recipients."),
+                        )
                 recurrence = form.cleaned_data.get("recurrence")
                 if recurrence and recurrence != ClientReportSchedule.PERIODICITY_NONE:
                     schedule = ClientReportSchedule.objects.create(
                         owner=owner,
                         created_by=request.user if request.user.is_authenticated else None,
                         periodicity=recurrence,
-                        email_recipients=form.cleaned_data.get("destinations", []),
-                        disable_emails=form.cleaned_data.get("disable_emails", False),
+                        email_recipients=recipients,
+                        disable_emails=disable_emails,
+                        language=language,
+                        title=title,
                     )
+                    if chargers:
+                        schedule.chargers.set(chargers)
                     report.schedule = schedule
                     report.save(update_fields=["schedule"])
                     messages.success(
                         request,
                         _(
-                            "Client report schedule created; future reports will be generated automatically."
+                            "Consumer report schedule created; future reports will be generated automatically."
                         ),
                     )
+                if disable_emails:
+                    messages.success(
+                        request,
+                        _(
+                            "Consumer report generated. The download will begin automatically."
+                        ),
+                    )
+                    redirect_url = f"{reverse('pages:client-report')}?download={report.pk}"
+                    return HttpResponseRedirect(redirect_url)
+    download_url = None
+    download_param = request.GET.get("download")
+    if download_param and request.user.is_authenticated:
+        try:
+            download_id = int(download_param)
+        except (TypeError, ValueError):
+            download_id = None
+        if download_id:
+            download_url = reverse(
+                "pages:client-report-download", args=[download_id]
+            )
+
     try:
         login_url = reverse("pages:login")
     except NoReverseMatch:
@@ -1424,10 +1515,25 @@ def client_report(request):
         "report": report,
         "schedule": schedule,
         "login_url": login_url,
+        "download_url": download_url,
     }
     return render(request, "pages/client_report.html", context)
 
 
+@login_required
+def client_report_download(request, report_id: int):
+    report = get_object_or_404(ClientReport, pk=report_id)
+    if not request.user.is_staff and report.owner_id != request.user.pk:
+        return HttpResponseForbidden(
+            _("You do not have permission to download this report.")
+        )
+    pdf_path = report.ensure_pdf()
+    if not pdf_path.exists():
+        raise Http404(_("Report file unavailable."))
+    filename = f"consumer-report-{report.start_date}-{report.end_date}.pdf"
+    response = FileResponse(pdf_path.open("rb"), content_type="application/pdf")
+    response["Content-Disposition"] = f'attachment; filename="{filename}"'
+    return response
 def _get_request_language_code(request) -> str:
     language_code = ""
     if hasattr(request, "session"):