fix: fix date representation in tables, fix url for datasets

Author: mutantsan

ckanext/better_stats/metrics/dataset_metrics.py

@@ -145,7 +145,7 @@ def get_data(self) -> list[dict[str, Any]]:
             .order_by("day")
             .all()
         )
-        return [{"day": row.day.strftime("%Y-%m-%d"), "count": row.count} for row in rows]
+        return [{"day": row.day.strftime("%d %B %Y"), "count": row.count} for row in rows]
 
     def get_chart_data(self) -> dict[str, Any]:
         data = self.get_data()
@@ -337,7 +337,7 @@ def get_table_data(self) -> dict[str, Any]:
             "rows": [
                 [
                     item["title"],
-                    {"text": item["url"], "url": item["url"]},
+                    {"text": item["title"], "url": item["url"]},
                 ]
                 for item in data
             ],
@@ -392,7 +392,8 @@ def get_data(self) -> list[dict[str, Any]]:
             {
                 "name": row.name,
                 "title": row.title or row.name,
-                "last_updated": row.metadata_modified.strftime("%Y-%m-%d"),
+                "last_updated": row.metadata_modified.strftime("%d %B %Y"),
+                "url": tk.url_for("dataset.read", id=row.name, _external=False),
             }
             for row in rows
         ]
@@ -404,7 +405,7 @@ def get_table_data(self) -> dict[str, Any]:
         data = self.get_data()
         return {
             "headers": [tk._("Dataset"), tk._("Last Updated")],
-            "rows": [[item["title"], item["last_updated"]] for item in data],
+            "rows": [[{"text": item["title"], "url": item["url"]}, item["last_updated"]] for item in data],
         }
 
     def get_export_data(self) -> dict[str, Any]:

ckanext/better_stats/metrics/organization_metrics.py

@@ -183,7 +183,7 @@ def get_table_data(self) -> dict[str, Any]:
             "rows": [
                 [
                     row.title or row[0],
-                    row.created.strftime("%Y-%m-%d") if row.created else "—",
+                    row.created.strftime("%d %B %Y") if row.created else "—",
                 ]
                 for row in rows
             ],
@@ -444,7 +444,7 @@ def get_data(self) -> list[dict[str, Any]]:
         return [
             {
                 "organization": row.title,
-                "created": row.created.strftime("%Y-%m-%d") if row.created else "—",
+                "created": row.created.strftime("%d %B %Y") if row.created else "—",
             }
             for row in rows
         ]

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ckanext-better-stats"
-version = "0.4.1"
+version = "0.4.2"
 description = "Flexible CKAN extension for defining and displaying custom metrics with support for caching, access control, and multiple output formats"
 readme = "README.md"
 authors = [