From 6ef3732e20d8c63fe0e782a84e6718308664d12a Mon Sep 17 00:00:00 2001 From: dmpayton Date: Wed, 25 Jun 2014 17:43:57 -0700 Subject: [PATCH 1/4] Fixes for Django 1.5+ - Fix imports in urls.py - Replace {% admin_media_prefix %} with {% static %} - Update {% url %} in templates --- .../templates/reportengine/async_wait.html | 5 ++-- .../templates/reportengine/calendar.html | 12 ++++++---- .../templates/reportengine/calendar_day.html | 3 ++- .../reportengine/calendar_month.html | 9 ++++---- reportengine/templates/reportengine/list.html | 12 ++++++---- .../templates/reportengine/report.html | 23 +++++++++++-------- .../reportengine/request_report.html | 23 +++++++++++-------- reportengine/urls.py | 19 +++++++-------- 8 files changed, 60 insertions(+), 46 deletions(-) diff --git a/reportengine/templates/reportengine/async_wait.html b/reportengine/templates/reportengine/async_wait.html index 84f1371..8b216ad 100644 --- a/reportengine/templates/reportengine/async_wait.html +++ b/reportengine/templates/reportengine/async_wait.html @@ -1,5 +1,6 @@ {% extends "admin/base_site.html" %} {% load i18n %} +{% load url from future %} {# TODO note that meta refreshes are deprecated.. but is there a nice clean way to do this otherwise? #} {% block extrahead %} @@ -18,8 +19,8 @@

{% trans "Please wait while your report is generated..." %}

{% block breadcrumbs %}
- {% trans "Home" %} › - {% trans "Reports" %} › + {% trans "Home" %} › + {% trans "Reports" %} › {{report.verbose_name}} › {% if format %} {% trans "Report Result" %} › diff --git a/reportengine/templates/reportengine/calendar.html b/reportengine/templates/reportengine/calendar.html index 033c186..f35f02f 100644 --- a/reportengine/templates/reportengine/calendar.html +++ b/reportengine/templates/reportengine/calendar.html @@ -1,16 +1,18 @@ {% extends "admin/base_site.html" %} -{% load adminmedia admin_list i18n %} +{% load i18n %} +{% load static %} +{% load url from future %} {% block extrastyle %} - + {% endblock %} {% block bodyclass %}change-list{% endblock %} {% block breadcrumbs %}
- {% trans "Home" %} › - Reports › + {% trans "Home" %} › + Reports › calendar for {% block calendar_breadcrumb %}{% endblock %}
{% endblock %} @@ -20,7 +22,7 @@ {% block content %}
{% block object-tools %}{% endblock %} - + {% block calendarcontent %}{% endblock %}
diff --git a/reportengine/templates/reportengine/calendar_day.html b/reportengine/templates/reportengine/calendar_day.html index d5ec061..12d76b1 100644 --- a/reportengine/templates/reportengine/calendar_day.html +++ b/reportengine/templates/reportengine/calendar_day.html @@ -1,4 +1,5 @@ {% extends "reportengine/calendar.html" %} +{% load url from future %} {% block calendar_breadcrumb %}{{ date|date:"d M Y" }}{% endblock %} @@ -7,7 +8,7 @@

Reports for {{ date|date:"d M Y" }}

diff --git a/reportengine/templates/reportengine/calendar_month.html b/reportengine/templates/reportengine/calendar_month.html index faa0a5e..7c32337 100644 --- a/reportengine/templates/reportengine/calendar_month.html +++ b/reportengine/templates/reportengine/calendar_month.html @@ -1,17 +1,18 @@ {% extends "reportengine/calendar.html" %} +{% load url from future %} {% block calendar_breadcrumb %}{{ date|date:"M Y" }}{% endblock %} {% block calendarcontent %}

Reports for {{ date|date:"M Y" }}

- current month + current month - + - + @@ -28,7 +29,7 @@

Reports for {{ date|date:"M Y" }}

diff --git a/reportengine/templates/reportengine/list.html b/reportengine/templates/reportengine/list.html index db88460..2f5fbdb 100755 --- a/reportengine/templates/reportengine/list.html +++ b/reportengine/templates/reportengine/list.html @@ -1,8 +1,10 @@ {% extends "admin/base_site.html" %} -{% load adminmedia admin_list i18n %} +{% load i18n %} +{% load static %} +{% load url from future %} {% block extrastyle %} - + {% endblock %} @@ -11,7 +13,7 @@ {% block breadcrumbs %}
- {% trans "Home" %} › + {% trans "Home" %} › Reports
@@ -28,7 +30,7 @@

Reports

- Calendar View + Calendar View
@@ -36,7 +38,7 @@

Reports

{% for namespace in report_list %}

{{ namespace.grouper|title }}

{% for report in namespace.list|dictsort:"verbose_name" %} - {{ report.verbose_name }}
+ {{ report.verbose_name }}
{% endfor %} {% endfor %}
diff --git a/reportengine/templates/reportengine/report.html b/reportengine/templates/reportengine/report.html index 7538e7d..0b378bc 100755 --- a/reportengine/templates/reportengine/report.html +++ b/reportengine/templates/reportengine/report.html @@ -1,24 +1,27 @@ {% extends "admin/base_site.html" %} -{% load adminmedia admin_list i18n %} +{% load admin_list %} +{% load i18n %} +{% load static %} +{% load url from future %} {% block extrastyle %} - - + + {% endblock %} {% block extrahead %} - - - - + + + + {% endblock %} {% block bodyclass %}change-list{% endblock %} {% block breadcrumbs %}
- {% trans "Home" %} › - {% trans "Reports" %} › + {% trans "Home" %} › + {% trans "Reports" %} › {{report.verbose_name}} › {% trans "Report Result" %}
@@ -57,7 +60,7 @@

{% trans "Alternate Formats" %}

{% ifequal of output_format %} {{ of.verbose_name }} {% if not forloop.last %}|{% endif %} {% else %} - {{ of.verbose_name }} {% if not forloop.last %}|{% endif %} + {{ of.verbose_name }} {% if not forloop.last %}|{% endif %} {% endifequal %} {% endfor %} diff --git a/reportengine/templates/reportengine/request_report.html b/reportengine/templates/reportengine/request_report.html index b359967..1261e61 100755 --- a/reportengine/templates/reportengine/request_report.html +++ b/reportengine/templates/reportengine/request_report.html @@ -1,17 +1,20 @@ {% extends "admin/base_site.html" %} -{% load adminmedia admin_list i18n %} +{% load admin_list %} +{% load i18n %} +{% load static %} +{% load url from future %} {% block extrastyle %} - - + + {% endblock %} {% block extrahead %} - - - - - + + + + + {% endblock %} {% block bodyclass %}change-list{% endblock %} @@ -19,7 +22,7 @@ {% block breadcrumbs %}
{% trans "Home" %} › - {% trans "Reports" %} › + {% trans "Reports" %} › {{report.verbose_name}}
{% endblock %} @@ -47,7 +50,7 @@

{% trans "Filters" %}

{% endblock %} - + {% block requested_reports %}

{% trans "Previously Requested Reports" %}

«« »»
M {% if day %}
- {{ day }} + {{ day }}
{% endif %}
diff --git a/reportengine/urls.py b/reportengine/urls.py index b812ecb..d208292 100644 --- a/reportengine/urls.py +++ b/reportengine/urls.py @@ -1,22 +1,25 @@ -from django.conf.urls.defaults import * +try: + from django.conf.urls import patterns, include, url +except ImportError: # django < 1.4 + from django.conf.urls.defaults import patterns, include, url urlpatterns = patterns('reportengine.views', # Listing of reports url('^$', 'report_list', name='reports-list'), # view report redirected to current date format (requires date_field argument) - url('^current/(?P(day|week|month|year))/(?P[-\w]+)/(?P[-\w]+)/$', + url('^current/(?P(day|week|month|year))/(?P[-\w]+)/(?P[-\w]+)/$', 'current_redirect', name='reports-current'), # view report redirected to current date format with formatting specified - url('^current/(?P(day|week|month|year))/(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/$', + url('^current/(?P(day|week|month|year))/(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/$', 'current_redirect', name='reports-current-format'), # specify range of report per time (requires date_field) - url('^date/(?P\d+)/(?P\d+)/(?P\d+)/(?P[-\w]+)/(?P[-\w]+)/$', + url('^date/(?P\d+)/(?P\d+)/(?P\d+)/(?P[-\w]+)/(?P[-\w]+)/$', 'day_redirect', name='reports-date-range'), # specify range of report per time with formatting - url('^date/(?P\d+)/(?P\d+)/(?P\d+)/(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/$', + url('^date/(?P\d+)/(?P\d+)/(?P\d+)/(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/$', 'day_redirect', name='reports-date-range-format'), - # Show latest calendar of all date accessible reports + # Show latest calendar of all date accessible reports url('^calendar/$', 'calendar_current_redirect', name='reports-calendar-current'), # Show specific month's calendar of reports url('^calendar/(?P\d+)/(?P\d+)/$', 'calendar_month_view', name='reports-calendar-month'), @@ -31,10 +34,8 @@ url('^request/(?P[-\w]+)/(?P[-\w]+)/$', 'request_report', name='reports-view'), # view report in specified output format #url('^request/(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/$', 'request_report', name='reports-view-format'), - + url('^view/(?P[\w\d]+)/$', 'view_report', name='reports-request-view'), # view report in specified output format url('^view/(?P[\w\d]+)/(?P[-\w]+)/$', 'view_report_export', name='reports-request-view-format'), ) - - From 491b600c37dbc6987b3d828e528476a6654a2428 Mon Sep 17 00:00:00 2001 From: dmpayton Date: Wed, 3 Sep 2014 11:42:26 -0700 Subject: [PATCH 2/4] Fix broken url templatetag in async_wait.html --- reportengine/templates/reportengine/async_wait.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reportengine/templates/reportengine/async_wait.html b/reportengine/templates/reportengine/async_wait.html index 8b216ad..f0ab93d 100644 --- a/reportengine/templates/reportengine/async_wait.html +++ b/reportengine/templates/reportengine/async_wait.html @@ -19,7 +19,7 @@

{% trans "Please wait while your report is generated..." %}

{% block breadcrumbs %}
- {% trans "Home" %} › + {% trans "Home" %} › {% trans "Reports" %} › {{report.verbose_name}} › {% if format %} From da989469eb28337ded73b33e90a4d3db080ff11c Mon Sep 17 00:00:00 2001 From: fr93274 Date: Wed, 14 Jan 2015 16:16:47 -0800 Subject: [PATCH 3/4] Update request_report.html Fixes missing jquery, that causes widgets to fail --- reportengine/templates/reportengine/request_report.html | 1 + 1 file changed, 1 insertion(+) diff --git a/reportengine/templates/reportengine/request_report.html b/reportengine/templates/reportengine/request_report.html index 1261e61..a894066 100755 --- a/reportengine/templates/reportengine/request_report.html +++ b/reportengine/templates/reportengine/request_report.html @@ -11,6 +11,7 @@ {% block extrahead %} + From b85c9c40f093548504cac66928dcd0c63ef7ecf6 Mon Sep 17 00:00:00 2001 From: fr93274 Date: Wed, 14 Jan 2015 21:02:52 -0800 Subject: [PATCH 4/4] Update filtercontrols.py Changed for user friendly-ness --- reportengine/filtercontrols.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reportengine/filtercontrols.py b/reportengine/filtercontrols.py index 4c82827..7644afb 100755 --- a/reportengine/filtercontrols.py +++ b/reportengine/filtercontrols.py @@ -103,8 +103,8 @@ def get_fields(self): :return: A dictionary containing hte start and end dates for the filtercontrol """ ln=self.label or self.field_name - start=forms.CharField(label=_("%s From")%ln,required=False,widget=forms.DateTimeInput(attrs={'class': 'vDateField'})) - end=forms.CharField(label=_("%s To")%ln,required=False,widget=forms.DateTimeInput(attrs={'class': 'vDateField'})) + start=forms.CharField(label=_("%s is After")%ln,required=False,widget=forms.DateTimeInput(attrs={'class': 'vDateField'})) + end=forms.CharField(label=_("%s is Before")%ln,required=False,widget=forms.DateTimeInput(attrs={'class': 'vDateField'})) return SortedDict([("%s__gte"%self.field_name, start), ("%s__lt"%self.field_name, end),])