arthexis 0.1.12__py3-none-any.whl → 0.1.13__py3-none-any.whl

ocpp/transactions_io.py

@@ -61,6 +61,12 @@ def export_transactions(
                 "soc_stop": tx.soc_stop,
                 "start_time": tx.start_time.isoformat(),
                 "stop_time": tx.stop_time.isoformat() if tx.stop_time else None,
+                "received_start_time": tx.received_start_time.isoformat()
+                if tx.received_start_time
+                else None,
+                "received_stop_time": tx.received_stop_time.isoformat()
+                if tx.received_stop_time
+                else None,
                 "meter_values": [
                     {
                         "connector_id": mv.connector_id,
@@ -157,6 +163,10 @@ def import_transactions(data: dict) -> int:
             soc_stop=tx.get("soc_stop"),
             start_time=_parse_dt(tx.get("start_time")),
             stop_time=_parse_dt(tx.get("stop_time")),
+            received_start_time=_parse_dt(tx.get("received_start_time"))
+            or _parse_dt(tx.get("start_time")),
+            received_stop_time=_parse_dt(tx.get("received_stop_time"))
+            or _parse_dt(tx.get("stop_time")),
         )
         for mv in tx.get("meter_values", []):
             connector_id = mv.get("connector_id")

ocpp/views.py

@@ -26,13 +26,14 @@ from pages.utils import landing
 from core.liveupdate import live_update
 
 from . import store
-from .models import Transaction, Charger, DataTransferMessage
+from .models import Transaction, Charger, DataTransferMessage, RFID
 from .evcs import (
     _start_simulator,
     _stop_simulator,
     get_simulator_state,
     _simulator_status_json,
 )
+from .status_display import STATUS_BADGE_MAP, ERROR_OK_VALUES
 
 
 def _normalize_connector_slug(slug: str | None) -> tuple[int | None, str]:
@@ -99,7 +100,41 @@ def _ensure_charger_access(user, charger: Charger):
         raise Http404("Charger not found")
 
 
-def _connector_overview(charger: Charger, user=None) -> list[dict]:
+def _transaction_rfid_details(
+    tx_obj, *, cache: dict[str, dict[str, str | None]] | None = None
+) -> dict[str, str | None] | None:
+    """Return normalized RFID metadata for a transaction-like object."""
+
+    if not tx_obj:
+        return None
+    rfid_value = getattr(tx_obj, "rfid", None)
+    if not rfid_value:
+        return None
+    normalized = str(rfid_value).strip()
+    if not normalized:
+        return None
+    normalized = normalized.upper()
+    if cache is not None and normalized in cache:
+        return cache[normalized]
+    tag = RFID.objects.filter(rfid=normalized).only("pk").first()
+    rfid_url = None
+    if tag:
+        try:
+            rfid_url = reverse("admin:core_rfid_change", args=[tag.pk])
+        except NoReverseMatch:  # pragma: no cover - admin may be disabled
+            rfid_url = None
+    details = {"value": normalized, "url": rfid_url}
+    if cache is not None:
+        cache[normalized] = details
+    return details
+
+
+def _connector_overview(
+    charger: Charger,
+    user=None,
+    *,
+    rfid_cache: dict[str, dict[str, str | None]] | None = None,
+) -> list[dict]:
     """Return connector metadata used for navigation and summaries."""
 
     overview: list[dict] = []
@@ -123,6 +158,9 @@ def _connector_overview(charger: Charger, user=None) -> list[dict]:
                 "last_status_timestamp": sibling.last_status_timestamp,
                 "last_status_vendor_info": sibling.last_status_vendor_info,
                 "tx": tx_obj,
+                "rfid_details": _transaction_rfid_details(
+                    tx_obj, cache=rfid_cache
+                ),
                 "connected": store.is_connected(
                     sibling.charger_id, sibling.connector_id
                 ),
@@ -166,6 +204,7 @@ def _landing_page_translations() -> dict[str, dict[str, str]]:
                 "charging_label": gettext("Charging"),
                 "energy_label": gettext("Energy"),
                 "started_label": gettext("Started"),
+                "rfid_label": gettext("RFID"),
                 "instruction_text": gettext(
                     "Plug in your vehicle and slide your RFID card over the reader to begin charging."
                 ),
@@ -190,32 +229,26 @@ def _landing_page_translations() -> dict[str, dict[str, str]]:
     return catalog
 
 
-STATUS_BADGE_MAP: dict[str, tuple[str, str]] = {
-    "available": (_("Available"), "#0d6efd"),
-    "preparing": (_("Preparing"), "#0d6efd"),
-    "charging": (_("Charging"), "#198754"),
-    "suspendedevse": (_("Suspended (EVSE)"), "#fd7e14"),
-    "suspendedev": (_("Suspended (EV)"), "#fd7e14"),
-    "finishing": (_("Finishing"), "#20c997"),
-    "faulted": (_("Faulted"), "#dc3545"),
-    "unavailable": (_("Unavailable"), "#6c757d"),
-    "reserved": (_("Reserved"), "#6f42c1"),
-    "occupied": (_("Occupied"), "#0dcaf0"),
-    "outofservice": (_("Out of Service"), "#6c757d"),
-}
-
-_ERROR_OK_VALUES = {"", "noerror", "no_error"}
-
-
 def _charger_state(charger: Charger, tx_obj: Transaction | list | None):
     """Return human readable state and color for a charger."""
 
     status_value = (charger.last_status or "").strip()
+    has_session = bool(tx_obj)
     if status_value:
         key = status_value.lower()
         label, color = STATUS_BADGE_MAP.get(key, (status_value, "#0d6efd"))
         error_code = (charger.last_error_code or "").strip()
-        if error_code and error_code.lower() not in _ERROR_OK_VALUES:
+        error_code_lower = error_code.lower()
+        if (
+            has_session
+            and error_code_lower in ERROR_OK_VALUES
+            and (key not in STATUS_BADGE_MAP or key == "available")
+        ):
+            # Some stations continue reporting "Available" (or an unknown status)
+            # while a session is active. Override the badge so the user can see
+            # the charger is actually busy.
+            label, color = STATUS_BADGE_MAP.get("charging", (_("Charging"), "#198754"))
+        elif error_code and error_code_lower not in ERROR_OK_VALUES:
             label = _("%(status)s (%(error)s)") % {
                 "status": label,
                 "error": error_code,
@@ -225,7 +258,6 @@ def _charger_state(charger: Charger, tx_obj: Transaction | list | None):
 
     cid = charger.charger_id
     connected = store.is_connected(cid, charger.connector_id)
-    has_session = bool(tx_obj)
     if connected and has_session:
         return _("Charging"), "green"
     if connected:
@@ -575,7 +607,10 @@ def charger_page(request, cid, connector=None):
     """Public landing page for a charger displaying usage guidance or progress."""
     charger, connector_slug = _get_charger(cid, connector)
     _ensure_charger_access(request.user, charger)
-    overview = _connector_overview(charger, request.user)
+    rfid_cache: dict[str, dict[str, str | None]] = {}
+    overview = _connector_overview(
+        charger, request.user, rfid_cache=rfid_cache
+    )
     sessions = _live_sessions(charger)
     tx = None
     active_connector_count = 0
@@ -621,12 +656,14 @@ def charger_page(request, cid, connector=None):
         item for item in overview if item["charger"].connector_id is not None
     ]
     status_url = _reverse_connector_url("charger-status", cid, connector_slug)
+    tx_rfid_details = _transaction_rfid_details(tx, cache=rfid_cache)
     return render(
         request,
         "ocpp/charger_page.html",
         {
             "charger": charger,
             "tx": tx,
+            "tx_rfid_details": tx_rfid_details,
             "connector_slug": connector_slug,
             "connector_links": connector_links,
             "connector_overview": connector_overview,
@@ -680,7 +717,39 @@ def charger_status(request, cid, connector=None):
     paginator = Paginator(transactions_qs, 10)
     page_obj = paginator.get_page(request.GET.get("page"))
     transactions = page_obj.object_list
+    date_view = request.GET.get("dates", "charger").lower()
+    if date_view not in {"charger", "received"}:
+        date_view = "charger"
+
+    def _date_query(mode: str) -> str:
+        params = request.GET.copy()
+        params["dates"] = mode
+        query = params.urlencode()
+        return f"?{query}" if query else ""
+
+    date_view_options = {
+        "charger": _("Charger timestamps"),
+        "received": _("Received timestamps"),
+    }
+    date_toggle_links = [
+        {
+            "mode": mode,
+            "label": label,
+            "url": _date_query(mode),
+            "active": mode == date_view,
+        }
+        for mode, label in date_view_options.items()
+    ]
     chart_data = {"labels": [], "datasets": []}
+    pagination_params = request.GET.copy()
+    pagination_params["dates"] = date_view
+    pagination_params.pop("page", None)
+    pagination_query = pagination_params.urlencode()
+    session_params = request.GET.copy()
+    session_params["dates"] = date_view
+    session_params.pop("session", None)
+    session_params.pop("page", None)
+    session_query = session_params.urlencode()
 
     def _series_from_transaction(tx):
         points: list[tuple[str, float]] = []
@@ -785,6 +854,8 @@ def charger_status(request, cid, connector=None):
             "error": str(_("Unable to send remote start request.")),
         }
     action_url = _reverse_connector_url("charger-action", cid, connector_slug)
+    chart_should_animate = bool(has_active_session and not past_session)
+
     return render(
         request,
         "ocpp/charger_status.html",
@@ -815,6 +886,11 @@ def charger_status(request, cid, connector=None):
                     for dataset in chart_data["datasets"]
                 )
             ),
+            "date_view": date_view,
+            "date_toggle_links": date_toggle_links,
+            "pagination_query": pagination_query,
+            "session_query": session_query,
+            "chart_should_animate": chart_should_animate,
         },
     )
 
@@ -824,6 +900,28 @@ def charger_session_search(request, cid, connector=None):
     charger, connector_slug = _get_charger(cid, connector)
     _ensure_charger_access(request.user, charger)
     date_str = request.GET.get("date")
+    date_view = request.GET.get("dates", "charger").lower()
+    if date_view not in {"charger", "received"}:
+        date_view = "charger"
+
+    def _date_query(mode: str) -> str:
+        params = request.GET.copy()
+        params["dates"] = mode
+        query = params.urlencode()
+        return f"?{query}" if query else ""
+
+    date_toggle_links = [
+        {
+            "mode": mode,
+            "label": label,
+            "url": _date_query(mode),
+            "active": mode == date_view,
+        }
+        for mode, label in {
+            "charger": _("Charger timestamps"),
+            "received": _("Received timestamps"),
+        }.items()
+    ]
     transactions = None
     if date_str:
         try:
@@ -861,6 +959,8 @@ def charger_session_search(request, cid, connector=None):
             "connector_slug": connector_slug,
             "connector_links": connector_links,
             "status_url": status_url,
+            "date_view": date_view,
+            "date_toggle_links": date_toggle_links,
         },
     )
 

pages/admin.py

@@ -23,6 +23,8 @@ from django.utils.translation import gettext_lazy as _, ngettext
 from nodes.models import Node
 from nodes.utils import capture_screenshot, save_screenshot
 
+from .forms import UserManualAdminForm
+
 from .models import (
     SiteBadge,
     Application,
@@ -190,6 +192,7 @@ class ModuleAdmin(EntityModelAdmin):
 
 @admin.register(UserManual)
 class UserManualAdmin(EntityModelAdmin):
+    form = UserManualAdminForm
     list_display = ("title", "slug", "languages", "is_seed_data", "is_user_data")
     search_fields = ("title", "slug", "description")
     list_filter = ("is_seed_data", "is_user_data")

pages/forms.py

@@ -9,7 +9,9 @@ from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
 from django.views.decorators.debug import sensitive_variables
 
-from .models import UserStory
+from core.form_fields import Base64FileField
+
+from .models import UserManual, UserStory
 
 
 class AuthenticatorLoginForm(AuthenticationForm):
@@ -133,6 +135,33 @@ class AuthenticatorEnrollmentForm(forms.Form):
         return self.device
 
 
+_manual_pdf_field = UserManual._meta.get_field("content_pdf")
+
+
+class UserManualAdminForm(forms.ModelForm):
+    content_pdf = Base64FileField(
+        label=_manual_pdf_field.verbose_name,
+        help_text=_manual_pdf_field.help_text,
+        required=not _manual_pdf_field.blank,
+        content_type="application/pdf",
+        download_name="manual.pdf",
+    )
+
+    class Meta:
+        model = UserManual
+        fields = "__all__"
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        instance = getattr(self, "instance", None)
+        slug = getattr(instance, "slug", "")
+        if slug:
+            self.fields["content_pdf"].widget.download_name = f"{slug}.pdf"
+        self.fields["content_pdf"].widget.attrs.setdefault(
+            "accept", "application/pdf"
+        )
+
+
 class UserStoryForm(forms.ModelForm):
     class Meta:
         model = UserStory

pages/tests.py

@@ -22,9 +22,15 @@ from pages.models import (
     SiteBadge,
     Favorite,
     ViewHistory,
+    UserManual,
     UserStory,
 )
-from pages.admin import ApplicationAdmin, UserStoryAdmin, ViewHistoryAdmin
+from pages.admin import (
+    ApplicationAdmin,
+    UserManualAdmin,
+    UserStoryAdmin,
+    ViewHistoryAdmin,
+)
 from pages.screenshot_specs import (
     ScreenshotSpec,
     ScreenshotSpecRunner,
@@ -1069,6 +1075,65 @@ class ConstellationNavTests(TestCase):
         resp = self.client.get(reverse("pages:index"))
         self.assertContains(resp, 'href="/ocpp/"')
 
+class ControlNavTests(TestCase):
+    def setUp(self):
+        self.client = Client()
+        role, _ = NodeRole.objects.get_or_create(name="Control")
+        Node.objects.update_or_create(
+            mac_address=Node.get_current_mac(),
+            defaults={
+                "hostname": "localhost",
+                "address": "127.0.0.1",
+                "role": role,
+            },
+        )
+        Site.objects.update_or_create(
+            id=1, defaults={"domain": "testserver", "name": ""}
+        )
+        fixtures = [
+            Path(
+                settings.BASE_DIR,
+                "pages",
+                "fixtures",
+                "control__application_ocpp.json",
+            ),
+            Path(
+                settings.BASE_DIR,
+                "pages",
+                "fixtures",
+                "control__module_ocpp.json",
+            ),
+            Path(
+                settings.BASE_DIR,
+                "pages",
+                "fixtures",
+                "control__landing_ocpp_dashboard.json",
+            ),
+            Path(
+                settings.BASE_DIR,
+                "pages",
+                "fixtures",
+                "control__landing_ocpp_cp_simulator.json",
+            ),
+            Path(
+                settings.BASE_DIR,
+                "pages",
+                "fixtures",
+                "control__landing_ocpp_rfid.json",
+            ),
+        ]
+        call_command("loaddata", *map(str, fixtures))
+
+    def test_ocpp_dashboard_visible(self):
+        user = get_user_model().objects.create_user("control", password="pw")
+        self.client.force_login(user)
+        resp = self.client.get(reverse("pages:index"))
+        self.assertEqual(resp.status_code, 200)
+        self.assertContains(resp, 'href="/ocpp/"')
+        self.assertContains(
+            resp, 'badge rounded-pill text-bg-secondary">CHARGERS'
+        )
+
     def test_header_links_visible_when_defined(self):
         Reference.objects.create(
             alt_text="Console",
@@ -1242,6 +1307,58 @@ class ApplicationAdminDisplayTests(TestCase):
         self.assertContains(resp, "Power, Energy and Cost calculations.")
 
 
+class UserManualAdminFormTests(TestCase):
+    def setUp(self):
+        self.manual = UserManual.objects.create(
+            slug="manual-one",
+            title="Manual One",
+            description="Test manual",
+            languages="en",
+            content_html="<p>Manual</p>",
+            content_pdf=base64.b64encode(b"initial").decode("ascii"),
+        )
+
+    def test_widget_uses_slug_for_download(self):
+        admin_instance = UserManualAdmin(UserManual, admin.site)
+        form_class = admin_instance.get_form(request=None, obj=self.manual)
+        form = form_class(instance=self.manual)
+        field = form.fields["content_pdf"]
+        self.assertEqual(field.widget.download_name, f"{self.manual.slug}.pdf")
+        self.assertEqual(field.widget.content_type, "application/pdf")
+
+    def test_upload_encodes_content_pdf(self):
+        admin_instance = UserManualAdmin(UserManual, admin.site)
+        form_class = admin_instance.get_form(request=None, obj=self.manual)
+        payload = {
+            "slug": self.manual.slug,
+            "title": self.manual.title,
+            "description": self.manual.description,
+            "languages": self.manual.languages,
+            "content_html": self.manual.content_html,
+        }
+        upload = SimpleUploadedFile("manual.pdf", b"PDF data")
+        form = form_class(data=payload, files={"content_pdf": upload}, instance=self.manual)
+        self.assertTrue(form.is_valid(), form.errors.as_json())
+        self.assertEqual(
+            form.cleaned_data["content_pdf"],
+            base64.b64encode(b"PDF data").decode("ascii"),
+        )
+
+    def test_initial_base64_preserved_without_upload(self):
+        admin_instance = UserManualAdmin(UserManual, admin.site)
+        form_class = admin_instance.get_form(request=None, obj=self.manual)
+        payload = {
+            "slug": self.manual.slug,
+            "title": self.manual.title,
+            "description": self.manual.description,
+            "languages": self.manual.languages,
+            "content_html": self.manual.content_html,
+        }
+        form = form_class(data=payload, files={}, instance=self.manual)
+        self.assertTrue(form.is_valid(), form.errors.as_json())
+        self.assertEqual(form.cleaned_data["content_pdf"], self.manual.content_pdf)
+
+
 class LandingCreationTests(TestCase):
     def setUp(self):
         role, _ = NodeRole.objects.get_or_create(name="Terminal")

pages/views.py

@@ -169,7 +169,7 @@ def _build_model_graph(models):
         raise RuntimeError("Graphviz is not installed")
 
     graph = Digraph(
-        "admin_app_models",
+        name="admin_app_models",
         graph_attr={
             "rankdir": "LR",
             "splines": "ortho",
@@ -229,7 +229,7 @@ def _build_model_graph(models):
         label = '<\n  <table BORDER="0" CELLBORDER="1" CELLSPACING="0" CELLPADDING="4">\n    '
         label += "\n    ".join(rows)
         label += "\n  </table>\n>"
-        graph.node(node_id, label=label)
+        graph.node(name=node_id, label=label)
 
     edges = set()
     for model in models:
@@ -244,7 +244,11 @@ def _build_model_graph(models):
             key = (source_id, node_ids[related], tuple(sorted(attrs.items())))
             if key not in edges:
                 edges.add(key)
-                graph.edge(source_id, node_ids[related], **attrs)
+                graph.edge(
+                    tail_name=source_id,
+                    head_name=node_ids[related],
+                    **attrs,
+                )
 
         for field in model._meta.local_many_to_many:
             related = _resolve_related_model(field, model._meta.app_label)
@@ -259,7 +263,11 @@ def _build_model_graph(models):
             key = (source_id, node_ids[related], tuple(sorted(attrs.items())))
             if key not in edges:
                 edges.add(key)
-                graph.edge(source_id, node_ids[related], **attrs)
+                graph.edge(
+                    tail_name=source_id,
+                    head_name=node_ids[related],
+                    **attrs,
+                )
 
     return graph