diff options
| -rw-r--r-- | archaeological_context_records/forms.py | 2 | ||||
| -rw-r--r-- | archaeological_context_records/migrations/0106_auto_20210326_1434.py | 25 | ||||
| -rw-r--r-- | archaeological_context_records/models.py | 2 | ||||
| -rw-r--r-- | archaeological_operations/forms.py | 2 | ||||
| -rw-r--r-- | archaeological_operations/migrations/0107_auto_20210326_1434.py | 46 | ||||
| -rw-r--r-- | archaeological_operations/models.py | 2 | ||||
| -rw-r--r-- | archaeological_warehouse/models.py | 2 |
7 files changed, 76 insertions, 5 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index d727dae27..409ed0864 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -302,7 +302,7 @@ class RecordFormGeneral(CustomForm, ManageOldType): excavation_technic = forms.ChoiceField( label=_("Excavation technique"), choices=[], required=False ) - surface = forms.IntegerField( + surface = forms.FloatField( required=False, widget=widgets.AreaWidget, label=_("Total surface (m2)"), diff --git a/archaeological_context_records/migrations/0106_auto_20210326_1434.py b/archaeological_context_records/migrations/0106_auto_20210326_1434.py new file mode 100644 index 000000000..cd52111d5 --- /dev/null +++ b/archaeological_context_records/migrations/0106_auto_20210326_1434.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.27 on 2021-03-26 14:34 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_context_records', '0105_auto_20201203_1453'), + ] + + operations = [ + migrations.AlterField( + model_name='contextrecord', + name='surface', + field=models.FloatField(blank=True, null=True, verbose_name='Surface (m2)'), + ), + migrations.AlterField( + model_name='historicalcontextrecord', + name='surface', + field=models.FloatField(blank=True, null=True, verbose_name='Surface (m2)'), + ), + ] diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 02d488c85..26353eed1 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -639,7 +639,7 @@ class ContextRecord( depth_of_appearance = models.FloatField( _("Depth of appearance (m)"), blank=True, null=True ) - surface = models.IntegerField(_("Surface (m2)"), blank=True, null=True) + surface = models.FloatField(_("Surface (m2)"), blank=True, null=True) location = models.TextField( _("Location"), blank=True, diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 12011ef28..bd237488d 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -831,7 +831,7 @@ class OperationFormGeneral(CustomForm, ManageOldType): limit={'person_types': [person_type_pk_lazy('sra_agent')]}, new=True), validators=[valid_id(Person)], required=False) - surface = forms.IntegerField( + surface = forms.FloatField( required=False, widget=widgets.AreaWidget, label=_("Total surface (m2)"), validators=[validators.MinValueValidator(0), diff --git a/archaeological_operations/migrations/0107_auto_20210326_1434.py b/archaeological_operations/migrations/0107_auto_20210326_1434.py new file mode 100644 index 000000000..88f4774b6 --- /dev/null +++ b/archaeological_operations/migrations/0107_auto_20210326_1434.py @@ -0,0 +1,46 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.27 on 2021-03-26 14:34 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_operations', '0106_auto_20201204_1557'), + ] + + operations = [ + migrations.AlterField( + model_name='historicaloperation', + name='cira_date', + field=models.DateField(blank=True, null=True, verbose_name='Date avis CTRA/CIRA'), + ), + migrations.AlterField( + model_name='historicaloperation', + name='cira_rapporteur', + field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.Person', verbose_name='Rapporteur CTRA/CIRA'), + ), + migrations.AlterField( + model_name='historicaloperation', + name='surface', + field=models.FloatField(blank=True, null=True, verbose_name='Surface (m2)'), + ), + migrations.AlterField( + model_name='operation', + name='cira_date', + field=models.DateField(blank=True, null=True, verbose_name='Date avis CTRA/CIRA'), + ), + migrations.AlterField( + model_name='operation', + name='cira_rapporteur', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='cira_rapporteur', to='ishtar_common.Person', verbose_name='Rapporteur CTRA/CIRA'), + ), + migrations.AlterField( + model_name='operation', + name='surface', + field=models.FloatField(blank=True, null=True, verbose_name='Surface (m2)'), + ), + ] diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 128b04496..691af56e1 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -1171,7 +1171,7 @@ class Operation( operation_type = models.ForeignKey( OperationType, related_name="+", verbose_name=_("Operation type") ) - surface = models.IntegerField(_("Surface (m2)"), blank=True, null=True) + surface = models.FloatField(_("Surface (m2)"), blank=True, null=True) remains = models.ManyToManyField( "RemainType", verbose_name=_("Remains"), blank=True ) diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index 29615b6ef..7b694b799 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -623,7 +623,7 @@ class ContainerType(GeneralType): default=False, help_text=_( "Container that will not usually be moved. Ex: building, " - "room, span, shelf." + "room, span, shelf. Stationary containers are not automatically numbered." ), ) length = models.IntegerField(_("Length (mm)"), blank=True, null=True) |