wbreport 1.44.4__py2.py3-none-any.whl → 1.45.0__py2.py3-none-any.whl

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/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/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/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/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/filters.py

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

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/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/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/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/urls_public.py

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

wbreport/viewsets/__init__.py

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

wbreport/viewsets/configs/__init__.py

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

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/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/viewsets/configs/titles.py

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

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 ""

{wbreport-1.44.4.dist-info → wbreport-1.45.0.dist-info}/METADATA

@@ -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.dist-info → wbreport-1.45.0.dist-info}/RECORD

@@ -2,22 +2,22 @@ wbreport/__init__.py,sha256=J-j-u0itpEFT6irdmWmixQqYMadNl1X91TxUmoiLHMI,22
 wbreport/admin.py,sha256=tQPq0BKzXZ7I3aOE0FaGyjuKs37TiT56s7OT0mDfOXo,2364
 wbreport/apps.py,sha256=4z2N25hswEAlsJsntASC5iOWUwsqMCL99-gvqBlPGFY,148
 wbreport/dynamic_preferences_registry.py,sha256=nGT-fS5vN-BSVNyGcJ81ORjiXlOngePRN9hipB9olPw,508
-wbreport/filters.py,sha256=2j8osC3fx5mLWilV3rKoSjSph9mWL04TMuVcd-yEf4A,1146
-wbreport/mixins.py,sha256=Hx_LTPVfmygrnyDTOjNi58N_QNfdBURPmriLNV3pbfU,5520
+wbreport/filters.py,sha256=2onemO-Vpeqi7gXqxZWAmQg-5TT9Vyt3iJX32sLfhwU,1147
+wbreport/mixins.py,sha256=bAfMvfPL4YEGfEM8fsX-B_JDnN1spcefOhZU-g30080,5521
 wbreport/models.py,sha256=cRKgmdbb2cKRr04jkTtwv6kmRc5fd8CcIUENKlGIegQ,29595
-wbreport/serializers.py,sha256=_heMGD75ncR3ygs-OcdpFVPjCZUyEI4F3iVS9yp47Yc,7226
-wbreport/tasks.py,sha256=KLSRyw0aRhLsmT5UGdlalpRbNyRFXBRfejg5k9j8wPo,2270
-wbreport/urls.py,sha256=6VuxcSKi5aMmH8IIqmXlBcIhdam_pGl2T_xemhZh6FI,1205
-wbreport/urls_public.py,sha256=LbzOc79VKmKUntsUb54lm0QoC22ip05ZdyNbSl2j3KQ,369
+wbreport/serializers.py,sha256=k1hrtd8QodqRkM1Ol9MsLjk0n_XZU8qGLRR62EHJCXM,7236
+wbreport/tasks.py,sha256=O1mcYdOlqnj0lA7K52OszA7OBLClMhuzRm6ZiTcXAOY,2271
+wbreport/urls.py,sha256=yoIFuuwPCRRjOM0VzMznyMmMQXbSVfdk1l12xZJ7Ecs,1463
+wbreport/urls_public.py,sha256=oc_gBiKvLqWkSDAm_0yitWgpfEnlh3_hGUugkLrLCLs,370
 wbreport/defaults/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbreport/defaults/factsheets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbreport/defaults/factsheets/base.py,sha256=0qmn10S2l6cqcZV_pUS7c-lHlC8ajOmDmUsgJVQ2OJU,41089
-wbreport/defaults/factsheets/menu.py,sha256=G2iX6jZhqddoFsc3-t2uI7ZverUaBzF7EjqAbLrIEYU,4579
+wbreport/defaults/factsheets/base.py,sha256=9dIylgXoUSXdHcspCGm3-TJ8Kei38tJ_6ew3gHoM9M4,41090
+wbreport/defaults/factsheets/menu.py,sha256=NTcUuViV4Q-qkffoA7wMSyxnE4mWPysu3KTKWxFmMCM,4580
 wbreport/defaults/factsheets/mixins.py,sha256=E0RvxmUpvpG7B7YngBPXJ35eD3nwNandJFzLjj1rNRI,1267
-wbreport/defaults/factsheets/multitheme.py,sha256=Kje360mRE8XTIOugCOL7-44fjjIrnbmcx5HrzVqtzbI,38487
+wbreport/defaults/factsheets/multitheme.py,sha256=LHM7tceWP9SJ9E8ChtD7eAq21uWMPdLBolnmgYBDTaw,38488
 wbreport/factories/__init__.py,sha256=jyD1_R-xc2JPZIaSwtE7zYATdL9NIXIDqTwjLw1MolA,170
-wbreport/factories/data_classes.py,sha256=BwYqbw75lnZSim8LNY9-mhf79GjGqdQdd8XQiPPNyvA,1486
-wbreport/factories/reports.py,sha256=_oJBJp5WmoaZ0BjU8MwqYdBpSJxsQH61b3QQrOmYOOU,2285
+wbreport/factories/data_classes.py,sha256=Ms9bqG370OQTmE3Kxvt9xay-6lfTnqEA3Sx7zCQKWXw,1487
+wbreport/factories/reports.py,sha256=nGWa_fS78XGUbS8E35rGl3IJySHLB81ggq-3JllPOx4,2286
 wbreport/fixtures/wbreport.yaml,sha256=VKagUKjjW49ZMjKvUdO72AS9rQzWk-6YWzpiUjmHCXk,5467
 wbreport/migrations/0001_initial_squashed_squashed_0007_report_key.py,sha256=ghAnYJK01-ISld9CUfU18sqdIstuw5UrOgWH2y8gcTs,10061
 wbreport/migrations/0008_alter_report_file_content_type.py,sha256=qPR9kWiZLDvfw9H3-BsUdmdIEwlhm5iHSoSax8hzjNE,715
@@ -56,15 +56,15 @@ wbreport/tests/test_models.py,sha256=nCBcCLBylZsFMSgkU6mm4iQdoPVRuS42taCI0pb6Gx4
 wbreport/tests/test_tasks.py,sha256=icRtEyAtKfhxyx_oN6cYtkUA4QMaGwEpdKKhc07OPKc,762
 wbreport/tests/test_viewsets.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbreport/tests/tests.py,sha256=j2A1uu5DtGu2w056j0S4O7u2OxylldMPCmr7bbSOvfk,282
-wbreport/viewsets/__init__.py,sha256=EzsLpS7Y7HxrcLXUJ0DPAmtgewOqkKjoLwHmgijT7Hk,287
-wbreport/viewsets/viewsets.py,sha256=MuglJiKtfKWX3uq81ghChEGJVzvXDqJEef9dSEZJ2Ao,13120
-wbreport/viewsets/configs/__init__.py,sha256=Tsw7Ffe_iy63CPRZgtsIXkZjUMvKdsMxSz5xzmyqF5A,494
-wbreport/viewsets/configs/buttons.py,sha256=Hbofe9TtZ5JdoLOb_rlGzC-_Z_lnJpIseXnFoJd9i-g,8914
+wbreport/viewsets/__init__.py,sha256=iEgYvZsLxQ3Hhf1hwHVdSD7Dm1OZK1Z6qhvTADqs-oc,322
+wbreport/viewsets/viewsets.py,sha256=IDHm-38_i-hcwODz9v6zUXQBUQq2rYqHLXICEUqsx-8,13746
+wbreport/viewsets/configs/__init__.py,sha256=WDvXbmGKD6_DP3nongBzL6lOHYwz5JC0gWtS1C2N4FY,535
+wbreport/viewsets/configs/buttons.py,sha256=jJYCTpE9mT1VF6zdrGipenw2fZPE2P5_wbitz4R-XAw,8912
 wbreport/viewsets/configs/displays.py,sha256=py3Wcut9uKmer7LV-ftIi0xU97PFctJT-yKZmdgc8qk,4897
-wbreport/viewsets/configs/endpoints.py,sha256=wPbB0JnnKSF8hSX07W67rdGkP0VKqLBhTnjBKjZzaL0,799
+wbreport/viewsets/configs/endpoints.py,sha256=LdGFUYMNUHt6qBORnu4IR8Vn2qIIv2Q2TLOs0-cGH0g,1060
 wbreport/viewsets/configs/menus.py,sha256=trDZsdjXip8KQ4SY1uIudZWFqwb3rQHIRSU36dzRzy0,269
-wbreport/viewsets/configs/titles.py,sha256=AYY1ekJp9V8iihcuR8Ygl-7_1AYpXoAp8WthpWWD5GE,782
-wbreport-1.44.4.dist-info/METADATA,sha256=R2PoRa-2lwbdk_x5SRDigqOg0uE-VWWRhAU5IVw0AkI,186
-wbreport-1.44.4.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbreport-1.44.4.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
-wbreport-1.44.4.dist-info/RECORD,,
+wbreport/viewsets/configs/titles.py,sha256=bAfruj40yHrSUPzuJ7WGlfJDl7NXXKSaTqITPNn4eJA,783
+wbreport-1.45.0.dist-info/METADATA,sha256=lOOlx1Ruw3FK4RvYFENTcpctHyCW-FzBaLToXQ2Ijg0,186
+wbreport-1.45.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbreport-1.45.0.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
+wbreport-1.45.0.dist-info/RECORD,,