PyPI - django-advanced-report-builder - Versions diffs - 1.0.2__tar.gz → 1.0.4__tar.gz - Mend

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-advanced-report-builder
-Version: 1.0.2
+Version: 1.0.4
 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

@@ -67,7 +67,6 @@ class FullCalendarYearView(SourceBase):
 packages = {
     'query_builder': [JQueryExtendext, Dot, QueryBuilder],
     'full_calendar': [Moment, FullCalendar, FullCalendarYearView],
-    'full_calendar2': [FullCalendar, FullCalendarYearView],
     'dashboard': [DashboardInclude],
     'funnel': [D3, D3Funnel],
 }

@@ -27,7 +27,10 @@
                         }
                         function toISOFormat(dateStr) {
-                            if (dateStr.includes(' ')) {
+                            if (dateStr.includes('-')) {
+                                return dateStr;
+                            }
+                            else if (dateStr.includes(' ')) {
                                 const [date, time] = dateStr.split(' ');
                                 const [day, month, year] = date.split('/');
                                 return `${year}-${month.padStart(2, '0')}-${day.padStart(2, '0')}T${time}`;

@@ -52,7 +52,6 @@ class VariableDate:
     RANGE_TYPE_4_WEEKS_AGO = 46
     RANGE_TYPE_5_WEEKS_AGO = 47
     RANGE_TYPE_6_WEEKS_AGO = 48
-    RANGE_TYPE_CUSTOM_STRING = 50
     RANGE_TYPE_CHOICES = (
         (RANGE_TYPE_LAST_36_MONTHS, 'Last 36 months'),
@@ -99,7 +98,6 @@ class VariableDate:
         (RANGE_TYPE_NEXT_36_MONTHS, 'Next 36 months'),
         (RANGE_TYPE_THIS_YEAR, 'This year'),
         (RANGE_TYPE_LAST_YEAR, 'Last year'),
-        (RANGE_TYPE_CUSTOM_STRING, 'Custom string'),
     )
     def get_variable_dates(self, range_type):

@@ -8,7 +8,7 @@ from django.http import JsonResponse
 from django.shortcuts import get_object_or_404
 from django.urls import reverse
 from django.views.generic import TemplateView
-from django_datatables.columns import DateColumn, MenuColumn
+from django_datatables.columns import DateColumn, MenuColumn, DateTimeColumn
 from django_datatables.datatables import DatatableExcludedRow
 from django_datatables.helpers import DUMMY_ID, row_link
 from django_datatables.widgets import DataTableReorderWidget
@@ -39,6 +39,8 @@ from advanced_report_builder.views.report import ReportBase
 class CalendarTable(ChartJSTable):
+    DATE_COLUMNS = (DateColumn, DateTimeColumn)
     def get_table_array(self, request, results):
         result_processes = self.get_result_processes()
         for p in result_processes:
@@ -54,6 +56,8 @@ class CalendarTable(ChartJSTable):
                 for column in self.columns:
                     if isinstance(column, DescriptionColumn):
                         row_data.append(column.row_result(data_dict, self.page_results, columns=self.columns))
+                    elif isinstance(column, self.DATE_COLUMNS) and hasattr(column, 'iso_row_result'):
+                        row_data.append(column.iso_row_result(data_dict, self.page_results))
                     else:
                         row_data.append(column.row_result(data_dict, self.page_results))

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

django-advanced-report-builder 1.0.2__tar.gz → 1.0.4__tar.gz