summaryrefslogtreecommitdiff
path: root/archaeological_operations
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2021-03-26 15:12:31 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2021-03-26 15:12:31 +0100
commitfffbad69c962bea546d8193b922b472c886c4023 (patch)
treebfbc5fa7a296011944c6c43865432e56584eb05a /archaeological_operations
parentf6b335e4a41c185101b58731a023a717567e33fa (diff)
downloadIshtar-fffbad69c962bea546d8193b922b472c886c4023.tar.bz2
Ishtar-fffbad69c962bea546d8193b922b472c886c4023.zip
Operation - Context records: Surface int -> float
Diffstat (limited to 'archaeological_operations')
-rw-r--r--archaeological_operations/forms.py2
-rw-r--r--archaeological_operations/migrations/0107_auto_20210326_1434.py46
-rw-r--r--archaeological_operations/models.py2
3 files changed, 48 insertions, 2 deletions
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
)