Commit eee25e09 authored by Administrator's avatar Administrator

improve listngram class

parent f70b8958
No related merge requests found
......@@ -38,7 +38,6 @@ class ProjectAdmin(admin.ModelAdmin):
obj.analyst = request.user
obj.save()
class CorpusAdmin(admin.ModelAdmin):
exclude = ('analyst',)
list_display = ('title', 'date', 'database', 'analyst')
......@@ -64,7 +63,6 @@ class CorpusAdmin(admin.ModelAdmin):
obj.analyst = request.user
obj.save()
class DocumentAdmin(admin.ModelAdmin):
exclude = ('analyst',)
list_display = ('date', 'source', 'title')
......@@ -90,6 +88,20 @@ class DocumentAdmin(admin.ModelAdmin):
obj.analyst = request.user
obj.save()
class NgramAdmin(admin.ModelAdmin):
list_display = ('terms', 'stem', 'n')
list_per_page = 20
class NgramDocAdmin(admin.ModelAdmin):
list_display = ('terms', 'document', 'occurrences')
list_per_page = 20
class ListNgramAdmin(admin.ModelAdmin):
list_display = ('liste', 'mainForm', 'cvalue')
list_per_page = 20
admin.site.register(Database)
admin.site.register(Language)
......@@ -97,8 +109,8 @@ admin.site.register(Project, ProjectAdmin)
admin.site.register(Corpus, CorpusAdmin)
admin.site.register(Document, DocumentAdmin)
admin.site.register(Ngram,NgramAdmin)
admin.site.register(NgramDocument, NgramDocAdmin)
admin.site.register(Ngram)
admin.site.register(NgramDocument)
admin.site.register(List)
admin.site.register(ListNgram)
admin.site.register(ListNgram, ListNgramAdmin)
......@@ -27,7 +27,6 @@ class Language(models.Model):
return self.language
language = models.CharField(max_length=30, unique=True)
class Project(models.Model):
date = models.DateField(default=timezone.now(), verbose_name="Date of creation")
analyst = models.ForeignKey(User, related_name='entries')
......@@ -46,7 +45,6 @@ class Project(models.Model):
def __str__(self):
return self.title
class Corpus(models.Model):
project = models.ForeignKey(Project)
database = models.ForeignKey(Database)
......@@ -71,7 +69,6 @@ class Corpus(models.Model):
def __str__(self):
return self.title
class Document(models.Model):
project = models.ForeignKey(Project)
corpus = models.ForeignKey(Corpus)
......@@ -149,8 +146,8 @@ class List(models.Model):
class ListNgram(models.Model):
liste = models.ForeignKey(List)
mainForm = models.ForeignKey(Ngram, related_name="mainForm")
othersForms = models.ManyToManyField(Ngram, related_name="otherForms")
cvalue = models.DecimalField(max_digits=19, decimal_places=10,blank=True)
othersForms = models.ManyToManyField(Ngram, related_name="otherForms", blank=True)
cvalue = models.DecimalField(max_digits=19, decimal_places=10, blank=True, null=True)
def __str__(self):
return self.mainForm.terms
......@@ -179,7 +176,6 @@ class Coocurrence(models.Model):
return self.title
# graph ?
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment