django-advanced-report-builder 1.0.3__tar.gz → 1.0.5__tar.gz

{django_advanced_report_builder-1.0.3/django_advanced_report_builder.egg-info → django_advanced_report_builder-1.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-advanced-report-builder
-Version: 1.0.3
+Version: 1.0.5
 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-1.0.3 → django_advanced_report_builder-1.0.5}/advanced_report_builder/templates/advanced_report_builder/calendar/report.html

@@ -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}`;

{django_advanced_report_builder-1.0.3 → django_advanced_report_builder-1.0.5}/advanced_report_builder/views/calendar.py

@@ -3,7 +3,7 @@ from datetime import timedelta
 
 from ajax_helpers.utils import random_string
 from django.conf import settings
-from django.forms import CharField, ModelChoiceField, NumberInput
+from django.forms import CharField, ModelChoiceField, NumberInput, IntegerField
 from django.http import JsonResponse
 from django.shortcuts import get_object_or_404
 from django.urls import reverse
@@ -151,8 +151,13 @@ class CalendarView(DataMergeUtils, ReportBase, FilterQueryMixin, TemplateView):
 
             class FixedDurationEndDateColumn(DateColumn):
                 def row_result(self, data, _page_result):
+
                     start_date = data.get(self.model_path + start_field_col_field)
-                    end_date = start_date + timedelta(seconds=calendar_report_data_set.end_duration)
+                    end_duration = calendar_report_data_set.end_duration
+                    if end_duration is None:
+                        end_duration = 3600
+
+                    end_date = start_date + timedelta(seconds=end_duration)
                     try:
                         date = end_date.strftime('%d/%m/%Y')
                         time_str = end_date.strftime('%H:%M')
@@ -413,6 +418,8 @@ class CalendarModal(ModelFormModal):
                 o.save()
         return self.command_response('')
 
+
+
     def post_save(self, created, form):
         if created:
             self.modal_redirect(self.request.resolver_match.view_name, slug=f'pk-{self.object.id}-new-True')
@@ -429,6 +436,23 @@ class CalendarDataSetForm(QueryBuilderModelForm):
     class DurationWidget(NumberInput):
         crispy_kwargs = {'appended_text': 'Seconds', 'input_size': 'input-group-sm'}
 
+    def clean(self):
+        cleaned_data = super().clean()
+        start_date_field = cleaned_data['start_date_field']
+        if start_date_field is None:
+            self.add_error('start_date_field', 'Please select a start period')
+        end_date_type = cleaned_data['end_date_type']
+        if (end_date_type == CalendarReportDataSet.END_DATE_TYPE_FIELD and
+                cleaned_data['end_date_field'] is None):
+            self.add_error('end_date_field', 'Please select a end period')
+        elif (end_date_type == CalendarReportDataSet.END_DATE_TYPE_DURATION_FIELD and
+              cleaned_data['end_duration_field'] is None):
+            self.add_error('end_duration_field', 'Please select a end period')
+        elif (end_date_type == CalendarReportDataSet.END_DATE_TYPE_DURATION_FIXED and
+              (cleaned_data['end_duration'] is None or cleaned_data['end_duration'] == '')):
+            self.add_error('end_duration', 'Please select a end period')
+        return cleaned_data
+
     class Meta:
         model = CalendarReportDataSet
         fields = [
@@ -451,7 +475,7 @@ class CalendarDataSetForm(QueryBuilderModelForm):
             'end_date_type': Select2,
         }
 
-    end_duration = CharField(widget=DurationWidget)
+    end_duration = IntegerField(widget=DurationWidget, required=False)
 
 
 class CalendarDataSetModal(QueryBuilderModalBase):

{django_advanced_report_builder-1.0.3 → django_advanced_report_builder-1.0.5/django_advanced_report_builder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-advanced-report-builder
-Version: 1.0.3
+Version: 1.0.5
 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-1.0.3 → django_advanced_report_builder-1.0.5}/setup.py

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