wbreport 1.44.4__tar.gz → 1.45.0__tar.gz

{wbreport-1.44.4 → wbreport-1.45.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbreport
-Version: 1.44.4
+Version: 1.45.0
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 License-File: LICENSE
 Requires-Dist: wbcore

{wbreport-1.44.4 → wbreport-1.45.0}/wbreport/defaults/factsheets/base.py

@@ -34,6 +34,7 @@ from wbcore.utils.figures import (
     get_piechart,
 )
 from wbportfolio.models.products import InvestmentIndex
+
 from wbreport.mixins import ReportMixin
 from wbreport.models import ReportAsset
 from wbreport.pdf.charts.pie import (

{wbreport-1.44.4 → wbreport-1.45.0}/wbreport/defaults/factsheets/menu.py

@@ -4,6 +4,7 @@ from django.db import models
 from django.template.loader import get_template
 from rest_framework.reverse import reverse
 from wbportfolio.models import Instrument
+
 from wbreport.mixins import ReportMixin
 
 from .mixins import FactsheetReportMixin

{wbreport-1.44.4 → wbreport-1.45.0}/wbreport/defaults/factsheets/multitheme.py

@@ -33,6 +33,7 @@ from wbcore.utils.figures import (
     get_piechart,
 )
 from wbportfolio.models.products import InvestmentIndex
+
 from wbreport.mixins import ReportMixin
 from wbreport.models import ReportAsset
 from wbreport.pdf.charts.pie import (

{wbreport-1.44.4 → wbreport-1.45.0}/wbreport/factories/data_classes.py

@@ -2,6 +2,7 @@ import datetime as dt
 from io import BytesIO
 
 from django.template import Context, Template
+
 from wbreport.mixins import ReportMixin
 
 

{wbreport-1.44.4 → wbreport-1.45.0}/wbreport/factories/reports.py

@@ -3,6 +3,7 @@ from io import BytesIO
 import factory
 from PIL import Image
 from wbcore.contrib.color.factories import ColorGradientFactory
+
 from wbreport.models import (
     Report,
     ReportAsset,

{wbreport-1.44.4 → wbreport-1.45.0}/wbreport/filters.py

@@ -1,4 +1,5 @@
 from wbcore import filters as wb_filters
+
 from wbreport.models import Report, ReportVersion
 
 

{wbreport-1.44.4 → wbreport-1.45.0}/wbreport/mixins.py

@@ -4,6 +4,7 @@ from typing import Any, Dict
 
 from django.contrib.auth import get_user_model
 from django.template.loader import get_template
+
 from wbreport.models import Report, ReportVersion
 
 User = get_user_model()

{wbreport-1.44.4 → wbreport-1.45.0}/wbreport/serializers.py

@@ -60,7 +60,7 @@ class ReportVersionModelSerializer(wb_serializers.ModelSerializer):
             if not instance.report.file_disabled:
                 res["file"] = reverse("report:reportversion-file", args=[instance.id], request=request)
 
-            res["html"] = reverse("report:reportversion-html", args=[instance.id], request=request)
+            res["html"] = reverse("wbreport:reportversion-rawhtml-list", args=[instance.id], request=request)
             if instance.report.mailing_list:
                 res["send_email"] = reverse("report:reportversion-sendemail", args=[instance.id], request=request)
         return res

{wbreport-1.44.4 → wbreport-1.45.0}/wbreport/tasks.py

@@ -8,6 +8,7 @@ from django.template.loader import get_template
 from slugify import slugify
 from wbcore.contrib.authentication.models import User
 from wbcore.utils.html import convert_html2text
+
 from wbreport.models import Report, ReportVersion
 
 

{wbreport-1.44.4 → wbreport-1.45.0}/wbreport/urls.py

@@ -1,5 +1,6 @@
 from django.urls import include, path
 from wbcore.routers import WBCoreRouter
+
 from wbreport.viewsets import viewsets
 
 router = WBCoreRouter()
@@ -25,5 +26,11 @@ router.register(r"reportcategory", viewsets.ReportCategoryModelViewSet, basename
 report_router = WBCoreRouter()
 report_router.register(r"version", viewsets.ReportVersionReportModelViewSet, basename="report-version")
 
+report_version_router = WBCoreRouter()
+report_version_router.register(r"rawhtml", viewsets.ReportVersionReportHTMLViewSet, basename="reportversion-rawhtml")
 
-urlpatterns = [path("", include(router.urls)), path("report/<int:report_id>/", include(report_router.urls))]
+urlpatterns = [
+    path("", include(router.urls)),
+    path("report/<int:report_id>/", include(report_router.urls)),
+    path("reportversion/<int:report_version_id>/", include(report_version_router.urls)),
+]

{wbreport-1.44.4 → wbreport-1.45.0}/wbreport/urls_public.py

@@ -1,4 +1,5 @@
 from django.urls import path
+
 from wbreport.viewsets import viewsets
 
 urlpatterns = [

{wbreport-1.44.4 → wbreport-1.45.0}/wbreport/viewsets/__init__.py

@@ -7,4 +7,5 @@ from .viewsets import (
     ReportVersionRepresentationViewSet,
     download_report_version_file,
     report_version,
+    ReportVersionReportHTMLViewSet
 )

{wbreport-1.44.4 → wbreport-1.45.0}/wbreport/viewsets/configs/__init__.py

@@ -9,6 +9,7 @@ from .endpoints import (
     ReportEndpointConfig,
     ReportVersionEndpointConfig,
     ReportVersionReportEndpointConfig,
+    ReportVersionReportHTMEndpointConfig
 )
 from .titles import (
     ReportTitleConfig,

{wbreport-1.44.4 → wbreport-1.45.0}/wbreport/viewsets/configs/buttons.py

@@ -6,6 +6,7 @@ from wbcore.metadata.configs.buttons.view_config import ButtonViewConfig
 from wbcore.metadata.configs.display.instance_display.shortcuts import (
     create_simple_display,
 )
+
 from wbreport.models import Report
 
 
@@ -147,7 +148,7 @@ class ReportButtonConfig(ButtonViewConfig):
 class ReportVersionButtonConfig(ButtonViewConfig):
     def get_custom_list_instance_buttons(self):
         return {
-            bt.HyperlinkButton(
+            bt.WidgetButton(
                 key="html",
                 label="Report (HTML)",
                 icon=WBIcon.LINK.icon,

{wbreport-1.44.4 → wbreport-1.45.0}/wbreport/viewsets/configs/endpoints.py

@@ -21,3 +21,10 @@ class ReportEndpointConfig(EndpointViewConfig):
 class ReportVersionReportEndpointConfig(EndpointViewConfig):
     def get_list_endpoint(self, **kwargs):
         return reverse("wbreport:report-version-list", args=[self.view.kwargs["report_id"]], request=self.request)
+
+
+class ReportVersionReportHTMEndpointConfig(EndpointViewConfig):
+    def get_list_endpoint(self, **kwargs):
+        return reverse(
+            "wbreport:reportversion-rawhtml-list", args=[self.view.kwargs["report_version_id"]], request=self.request
+        )

{wbreport-1.44.4 → wbreport-1.45.0}/wbreport/viewsets/configs/titles.py

@@ -1,4 +1,5 @@
 from wbcore.metadata.configs.titles import TitleViewConfig
+
 from wbreport.models import Report
 
 

{wbreport-1.44.4 → wbreport-1.45.0}/wbreport/viewsets/viewsets.py

@@ -21,6 +21,7 @@ from wbcore.contrib.authentication.authentication import (
     QueryTokenAuthentication,
 )
 from wbcore.contrib.guardian.viewsets.mixins import GuardianFilterMixin
+
 from wbreport.filters import ReportFilterSet, ReportVersionFilterSet
 from wbreport.models import (
     Report,
@@ -54,6 +55,7 @@ from wbreport.viewsets.configs import (
     ReportVersionEndpointConfig,
     ReportVersionReportDisplayConfig,
     ReportVersionReportEndpointConfig,
+    ReportVersionReportHTMEndpointConfig,
     ReportVersionReportTitleConfig,
     ReportVersionTitleConfig,
 )
@@ -328,3 +330,19 @@ class ReportVersionReportModelViewSet(ReportVersionModelViewSet):
         if report.is_accessible(self.request.user):
             return super().get_queryset().filter(report=self.kwargs["report_id"])
         return ReportVersion.objects.none()
+
+
+class ReportVersionReportHTMLViewSet(viewsets.HTMLViewSet):
+    IDENTIFIER = "wbreport:reportversion-rawhtml"
+    queryset = ReportVersion.objects.all()
+
+    endpoint_config_class = ReportVersionReportHTMEndpointConfig
+
+    def get_queryset(self):
+        return super().get_queryset().filter(id=self.kwargs["report_version_id"])
+
+    def get_html(self, queryset) -> str:
+        version = get_object_or_404(ReportVersion, id=self.kwargs["report_version_id"])
+        if version.report.is_accessible(self.request.user):
+            return version.generate_html()
+        return ""