diff --git a/borme/admin.py b/borme/admin.py index fb469f2..34e2b25 100644 --- a/borme/admin.py +++ b/borme/admin.py @@ -3,22 +3,27 @@ class AnuncioAdmin(admin.ModelAdmin): + list_display = ('id_anuncio', 'year', 'company', 'borme', 'total_actos') search_fields = ['id_anuncio', 'year'] class BormeAdmin(admin.ModelAdmin): + list_display = ('cve', 'date', 'province', 'section', 'total_anuncios') search_fields = ['cve', 'province'] class BormeLogAdmin(admin.ModelAdmin): + list_display = ('borme', 'path', 'date_created', 'date_updated', 'date_parsed', 'parsed') search_fields = ['borme__cve'] class CompanyAdmin(admin.ModelAdmin): + list_display = ('name', 'type', 'date_updated', 'in_bormes', 'anuncios', 'total_bormes', 'total_anuncios') search_fields = ['name'] class PersonAdmin(admin.ModelAdmin): + list_display = ('name', 'date_updated', 'in_companies', 'in_bormes', 'total_companies', 'total_bormes') search_fields = ['name'] diff --git a/borme/models.py b/borme/models.py index c43d72a..427f67e 100644 --- a/borme/models.py +++ b/borme/models.py @@ -34,6 +34,10 @@ class Borme(Model): #pages = IntegerField() anuncios = ArrayField(IntegerField(), default=list) # FIXME: {year, id} + @property + def total_anuncios(self): + return len(self.anuncios) + def get_absolute_url(self): return reverse('borme-borme', args=[str(self.cve)]) @@ -78,6 +82,14 @@ def update_cargos_salientes(self, cargos): break self.cargos_historial.append(cargo) + @property + def total_companies(self): + return len(self.in_companies) + + @property + def total_bormes(self): + return len(self.in_bormes) + @property def todos_cargos(self): return self.cargos_actuales + self.cargos_historial @@ -115,6 +127,14 @@ def add_in_bormes(self, borme): if not borme in self.in_bormes: self.in_bormes.append(borme) + @property + def total_anuncios(self): + return len(self.anuncios) + + @property + def total_bormes(self): + return len(self.in_bormes) + @property def fullname(self): return '%s %s' % (self.name.title(), self.type) @@ -224,6 +244,10 @@ class Meta: #objects = hstore.HStoreManager() + @property + def total_actos(self): + return len(self.actos) + def get_absolute_url(self): return reverse('borme-anuncio', args=[str(self.year), str(self.id_anuncio)])