diff options
Diffstat (limited to 'archaeological_operations')
| -rw-r--r-- | archaeological_operations/migrations/0111_auto_20230130_1604.py (renamed from archaeological_operations/migrations/0111_auto_20230127_1503.py) | 43 | ||||
| -rw-r--r-- | archaeological_operations/migrations/0112_migrate_created.py | 27 | ||||
| -rw-r--r-- | archaeological_operations/templates/ishtar/sheet_operation.html | 14 |
3 files changed, 76 insertions, 8 deletions
diff --git a/archaeological_operations/migrations/0111_auto_20230127_1503.py b/archaeological_operations/migrations/0111_auto_20230130_1604.py index 075422d9f..4332347fe 100644 --- a/archaeological_operations/migrations/0111_auto_20230127_1503.py +++ b/archaeological_operations/migrations/0111_auto_20230130_1604.py @@ -1,5 +1,6 @@ -# Generated by Django 2.2.24 on 2023-01-27 15:03 +# Generated by Django 2.2.24 on 2023-01-30 16:04 +import datetime from django.db import migrations, models import django.db.models.deletion @@ -11,6 +12,46 @@ class Migration(migrations.Migration): ] operations = [ + migrations.AddField( + model_name='administrativeact', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='archaeologicalsite', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='historicaladministrativeact', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='historicalarchaeologicalsite', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='historicaloperation', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='operation', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='parcel', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='parcelowner', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), migrations.AlterField( model_name='archaeologicalsite', name='geodata', diff --git a/archaeological_operations/migrations/0112_migrate_created.py b/archaeological_operations/migrations/0112_migrate_created.py new file mode 100644 index 000000000..19978e2f3 --- /dev/null +++ b/archaeological_operations/migrations/0112_migrate_created.py @@ -0,0 +1,27 @@ +# Generated by Django 2.2.24 on 2023-01-30 16:14 + +from django.db import migrations +from ishtar_common.utils_migrations import migrate_created_field + + +def migrate_created(apps, __): + app_name = "archaeological_operations" + model_names = [ + "AdministrativeAct", + "ArchaeologicalSite", + "Operation", + "Parcel", + "ParcelOwner" + ] + migrate_created_field(apps, app_name, model_names) + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_operations', '0111_auto_20230130_1604'), + ] + + operations = [ + migrations.RunPython(migrate_created) + ] diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 4a71ebc08..8d0b717a3 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -266,13 +266,6 @@ {% field_flex_full "Comment about scientific documentation" item.scientific_documentation_comment "<pre>" "</pre>" %} </div> - {% if not is_external %} - <h3>{% trans "Sheet"%}</h3> - <div class="row"> - {% include "ishtar/blocks/sheet_creation_section.html" %} - </div> - {% endif %} - {% if item.virtual_operation %} <div class="alert alert-warning" role="alert"> {% trans "This operation is virtual." %} @@ -317,6 +310,13 @@ {% field_flex "Postal code" item.associated_file.postal_code %} {% endif %} </div> + {% if not is_external %} + <h3>{% trans "Sheet"%}</h3> + <div class="row"> + {% include "ishtar/blocks/sheet_creation_section.html" %} + </div> + {% endif %} + </div> {% if display_sites %} |