django-advanced-report-builder 0.9.6__tar.gz → 0.9.8__tar.gz

{django_advanced_report_builder-0.9.6/django_advanced_report_builder.egg-info → django_advanced_report_builder-0.9.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-advanced-report-builder
-Version: 0.9.6
+Version: 0.9.8
 Summary: Django app that allows you to build reports from modals
 Home-page: https://github.com/django-advance-utils/django-advanced-report-builder
 Author: Thomas Turner

{django_advanced_report_builder-0.9.6 → django_advanced_report_builder-0.9.8}/advanced_report_builder/columns.py

@@ -238,18 +238,39 @@ class ReportBuilderColumnLink(ColumnLink):
     def url(self):
         return self._url
 
+    def setup_link(self, link_css, link_html):
+        if self.enable_links():
+            link_css = f' class="{link_css}"' if link_css else ''
+            link = f'<a{link_css} href="{self.url}">{{}}</a>'
+        else:
+            link = f'{{}}'
+        if isinstance(self.field, (list, tuple)):
+            self.options['render'] = [
+                render_replace(column=self.column_name + ':0', html=link.format(link_html), var='999999'),
+                render_replace(column=self.column_name + ':1'),
+            ]
+        elif self.var not in link_html:
+            self.options['render'] = [render_replace(column=self.link_ref_column,
+                                                     html=link.format(link_html), var='999999')]
+        else:
+            self.options['render'] = [render_replace(column=self.column_name,
+                                                     html=link.format(link_html),
+                                                     var=self.var),
+                                      render_replace(column=self.link_ref_column, var='999999')]
+
     @url.setter
     def url(self, url_name):
-        if (
-            not self.table
-            or self.table.view is None
-            or self.table.view.kwargs.get('enable_links')
-            or getattr(self.table.view, 'enable_links', False)
-        ):
+        if self.enable_links():
             self._url = get_url(url_name)
         else:
             self._url = f'#?{DUMMY_ID}'
 
+    def enable_links(self):
+        return (not self.table
+                or self.table.view is None
+                or self.table.view.kwargs.get('enable_links')
+                or getattr(self.table.view, 'enable_links', False))
+
 
 class RecordCountColumn(ColumnBase):
     def __init__(self, field=None, **kwargs):

django_advanced_report_builder-0.9.8/advanced_report_builder/templates/advanced_report_builder/extra_query_modal.html

@@ -0,0 +1,13 @@
+{% extends 'django_modals/modal_formset_base.html' %}
+
+{% block javascript %}
+<script>
+
+function save_modal_{{ form.form_id }}() {
+    id_query.save_query_builder();
+    id_extra_query.save_query_builder();
+    django_modal.process_commands_lock([{'function': 'post_modal'}]);
+}
+</script>
+{% endblock %}
+

{django_advanced_report_builder-0.9.6 → django_advanced_report_builder-0.9.8/django_advanced_report_builder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-advanced-report-builder
-Version: 0.9.6
+Version: 0.9.8
 Summary: Django app that allows you to build reports from modals
 Home-page: https://github.com/django-advance-utils/django-advanced-report-builder
 Author: Thomas Turner

{django_advanced_report_builder-0.9.6 → django_advanced_report_builder-0.9.8}/django_advanced_report_builder.egg-info/SOURCES.txt

@@ -123,6 +123,7 @@ advanced_report_builder/static/advanced_report_builder/query_builder/scss/plugin
 advanced_report_builder/static/advanced_report_builder/query_builder/scss/plugins/filter-description.scss
 advanced_report_builder/static/advanced_report_builder/query_builder/scss/plugins/invert.scss
 advanced_report_builder/static/advanced_report_builder/query_builder/scss/plugins/sortable.scss
+advanced_report_builder/templates/advanced_report_builder/extra_query_modal.html
 advanced_report_builder/templates/advanced_report_builder/query_builder.html
 advanced_report_builder/templates/advanced_report_builder/query_modal.html
 advanced_report_builder/templates/advanced_report_builder/select_column.html

{django_advanced_report_builder-0.9.6 → django_advanced_report_builder-0.9.8}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="django-advanced-report-builder",
-    version="0.9.6",
+    version="0.9.8",
     author="Thomas Turner",
     description="Django app that allows you to build reports from modals",
     long_description=long_description,