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

{arthexis-0.1.22.dist-info → arthexis-0.1.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arthexis
-Version: 0.1.22
+Version: 0.1.24
 Summary: Power & Energy Infrastructure
 Author-email: "Rafael J. Guillén-Osorio" <tecnologia@gelectriic.com>
 License-Expression: GPL-3.0-only
@@ -15,7 +15,7 @@ Requires-Dist: amqp==5.3.1
 Requires-Dist: annotated-types==0.7.0
 Requires-Dist: anyio==4.9.0
 Requires-Dist: asgiref==3.10.0
-Requires-Dist: atproto==0.0.62
+Requires-Dist: atproto<0.1.0,>=0.0.63
 Requires-Dist: attrs==25.3.0
 Requires-Dist: autobahn==24.4.2
 Requires-Dist: Automat==25.4.16
@@ -70,8 +70,8 @@ Requires-Dist: psycopg-binary==3.2.12
 Requires-Dist: pyasn1==0.6.1
 Requires-Dist: pyasn1_modules==0.4.2
 Requires-Dist: pycparser==2.22
-Requires-Dist: pydantic==2.11.7
-Requires-Dist: pydantic_core==2.33.2
+Requires-Dist: pydantic==2.12.3
+Requires-Dist: pydantic_core==2.41.4
 Requires-Dist: pyOpenSSL==25.1.0
 Requires-Dist: pyperclip==1.11.0
 Requires-Dist: PySocks==1.7.1
@@ -106,7 +106,7 @@ Requires-Dist: vine==5.1.0
 Requires-Dist: wcwidth==0.2.14
 Requires-Dist: webencodings==0.5.1
 Requires-Dist: websocket-client==1.8.0
-Requires-Dist: websockets==13.1
+Requires-Dist: websockets==15.0.1
 Requires-Dist: whitenoise==6.11.0
 Requires-Dist: plyer==2.1.0; sys_platform == "win32"
 Requires-Dist: wsproto==1.2.0
@@ -203,6 +203,7 @@ Terminal nodes can start directly with the scripts below without installing; Con
      - `--constellation` – enables the multi-user orchestration stack.
    - Use `./install.sh --help` to list every available flag if you need to customize the node beyond the role defaults.
    - Upgrade with [`./upgrade.sh`](upgrade.sh).
+   - Consult the [Install & Lifecycle Scripts Manual](docs/development/install-lifecycle-scripts-manual.md) for complete flag descriptions and operational notes.
 
 - **Windows:**
    - Run [`install.bat`](install.bat) to install (Terminal role) and [`upgrade.bat`](upgrade.bat) to upgrade.

{arthexis-0.1.22.dist-info → arthexis-0.1.24.dist-info}/RECORD

@@ -1,4 +1,4 @@
-arthexis-0.1.22.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+arthexis-0.1.24.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
 config/__init__.py,sha256=AwpOX7il-DAOmkdJ5dVfVJ3CWWebn1lHyQNmkw1EkDw,103
 config/active_app.py,sha256=KJqYh-o91nPQjVXPEdbiJHzsI6cN9IZsBZ9O3iZ6Hyc,373
 config/asgi.py,sha256=Z2HjWrxOxVU9BXcqS7dMEfOGJC48H-WPwFwokRdermY,774
@@ -10,12 +10,12 @@ config/loadenv.py,sha256=CjXx-wBaTt1wixub4GJ5CMSMFqtiK5JURc7cPXpqO7s,287
 config/logging.py,sha256=1cIbPgRshHuMKnVEEH0jKpRAlJSpewvLFbYDz7sCBG4,2104
 config/middleware.py,sha256=zF8Cma0n5G8NNdh2LVeNJi7Hgl1G4mF9msRE2eRi1RU,2328
 config/offline.py,sha256=X-yDcyoI4C44Y27lpkUwszY_09GwwFfazEsthKJpQ70,1382
-config/settings.py,sha256=b27y7mmQMJmcIFuceNxrX-9yO_R1GqbIf_wFdZNvTWo,20789
+config/settings.py,sha256=tFf0C4PO1whB4a_U7KcVlYnp2_gNC16t-cce3nNoStc,20914
 config/settings_helpers.py,sha256=0BdBciUHIkwsWa0vV_RKAd4wDuEzgE7G-42XYiES4YQ,3127
 config/urls.py,sha256=979WyL05v7nb-Lz_3Qf6Z2QzGtWpXADbIKZ28Zm12ts,5535
 config/wsgi.py,sha256=zU_mKlya6hejQ21PxKacTui3dUWd4ca_-YJNSYAoMX0,433
 core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-core/admin.py,sha256=dzM1-jibV1bzpcXGvydoR_8_WMclKYS4ohLreHgipvU,146524
+core/admin.py,sha256=N_x_4t7lSBIg1f13lN5qW54l29giXcGAy3_GWRVn4C0,153652
 core/admin_history.py,sha256=XZ4b0ryufIka-xcwboK3DzmOL-INSx5Y2fJO-aJdV70,1783
 core/admindocs.py,sha256=ycD0bJ_VE6rTGf9ebXTiKdYkD8Y8hD2oQ4HxxoBURCM,6756
 core/apps.py,sha256=S6fySxtxUzfvz8FI9dii0KI4wSyLhh5API_oeERLIsc,14084
@@ -34,60 +34,60 @@ core/liveupdate.py,sha256=22m0ueQ10-6b-9pQJHY0_5WRYA98fysXKEXOWzIr550,691
 core/log_paths.py,sha256=lxvgXPgJtVNZ-kYrqV8VFle4GFQrSxG-yRTglqvclmU,3318
 core/mailer.py,sha256=JpW0RnD9uZ4O-wvlqeW7CMw95IFeCSkdvbankJDwHq0,2886
 core/middleware.py,sha256=j19K9SX-Emkv7BDDtAacR9g6RWsxhKHwCc8w23JFvMM,3388
-core/models.py,sha256=9cwmW1onK7tAg7NQyhSavm2-eXV4nqDewyJUIHuMjZc,143176
+core/models.py,sha256=jwr_LL0CmtLLybiFjeRFMPY1aNRLaE_IOPvQuihwnJ0,171669
 core/notifications.py,sha256=jNLSuSCrhb8x5cDu_APeDlkrmbMejufk5eJOhssAC4I,3917
 core/public_wifi.py,sha256=yydLgxOo9DmJJbM4X_23wGR3gxL3YzHno54v9GssuFA,7213
 core/reference_utils.py,sha256=tffCoyE1w4_SmYzXVWOsW8aR_ZVVTSPzrGhBq8K2xzA,3631
-core/release.py,sha256=y5NRs0XwB7RQVvMEZoNWYjTBxuG68dOMizUXLRx7-x8,31561
+core/release.py,sha256=tEMcM7qubmFGmER3TD_MG5j4RceHcwtBjczArZWXEWE,31357
 core/rfid_import_export.py,sha256=petyhPvL0WUpehc6uGUDUhjYQ9AVvc6O49zuhDs6YFw,3516
 core/sigil_builder.py,sha256=nMuhYlw3j3LosrK85Q0pYsMcfGWCmrmdnv8UG7GTq_o,4856
 core/sigil_context.py,sha256=GCzjfM6fcVvBtSbVNfmE6sx3HU8QnxnXrCIytnNpQzM,439
 core/sigil_resolver.py,sha256=rCsypuX-0oWNfKyM1T9ZLWHY0Ezwhtk4VmI0L3krnsE,11098
 core/system.py,sha256=6ndxYDPswKkC3ySTwbgXzH0CdQYCZJytfA-99smyv_Q,42249
-core/tasks.py,sha256=d0MQP5fmn5pA2VCFGxDMEX0xppDIIh8IAzPfGdnk8J4,12340
+core/tasks.py,sha256=ptO44VTBAoTwf7Y3pI6TnniIs4lTUgN4MKCgNAUjhm4,13135
 core/temp_passwords.py,sha256=FieUnIUeQHmA1DoXvfJ5U6-Ayv3oDz-hSln5s_vNbA4,5271
 core/test_system_info.py,sha256=IMPz21KEs6OC5YbL7YaIBdmJVLjRY6MgPuZpldJB5OI,6935
-core/tests.py,sha256=eKKoUkF-zI4pCXpjMCuIKCXnv_KgLO8q3_9W0f2lcws,104199
+core/tests.py,sha256=PuxoarDS4reHNV4EDIyVRW7xIOFxZJYou1K_LI9ZNHY,105265
 core/tests_liveupdate.py,sha256=IquU8ztk6zbzC1bQu3Nrr3RzGzuujtPwDkANJHbxg98,510
 core/urls.py,sha256=YPippON1MAP2KeZZ8jHpcLO6mvbnKn1q7fdMv5Vm9dY,425
-core/user_data.py,sha256=02CfvxayELWSWZJCxWpv1Yz7EGg08yEu5MM31Khsi0U,21083
-core/views.py,sha256=oq3_INVD6VwgeRfZ3-UXV0aCUYKj4Kh7Hjx1B9eHVbA,87819
+core/user_data.py,sha256=4pheHB5RqLJtmWMql30CLaCpuVqSyShXb7Sy-crRk_4,22400
+core/views.py,sha256=QIYcBDjzn3YQzP53ub99wVR79d8SCNXRfSX_ENW3snE,88310
 core/widgets.py,sha256=vlR9PlFfZGlkHm5X2cqNXuEBZSj8gmWaR6MO1mMy6kg,6904
 nodes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nodes/admin.py,sha256=GDptKIbz5JTu57UxEFiKIq0aqDBFSXilg_zYxc4Tgew,72336
+nodes/admin.py,sha256=oOPXFsqQXGUKpgH0B9SIdcPJziBqZRrgFEwo-yEH-O4,72895
 nodes/apps.py,sha256=oi_M2Ya8CAR8N_MoYU68u7_9u-9SlIMelzLOgYM9tDs,3059
 nodes/backends.py,sha256=dmmbS0X2YIlCDz2KjoDf_L62dy--nuqZF1rEDoi2JHM,5921
 nodes/dns.py,sha256=D5smXD7Rkh6E4MdL6TBL2WY8GgJg7Rx9z88LZrcMbTw,7048
 nodes/feature_checks.py,sha256=27e4PCkZ8BGWnJCOwMcY2Bo9z7LoeZWiTZuISWGnrzk,3996
 nodes/lcd.py,sha256=iKA8Wmq85KZD52aTzAU8ZmS144_gbdGMOXcE8yuECps,5758
-nodes/models.py,sha256=3ym5od7ykGokkxOrvXhU8h439e7EaOGsIbG89x7BYz8,72598
+nodes/models.py,sha256=zIeEfUGduaRJ6CYsIiHlba55wgT6pCtyhiP_2w2ssGE,72890
 nodes/reports.py,sha256=NRYh3Y0SlZFhx31Zh2K03yO12ZrpxEHEY6T-dODA6WE,12059
 nodes/rfid_sync.py,sha256=oeblawcp6xeLApdIuhsJS83OAk58Eu7pVVmgpAc0Nt8,6953
 nodes/signals.py,sha256=PtOKdQfb08mV1LgSZvn7ZAcfOyy2c3Xkq4AOpBQyUdE,622
 nodes/tasks.py,sha256=7m9pKO-iI6JDdfPQ-GWRGown4mdyKrcroOnhbiWN7dY,5246
-nodes/tests.py,sha256=5aP2byahZXzKtUY87XtNc9Zv0P9ex2WUrkpNPK0BtJI,186035
-nodes/urls.py,sha256=-o9_pLo6XHerKMQwL0TW80wm6wmtVZqyNWcUhpdq9vk,915
+nodes/tests.py,sha256=IikaUCBOUo7r0VHJmqcnk-CsXbbBDT8687p0BmVVJOM,186523
+nodes/urls.py,sha256=c1C-4rROmp51HbVf3KTERuFYvTRXwD5LlApoX4SIwBg,1135
 nodes/utils.py,sha256=wt7UuSXGuq79A-g-B6EW3kK49QWJBb7zhhkw4pun4k8,4474
-nodes/views.py,sha256=EByqVc8Nj1nGdLgu-2a8AcxcSqbUtXyuLCF_tRSDTSk,38564
+nodes/views.py,sha256=b7g2TD4pHO01SK6e7uDf78zKbnQVVw3v0N7S2VBvdKQ,57780
 ocpp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ocpp/admin.py,sha256=FWYLzZ51-ArcIOZlvI8vwk0ohdPVTAXwurlCOhRhWnc,40502
+ocpp/admin.py,sha256=tRB7F9a4nQxcM-xV1AAeGRlEKQxm8i235yIq57xDU90,54379
 ocpp/apps.py,sha256=i3NqrmIamNEQBT33CIqh7HOSOPmJXCMKrZ-DUd3whqg,842
 ocpp/consumers.py,sha256=7PYlOkSlHSlIz2FUcBjui4uLFEIHOBWIHfnYpvITrMY,71719
 ocpp/evcs.py,sha256=q1mZrCVSZxXTrtYsDqH6lkeEcJ6tfSC7p9YxkDmpSCw,28883
 ocpp/evcs_discovery.py,sha256=OmrzgaOHwveDRJs8AIhrM3apX8_k2PPXh_oYaYpNW3c,3876
-ocpp/models.py,sha256=XMTKNu8K03_GId5Z9ucHUxMKlIw8crFnn4aTUHZYW8s,36763
+ocpp/models.py,sha256=VmkNPEACRks2kbyUa-2qt3xjrtBaipBonlgOk8xFTXg,38481
 ocpp/reference_utils.py,sha256=_UR82GfE93kv4766mHyVIfdhhyYvrT59660r3H6W55M,1072
 ocpp/routing.py,sha256=3kQya-MdJ00778xDmX0esQLBP05P200V45asg-CGNoo,438
 ocpp/simulator.py,sha256=vnyd59QffT79AaPhmfM_jipni_nqfG57X5tXyx1rBoc,28016
 ocpp/status_display.py,sha256=YGFosd5HJETA0DcLdsjvx6EfhZSnI8Aa3cMnHG2WsBE,939
 ocpp/store.py,sha256=gLCSaP9KKF7li2ALlE3O3RW5eVJtoe-_YHfKhdf0VOM,18943
-ocpp/tasks.py,sha256=VSna6Mi1jp3zjYTo4y0c5N-n-4efIq5FRKu3z2y8Oio,8950
+ocpp/tasks.py,sha256=Hv_YUzT0dIq8OZE0yHIKzViGU7fEPKknXcXuNkJqC-g,20287
 ocpp/test_export_import.py,sha256=ouQbTCp4mxfqoK6gondlu3PPcyrT9jSbWAX5gqqgaNk,4561
 ocpp/test_rfid.py,sha256=IhFSlvsI8A8D3S32sRE298nYfrmqxbv7GfVErtNU3DQ,39137
-ocpp/tests.py,sha256=5PWaNY3gUPxQmkoEkkjU5AXlryzyeWkDL6MUfsydEyg,203144
+ocpp/tests.py,sha256=0AsSR7UKZQUhWFPEwCE4FJHH1Ykl2UpooSGlBIPJOeU,207815
 ocpp/transactions_io.py,sha256=p2aUsKlCDYnZ4ZBrOM7pxXoW_w3Tbm-tvRFSjnR3x24,7738
 ocpp/urls.py,sha256=5ZomUtznJe3kfs8E-DtVp12eFva5jUuJdpTEczIsQ5w,1730
-ocpp/views.py,sha256=AsdHwLe_6gdLy6DQcwH5ioSbFATqmlpdKkesGoWD7QI,76346
+ocpp/views.py,sha256=iwm2oEMN_d9mmjaD6Hh9axqBIpqw_qSWpMSzyHICrE4,77091
 pages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pages/admin.py,sha256=VbxkwgjrFx7lXVhwbZuPSvCkS7EC-flBpwOztHejWtE,35834
 pages/apps.py,sha256=0qcTFKVX9_QgqexJtGeph1sHRqq7khJf4x5ZtkWwblg,1424
@@ -100,11 +100,11 @@ pages/models.py,sha256=9LdIoIK2Epp3YDUk8LUWyhLW5pJ-NiuYTzO_-xKjg0c,23636
 pages/module_defaults.py,sha256=rCAY8aTyxYNL0M5zDr393rX-Gi-svXqKtuLXm0rILrQ,5444
 pages/site_config.py,sha256=f1Me0GFdHeGbIeyMlQNzD2e6hym59YHqbz92U_ppffY,4057
 pages/tasks.py,sha256=ivcba_3wSQ1-cku0oDplzw6vLeQ9hBq3R4TG-LmR5gs,1913
-pages/tests.py,sha256=OFyYVFeAfsnHXL27zL3ma821pE4cXGVtOrtIO2YGjsk,153460
-pages/urls.py,sha256=2PVF8--cKi3h230CZl7VQsoVaQrxvWg3GPAKiQowQB0,1354
+pages/tests.py,sha256=akLS7p62PeUCaSXTAIsjAfDyv4KWOMJ2MkAGjPuX7AE,154350
+pages/urls.py,sha256=Oe88tm67iVHRFcGJLSBidZ0rkRQPRZ_vRt6ahxNqPek,1499
 pages/utils.py,sha256=CR4D1debgJLGgXsw9kap2ggpe7fIpSoWS_ivbgMNp2k,564
-pages/views.py,sha256=7F3zvXUMBH320rY-UtnxOiUz8HFWTRrGkxwdjZlOdbg,60863
-arthexis-0.1.22.dist-info/METADATA,sha256=72h6hoADl-yJFWfojMeYpb2qo3cW56E9a5UyMdSdxn4,11724
-arthexis-0.1.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-arthexis-0.1.22.dist-info/top_level.txt,sha256=J2a2q8_BWrCZ8H2WFUNMBfO2jz8j2gax6zZh-_1QDac,29
-arthexis-0.1.22.dist-info/RECORD,,
+pages/views.py,sha256=7-10W-GYDzlef98Warr2JIs3oQkTwKoOMo1aFGglj14,65214
+arthexis-0.1.24.dist-info/METADATA,sha256=9xkmegLGMFbSSMo1b3Fk8lGrksWPvJN57AeSDRWJ7so,11895
+arthexis-0.1.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+arthexis-0.1.24.dist-info/top_level.txt,sha256=J2a2q8_BWrCZ8H2WFUNMBfO2jz8j2gax6zZh-_1QDac,29
+arthexis-0.1.24.dist-info/RECORD,,

config/settings.py

@@ -666,4 +666,8 @@ CELERY_BEAT_SCHEDULE = {
         "task": "ocpp.tasks.schedule_daily_charge_point_configuration_checks",
         "schedule": crontab(minute=0, hour=0),
     },
+    "ocpp_remote_sync": {
+        "task": "ocpp.tasks.sync_remote_chargers",
+        "schedule": crontab(minute="*"),
+    },
 }

core/admin.py

@@ -9,10 +9,13 @@ from django.urls import NoReverseMatch, path, reverse
 from urllib.parse import urlencode, urlparse
 from django.shortcuts import get_object_or_404, redirect, render
 from django.http import (
+    FileResponse,
+    Http404,
     HttpResponse,
     JsonResponse,
     HttpResponseBase,
     HttpResponseRedirect,
+    HttpResponseNotAllowed,
 )
 from django.template.response import TemplateResponse
 from django.conf import settings
@@ -47,6 +50,7 @@ import uuid
 import requests
 import datetime
 from django.db import IntegrityError, transaction
+from django.db.models import Q
 import calendar
 import re
 from django_object_actions import DjangoObjectActions
@@ -60,7 +64,7 @@ from reportlab.graphics.barcode import qr
 from reportlab.graphics.shapes import Drawing
 from reportlab.lib.styles import getSampleStyleSheet
 from reportlab.platypus import Paragraph, SimpleDocTemplate, Spacer, Table, TableStyle
-from ocpp.models import Transaction
+from ocpp.models import Charger, Transaction
 from ocpp.rfid.utils import build_mode_toggle
 from nodes.models import EmailOutbox
 from .github_helper import GitHubRepositoryError, create_repository_for_package
@@ -606,15 +610,18 @@ class PackageAdmin(SaveBeforeChangeAction, EntityModelAdmin):
     change_actions = ["create_repository_action", "prepare_next_release_action"]
 
     def _prepare(self, request, package):
+        if request.method not in {"POST", "GET"}:
+            return HttpResponseNotAllowed(["GET", "POST"])
         from pathlib import Path
         from packaging.version import Version
 
         ver_file = Path("VERSION")
-        repo_version = (
-            Version(ver_file.read_text().strip())
-            if ver_file.exists()
-            else Version("0.0.0")
-        )
+        if ver_file.exists():
+            raw_version = ver_file.read_text().strip()
+            cleaned_version = raw_version.rstrip("+") or "0.0.0"
+            repo_version = Version(cleaned_version)
+        else:
+            repo_version = Version("0.0.0")
 
         pypi_latest = Version("0.0.0")
         try:
@@ -3609,13 +3616,62 @@ class RFIDAdmin(EntityModelAdmin, ImportExportModelAdmin):
         return JsonResponse(result, status=status)
 
 
+class ClientReportRecurrencyFilter(admin.SimpleListFilter):
+    title = "Recurrency"
+    parameter_name = "recurrency"
+
+    def lookups(self, request, model_admin):
+        for value, label in ClientReportSchedule.PERIODICITY_CHOICES:
+            yield (value, label)
+
+    def queryset(self, request, queryset):
+        value = self.value()
+        if not value:
+            return queryset
+        if value == ClientReportSchedule.PERIODICITY_NONE:
+            return queryset.filter(
+                Q(schedule__isnull=True) | Q(schedule__periodicity=value)
+            )
+        return queryset.filter(schedule__periodicity=value)
+
+
 @admin.register(ClientReport)
 class ClientReportAdmin(EntityModelAdmin):
-    list_display = ("created_on", "start_date", "end_date")
+    list_display = (
+        "created_on",
+        "period_range",
+        "owner",
+        "recurrency_display",
+        "total_kw_period_display",
+        "download_link",
+    )
+    list_select_related = ("schedule", "owner")
+    list_filter = ("owner", ClientReportRecurrencyFilter)
     readonly_fields = ("created_on", "data")
 
     change_list_template = "admin/core/clientreport/change_list.html"
 
+    def period_range(self, obj):
+        return str(obj)
+
+    period_range.short_description = "Period"
+
+    def recurrency_display(self, obj):
+        return obj.periodicity_label
+
+    recurrency_display.short_description = "Recurrency"
+
+    def total_kw_period_display(self, obj):
+        return f"{obj.total_kw_period:.2f}"
+
+    total_kw_period_display.short_description = "Total kW (period)"
+
+    def download_link(self, obj):
+        url = reverse("admin:core_clientreport_download", args=[obj.pk])
+        return format_html('<a href="{}">Download</a>', url)
+
+    download_link.short_description = "Download"
+
     class ClientReportForm(forms.Form):
         PERIOD_CHOICES = [
             ("range", "Date range"),
@@ -3651,8 +3707,28 @@ class ClientReportAdmin(EntityModelAdmin):
             label="Month",
             required=False,
             widget=forms.DateInput(attrs={"type": "month"}),
+            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,
@@ -3670,10 +3746,10 @@ class ClientReportAdmin(EntityModelAdmin):
             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):
@@ -3685,6 +3761,13 @@ class ClientReportAdmin(EntityModelAdmin):
                 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()
@@ -3729,6 +3812,10 @@ class ClientReportAdmin(EntityModelAdmin):
                 emails.append(candidate)
             return emails
 
+        def clean_title(self):
+            title = self.cleaned_data.get("title")
+            return ClientReport.normalize_title(title)
+
     def get_urls(self):
         urls = super().get_urls()
         custom = [
@@ -3737,6 +3824,16 @@ class ClientReportAdmin(EntityModelAdmin):
                 self.admin_site.admin_view(self.generate_view),
                 name="core_clientreport_generate",
             ),
+            path(
+                "generate/action/",
+                self.admin_site.admin_view(self.generate_report),
+                name="core_clientreport_generate_report",
+            ),
+            path(
+                "download/<int:report_id>/",
+                self.admin_site.admin_view(self.download_view),
+                name="core_clientreport_download",
+            ),
         ]
         return custom + urls
 
@@ -3744,40 +3841,127 @@ class ClientReportAdmin(EntityModelAdmin):
         form = self.ClientReportForm(request.POST or None, request=request)
         report = None
         schedule = None
+        download_url = None
         if request.method == "POST" and form.is_valid():
             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"])
+                    self.message_user(
+                        request,
+                        "Consumer report emailed to the selected recipients.",
+                        messages.SUCCESS,
+                    )
             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"])
                 self.message_user(
                     request,
-                    "Client report schedule created; future reports will be generated automatically.",
+                    "Consumer report schedule created; future reports will be generated automatically.",
+                    messages.SUCCESS,
+                )
+            if disable_emails:
+                self.message_user(
+                    request,
+                    "Consumer report generated. The download will begin automatically.",
                     messages.SUCCESS,
                 )
+                redirect_url = f"{reverse('admin:core_clientreport_generate')}?download={report.pk}"
+                return HttpResponseRedirect(redirect_url)
+        download_param = request.GET.get("download")
+        if download_param:
+            try:
+                download_report = ClientReport.objects.get(pk=download_param)
+            except ClientReport.DoesNotExist:
+                pass
+            else:
+                download_url = reverse(
+                    "admin:core_clientreport_download", args=[download_report.pk]
+                )
         context = self.admin_site.each_context(request)
-        context.update({"form": form, "report": report, "schedule": schedule})
+        context.update(
+            {
+                "form": form,
+                "report": report,
+                "schedule": schedule,
+                "download_url": download_url,
+                "opts": self.model._meta,
+            }
+        )
         return TemplateResponse(
             request, "admin/core/clientreport/generate.html", context
         )
 
+    def get_changelist_actions(self, request):
+        parent = getattr(super(), "get_changelist_actions", None)
+        actions: list[str] = []
+        if callable(parent):
+            parent_actions = parent(request)
+            if parent_actions:
+                actions.extend(parent_actions)
+        if "generate_report" not in actions:
+            actions.append("generate_report")
+        return actions
+
+    def generate_report(self, request):
+        return HttpResponseRedirect(reverse("admin:core_clientreport_generate"))
+
+    generate_report.label = _("Generate report")
+
+    def download_view(self, request, report_id: int):
+        report = get_object_or_404(ClientReport, pk=report_id)
+        pdf_path = report.ensure_pdf()
+        if not pdf_path.exists():
+            raise Http404("Report file unavailable")
+        end_date = report.end_date
+        if hasattr(end_date, "isoformat"):
+            end_date_str = end_date.isoformat()
+        else:  # pragma: no cover - fallback for unexpected values
+            end_date_str = str(end_date)
+        filename = f"consumer-report-{end_date_str}.pdf"
+        response = FileResponse(pdf_path.open("rb"), content_type="application/pdf")
+        response["Content-Disposition"] = f'attachment; filename="{filename}"'
+        return response
 
 @admin.register(PackageRelease)
 class PackageReleaseAdmin(SaveBeforeChangeAction, EntityModelAdmin):