diff options
| -rw-r--r-- | archaeological_files/admin.py | 27 | ||||
| -rw-r--r-- | archaeological_files/lookups.py | 32 | ||||
| -rw-r--r-- | archaeological_files/models.py | 4 | ||||
| -rw-r--r-- | ishtar_common/admin.py | 13 | ||||
| -rw-r--r-- | ishtar_common/lookups.py | 22 |
5 files changed, 88 insertions, 10 deletions
diff --git a/archaeological_files/admin.py b/archaeological_files/admin.py index f341dec41..525f7e840 100644 --- a/archaeological_files/admin.py +++ b/archaeological_files/admin.py @@ -17,6 +17,8 @@ # See the file COPYING for details. +from ajax_select import make_ajax_form + from django.conf import settings from ishtar_common.apps import admin_site @@ -26,12 +28,29 @@ import models class FileAdmin(HistorizedObjectAdmin): - list_display = ['year', 'numeric_reference', 'internal_reference', - 'end_date', 'file_type', 'general_contractor'] + list_display = ['year', 'numeric_reference', 'file_type', 'name'] if settings.COUNTRY == 'fr': list_display += ['saisine_type', 'permit_reference'] - list_filter = ("file_type", "year",) - search_fields = ('towns__name',) + list_filter = ["file_type", "year"] + if settings.COUNTRY == 'fr': + list_filter += ['saisine_type'] + search_fields = ('name', 'towns__name', 'permit_reference') + form = make_ajax_form( + models.File, {'in_charge': 'person', + 'general_contractor': 'person', + 'corporation_general_contractor': 'organization', + 'responsible_town_planning_service': 'person', + 'planning_service': 'organization', + 'organization': 'organization', + 'scientist': 'person', + 'main_town': 'town', + 'towns': 'town', + 'related_file': 'file' + }) + readonly_fields = HistorizedObjectAdmin.readonly_fields + [ + 'raw_general_contractor', 'raw_town_planning_service', 'imports', + 'cached_label', 'imported_line' + ] model = models.File admin_site.register(models.File, FileAdmin) diff --git a/archaeological_files/lookups.py b/archaeological_files/lookups.py new file mode 100644 index 000000000..4de713419 --- /dev/null +++ b/archaeological_files/lookups.py @@ -0,0 +1,32 @@ +from ajax_select import register, LookupChannel + +from django.db.models import Q +from archaeological_files.models import File + + +@register('file') +class FileLookup(LookupChannel): + model = File + + def get_query(self, q, request): + query = Q() + for term in q.strip().split(' '): + subquery = ( + Q(towns__name__icontains=term) | + Q(towns__numero_insee__icontains=term) | + Q(main_town__name__icontains=term) | + Q(main_town__numero_insee__icontains=term) | + Q(name__icontains=term) | + Q(internal_reference__icontains=term) | + Q(permit_reference__icontains=term) + ) + try: + num = int(term) + subquery |= Q(year=num) | Q(numeric_reference=num) + except ValueError: + pass + query &= subquery + return self.model.objects.filter(query).order_by('cached_label')[:20] + + def format_item_display(self, item): + return u"<span class='ajax-label'>%s</span>" % item.cached_label diff --git a/archaeological_files/models.py b/archaeological_files/models.py index a9a277280..0d5b4b3e8 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -151,10 +151,10 @@ class File(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter, permit_reference = models.TextField(_(u"Permit reference"), blank=True, null=True) end_date = models.DateField(_(u"Closing date"), null=True, blank=True) - main_town = models.ForeignKey(Town, verbose_name=_(u"Town"), null=True, + main_town = models.ForeignKey(Town, verbose_name=_(u"Main town"), null=True, blank=True, related_name='file_main') towns = models.ManyToManyField(Town, verbose_name=_(u"Towns"), - related_name='file') + related_name='file', blank=True) creation_date = models.DateField( _(u"Creation date"), default=datetime.date.today, blank=True, null=True) diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index 897ceaa6e..90f3067e3 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -17,9 +17,6 @@ # See the file COPYING for details. -""" -Admin description -""" import csv from ajax_select import make_ajax_form @@ -28,6 +25,7 @@ from django.conf import settings from django.contrib import admin from django.contrib.auth.admin import GroupAdmin, UserAdmin from django.contrib.auth.models import Group, User +from django.contrib.gis.forms import PointField, OSMWidget from django.http import HttpResponseRedirect, HttpResponse from django.shortcuts import render_to_response from django.template import RequestContext @@ -172,6 +170,14 @@ class PersonAdmin(HistorizedObjectAdmin): admin_site.register(models.Person, PersonAdmin) +class AdminTownForm(forms.ModelForm): + class Meta: + model = models.Town + exclude = [] + center = PointField(label=_(u"center"), required=False, + widget=OSMWidget) + + class TownAdmin(admin.ModelAdmin): list_display = ['name', ] search_fields = ['name'] @@ -181,6 +187,7 @@ class TownAdmin(admin.ModelAdmin): list_filter = ("departement",) readonly_fields = ['imports'] model = models.Town + form = AdminTownForm admin_site.register(models.Town, TownAdmin) diff --git a/ishtar_common/lookups.py b/ishtar_common/lookups.py index a031af9b3..ef2ff81f1 100644 --- a/ishtar_common/lookups.py +++ b/ishtar_common/lookups.py @@ -1,7 +1,27 @@ from ajax_select import register, LookupChannel +from django.conf import settings from django.db.models import Q -from ishtar_common.models import Person, Organization, IshtarUser +from ishtar_common.models import Person, Organization, IshtarUser, Town + + +@register('town') +class TownLookup(LookupChannel): + model = Town + + def get_query(self, q, request): + if settings.COUNTRY == 'fr': + query = Q() + for term in q.strip().split(' '): + query &= ( + Q(name__icontains=term) | Q(numero_insee__icontains=term) + ) + else: + query = Q(name__icontains=q) + return self.model.objects.filter(query).order_by('name')[:20] + + def format_item_display(self, item): + return u"<span class='ajax-label'>%s</span>" % unicode(item) @register('organization') |