The reporting module now passes flake8
This commit is contained in:
parent
4664c4711a
commit
aacdab7d16
3 changed files with 12 additions and 24 deletions
|
@ -1,19 +1,8 @@
|
||||||
from collections import namedtuple
|
|
||||||
|
|
||||||
from django.contrib.auth.decorators import user_passes_test
|
from django.contrib.auth.decorators import user_passes_test
|
||||||
from django.core.urlresolvers import reverse
|
|
||||||
from django.db import models
|
|
||||||
from django.db.models import F, Q
|
|
||||||
from django.db.models import Sum
|
|
||||||
from django.db.models import Case, When, Value
|
|
||||||
from django.http import Http404
|
|
||||||
from django.shortcuts import render
|
from django.shortcuts import render
|
||||||
from functools import wraps
|
from functools import wraps
|
||||||
|
|
||||||
from registrasion import forms
|
|
||||||
from registrasion import views
|
from registrasion import views
|
||||||
from registrasion.models import commerce
|
|
||||||
from registrasion.models import inventory
|
|
||||||
|
|
||||||
|
|
||||||
''' A list of report views objects that can be used to load a list of
|
''' A list of report views objects that can be used to load a list of
|
||||||
|
|
|
@ -1,18 +1,13 @@
|
||||||
from collections import namedtuple
|
|
||||||
|
|
||||||
from django.contrib.auth.decorators import user_passes_test
|
from django.contrib.auth.decorators import user_passes_test
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.db.models import F, Q
|
from django.db.models import F, Q
|
||||||
from django.db.models import Sum
|
from django.db.models import Sum
|
||||||
from django.db.models import Case, When, Value
|
from django.db.models import Case, When, Value
|
||||||
from django.http import Http404
|
|
||||||
from django.shortcuts import render
|
from django.shortcuts import render
|
||||||
from functools import wraps
|
|
||||||
|
|
||||||
from registrasion import forms
|
from registrasion import forms
|
||||||
from registrasion.models import commerce
|
from registrasion.models import commerce
|
||||||
from registrasion.models import inventory
|
|
||||||
from registrasion import views
|
from registrasion import views
|
||||||
|
|
||||||
from reports import get_all_reports
|
from reports import get_all_reports
|
||||||
|
@ -28,15 +23,15 @@ def reports_list(request):
|
||||||
|
|
||||||
for report in get_all_reports():
|
for report in get_all_reports():
|
||||||
reports.append({
|
reports.append({
|
||||||
"name" : report.__name__,
|
"name": report.__name__,
|
||||||
"url" : reverse(report),
|
"url": reverse(report),
|
||||||
"description" : report.__doc__,
|
"description": report.__doc__,
|
||||||
})
|
})
|
||||||
|
|
||||||
reports.sort(key=lambda report: report["name"])
|
reports.sort(key=lambda report: report["name"])
|
||||||
|
|
||||||
ctx = {
|
ctx = {
|
||||||
"reports" : reports,
|
"reports": reports,
|
||||||
}
|
}
|
||||||
|
|
||||||
return render(request, "registrasion/reports_list.html", ctx)
|
return render(request, "registrasion/reports_list.html", ctx)
|
||||||
|
@ -91,8 +86,8 @@ def items_sold(request, form):
|
||||||
return Report("Paid items", headings, data)
|
return Report("Paid items", headings, data)
|
||||||
|
|
||||||
|
|
||||||
@report_view("Inventory", form_type=forms.ProductAndCategoryForm)
|
@report_view("Product status", form_type=forms.ProductAndCategoryForm)
|
||||||
def inventory(request, form):
|
def product_status(request, form):
|
||||||
''' Summarises the inventory status of the given items, grouping by
|
''' Summarises the inventory status of the given items, grouping by
|
||||||
invoice status. '''
|
invoice status. '''
|
||||||
|
|
||||||
|
|
|
@ -38,8 +38,12 @@ public = [
|
||||||
|
|
||||||
reports = [
|
reports = [
|
||||||
url(r"^$", reporting_views.reports_list, name="reports_list"),
|
url(r"^$", reporting_views.reports_list, name="reports_list"),
|
||||||
url(r"^credit_notes/?$", reporting_views.credit_notes, name="inventory"),
|
url(r"^credit_notes/?$", reporting_views.credit_notes, name="credit_notes"),
|
||||||
url(r"^inventory/?$", reporting_views.inventory, name="inventory"),
|
url(
|
||||||
|
r"^product_status/?$",
|
||||||
|
reporting_views.product_status,
|
||||||
|
name="product_status",
|
||||||
|
),
|
||||||
url(r"^items_sold/?$", reporting_views.items_sold, name="items_sold"),
|
url(r"^items_sold/?$", reporting_views.items_sold, name="items_sold"),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue