arthexis 0.1.24__tar.gz → 0.1.25__tar.gz

{arthexis-0.1.24 → arthexis-0.1.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arthexis
-Version: 0.1.24
+Version: 0.1.25
 Summary: Power & Energy Infrastructure
 Author-email: "Rafael J. Guillén-Osorio" <tecnologia@gelectriic.com>
 License-Expression: GPL-3.0-only
@@ -48,6 +48,7 @@ Requires-Dist: django-timezone-field==7.1
 Requires-Dist: dnspython==2.7.0
 Requires-Dist: docutils==0.22.2
 Requires-Dist: gpiozero==2.0.1; sys_platform == "linux"
+Requires-Dist: graphene-django==3.2.2
 Requires-Dist: graphviz==0.21
 Requires-Dist: h11==0.16.0
 Requires-Dist: httpcore==1.0.9
@@ -124,19 +125,39 @@ Arthexis Constellation is a [narrative-driven](https://en.wikipedia.org/wiki/Nar
 
 ## Current Features
 
-- Compatible with the [Open Charge Point Protocol (OCPP) 1.6](https://www.openchargealliance.org/protocols/ocpp-16/) central system, handling:
-  - Lifecycle & sessions
-    - `BootNotification`
-    - `Heartbeat`
-    - `StatusNotification`
-    - `StartTransaction`
-    - `StopTransaction`
-  - Access & metering
-    - `Authorize`
-    - `MeterValues`
-  - Maintenance & firmware
-    - `DiagnosticsStatusNotification`
-    - `FirmwareStatusNotification`
+- Compatible with the [Open Charge Point Protocol (OCPP) 1.6](https://www.openchargealliance.org/protocols/ocpp-16/) central system. Supported actions are summarized below.
+
+  **Charge point → CSMS**
+
+  | Action | What we do |
+  | --- | --- |
+  | `Authorize` | Validate RFID or token authorization requests before a session starts. |
+  | `BootNotification` | Register the charge point and update identity, firmware, and status details. |
+  | `DataTransfer` | Accept vendor-specific payloads and record the results. |
+  | `DiagnosticsStatusNotification` | Track the progress of diagnostic uploads kicked off from the back office. |
+  | `FirmwareStatusNotification` | Track firmware update lifecycle events from charge points. |
+  | `Heartbeat` | Keep the websocket session alive and update last-seen timestamps. |
+  | `MeterValues` | Persist periodic energy and power readings while a transaction is active. |
+  | `StartTransaction` | Create charging sessions with initial meter values and identification data. |
+  | `StatusNotification` | Reflect connector availability and fault states in real time. |
+  | `StopTransaction` | Close charging sessions, capturing closing meter values and stop reasons. |
+
+  **CSMS → Charge point**
+
+  | Action | What we do |
+  | --- | --- |
+  | `ChangeAvailability` | Switch connectors or the whole station between operative and inoperative states. |
+  | `DataTransfer` | Send vendor-specific commands and log the charge point response. |
+  | `GetConfiguration` | Poll the device for the current values of tracked configuration keys. |
+  | `RemoteStartTransaction` | Initiate a charging session remotely for an identified customer or token. |
+  | `RemoteStopTransaction` | Terminate active charging sessions from the control center. |
+  | `ReserveNow` | Reserve connectors for upcoming sessions with automatic connector selection and confirmation tracking. |
+  | `Reset` | Request a soft or hard reboot to recover from faults. |
+  | `TriggerMessage` | Ask the device to send an immediate update (for example status or diagnostics). |
+
+  **OCPP 1.6 roadmap.** The following catalogue actions are in our backlog: `CancelReservation`, `ChangeConfiguration`, `ClearCache`, `ClearChargingProfile`, `GetCompositeSchedule`, `GetDiagnostics`, `GetLocalListVersion`, `SendLocalList`, `SetChargingProfile`, `UnlockConnector`, `UpdateFirmware`.
+
+- Charge point reservations with automated connector assignment, energy account and RFID linkage, and EVCS confirmation tracking.
 - [API](https://en.wikipedia.org/wiki/API) integration with [Odoo](https://www.odoo.com/), syncing:
   - Employee credentials via `res.users`
   - Product catalog lookups via `product.product`

{arthexis-0.1.24 → arthexis-0.1.25}/README.md

@@ -9,19 +9,39 @@ Arthexis Constellation is a [narrative-driven](https://en.wikipedia.org/wiki/Nar
 
 ## Current Features
 
-- Compatible with the [Open Charge Point Protocol (OCPP) 1.6](https://www.openchargealliance.org/protocols/ocpp-16/) central system, handling:
-  - Lifecycle & sessions
-    - `BootNotification`
-    - `Heartbeat`
-    - `StatusNotification`
-    - `StartTransaction`
-    - `StopTransaction`
-  - Access & metering
-    - `Authorize`
-    - `MeterValues`
-  - Maintenance & firmware
-    - `DiagnosticsStatusNotification`
-    - `FirmwareStatusNotification`
+- Compatible with the [Open Charge Point Protocol (OCPP) 1.6](https://www.openchargealliance.org/protocols/ocpp-16/) central system. Supported actions are summarized below.
+
+  **Charge point → CSMS**
+
+  | Action | What we do |
+  | --- | --- |
+  | `Authorize` | Validate RFID or token authorization requests before a session starts. |
+  | `BootNotification` | Register the charge point and update identity, firmware, and status details. |
+  | `DataTransfer` | Accept vendor-specific payloads and record the results. |
+  | `DiagnosticsStatusNotification` | Track the progress of diagnostic uploads kicked off from the back office. |
+  | `FirmwareStatusNotification` | Track firmware update lifecycle events from charge points. |
+  | `Heartbeat` | Keep the websocket session alive and update last-seen timestamps. |
+  | `MeterValues` | Persist periodic energy and power readings while a transaction is active. |
+  | `StartTransaction` | Create charging sessions with initial meter values and identification data. |
+  | `StatusNotification` | Reflect connector availability and fault states in real time. |
+  | `StopTransaction` | Close charging sessions, capturing closing meter values and stop reasons. |
+
+  **CSMS → Charge point**
+
+  | Action | What we do |
+  | --- | --- |
+  | `ChangeAvailability` | Switch connectors or the whole station between operative and inoperative states. |
+  | `DataTransfer` | Send vendor-specific commands and log the charge point response. |
+  | `GetConfiguration` | Poll the device for the current values of tracked configuration keys. |
+  | `RemoteStartTransaction` | Initiate a charging session remotely for an identified customer or token. |
+  | `RemoteStopTransaction` | Terminate active charging sessions from the control center. |
+  | `ReserveNow` | Reserve connectors for upcoming sessions with automatic connector selection and confirmation tracking. |
+  | `Reset` | Request a soft or hard reboot to recover from faults. |
+  | `TriggerMessage` | Ask the device to send an immediate update (for example status or diagnostics). |
+
+  **OCPP 1.6 roadmap.** The following catalogue actions are in our backlog: `CancelReservation`, `ChangeConfiguration`, `ClearCache`, `ClearChargingProfile`, `GetCompositeSchedule`, `GetDiagnostics`, `GetLocalListVersion`, `SendLocalList`, `SetChargingProfile`, `UnlockConnector`, `UpdateFirmware`.
+
+- Charge point reservations with automated connector assignment, energy account and RFID linkage, and EVCS confirmation tracking.
 - [API](https://en.wikipedia.org/wiki/API) integration with [Odoo](https://www.odoo.com/), syncing:
   - Employee credentials via `res.users`
   - Product catalog lookups via `product.product`

{arthexis-0.1.24 → arthexis-0.1.25}/arthexis.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arthexis
-Version: 0.1.24
+Version: 0.1.25
 Summary: Power & Energy Infrastructure
 Author-email: "Rafael J. Guillén-Osorio" <tecnologia@gelectriic.com>
 License-Expression: GPL-3.0-only
@@ -48,6 +48,7 @@ Requires-Dist: django-timezone-field==7.1
 Requires-Dist: dnspython==2.7.0
 Requires-Dist: docutils==0.22.2
 Requires-Dist: gpiozero==2.0.1; sys_platform == "linux"
+Requires-Dist: graphene-django==3.2.2
 Requires-Dist: graphviz==0.21
 Requires-Dist: h11==0.16.0
 Requires-Dist: httpcore==1.0.9
@@ -124,19 +125,39 @@ Arthexis Constellation is a [narrative-driven](https://en.wikipedia.org/wiki/Nar
 
 ## Current Features
 
-- Compatible with the [Open Charge Point Protocol (OCPP) 1.6](https://www.openchargealliance.org/protocols/ocpp-16/) central system, handling:
-  - Lifecycle & sessions
-    - `BootNotification`
-    - `Heartbeat`
-    - `StatusNotification`
-    - `StartTransaction`
-    - `StopTransaction`
-  - Access & metering
-    - `Authorize`
-    - `MeterValues`
-  - Maintenance & firmware
-    - `DiagnosticsStatusNotification`
-    - `FirmwareStatusNotification`
+- Compatible with the [Open Charge Point Protocol (OCPP) 1.6](https://www.openchargealliance.org/protocols/ocpp-16/) central system. Supported actions are summarized below.
+
+  **Charge point → CSMS**
+
+  | Action | What we do |
+  | --- | --- |
+  | `Authorize` | Validate RFID or token authorization requests before a session starts. |
+  | `BootNotification` | Register the charge point and update identity, firmware, and status details. |
+  | `DataTransfer` | Accept vendor-specific payloads and record the results. |
+  | `DiagnosticsStatusNotification` | Track the progress of diagnostic uploads kicked off from the back office. |
+  | `FirmwareStatusNotification` | Track firmware update lifecycle events from charge points. |
+  | `Heartbeat` | Keep the websocket session alive and update last-seen timestamps. |
+  | `MeterValues` | Persist periodic energy and power readings while a transaction is active. |
+  | `StartTransaction` | Create charging sessions with initial meter values and identification data. |
+  | `StatusNotification` | Reflect connector availability and fault states in real time. |
+  | `StopTransaction` | Close charging sessions, capturing closing meter values and stop reasons. |
+
+  **CSMS → Charge point**
+
+  | Action | What we do |
+  | --- | --- |
+  | `ChangeAvailability` | Switch connectors or the whole station between operative and inoperative states. |
+  | `DataTransfer` | Send vendor-specific commands and log the charge point response. |
+  | `GetConfiguration` | Poll the device for the current values of tracked configuration keys. |
+  | `RemoteStartTransaction` | Initiate a charging session remotely for an identified customer or token. |
+  | `RemoteStopTransaction` | Terminate active charging sessions from the control center. |
+  | `ReserveNow` | Reserve connectors for upcoming sessions with automatic connector selection and confirmation tracking. |
+  | `Reset` | Request a soft or hard reboot to recover from faults. |
+  | `TriggerMessage` | Ask the device to send an immediate update (for example status or diagnostics). |
+
+  **OCPP 1.6 roadmap.** The following catalogue actions are in our backlog: `CancelReservation`, `ChangeConfiguration`, `ClearCache`, `ClearChargingProfile`, `GetCompositeSchedule`, `GetDiagnostics`, `GetLocalListVersion`, `SendLocalList`, `SetChargingProfile`, `UnlockConnector`, `UpdateFirmware`.
+
+- Charge point reservations with automated connector assignment, energy account and RFID linkage, and EVCS confirmation tracking.
 - [API](https://en.wikipedia.org/wiki/API) integration with [Odoo](https://www.odoo.com/), syncing:
   - Employee credentials via `res.users`
   - Product catalog lookups via `product.product`

{arthexis-0.1.24 → arthexis-0.1.25}/arthexis.egg-info/SOURCES.txt

@@ -83,6 +83,7 @@ ocpp/consumers.py
 ocpp/evcs.py
 ocpp/evcs_discovery.py
 ocpp/models.py
+ocpp/network.py
 ocpp/reference_utils.py
 ocpp/routing.py
 ocpp/simulator.py

{arthexis-0.1.24 → arthexis-0.1.25}/arthexis.egg-info/requires.txt

@@ -34,6 +34,7 @@ django-otp==1.5.4
 django-timezone-field==7.1
 dnspython==2.7.0
 docutils==0.22.2
+graphene-django==3.2.2
 graphviz==0.21
 h11==0.16.0
 httpcore==1.0.9

{arthexis-0.1.24 → arthexis-0.1.25}/config/settings.py

@@ -18,6 +18,8 @@ import ipaddress
 import socket
 from core.log_paths import select_log_dir
 from django.utils.translation import gettext_lazy as _
+from datetime import timedelta
+
 from celery.schedules import crontab
 from django.http import request as http_request
 from django.http.request import split_domain_port
@@ -333,6 +335,7 @@ CsrfViewMiddleware._check_referer = _check_referer_with_forwarded
 # Application definition
 
 LOCAL_APPS = [
+    "api",
     "nodes",
     "core",
     "ocpp",
@@ -666,8 +669,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="*"),
+    "ocpp_forwarding_push": {
+        "task": "ocpp.tasks.push_forwarded_charge_points",
+        "schedule": timedelta(seconds=5),
     },
 }

{arthexis-0.1.24 → arthexis-0.1.25}/config/urls.py

@@ -20,6 +20,7 @@ from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import RedirectView
 from django.views.i18n import set_language
 from django.utils.translation import gettext_lazy as _
+from api.views import EnergyGraphQLView
 from core import views as core_views
 from core.admindocs import (
     CommandsView,
@@ -119,6 +120,7 @@ urlpatterns = [
         name="admin-model-graph",
     ),
     path("version/", core_views.version_info, name="version-info"),
+    path("graphql/", EnergyGraphQLView.as_view(), name="graphql"),
     path(
         "admin/core/releases/<int:pk>/<str:action>/",
         core_views.release_progress,

{arthexis-0.1.24 → arthexis-0.1.25}/core/admin.py

@@ -2266,199 +2266,15 @@ class ProductAdminForm(forms.ModelForm):
         widgets = {"odoo_product": OdooProductWidget}
 
 
-class ProductFetchWizardForm(forms.Form):
-    name = forms.CharField(label="Name", required=False)
-    default_code = forms.CharField(label="Internal reference", required=False)
-    barcode = forms.CharField(label="Barcode", required=False)
-    renewal_period = forms.IntegerField(
-        label="Renewal period (days)", min_value=1, initial=30
-    )
-
-    def __init__(self, *args, require_search_terms=True, **kwargs):
-        self.require_search_terms = require_search_terms
-        super().__init__(*args, **kwargs)
-
-    def clean(self):
-        cleaned = super().clean()
-        if self.require_search_terms:
-            if not any(
-                cleaned.get(field) for field in ("name", "default_code", "barcode")
-            ):
-                raise forms.ValidationError(
-                    _("Enter at least one field to search for a product.")
-                )
-        return cleaned
-
-    def build_domain(self):
-        domain = []
-        if self.cleaned_data.get("name"):
-            domain.append(("name", "ilike", self.cleaned_data["name"]))
-        if self.cleaned_data.get("default_code"):
-            domain.append(("default_code", "ilike", self.cleaned_data["default_code"]))
-        if self.cleaned_data.get("barcode"):
-            domain.append(("barcode", "ilike", self.cleaned_data["barcode"]))
-        return domain
-
-
 @admin.register(Product)
 class ProductAdmin(EntityModelAdmin):
     form = ProductAdminForm
-    actions = ["fetch_odoo_product", "register_from_odoo"]
+    actions = ["register_from_odoo"]
     change_list_template = "admin/core/product/change_list.html"
 
     def _odoo_profile_admin(self):
         return self.admin_site._registry.get(OdooProfile)
 
-    def _search_odoo_products(self, profile, form):
-        domain = form.build_domain()
-        return profile.execute(
-            "product.product",
-            "search_read",
-            [domain],
-            fields=[
-                "name",
-                "default_code",
-                "barcode",
-                "description_sale",
-            ],
-            limit=50,
-        )
-
-    @admin.action(description="Fetch Odoo Product")
-    def fetch_odoo_product(self, request, queryset):
-        profile = getattr(request.user, "odoo_profile", None)
-        has_credentials = bool(profile and profile.is_verified)
-        profile_admin = self._odoo_profile_admin()
-        profile_url = None
-        if profile_admin is not None:
-            profile_url = profile_admin.get_my_profile_url(request)
-
-        context = {
-            "opts": self.model._meta,
-            "queryset": queryset,
-            "action": "fetch_odoo_product",
-            "has_credentials": has_credentials,
-            "profile_url": profile_url,
-        }
-
-        if not has_credentials:
-            context["credential_error"] = _(
-                "Configure your Odoo employee credentials before fetching products."
-            )
-            return TemplateResponse(
-                request, "admin/core/product/fetch_odoo.html", context
-            )
-
-        is_import = "import" in request.POST
-        form_kwargs = {"require_search_terms": not is_import}
-        if request.method == "POST":
-            form = ProductFetchWizardForm(request.POST, **form_kwargs)
-        else:
-            form = ProductFetchWizardForm()
-
-        results = None
-        selected_product_id = request.POST.get("product_id", "")
-
-        if request.method == "POST" and form.is_valid():
-            try:
-                results = self._search_odoo_products(profile, form)
-            except Exception:
-                logger.exception(
-                    "Failed to fetch Odoo products for user %s (profile_id=%s, host=%s, database=%s)",
-                    getattr(getattr(request, "user", None), "pk", None),
-                    getattr(profile, "pk", None),
-                    getattr(profile, "host", None),
-                    getattr(profile, "database", None),
-                )
-                form.add_error(None, _("Unable to fetch products from Odoo."))
-                results = []
-            else:
-                if is_import:
-                    if not self.has_add_permission(request):
-                        form.add_error(
-                            None, _("You do not have permission to add products.")
-                        )
-                    else:
-                        product_id = request.POST.get("product_id")
-                        if not product_id:
-                            form.add_error(None, _("Select a product to import."))
-                        else:
-                            try:
-                                odoo_id = int(product_id)
-                            except (TypeError, ValueError):
-                                form.add_error(None, _("Invalid product selection."))
-                            else:
-                                match = next(
-                                    (item for item in results if item.get("id") == odoo_id),
-                                    None,
-                                )
-                                if not match:
-                                    form.add_error(
-                                        None,
-                                        _(
-                                            "The selected product was not found. Run the search again."
-                                        ),
-                                    )
-                                else:
-                                    existing = self.model.objects.filter(
-                                        odoo_product__id=odoo_id
-                                    ).first()
-                                    if existing:
-                                        self.message_user(
-                                            request,
-                                            _(
-                                                "Product %(name)s already imported; opening existing record."
-                                            )
-                                            % {"name": existing.name},
-                                            level=messages.WARNING,
-                                        )
-                                        return HttpResponseRedirect(
-                                            reverse(
-                                                "admin:%s_%s_change"
-                                                % (
-                                                    existing._meta.app_label,
-                                                    existing._meta.model_name,
-                                                ),
-                                                args=[existing.pk],
-                                            )
-                                        )
-                                    product = self.model.objects.create(
-                                        name=match.get("name") or f"Odoo Product {odoo_id}",
-                                        description=match.get("description_sale", "") or "",
-                                        renewal_period=form.cleaned_data["renewal_period"],
-                                        odoo_product={
-                                            "id": odoo_id,
-                                            "name": match.get("name", ""),
-                                        },
-                                    )
-                                    self.log_addition(
-                                        request, product, "Imported product from Odoo"
-                                    )
-                                    self.message_user(
-                                        request,
-                                        _("Imported %(name)s from Odoo.")
-                                        % {"name": product.name},
-                                    )
-                                    return HttpResponseRedirect(
-                                        reverse(
-                                            "admin:%s_%s_change"
-                                            % (
-                                                product._meta.app_label,
-                                                product._meta.model_name,
-                                            ),
-                                            args=[product.pk],
-                                        )
-                                    )
-        context.update(
-            {
-                "form": form,
-                "results": results,
-                "selected_product_id": selected_product_id,
-            }
-        )
-        context["media"] = self.media + form.media
-        return TemplateResponse(request, "admin/core/product/fetch_odoo.html", context)
-
     def get_urls(self):
         urls = super().get_urls()
         custom = [
@@ -2507,7 +2323,6 @@ class ProductAdmin(EntityModelAdmin):
             products = profile.execute(
                 "product.product",
                 "search_read",
-                [[]],
                 fields=[
                     "name",
                     "description_sale",

{arthexis-0.1.24 → arthexis-0.1.25}/core/backends.py

@@ -217,7 +217,9 @@ class LocalhostAdminBackend(ModelBackend):
             try:
                 ipaddress.ip_address(host)
             except ValueError:
-                if not self._is_test_environment(request):
+                if host.lower() == "localhost":
+                    host = "127.0.0.1"
+                elif not self._is_test_environment(request):
                     return None
             forwarded = request.META.get("HTTP_X_FORWARDED_FOR")
             if forwarded:

{arthexis-0.1.24 → arthexis-0.1.25}/core/models.py

@@ -634,11 +634,21 @@ class OdooProfile(Profile):
         """Return the display label for this profile."""
 
         username = self._resolved_field_value("username")
+        database = self._resolved_field_value("database")
+        if username and database:
+            return f"{username}@{database}"
         if username:
             return username
-        database = self._resolved_field_value("database")
         return database or ""
 
+    def _profile_name(self) -> str:
+        """Return the stored name for this profile without database suffix."""
+
+        username = self._resolved_field_value("username")
+        if username:
+            return username
+        return self._resolved_field_value("database")
+
     def save(self, *args, **kwargs):
         if self.pk:
             old = type(self).all_objects.get(pk=self.pk)
@@ -649,7 +659,7 @@ class OdooProfile(Profile):
                 or old.host != self.host
             ):
                 self._clear_verification()
-        computed_name = self._display_identifier()
+        computed_name = self._profile_name()
         update_fields = kwargs.get("update_fields")
         update_fields_set = set(update_fields) if update_fields is not None else None
         if computed_name != self.name:
@@ -684,6 +694,7 @@ class OdooProfile(Profile):
         self.odoo_uid = uid
         self.email = info.get("email", "")
         self.verified_on = timezone.now()
+        self.name = self._profile_name()
         self.save(update_fields=["odoo_uid", "name", "email", "verified_on"])
         return True
 
@@ -3541,6 +3552,31 @@ class ClientReport(Entity):
 
         return start_value, end_value
 
+    @staticmethod
+    def _format_session_datetime(value):
+        if not value:
+            return None
+        localized = timezone.localtime(value)
+        date_part = formats.date_format(
+            localized, format="MONTH_DAY_FORMAT", use_l10n=True
+        )
+        time_part = formats.time_format(
+            localized, format="TIME_FORMAT", use_l10n=True
+        )
+        return gettext("%(date)s, %(time)s") % {
+            "date": date_part,
+            "time": time_part,
+        }
+
+    @staticmethod
+    def _calculate_duration_minutes(start, end):
+        if not start or not end:
+            return None
+        total_seconds = (end - start).total_seconds()
+        if total_seconds < 0:
+            return None
+        return int(round(total_seconds / 60.0))
+
     @staticmethod
     def _normalize_dataset_for_display(dataset: dict[str, Any]):
         schema = dataset.get("schema")
@@ -3576,6 +3612,15 @@ class ClientReport(Entity):
                             "session_kwh": row.get("session_kwh"),
                             "start": start_dt,
                             "end": end_dt,
+                            "start_display": ClientReport._format_session_datetime(
+                                start_dt
+                            ),
+                            "end_display": ClientReport._format_session_datetime(
+                                end_dt
+                            ),
+                            "duration_minutes": ClientReport._calculate_duration_minutes(
+                                start_dt, end_dt
+                            ),
                         }
                     )
 
@@ -3624,6 +3669,7 @@ class ClientReport(Entity):
                         start_dt = timezone.make_aware(start_dt, timezone.utc)
                     item["start"] = start_dt
                 else:
+                    start_dt = None
                     item["start"] = None
 
                 if end_val:
@@ -3632,8 +3678,15 @@ class ClientReport(Entity):
                         end_dt = timezone.make_aware(end_dt, timezone.utc)
                     item["end"] = end_dt
                 else:
+                    end_dt = None
                     item["end"] = None
 
+                item["start_display"] = ClientReport._format_session_datetime(start_dt)
+                item["end_display"] = ClientReport._format_session_datetime(end_dt)
+                item["duration_minutes"] = ClientReport._calculate_duration_minutes(
+                    start_dt, end_dt
+                )
+
                 parsed.append(item)
 
             return {"schema": schema, "rows": parsed}
@@ -3749,7 +3802,8 @@ class ClientReport(Entity):
             total_kw_period_label = gettext("Total kW (period)")
             connector_label = gettext("Connector")
             account_label = gettext("Account")
-            session_kwh_label = gettext("Session kWh")
+            session_kwh_label = gettext("Session kW")
+            time_label = gettext("Time")
             no_sessions_period = gettext(
                 "No charging sessions recorded for the selected period."
             )
@@ -3765,16 +3819,18 @@ class ClientReport(Entity):
             def format_datetime(value):
                 if not value:
                     return "—"
-                localized = timezone.localtime(value)
-                return formats.date_format(
-                    localized, format="DATETIME_FORMAT", use_l10n=True
-                )
+                return ClientReport._format_session_datetime(value) or "—"
 
             def format_decimal(value):
                 if value is None:
                     return "—"
                 return formats.number_format(value, decimal_pos=2, use_l10n=True)
 
+            def format_duration(value):
+                if value is None:
+                    return "—"
+                return formats.number_format(value, decimal_pos=0, use_l10n=True)
+
             if schema == "evcs-session/v1":
                 evcs_entries = dataset.get("evcs", [])
                 if not evcs_entries:
@@ -3810,6 +3866,7 @@ class ClientReport(Entity):
                                 session_kwh_label,
                                 gettext("Session start"),
                                 gettext("Session end"),
+                                time_label,
                                 connector_label,
                                 gettext("RFID label"),
                                 account_label,
@@ -3819,11 +3876,13 @@ class ClientReport(Entity):
                         for row in transactions:
                             start_dt = row.get("start")
                             end_dt = row.get("end")
+                            duration_value = row.get("duration_minutes")
                             table_data.append(
                                 [
                                     format_decimal(row.get("session_kwh")),
                                     format_datetime(start_dt),
                                     format_datetime(end_dt),
+                                    format_duration(duration_value),
                                     row.get("connector")
                                     if row.get("connector") is not None
                                     else "—",
@@ -3832,7 +3891,14 @@ class ClientReport(Entity):
                                 ]
                             )
 
-                        table = Table(table_data, repeatRows=1)
+                        column_count = len(table_data[0])
+                        col_width = document.width / column_count if column_count else None
+                        table = Table(
+                            table_data,
+                            repeatRows=1,
+                            colWidths=[col_width] * column_count if col_width else None,
+                            hAlign="LEFT",
+                        )
                         table.setStyle(
                             TableStyle(
                                 [