Add role field

This commit is contained in:
PCoder 2021-11-22 15:39:33 +05:30
parent 661ffe8a3b
commit 7461bea49c
3 changed files with 43 additions and 2 deletions

View File

@ -171,6 +171,10 @@ class PeopleRangeAdmin(admin.ModelAdmin):
return str(obj.range.name)
class PeopleResourceAdmin(admin.ModelAdmin):
fields = ('person', 'resource', 'p_r_role')
class SpeciesRangeAdmin(admin.ModelAdmin):
model = SpeciesRange
search_fields = ['scientific_name__scientific_name', 'range__range_name']
@ -239,5 +243,5 @@ admin.site.register(PeopleFunction)
admin.site.register(SpeciesRange, SpeciesRangeAdmin)
admin.site.register(RangesPeople, PeopleRangeAdmin)
admin.site.register(TaxonRange, TaxonRangeAdmin)
admin.site.register(PeopleResource)
admin.site.register(PeopleResource, PeopleResourceAdmin)
admin.site.register(RangeCountry, RangeCountryAdmin)

View File

@ -0,0 +1,31 @@
# Generated by Django 3.2.5 on 2021-11-22 10:08
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('app', '0016_alter_person_status'),
]
operations = [
migrations.CreateModel(
name='Role',
fields=[
('id', models.AutoField(primary_key=True, serialize=False)),
('role', models.TextField(blank=True, null=True)),
],
),
migrations.AlterField(
model_name='person',
name='entry_date',
field=models.TextField(blank=True, editable=False, null=True),
),
migrations.AddField(
model_name='peopleresource',
name='p_r_role',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='app.role'),
),
]

View File

@ -496,7 +496,7 @@ class Person(models.Model):
url = models.TextField(blank=True, null=True)
field_of_expertise = models.TextField(blank=True, null=True)
status = models.ForeignKey(PeopleStatus, models.DO_NOTHING, blank=True, null=True, to_field='id')
entry_date = models.TextField(blank=True, null=True)
entry_date = models.TextField(blank=True, null=True, editable=False)
gmba_function = models.TextField(blank=True, null=True)
news_letter = models.BooleanField(default=False)
country = models.ForeignKey(Country, models.DO_NOTHING, blank=True, null=True, to_field='id')
@ -679,11 +679,17 @@ class TaxonRange(models.Model):
return self.taxon if self.taxon else '--'
class Role(models.Model):
id = models.AutoField(primary_key=True)
role = models.TextField(blank=True, null=True)
class PeopleResource(models.Model):
id = models.AutoField(primary_key=True)
person = models.ForeignKey(Person, models.DO_NOTHING, blank=True, null=True)
resource = models.ForeignKey(Resource, models.DO_NOTHING, blank=True, null=True)
role = models.TextField(blank=True, null=True)
p_r_role = models.ForeignKey(Role, models.DO_NOTHING, blank=True, null=True)
def __str__(self):
return self.person.full_name if self.person else ' -- '