diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-03-26 18:39:45 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-03-26 18:39:45 +0200 |
| commit | c6641be6f54e2aff0a4256e19b9c061cb4f4612b (patch) | |
| tree | c25424d9c4d45131f18dadf261854ffa54e6b631 /archaeological_finds/models_finds.py | |
| parent | 15611a7231ad6b16a9fb5586d036e3db53b3cc1b (diff) | |
| download | Ishtar-c6641be6f54e2aff0a4256e19b9c061cb4f4612b.tar.bz2 Ishtar-c6641be6f54e2aff0a4256e19b9c061cb4f4612b.zip | |
Finds - discovery date: add a TAQ field (refs #4039) - improve display of discovery date in sheet - better display for textarea field
Diffstat (limited to 'archaeological_finds/models_finds.py')
| -rw-r--r-- | archaeological_finds/models_finds.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 1f132d3e8..ae3c45579 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -219,8 +219,10 @@ class BaseFind(BulkUpdatedItem, BaseHistorizedItem, OwnPerms): context_record = models.ForeignKey( ContextRecord, related_name='base_finds', verbose_name=_(u"Context Record")) - discovery_date = models.DateField(_(u"Discovery date"), + discovery_date = models.DateField(_(u"Discovery date (exact or TPQ)"), blank=True, null=True) + discovery_date_taq = models.DateField(_(u"Discovery date (TAQ)"), + blank=True, null=True) batch = models.ForeignKey(BatchType, verbose_name=_(u"Batch/object"), blank=True, null=True) index = models.IntegerField(u"Index", default=0) @@ -594,7 +596,10 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel, 'base_finds__topographic_localisation': _(u"Base find - " u"Topographic localisation"), 'base_finds__special_interest': _(u"Base find - Special interest"), - 'base_finds__discovery_date': _(u"Base find - Discovery date"), + 'base_finds__discovery_date': _( + u"Base find - Discovery date (exact or TPQ)"), + 'base_finds__discovery_date_taq': _( + u"Base find - Discovery date (TAQ)"), 'container__cached_label': _(u"Container"), 'datings__period__label': _(u"Periods"), 'material_types__label': _(u"Material types"), @@ -607,7 +612,9 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel, 'base_finds__comment', 'base_finds__description', 'base_finds__topographic_localisation', 'base_finds__special_interest', - 'base_finds__discovery_date'] + 'base_finds__discovery_date', + 'base_finds__discovery_date_taq', + ] ATTRS_EQUIV = {'get_first_base_find': 'base_finds'} # search parameters |