mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-02-05 06:38:21 +00:00
PEP8 format files
This commit is contained in:
@@ -19,6 +19,7 @@ admin.site.register(models.EventItem, reversion.VersionAdmin)
|
|||||||
admin.site.register(models.Invoice)
|
admin.site.register(models.Invoice)
|
||||||
admin.site.register(models.Payment)
|
admin.site.register(models.Payment)
|
||||||
|
|
||||||
|
|
||||||
@admin.register(models.Profile)
|
@admin.register(models.Profile)
|
||||||
class ProfileAdmin(UserAdmin):
|
class ProfileAdmin(UserAdmin):
|
||||||
fieldsets = (
|
fieldsets = (
|
||||||
@@ -39,6 +40,7 @@ class ProfileAdmin(UserAdmin):
|
|||||||
form = forms.ProfileChangeForm
|
form = forms.ProfileChangeForm
|
||||||
add_form = forms.ProfileCreationForm
|
add_form = forms.ProfileCreationForm
|
||||||
|
|
||||||
|
|
||||||
class AssociateAdmin(reversion.VersionAdmin):
|
class AssociateAdmin(reversion.VersionAdmin):
|
||||||
list_display = ('id', 'name', 'number_of_events')
|
list_display = ('id', 'name', 'number_of_events')
|
||||||
search_fields = ['id', 'name']
|
search_fields = ['id', 'name']
|
||||||
@@ -52,6 +54,7 @@ class AssociateAdmin(reversion.VersionAdmin):
|
|||||||
|
|
||||||
def number_of_events(self, obj):
|
def number_of_events(self, obj):
|
||||||
return obj.latest_events.count()
|
return obj.latest_events.count()
|
||||||
|
|
||||||
number_of_events.admin_order_field = 'event_count'
|
number_of_events.admin_order_field = 'event_count'
|
||||||
|
|
||||||
def merge(self, request, queryset):
|
def merge(self, request, queryset):
|
||||||
@@ -90,18 +93,22 @@ class AssociateAdmin(reversion.VersionAdmin):
|
|||||||
'action_checkbox_name': helpers.ACTION_CHECKBOX_NAME,
|
'action_checkbox_name': helpers.ACTION_CHECKBOX_NAME,
|
||||||
'forms': forms
|
'forms': forms
|
||||||
}
|
}
|
||||||
return TemplateResponse(request, 'RIGS/admin_associate_merge.html', context, current_app=self.admin_site.name)
|
return TemplateResponse(request, 'RIGS/admin_associate_merge.html', context,
|
||||||
|
current_app=self.admin_site.name)
|
||||||
|
|
||||||
|
|
||||||
@admin.register(models.Person)
|
@admin.register(models.Person)
|
||||||
class PersonAdmin(AssociateAdmin):
|
class PersonAdmin(AssociateAdmin):
|
||||||
list_display = ('id', 'name', 'phone', 'email', 'number_of_events')
|
list_display = ('id', 'name', 'phone', 'email', 'number_of_events')
|
||||||
merge_fields = ['name', 'phone', 'email', 'address', 'notes']
|
merge_fields = ['name', 'phone', 'email', 'address', 'notes']
|
||||||
|
|
||||||
|
|
||||||
@admin.register(models.Venue)
|
@admin.register(models.Venue)
|
||||||
class VenueAdmin(AssociateAdmin):
|
class VenueAdmin(AssociateAdmin):
|
||||||
list_display = ('id', 'name', 'phone', 'email', 'number_of_events')
|
list_display = ('id', 'name', 'phone', 'email', 'number_of_events')
|
||||||
merge_fields = ['name', 'phone', 'email', 'address', 'notes', 'three_phase_available']
|
merge_fields = ['name', 'phone', 'email', 'address', 'notes', 'three_phase_available']
|
||||||
|
|
||||||
|
|
||||||
@admin.register(models.Organisation)
|
@admin.register(models.Organisation)
|
||||||
class OrganisationAdmin(AssociateAdmin):
|
class OrganisationAdmin(AssociateAdmin):
|
||||||
list_display = ('id', 'name', 'phone', 'email', 'number_of_events')
|
list_display = ('id', 'name', 'phone', 'email', 'number_of_events')
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ def model_compare(oldObj, newObj, excluded_keys=[]):
|
|||||||
except AttributeError:
|
except AttributeError:
|
||||||
theFields = newObj._meta.fields
|
theFields = newObj._meta.fields
|
||||||
|
|
||||||
|
|
||||||
class FieldCompare(object):
|
class FieldCompare(object):
|
||||||
def __init__(self, field=None, old=None, new=None):
|
def __init__(self, field=None, old=None, new=None):
|
||||||
self.field = field
|
self.field = field
|
||||||
@@ -112,6 +111,7 @@ def model_compare(oldObj, newObj, excluded_keys=[]):
|
|||||||
|
|
||||||
return changes
|
return changes
|
||||||
|
|
||||||
|
|
||||||
def compare_event_items(old, new):
|
def compare_event_items(old, new):
|
||||||
# Recieves two event version objects and compares their items, returns an array of ItemCompare objects
|
# Recieves two event version objects and compares their items, returns an array of ItemCompare objects
|
||||||
|
|
||||||
@@ -148,6 +148,7 @@ def compare_event_items(old, new):
|
|||||||
|
|
||||||
return changes
|
return changes
|
||||||
|
|
||||||
|
|
||||||
def get_versions_for_model(models):
|
def get_versions_for_model(models):
|
||||||
content_types = []
|
content_types = []
|
||||||
for model in models:
|
for model in models:
|
||||||
@@ -159,6 +160,7 @@ def get_versions_for_model(models):
|
|||||||
|
|
||||||
return versions
|
return versions
|
||||||
|
|
||||||
|
|
||||||
def get_previous_version(version):
|
def get_previous_version(version):
|
||||||
thisId = version.object_id
|
thisId = version.object_id
|
||||||
thisVersionId = version.pk
|
thisVersionId = version.pk
|
||||||
@@ -166,12 +168,14 @@ def get_previous_version(version):
|
|||||||
versions = reversion.get_for_object_reference(version.content_type.model_class(), thisId)
|
versions = reversion.get_for_object_reference(version.content_type.model_class(), thisId)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
previousVersions = versions.filter(revision_id__lt=version.revision_id).latest(field_name='revision__date_created')
|
previousVersions = versions.filter(revision_id__lt=version.revision_id).latest(
|
||||||
|
field_name='revision__date_created')
|
||||||
except ObjectDoesNotExist:
|
except ObjectDoesNotExist:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
return previousVersions
|
return previousVersions
|
||||||
|
|
||||||
|
|
||||||
def get_changes_for_version(newVersion, oldVersion=None):
|
def get_changes_for_version(newVersion, oldVersion=None):
|
||||||
# Pass in a previous version if you already know it (for efficiancy)
|
# Pass in a previous version if you already know it (for efficiancy)
|
||||||
# if not provided then it will be looked up in the database
|
# if not provided then it will be looked up in the database
|
||||||
@@ -200,6 +204,7 @@ def get_changes_for_version(newVersion, oldVersion=None):
|
|||||||
|
|
||||||
return compare
|
return compare
|
||||||
|
|
||||||
|
|
||||||
class VersionHistory(generic.ListView):
|
class VersionHistory(generic.ListView):
|
||||||
model = reversion.revisions.Version
|
model = reversion.revisions.Version
|
||||||
template_name = "RIGS/version_history.html"
|
template_name = "RIGS/version_history.html"
|
||||||
@@ -236,6 +241,7 @@ class VersionHistory(generic.ListView):
|
|||||||
|
|
||||||
return context
|
return context
|
||||||
|
|
||||||
|
|
||||||
class ActivityTable(generic.ListView):
|
class ActivityTable(generic.ListView):
|
||||||
model = reversion.revisions.Version
|
model = reversion.revisions.Version
|
||||||
template_name = "RIGS/activity_table.html"
|
template_name = "RIGS/activity_table.html"
|
||||||
@@ -246,7 +252,6 @@ class ActivityTable(generic.ListView):
|
|||||||
return versions
|
return versions
|
||||||
|
|
||||||
def get_context_data(self, **kwargs):
|
def get_context_data(self, **kwargs):
|
||||||
|
|
||||||
# Call the base implementation first to get a context
|
# Call the base implementation first to get a context
|
||||||
context = super(ActivityTable, self).get_context_data(**kwargs)
|
context = super(ActivityTable, self).get_context_data(**kwargs)
|
||||||
|
|
||||||
@@ -260,6 +265,7 @@ class ActivityTable(generic.ListView):
|
|||||||
|
|
||||||
return context
|
return context
|
||||||
|
|
||||||
|
|
||||||
class ActivityFeed(generic.ListView):
|
class ActivityFeed(generic.ListView):
|
||||||
model = reversion.revisions.Version
|
model = reversion.revisions.Version
|
||||||
template_name = "RIGS/activity_feed_data.html"
|
template_name = "RIGS/activity_feed_data.html"
|
||||||
@@ -285,7 +291,8 @@ class ActivityFeed(generic.ListView):
|
|||||||
if thisItem['item_changes'] or thisItem['field_changes'] or thisItem['old'] == None:
|
if thisItem['item_changes'] or thisItem['field_changes'] or thisItem['old'] == None:
|
||||||
thisItem['withPrevious'] = False
|
thisItem['withPrevious'] = False
|
||||||
if len(items) >= 1:
|
if len(items) >= 1:
|
||||||
timeAgo = datetime.datetime.now(thisItem['revision'].date_created.tzinfo) - thisItem['revision'].date_created
|
timeAgo = datetime.datetime.now(thisItem['revision'].date_created.tzinfo) - thisItem[
|
||||||
|
'revision'].date_created
|
||||||
timeDiff = items[-1]['revision'].date_created - thisItem['revision'].date_created
|
timeDiff = items[-1]['revision'].date_created - thisItem['revision'].date_created
|
||||||
timeTogether = False
|
timeTogether = False
|
||||||
for params in maxTimeDelta:
|
for params in maxTimeDelta:
|
||||||
@@ -300,5 +307,4 @@ class ActivityFeed(generic.ListView):
|
|||||||
|
|
||||||
context['object_list'] = items
|
context['object_list'] = items
|
||||||
|
|
||||||
|
|
||||||
return context
|
return context
|
||||||
Reference in New Issue
Block a user