arthexis 0.1.16__py3-none-any.whl → 0.1.26__py3-none-any.whl

ocpp/admin.py

@@ -2,25 +2,38 @@ from django.contrib import admin, messages
 from django import forms
 
 import asyncio
-from datetime import timedelta
+import base64
+from datetime import datetime, time, timedelta
 import json
+from typing import Any
 
 from django.shortcuts import redirect
-from django.utils import timezone
+from django.utils import formats, timezone, translation
+from django.utils.translation import gettext_lazy as _
+from django.utils.dateparse import parse_datetime
+from django.utils.html import format_html
 from django.urls import path
 from django.http import HttpResponse, HttpResponseRedirect
 from django.template.response import TemplateResponse
 
 import uuid
 from asgiref.sync import async_to_sync
+import requests
+from requests import RequestException
+from cryptography.hazmat.primitives import hashes
+from cryptography.hazmat.primitives.asymmetric import padding
+from django.db import transaction
+from django.core.exceptions import ValidationError
 
 from .models import (
     Charger,
+    ChargerConfiguration,
     Simulator,
     MeterValue,
     Transaction,
     Location,
     DataTransferMessage,
+    CPReservation,
 )
 from .simulator import ChargePointSimulator
 from . import store
@@ -29,8 +42,10 @@ from .transactions_io import (
     import_transactions as import_transactions_data,
 )
 from .status_display import STATUS_BADGE_MAP, ERROR_OK_VALUES
+from .views import _charger_state, _live_sessions
 from core.admin import SaveBeforeChangeAction
 from core.user_data import EntityModelAdmin
+from nodes.models import Node
 
 
 class LocationAdminForm(forms.ModelForm):
@@ -63,6 +78,43 @@ class TransactionImportForm(forms.Form):
     file = forms.FileField()
 
 
+class CPReservationForm(forms.ModelForm):
+    class Meta:
+        model = CPReservation
+        fields = [
+            "location",
+            "account",
+            "rfid",
+            "id_tag",
+            "start_time",
+            "duration_minutes",
+        ]
+
+    def clean(self):
+        cleaned = super().clean()
+        instance = self.instance
+        for field in self.Meta.fields:
+            if field in cleaned:
+                setattr(instance, field, cleaned[field])
+        try:
+            instance.allocate_connector(force=bool(instance.pk))
+        except ValidationError as exc:
+            if exc.message_dict:
+                for field, errors in exc.message_dict.items():
+                    for error in errors:
+                        self.add_error(field, error)
+                raise forms.ValidationError(
+                    _("Unable to allocate a connector for the selected time window.")
+                )
+            raise forms.ValidationError(exc.messages or [str(exc)])
+        if not instance.id_tag_value:
+            message = _("Select an RFID or provide an idTag for the reservation.")
+            self.add_error("id_tag", message)
+            self.add_error("rfid", message)
+            raise forms.ValidationError(message)
+        return cleaned
+
+
 class LogViewAdminMixin:
     """Mixin providing an admin view to display charger or simulator logs."""
 
@@ -107,11 +159,107 @@ class LogViewAdminMixin:
         return TemplateResponse(request, self.log_template_name, context)
 
 
+@admin.register(ChargerConfiguration)
+class ChargerConfigurationAdmin(admin.ModelAdmin):
+    list_display = (
+        "charger_identifier",
+        "connector_display",
+        "origin_display",
+        "created_at",
+    )
+    list_filter = ("connector_id",)
+    search_fields = ("charger_identifier",)
+    readonly_fields = (
+        "charger_identifier",
+        "connector_id",
+        "origin_display",
+        "evcs_snapshot_at",
+        "created_at",
+        "updated_at",
+        "linked_chargers",
+        "configuration_keys_display",
+        "unknown_keys_display",
+        "raw_payload_display",
+    )
+    fieldsets = (
+        (
+            None,
+            {
+                "fields": (
+                    "charger_identifier",
+                    "connector_id",
+                    "origin_display",
+                    "evcs_snapshot_at",
+                    "linked_chargers",
+                    "created_at",
+                    "updated_at",
+                )
+            },
+        ),
+        (
+            "Payload",
+            {
+                "fields": (
+                    "configuration_keys_display",
+                    "unknown_keys_display",
+                    "raw_payload_display",
+                )
+            },
+        ),
+    )
+
+    @admin.display(description="Connector")
+    def connector_display(self, obj):
+        if obj.connector_id is None:
+            return "All"
+        return obj.connector_id
+
+    @admin.display(description="Linked charge points")
+    def linked_chargers(self, obj):
+        if obj.pk is None:
+            return ""
+        linked = [charger.identity_slug() for charger in obj.chargers.all()]
+        if not linked:
+            return "-"
+        return ", ".join(sorted(linked))
+
+    def _render_json(self, data):
+        from django.utils.html import format_html
+
+        if not data:
+            return "-"
+        formatted = json.dumps(data, indent=2, ensure_ascii=False)
+        return format_html("<pre>{}</pre>", formatted)
+
+    @admin.display(description="configurationKey")
+    def configuration_keys_display(self, obj):
+        return self._render_json(obj.configuration_keys)
+
+    @admin.display(description="unknownKey")
+    def unknown_keys_display(self, obj):
+        return self._render_json(obj.unknown_keys)
+
+    @admin.display(description="Raw payload")
+    def raw_payload_display(self, obj):
+        return self._render_json(obj.raw_payload)
+
+    @admin.display(description="Origin")
+    def origin_display(self, obj):
+        if obj.evcs_snapshot_at:
+            return "EVCS"
+        return "Local"
+
+    def save_model(self, request, obj, form, change):
+        obj.evcs_snapshot_at = None
+        super().save_model(request, obj, form, change)
+
+
 @admin.register(Location)
 class LocationAdmin(EntityModelAdmin):
     form = LocationAdminForm
-    list_display = ("name", "latitude", "longitude")
+    list_display = ("name", "zone", "contract_type", "latitude", "longitude")
     change_form_template = "admin/ocpp/location/change_form.html"
+    search_fields = ("name",)
 
 
 @admin.register(DataTransferMessage)
@@ -152,8 +300,139 @@ class DataTransferMessageAdmin(admin.ModelAdmin):
     )
 
 
+@admin.register(CPReservation)
+class CPReservationAdmin(EntityModelAdmin):
+    form = CPReservationForm
+    list_display = (
+        "location",
+        "connector_side_display",
+        "start_time",
+        "end_time_display",
+        "account",
+        "id_tag_display",
+        "evcs_status",
+        "evcs_confirmed",
+    )
+    list_filter = ("location", "evcs_confirmed")
+    search_fields = (
+        "location__name",
+        "connector__charger_id",
+        "connector__display_name",
+        "account__name",
+        "id_tag",
+        "rfid__rfid",
+    )
+    date_hierarchy = "start_time"
+    ordering = ("-start_time",)
+    autocomplete_fields = ("location", "account", "rfid")
+    readonly_fields = (
+        "connector_identity",
+        "connector_side_display",
+        "evcs_status",
+        "evcs_error",
+        "evcs_confirmed",
+        "evcs_confirmed_at",
+        "ocpp_message_id",
+        "created_on",
+        "updated_on",
+    )
+    fieldsets = (
+        (
+            None,
+            {
+                "fields": (
+                    "location",
+                    "account",
+                    "rfid",
+                    "id_tag",
+                    "start_time",
+                    "duration_minutes",
+                )
+            },
+        ),
+        (
+            _("Assigned connector"),
+            {"fields": ("connector_identity", "connector_side_display")},
+        ),
+        (
+            _("EVCS response"),
+            {
+                "fields": (
+                    "evcs_confirmed",
+                    "evcs_status",
+                    "evcs_confirmed_at",
+                    "evcs_error",
+                    "ocpp_message_id",
+                )
+            },
+        ),
+        (
+            _("Metadata"),
+            {"fields": ("created_on", "updated_on")},
+        ),
+    )
+
+    def save_model(self, request, obj, form, change):
+        trigger_fields = {
+            "start_time",
+            "duration_minutes",
+            "location",
+            "id_tag",
+            "rfid",
+            "account",
+        }
+        changed_data = set(getattr(form, "changed_data", []))
+        should_send = not change or bool(trigger_fields.intersection(changed_data))
+        with transaction.atomic():
+            super().save_model(request, obj, form, change)
+            if should_send:
+                try:
+                    obj.send_reservation_request()
+                except ValidationError as exc:
+                    raise ValidationError(exc.message_dict or exc.messages or str(exc))
+                else:
+                    self.message_user(
+                        request,
+                        _("Reservation request sent to %(connector)s.")
+                        % {"connector": self.connector_identity(obj)},
+                        messages.SUCCESS,
+                    )
+
+    @admin.display(description=_("Connector"), ordering="connector__connector_id")
+    def connector_side_display(self, obj):
+        return obj.connector_label or "-"
+
+    @admin.display(description=_("Connector identity"))
+    def connector_identity(self, obj):
+        if obj.connector_id:
+            return obj.connector.identity_slug()
+        return "-"
+
+    @admin.display(description=_("End time"))
+    def end_time_display(self, obj):
+        try:
+            value = timezone.localtime(obj.end_time)
+        except Exception:
+            value = obj.end_time
+        if not value:
+            return "-"
+        return formats.date_format(value, "DATETIME_FORMAT")
+
+    @admin.display(description=_("Id tag"))
+    def id_tag_display(self, obj):
+        value = obj.id_tag_value
+        return value or "-"
+
+
 @admin.register(Charger)
 class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
+    _REMOTE_DATETIME_FIELDS = {
+        "availability_state_updated_at",
+        "availability_requested_at",
+        "availability_request_status_at",
+        "last_online_at",
+    }
+
     fieldsets = (
         (
             "General",
@@ -162,6 +441,7 @@ class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
                     "charger_id",
                     "display_name",
                     "connector_id",
+                    "language",
                     "location",
                     "last_path",
                     "last_heartbeat",
@@ -205,7 +485,21 @@ class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
         ),
         (
             "Configuration",
-            {"fields": ("public_display", "require_rfid")},
+            {"fields": ("public_display", "require_rfid", "configuration")},
+        ),
+        (
+            "Network",
+            {
+                "fields": (
+                    "node_origin",
+                    "manager_node",
+                    "forwarded_to",
+                    "forwarding_watermark",
+                    "allow_remote",
+                    "export_transactions",
+                    "last_online_at",
+                )
+            },
         ),
         (
             "References",
@@ -234,15 +528,20 @@ class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
         "availability_request_status",
         "availability_request_status_at",
         "availability_request_details",
+        "configuration",
+        "forwarded_to",
+        "forwarding_watermark",
+        "last_online_at",
     )
     list_display = (
-        "charger_id",
+        "display_name_with_fallback",
         "connector_number",
-        "location_name",
+        "charger_name_display",
+        "local_indicator",
         "require_rfid_display",
         "public_display",
         "last_heartbeat",
-        "session_kw",
+        "today_kw",
         "total_kw_display",
         "page_link",
         "log_link",
@@ -253,6 +552,8 @@ class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
     actions = [
         "purge_data",
         "fetch_cp_configuration",
+        "toggle_rfid_authentication",
+        "recheck_charger_status",
         "change_availability_operative",
         "change_availability_inoperative",
         "set_availability_state_operative",
@@ -262,6 +563,159 @@ class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
         "delete_selected",
     ]
 
+    def _prepare_remote_credentials(self, request):
+        local = Node.get_local()
+        if not local or not local.uuid:
+            self.message_user(
+                request,
+                "Local node is not registered; remote actions are unavailable.",
+                level=messages.ERROR,
+            )
+            return None, None
+        private_key = local.get_private_key()
+        if private_key is None:
+            self.message_user(
+                request,
+                "Local node private key is unavailable; remote actions are disabled.",
+                level=messages.ERROR,
+            )
+            return None, None
+        return local, private_key
+
+    def _call_remote_action(
+        self,
+        request,
+        local_node: Node,
+        private_key,
+        charger: Charger,
+        action: str,
+        extra: dict[str, Any] | None = None,
+    ) -> tuple[bool, dict[str, Any]]:
+        if not charger.node_origin:
+            self.message_user(
+                request,
+                f"{charger}: remote node information is missing.",
+                level=messages.ERROR,
+            )
+            return False, {}
+        origin = charger.node_origin
+        if not origin.port:
+            self.message_user(
+                request,
+                f"{charger}: remote node port is not configured.",
+                level=messages.ERROR,
+            )
+            return False, {}
+
+        if not origin.get_remote_host_candidates():
+            self.message_user(
+                request,
+                f"{charger}: remote node connection details are incomplete.",
+                level=messages.ERROR,
+            )
+            return False, {}
+
+        payload: dict[str, Any] = {
+            "requester": str(local_node.uuid),
+            "requester_mac": local_node.mac_address,
+            "requester_public_key": local_node.public_key,
+            "charger_id": charger.charger_id,
+            "connector_id": charger.connector_id,
+            "action": action,
+        }
+        if extra:
+            payload.update(extra)
+
+        payload_json = json.dumps(payload, separators=(",", ":"), sort_keys=True)
+        headers = {"Content-Type": "application/json"}
+        try:
+            signature = private_key.sign(
+                payload_json.encode(),
+                padding.PKCS1v15(),
+                hashes.SHA256(),
+            )
+            headers["X-Signature"] = base64.b64encode(signature).decode()
+        except Exception:
+            self.message_user(
+                request,
+                "Unable to sign remote action payload; remote action aborted.",
+                level=messages.ERROR,
+            )
+            return False, {}
+
+        url = next(
+            origin.iter_remote_urls("/nodes/network/chargers/action/"),
+            "",
+        )
+        if not url:
+            self.message_user(
+                request,
+                f"{charger}: no reachable hosts were reported for the remote node.",
+                level=messages.ERROR,
+            )
+            return False, {}
+        try:
+            response = requests.post(url, data=payload_json, headers=headers, timeout=5)
+        except RequestException as exc:
+            self.message_user(
+                request,
+                f"{charger}: failed to contact remote node ({exc}).",
+                level=messages.ERROR,
+            )
+            return False, {}
+
+        try:
+            data = response.json()
+        except ValueError:
+            self.message_user(
+                request,
+                f"{charger}: invalid response from remote node.",
+                level=messages.ERROR,
+            )
+            return False, {}
+
+        if response.status_code != 200 or data.get("status") != "ok":
+            detail = data.get("detail") if isinstance(data, dict) else None
+            if not detail:
+                detail = response.text or "Remote node rejected the request."
+            self.message_user(
+                request,
+                f"{charger}: {detail}",
+                level=messages.ERROR,
+            )
+            return False, {}
+
+        updates = data.get("updates", {}) if isinstance(data, dict) else {}
+        if not isinstance(updates, dict):
+            updates = {}
+        return True, updates
+
+    def _apply_remote_updates(self, charger: Charger, updates: dict[str, Any]) -> None:
+        if not updates:
+            return
+
+        applied: dict[str, Any] = {}
+        for field, value in updates.items():
+            if field in self._REMOTE_DATETIME_FIELDS and isinstance(value, str):
+                parsed = parse_datetime(value)
+                if parsed and timezone.is_naive(parsed):
+                    parsed = timezone.make_aware(parsed, timezone.get_current_timezone())
+                applied[field] = parsed
+            else:
+                applied[field] = value
+
+        Charger.objects.filter(pk=charger.pk).update(**applied)
+        for field, value in applied.items():
+            setattr(charger, field, value)
+
+    def get_readonly_fields(self, request, obj=None):
+        readonly = list(super().get_readonly_fields(request, obj))
+        if obj and not obj.is_local:
+            for field in ("allow_remote", "export_transactions"):
+                if field not in readonly:
+                    readonly.append(field)
+        return tuple(readonly)
+
     def get_view_on_site_url(self, obj=None):
         return obj.get_absolute_url() if obj else None
 
@@ -317,16 +771,14 @@ class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
             "charger-status-connector",
             args=[obj.charger_id, obj.connector_slug],
         )
-        label = (obj.last_status or "status").strip() or "status"
-        status_key = label.lower()
-        error_code = (obj.last_error_code or "").strip().lower()
-        if (
-            self._has_active_session(obj)
-            and error_code in ERROR_OK_VALUES
-            and (status_key not in STATUS_BADGE_MAP or status_key == "available")
-        ):
-            label = STATUS_BADGE_MAP["charging"][0]
-        return format_html('<a href="{}" target="_blank">{}</a>', url, label)
+        tx_obj = store.get_transaction(obj.charger_id, obj.connector_id)
+        state, _ = _charger_state(
+            obj,
+            tx_obj
+            if obj.connector_id is not None
+            else (_live_sessions(obj) or None),
+        )
+        return format_html('<a href="{}" target="_blank">{}</a>', url, state)
 
     status_link.short_description = "Status"
 
@@ -347,6 +799,25 @@ class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
                 return True
         return False
 
+    @admin.display(description="Display Name", ordering="display_name")
+    def display_name_with_fallback(self, obj):
+        return self._charger_display_name(obj)
+
+    @admin.display(description="Charger", ordering="display_name")
+    def charger_name_display(self, obj):
+        return self._charger_display_name(obj)
+
+    def _charger_display_name(self, obj):
+        if obj.display_name:
+            return obj.display_name
+        if obj.location:
+            return obj.location.name
+        return obj.charger_id
+
+    @admin.display(boolean=True, description="Local")
+    def local_indicator(self, obj):
+        return obj.is_local
+
     def location_name(self, obj):
         return obj.location.name if obj.location else ""
 
@@ -359,9 +830,9 @@ class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
 
     purge_data.short_description = "Purge data"
 
-    @admin.action(description="Fetch CP configuration")
-    def fetch_cp_configuration(self, request, queryset):
-        fetched = 0
+    @admin.action(description="Re-check Charger Status")
+    def recheck_charger_status(self, request, queryset):
+        requested = 0
         for charger in queryset:
             connector_value = charger.connector_id
             ws = store.get_connection(charger.charger_id, connector_value)
@@ -372,15 +843,19 @@ class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
                     level=messages.ERROR,
                 )
                 continue
+            payload: dict[str, object] = {"requestedMessage": "StatusNotification"}
+            trigger_connector: int | None = None
+            if connector_value is not None:
+                payload["connectorId"] = connector_value
+                trigger_connector = connector_value
             message_id = uuid.uuid4().hex
-            payload = {}
-            msg = json.dumps([2, message_id, "GetConfiguration", payload])
+            msg = json.dumps([2, message_id, "TriggerMessage", payload])
             try:
                 async_to_sync(ws.send)(msg)
             except Exception as exc:  # pragma: no cover - network error
                 self.message_user(
                     request,
-                    f"{charger}: failed to send GetConfiguration ({exc})",
+                    f"{charger}: failed to send TriggerMessage ({exc})",
                     level=messages.ERROR,
                 )
                 continue
@@ -389,79 +864,254 @@ class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
             store.register_pending_call(
                 message_id,
                 {
-                    "action": "GetConfiguration",
+                    "action": "TriggerMessage",
                     "charger_id": charger.charger_id,
                     "connector_id": connector_value,
                     "log_key": log_key,
+                    "trigger_target": "StatusNotification",
+                    "trigger_connector": trigger_connector,
                     "requested_at": timezone.now(),
                 },
             )
             store.schedule_call_timeout(
                 message_id,
                 timeout=5.0,
-                action="GetConfiguration",
+                action="TriggerMessage",
                 log_key=log_key,
-                message=(
-                    "GetConfiguration timed out: charger did not respond"
-                    " (operation may not be supported)"
-                ),
+                message="TriggerMessage StatusNotification timed out",
             )
-            fetched += 1
+            requested += 1
+        if requested:
+            self.message_user(
+                request,
+                f"Requested status update from {requested} charger(s)",
+            )
+
+    @admin.action(description="Fetch CP configuration")
+    def fetch_cp_configuration(self, request, queryset):
+        fetched = 0
+        local_node = None
+        private_key = None
+        remote_unavailable = False
+        for charger in queryset:
+            if charger.is_local:
+                connector_value = charger.connector_id
+                ws = store.get_connection(charger.charger_id, connector_value)
+                if ws is None:
+                    self.message_user(
+                        request,
+                        f"{charger}: no active connection",
+                        level=messages.ERROR,
+                    )
+                    continue
+                message_id = uuid.uuid4().hex
+                payload = {}
+                msg = json.dumps([2, message_id, "GetConfiguration", payload])
+                try:
+                    async_to_sync(ws.send)(msg)
+                except Exception as exc:  # pragma: no cover - network error
+                    self.message_user(
+                        request,
+                        f"{charger}: failed to send GetConfiguration ({exc})",
+                        level=messages.ERROR,
+                    )
+                    continue
+                log_key = store.identity_key(charger.charger_id, connector_value)
+                store.add_log(log_key, f"< {msg}", log_type="charger")
+                store.register_pending_call(
+                    message_id,
+                    {
+                        "action": "GetConfiguration",
+                        "charger_id": charger.charger_id,
+                        "connector_id": connector_value,
+                        "log_key": log_key,
+                        "requested_at": timezone.now(),
+                    },
+                )
+                store.schedule_call_timeout(
+                    message_id,
+                    timeout=5.0,
+                    action="GetConfiguration",
+                    log_key=log_key,
+                    message=(
+                        "GetConfiguration timed out: charger did not respond"
+                        " (operation may not be supported)"
+                    ),
+                )
+                fetched += 1
+                continue
+
+            if not charger.allow_remote:
+                self.message_user(
+                    request,
+                    f"{charger}: remote administration is disabled.",
+                    level=messages.ERROR,
+                )
+                continue
+            if remote_unavailable:
+                continue
+            if local_node is None:
+                local_node, private_key = self._prepare_remote_credentials(request)
+                if not local_node or not private_key:
+                    remote_unavailable = True
+                    continue
+            success, updates = self._call_remote_action(
+                request,
+                local_node,
+                private_key,
+                charger,
+                "get-configuration",
+            )
+            if success:
+                self._apply_remote_updates(charger, updates)
+                fetched += 1
+
         if fetched:
             self.message_user(
                 request,
                 f"Requested configuration from {fetched} charger(s)",
             )
 
-    def _dispatch_change_availability(self, request, queryset, availability_type: str):
-        sent = 0
+    @admin.action(description="Toggle RFID Authentication")
+    def toggle_rfid_authentication(self, request, queryset):
+        enabled = 0
+        disabled = 0
+        local_node = None
+        private_key = None
+        remote_unavailable = False
         for charger in queryset:
-            connector_value = charger.connector_id
-            ws = store.get_connection(charger.charger_id, connector_value)
-            if ws is None:
+            new_value = not charger.require_rfid
+            if charger.is_local:
+                Charger.objects.filter(pk=charger.pk).update(require_rfid=new_value)
+                charger.require_rfid = new_value
+                if new_value:
+                    enabled += 1
+                else:
+                    disabled += 1
+                continue
+
+            if not charger.allow_remote:
                 self.message_user(
                     request,
-                    f"{charger}: no active connection",
+                    f"{charger}: remote administration is disabled.",
                     level=messages.ERROR,
                 )
                 continue
-            connector_id = connector_value if connector_value is not None else 0
-            message_id = uuid.uuid4().hex
-            payload = {"connectorId": connector_id, "type": availability_type}
-            msg = json.dumps([2, message_id, "ChangeAvailability", payload])
-            try:
-                async_to_sync(ws.send)(msg)
-            except Exception as exc:  # pragma: no cover - network error
+            if remote_unavailable:
+                continue
+            if local_node is None:
+                local_node, private_key = self._prepare_remote_credentials(request)
+                if not local_node or not private_key:
+                    remote_unavailable = True
+                    continue
+            success, updates = self._call_remote_action(
+                request,
+                local_node,
+                private_key,
+                charger,
+                "toggle-rfid",
+                {"enable": new_value},
+            )
+            if success:
+                self._apply_remote_updates(charger, updates)
+                if charger.require_rfid:
+                    enabled += 1
+                else:
+                    disabled += 1
+
+        if enabled or disabled:
+            changes = []
+            if enabled:
+                changes.append(f"enabled for {enabled} charger(s)")
+            if disabled:
+                changes.append(f"disabled for {disabled} charger(s)")
+            summary = "; ".join(changes)
+            self.message_user(
+                request,
+                f"Updated RFID authentication: {summary}",
+            )
+
+    def _dispatch_change_availability(self, request, queryset, availability_type: str):
+        sent = 0
+        local_node = None
+        private_key = None
+        remote_unavailable = False
+        for charger in queryset:
+            if charger.is_local:
+                connector_value = charger.connector_id
+                ws = store.get_connection(charger.charger_id, connector_value)
+                if ws is None:
+                    self.message_user(
+                        request,
+                        f"{charger}: no active connection",
+                        level=messages.ERROR,
+                    )
+                    continue
+                connector_id = connector_value if connector_value is not None else 0
+                message_id = uuid.uuid4().hex
+                payload = {"connectorId": connector_id, "type": availability_type}
+                msg = json.dumps([2, message_id, "ChangeAvailability", payload])
+                try:
+                    async_to_sync(ws.send)(msg)
+                except Exception as exc:  # pragma: no cover - network error
+                    self.message_user(
+                        request,
+                        f"{charger}: failed to send ChangeAvailability ({exc})",
+                        level=messages.ERROR,
+                    )
+                    continue
+                log_key = store.identity_key(charger.charger_id, connector_value)
+                store.add_log(log_key, f"< {msg}", log_type="charger")
+                timestamp = timezone.now()
+                store.register_pending_call(
+                    message_id,
+                    {
+                        "action": "ChangeAvailability",
+                        "charger_id": charger.charger_id,
+                        "connector_id": connector_value,
+                        "availability_type": availability_type,
+                        "requested_at": timestamp,
+                    },
+                )
+                updates = {
+                    "availability_requested_state": availability_type,
+                    "availability_requested_at": timestamp,
+                    "availability_request_status": "",
+                    "availability_request_status_at": None,
+                    "availability_request_details": "",
+                }
+                Charger.objects.filter(pk=charger.pk).update(**updates)
+                for field, value in updates.items():
+                    setattr(charger, field, value)
+                sent += 1
+                continue
+
+            if not charger.allow_remote:
                 self.message_user(
                     request,
-                    f"{charger}: failed to send ChangeAvailability ({exc})",
+                    f"{charger}: remote administration is disabled.",
                     level=messages.ERROR,
                 )
                 continue
-            log_key = store.identity_key(charger.charger_id, connector_value)
-            store.add_log(log_key, f"< {msg}", log_type="charger")
-            timestamp = timezone.now()
-            store.register_pending_call(
-                message_id,
-                {
-                    "action": "ChangeAvailability",
-                    "charger_id": charger.charger_id,
-                    "connector_id": connector_value,
-                    "availability_type": availability_type,
-                    "requested_at": timestamp,
-                },
+            if remote_unavailable:
+                continue
+            if local_node is None:
+                local_node, private_key = self._prepare_remote_credentials(request)
+                if not local_node or not private_key:
+                    remote_unavailable = True
+                    continue
+            success, updates = self._call_remote_action(
+                request,
+                local_node,
+                private_key,
+                charger,
+                "change-availability",
+                {"availability_type": availability_type},
             )
-            updates = {
-                "availability_requested_state": availability_type,
-                "availability_requested_at": timestamp,
-                "availability_request_status": "",
-                "availability_request_status_at": None,
-                "availability_request_details": "",
-            }
-            Charger.objects.filter(pk=charger.pk).update(**updates)
-            for field, value in updates.items():
-                setattr(charger, field, value)
-            sent += 1
+            if success:
+                self._apply_remote_updates(charger, updates)
+                sent += 1
+
         if sent:
             self.message_user(
                 request,
@@ -479,17 +1129,49 @@ class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
     def _set_availability_state(
         self, request, queryset, availability_state: str
     ) -> None:
-        timestamp = timezone.now()
         updated = 0
+        local_node = None
+        private_key = None
+        remote_unavailable = False
         for charger in queryset:
-            updates = {
-                "availability_state": availability_state,
-                "availability_state_updated_at": timestamp,
-            }
-            Charger.objects.filter(pk=charger.pk).update(**updates)
-            for field, value in updates.items():
-                setattr(charger, field, value)
-            updated += 1
+            if charger.is_local:
+                timestamp = timezone.now()
+                updates = {
+                    "availability_state": availability_state,
+                    "availability_state_updated_at": timestamp,
+                }
+                Charger.objects.filter(pk=charger.pk).update(**updates)
+                for field, value in updates.items():
+                    setattr(charger, field, value)
+                updated += 1
+                continue
+
+            if not charger.allow_remote:
+                self.message_user(
+                    request,
+                    f"{charger}: remote administration is disabled.",
+                    level=messages.ERROR,
+                )
+                continue
+            if remote_unavailable:
+                continue
+            if local_node is None:
+                local_node, private_key = self._prepare_remote_credentials(request)
+                if not local_node or not private_key:
+                    remote_unavailable = True
+                    continue
+            success, updates = self._call_remote_action(
+                request,
+                local_node,
+                private_key,
+                charger,
+                "set-availability-state",
+                {"availability_state": availability_state},
+            )
+            if success:
+                self._apply_remote_updates(charger, updates)
+                updated += 1
+
         if updated:
             self.message_user(
                 request,
@@ -507,55 +1189,86 @@ class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
     @admin.action(description="Remote stop active transaction")
     def remote_stop_transaction(self, request, queryset):
         stopped = 0
+        local_node = None
+        private_key = None
+        remote_unavailable = False
         for charger in queryset:
-            connector_value = charger.connector_id
-            ws = store.get_connection(charger.charger_id, connector_value)
-            if ws is None:
-                self.message_user(
-                    request,
-                    f"{charger}: no active connection",
-                    level=messages.ERROR,
+            if charger.is_local:
+                connector_value = charger.connector_id
+                ws = store.get_connection(charger.charger_id, connector_value)
+                if ws is None:
+                    self.message_user(
+                        request,
+                        f"{charger}: no active connection",
+                        level=messages.ERROR,
+                    )
+                    continue
+                tx_obj = store.get_transaction(charger.charger_id, connector_value)
+                if tx_obj is None:
+                    self.message_user(
+                        request,
+                        f"{charger}: no active transaction",
+                        level=messages.ERROR,
+                    )
+                    continue
+                message_id = uuid.uuid4().hex
+                payload = {"transactionId": tx_obj.pk}
+                msg = json.dumps([
+                    2,
+                    message_id,
+                    "RemoteStopTransaction",
+                    payload,
+                ])
+                try:
+                    async_to_sync(ws.send)(msg)
+                except Exception as exc:  # pragma: no cover - network error
+                    self.message_user(
+                        request,
+                        f"{charger}: failed to send RemoteStopTransaction ({exc})",
+                        level=messages.ERROR,
+                    )
+                    continue
+                log_key = store.identity_key(charger.charger_id, connector_value)
+                store.add_log(log_key, f"< {msg}", log_type="charger")
+                store.register_pending_call(
+                    message_id,
+                    {
+                        "action": "RemoteStopTransaction",
+                        "charger_id": charger.charger_id,
+                        "connector_id": connector_value,
+                        "transaction_id": tx_obj.pk,
+                        "log_key": log_key,
+                        "requested_at": timezone.now(),
+                    },
                 )
+                stopped += 1
                 continue
-            tx_obj = store.get_transaction(charger.charger_id, connector_value)
-            if tx_obj is None:
+
+            if not charger.allow_remote:
                 self.message_user(
                     request,
-                    f"{charger}: no active transaction",
+                    f"{charger}: remote administration is disabled.",
                     level=messages.ERROR,
                 )
                 continue
-            message_id = uuid.uuid4().hex
-            payload = {"transactionId": tx_obj.pk}
-            msg = json.dumps([
-                2,
-                message_id,
-                "RemoteStopTransaction",
-                payload,
-            ])
-            try:
-                async_to_sync(ws.send)(msg)
-            except Exception as exc:  # pragma: no cover - network error
-                self.message_user(
-                    request,
-                    f"{charger}: failed to send RemoteStopTransaction ({exc})",
-                    level=messages.ERROR,
-                )
+            if remote_unavailable:
                 continue
-            log_key = store.identity_key(charger.charger_id, connector_value)
-            store.add_log(log_key, f"< {msg}", log_type="charger")
-            store.register_pending_call(
-                message_id,
-                {
-                    "action": "RemoteStopTransaction",
-                    "charger_id": charger.charger_id,
-                    "connector_id": connector_value,
-                    "transaction_id": tx_obj.pk,
-                    "log_key": log_key,
-                    "requested_at": timezone.now(),
-                },
+            if local_node is None:
+                local_node, private_key = self._prepare_remote_credentials(request)
+                if not local_node or not private_key:
+                    remote_unavailable = True
+                    continue
+            success, updates = self._call_remote_action(
+                request,
+                local_node,
+                private_key,
+                charger,
+                "remote-stop",
             )
-            stopped += 1
+            if success:
+                self._apply_remote_updates(charger, updates)
+                stopped += 1
+
         if stopped:
             self.message_user(
                 request,
@@ -565,45 +1278,95 @@ class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
     @admin.action(description="Reset charger (soft)")
     def reset_chargers(self, request, queryset):
         reset = 0
+        local_node = None
+        private_key = None
+        remote_unavailable = False
         for charger in queryset:
-            connector_value = charger.connector_id
-            ws = store.get_connection(charger.charger_id, connector_value)
-            if ws is None:
-                self.message_user(
-                    request,
-                    f"{charger}: no active connection",
-                    level=messages.ERROR,
+            if charger.is_local:
+                connector_value = charger.connector_id
+                ws = store.get_connection(charger.charger_id, connector_value)
+                if ws is None:
+                    self.message_user(
+                        request,
+                        f"{charger}: no active connection",
+                        level=messages.ERROR,
+                    )
+                    continue
+                tx_obj = store.get_transaction(charger.charger_id, connector_value)
+                if tx_obj is not None:
+                    self.message_user(
+                        request,
+                        (
+                            f"{charger}: reset skipped because a session is active; "
+                            "stop the session first."
+                        ),
+                        level=messages.WARNING,
+                    )
+                    continue
+                message_id = uuid.uuid4().hex
+                msg = json.dumps([
+                    2,
+                    message_id,
+                    "Reset",
+                    {"type": "Soft"},
+                ])
+                try:
+                    async_to_sync(ws.send)(msg)
+                except Exception as exc:  # pragma: no cover - network error
+                    self.message_user(
+                        request,
+                        f"{charger}: failed to send Reset ({exc})",
+                        level=messages.ERROR,
+                    )
+                    continue
+                log_key = store.identity_key(charger.charger_id, connector_value)
+                store.add_log(log_key, f"< {msg}", log_type="charger")
+                store.register_pending_call(
+                    message_id,
+                    {
+                        "action": "Reset",
+                        "charger_id": charger.charger_id,
+                        "connector_id": connector_value,
+                        "log_key": log_key,
+                        "requested_at": timezone.now(),
+                    },
+                )
+                store.schedule_call_timeout(
+                    message_id,
+                    timeout=5.0,
+                    action="Reset",
+                    log_key=log_key,
+                    message="Reset timed out: charger did not respond",
                 )
+                reset += 1
                 continue
-            message_id = uuid.uuid4().hex
-            msg = json.dumps([
-                2,
-                message_id,
-                "Reset",
-                {"type": "Soft"},
-            ])
-            try:
-                async_to_sync(ws.send)(msg)
-            except Exception as exc:  # pragma: no cover - network error
+
+            if not charger.allow_remote:
                 self.message_user(
                     request,
-                    f"{charger}: failed to send Reset ({exc})",
+                    f"{charger}: remote administration is disabled.",
                     level=messages.ERROR,
                 )
                 continue
-            log_key = store.identity_key(charger.charger_id, connector_value)
-            store.add_log(log_key, f"< {msg}", log_type="charger")
-            store.register_pending_call(
-                message_id,
-                {
-                    "action": "Reset",
-                    "charger_id": charger.charger_id,
-                    "connector_id": connector_value,
-                    "log_key": log_key,
-                    "requested_at": timezone.now(),
-                },
+            if remote_unavailable:
+                continue
+            if local_node is None:
+                local_node, private_key = self._prepare_remote_credentials(request)
+                if not local_node or not private_key:
+                    remote_unavailable = True
+                    continue
+            success, updates = self._call_remote_action(
+                request,
+                local_node,
+                private_key,
+                charger,
+                "reset",
+                {"reset_type": "Soft"},
             )
-            reset += 1
+            if success:
+                self._apply_remote_updates(charger, updates)
+                reset += 1
+
         if reset:
             self.message_user(
                 request,
@@ -619,13 +1382,49 @@ class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
 
     total_kw_display.short_description = "Total kW"
 
-    def session_kw(self, obj):
-        tx = store.get_transaction(obj.charger_id, obj.connector_id)
-        if tx:
-            return round(tx.kw, 2)
-        return 0.0
+    def today_kw(self, obj):
+        start, end = self._today_range()
+        return round(obj.total_kw_for_range(start, end), 2)
+
+    today_kw.short_description = "Today kW"
+
+    def changelist_view(self, request, extra_context=None):
+        response = super().changelist_view(request, extra_context=extra_context)
+        if hasattr(response, "context_data"):
+            cl = response.context_data.get("cl")
+            if cl is not None:
+                response.context_data.update(
+                    self._charger_quick_stats_context(cl.queryset)
+                )
+        return response
+
+    def _charger_quick_stats_context(self, queryset):
+        chargers = list(queryset)
+        stats = {"total_kw": 0.0, "today_kw": 0.0}
+        if not chargers:
+            return {"charger_quick_stats": stats}
 
-    session_kw.short_description = "Session kW"
+        parent_ids = {c.charger_id for c in chargers if c.connector_id is None}
+        start, end = self._today_range()
+
+        for charger in chargers:
+            include_totals = True
+            if charger.connector_id is not None and charger.charger_id in parent_ids:
+                include_totals = False
+            if include_totals:
+                stats["total_kw"] += charger.total_kw
+                stats["today_kw"] += charger.total_kw_for_range(start, end)
+
+        stats = {key: round(value, 2) for key, value in stats.items()}
+        return {"charger_quick_stats": stats}
+
+    def _today_range(self):
+        today = timezone.localdate()
+        start = datetime.combine(today, time.min)
+        if timezone.is_naive(start):
+            start = timezone.make_aware(start, timezone.get_current_timezone())
+        end = start + timedelta(days=1)
+        return start, end
 
 
 @admin.register(Simulator)
@@ -637,7 +1436,7 @@ class SimulatorAdmin(SaveBeforeChangeAction, LogViewAdminMixin, EntityModelAdmin
         "ws_port",
         "ws_url",
         "interval",
-        "kw_max",
+        "kw_max_display",
         "running",
         "log_link",
     )
@@ -677,6 +1476,26 @@ class SimulatorAdmin(SaveBeforeChangeAction, LogViewAdminMixin, EntityModelAdmin
 
     log_type = "simulator"
 
+    @admin.display(description="kW Max", ordering="kw_max")
+    def kw_max_display(self, obj):
+        """Display ``kw_max`` with a dot decimal separator for Spanish locales."""
+
+        language = translation.get_language() or ""
+        if language.startswith("es"):
+            return formats.number_format(
+                obj.kw_max,
+                decimal_pos=2,
+                use_l10n=False,
+                force_grouping=False,
+            )
+
+        return formats.number_format(
+            obj.kw_max,
+            decimal_pos=2,
+            use_l10n=True,
+            force_grouping=False,
+        )
+
     def save_model(self, request, obj, form, change):
         previous_door_open = False
         if change and obj.pk:
@@ -830,8 +1649,10 @@ class TransactionAdmin(EntityModelAdmin):
     change_list_template = "admin/ocpp/transaction/change_list.html"
     list_display = (
         "charger",
+        "connector_number",
         "account",
         "rfid",
+        "vid",
         "meter_start",
         "meter_stop",
         "start_time",
@@ -843,6 +1664,12 @@ class TransactionAdmin(EntityModelAdmin):
     date_hierarchy = "start_time"
     inlines = [MeterValueInline]
 
+    def connector_number(self, obj):
+        return obj.connector_id or ""
+
+    connector_number.short_description = "#"
+    connector_number.admin_order_field = "connector_id"
+
     def get_urls(self):
         urls = super().get_urls()
         custom = [