diff options
| -rw-r--r-- | archaeological_operations/forms.py | 6 | ||||
| -rw-r--r-- | archaeological_operations/migrations/0024_auto_20180413_1540.py | 25 | ||||
| -rw-r--r-- | archaeological_operations/models.py | 4 | ||||
| -rw-r--r-- | archaeological_operations/templates/ishtar/sheet_site.html | 4 |
4 files changed, 37 insertions, 2 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index bb2393ab9..1fd9a8d79 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -1354,12 +1354,16 @@ class SiteUnderwaterForm(ManageOldType): form_admin_name = _(u"Archaeological site - 030 - Underwater") form_slug = u"archaeological_site-030-underwater" + shipwreck_name = forms.CharField( + label=_(u"Shipwreck name"), required=False) shipwreck_code = forms.CharField( label=_(u"Shipwreck code"), required=False) sinking_date = DateField( label=_(u"Sinking date"), required=False) + discovery_area = forms.CharField( + label=_(u"Discovery area"), widget=forms.Textarea, required=False) oceanographic_service_localisation = forms.CharField( - label=_("Oceanographic service localisation"), + label=_(u"Oceanographic service localisation"), widget=forms.Textarea, required=False ) diff --git a/archaeological_operations/migrations/0024_auto_20180413_1540.py b/archaeological_operations/migrations/0024_auto_20180413_1540.py new file mode 100644 index 000000000..1343ec8eb --- /dev/null +++ b/archaeological_operations/migrations/0024_auto_20180413_1540.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-04-13 15:40 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_operations', '0023_auto_20180413_1147'), + ] + + operations = [ + migrations.AddField( + model_name='archaeologicalsite', + name='discovery_area', + field=models.TextField(blank=True, null=True, verbose_name='Discovery area'), + ), + migrations.AddField( + model_name='archaeologicalsite', + name='shipwreck_name', + field=models.TextField(blank=True, null=True, verbose_name='Shipwreck name'), + ), + ] diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 12c1cce8e..a67397d1d 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -117,12 +117,16 @@ class ArchaeologicalSite(BaseHistorizedItem): locality_cadastral = models.TextField(_(u"Cadastral locality"), null=True, blank=True) # underwater + shipwreck_name = models.TextField( + _(u"Shipwreck name"), null=True, blank=True) oceanographic_service_localisation = models.TextField( _(u"Oceanographic service localisation"), null=True, blank=True) shipwreck_code = models.TextField( _(u"Shipwreck code"), null=True, blank=True) sinking_date = models.DateField( _(u"Sinking date"), null=True, blank=True) + discovery_area = models.TextField( + _(u"Discovery area"), null=True, blank=True) class Meta: verbose_name = _(u"Archaeological site") diff --git a/archaeological_operations/templates/ishtar/sheet_site.html b/archaeological_operations/templates/ishtar/sheet_site.html index c42cf4f88..d6360f965 100644 --- a/archaeological_operations/templates/ishtar/sheet_site.html +++ b/archaeological_operations/templates/ishtar/sheet_site.html @@ -51,12 +51,14 @@ </div> {% endif %} -{% if item.oceanographic_service_localisation or item.shipwreck_code or item.sinking_date %} +{% if item.oceanographic_service_localisation or item.shipwreck_code or item.sinking_date or item.discovery_area or item.shipwreck_name %} <h3>{% trans "Underwater"%}</h3> <div class="row"> + {% field_flex "Shipwreck name" item.shipwreck_name %} {% field_flex "Shipwreck code" item.shipwreck_code %} {% field_flex "Sinking date" item.sinking_date %} + {% field_flex_full "Discovery area" item.discovery_area "<pre>" "</pre>" %} {% field_flex_full "Oceanographic service localisation" item.oceanographic_service_localisation "<pre>" "</pre>" %} </div> {% endif %} |