From ec2ef1a59c01d79d0341545b92a07a60dee6321d Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 30 Jan 2023 17:32:49 +0100 Subject: Add "created" field on main items in order to facilitate queries --- .../migrations/0111_auto_20230127_1504.py | 160 ---------------- .../migrations/0111_auto_20230130_1604.py | 206 +++++++++++++++++++++ .../migrations/0112_migrate_created.py | 27 +++ .../templates/ishtar/sheet_basefind.html | 12 +- 4 files changed, 234 insertions(+), 171 deletions(-) delete mode 100644 archaeological_finds/migrations/0111_auto_20230127_1504.py create mode 100644 archaeological_finds/migrations/0111_auto_20230130_1604.py create mode 100644 archaeological_finds/migrations/0112_migrate_created.py (limited to 'archaeological_finds') diff --git a/archaeological_finds/migrations/0111_auto_20230127_1504.py b/archaeological_finds/migrations/0111_auto_20230127_1504.py deleted file mode 100644 index e1d833e03..000000000 --- a/archaeological_finds/migrations/0111_auto_20230127_1504.py +++ /dev/null @@ -1,160 +0,0 @@ -# Generated by Django 2.2.24 on 2023-01-27 15:04 - -from django.db import migrations, models -import django.db.models.deletion -import ishtar_common.utils - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_finds', '0110_auto_20220707_1633'), - ] - - operations = [ - migrations.AddField( - model_name='basefind', - name='cached_label', - field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), - ), - migrations.AddField( - model_name='historicalbasefind', - name='cached_label', - field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), - ), - migrations.AddField( - model_name='historicaltreatment', - name='complete_identifier', - field=models.TextField(blank=True, default='', verbose_name='Complete identifier'), - ), - migrations.AddField( - model_name='historicaltreatment', - name='custom_index', - field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), - ), - migrations.AddField( - model_name='historicaltreatment', - name='qrcode', - field=models.TextField(blank=True, max_length=255, null=True), - ), - migrations.AddField( - model_name='historicaltreatmentfile', - name='complete_identifier', - field=models.TextField(blank=True, default='', verbose_name='Complete identifier'), - ), - migrations.AddField( - model_name='historicaltreatmentfile', - name='custom_index', - field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), - ), - migrations.AddField( - model_name='historicaltreatmentfile', - name='qrcode', - field=models.TextField(blank=True, max_length=255, null=True), - ), - migrations.AddField( - model_name='treatment', - name='complete_identifier', - field=models.TextField(blank=True, default='', verbose_name='Complete identifier'), - ), - migrations.AddField( - model_name='treatment', - name='custom_index', - field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), - ), - migrations.AddField( - model_name='treatment', - name='qrcode', - field=models.ImageField(blank=True, max_length=255, null=True, upload_to=ishtar_common.utils.get_image_path), - ), - migrations.AddField( - model_name='treatmentfile', - name='complete_identifier', - field=models.TextField(blank=True, default='', verbose_name='Complete identifier'), - ), - migrations.AddField( - model_name='treatmentfile', - name='custom_index', - field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), - ), - migrations.AddField( - model_name='treatmentfile', - name='qrcode', - field=models.ImageField(blank=True, max_length=255, null=True, upload_to=ishtar_common.utils.get_image_path), - ), - migrations.AlterField( - model_name='basefind', - name='discovery_date', - field=models.DateField(blank=True, null=True, verbose_name='Discovery date (exact or beginning)'), - ), - migrations.AlterField( - model_name='basefind', - name='discovery_date_taq', - field=models.DateField(blank=True, null=True, verbose_name='Discovery date (end)'), - ), - migrations.AlterField( - model_name='basefind', - name='geodata', - field=models.ManyToManyField(blank=True, related_name='related_items_archaeological_finds_basefind', to='ishtar_common.GeoVectorData', verbose_name='Geodata'), - ), - migrations.AlterField( - model_name='basefind', - name='main_geodata', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='main_related_items_archaeological_finds_basefind', to='ishtar_common.GeoVectorData', verbose_name='Main geodata'), - ), - migrations.AlterField( - model_name='find', - name='find_number', - field=models.IntegerField(blank=True, null=True, verbose_name='Number of remains'), - ), - migrations.AlterField( - model_name='find', - name='museum_id', - field=models.TextField(blank=True, default='', verbose_name='Museum inventory number'), - ), - migrations.AlterField( - model_name='historicalbasefind', - name='discovery_date', - field=models.DateField(blank=True, null=True, verbose_name='Discovery date (exact or beginning)'), - ), - migrations.AlterField( - model_name='historicalbasefind', - name='discovery_date_taq', - field=models.DateField(blank=True, null=True, verbose_name='Discovery date (end)'), - ), - migrations.AlterField( - model_name='historicalbasefind', - name='main_geodata', - field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.GeoVectorData', verbose_name='Main geodata'), - ), - migrations.AlterField( - model_name='historicalfind', - name='find_number', - field=models.IntegerField(blank=True, null=True, verbose_name='Number of remains'), - ), - migrations.AlterField( - model_name='historicalfind', - name='museum_id', - field=models.TextField(blank=True, default='', verbose_name='Museum inventory number'), - ), - migrations.AlterField( - model_name='historicaltreatment', - name='cached_label', - field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), - ), - migrations.AlterField( - model_name='historicaltreatmentfile', - name='cached_label', - field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), - ), - migrations.AlterField( - model_name='treatment', - name='cached_label', - field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), - ), - migrations.AlterField( - model_name='treatmentfile', - name='cached_label', - field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), - ), - ] diff --git a/archaeological_finds/migrations/0111_auto_20230130_1604.py b/archaeological_finds/migrations/0111_auto_20230130_1604.py new file mode 100644 index 000000000..26a252c9a --- /dev/null +++ b/archaeological_finds/migrations/0111_auto_20230130_1604.py @@ -0,0 +1,206 @@ +# 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 +import ishtar_common.utils + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_finds', '0110_auto_20220707_1633'), + ] + + operations = [ + migrations.AddField( + model_name='basefind', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), + ), + migrations.AddField( + model_name='basefind', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='find', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='historicalbasefind', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), + ), + migrations.AddField( + model_name='historicalbasefind', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='historicalfind', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='historicaltreatment', + name='complete_identifier', + field=models.TextField(blank=True, default='', verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='historicaltreatment', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='historicaltreatment', + name='custom_index', + field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), + ), + migrations.AddField( + model_name='historicaltreatment', + name='qrcode', + field=models.TextField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='historicaltreatmentfile', + name='complete_identifier', + field=models.TextField(blank=True, default='', verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='historicaltreatmentfile', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='historicaltreatmentfile', + name='custom_index', + field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), + ), + migrations.AddField( + model_name='historicaltreatmentfile', + name='qrcode', + field=models.TextField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='property', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='treatment', + name='complete_identifier', + field=models.TextField(blank=True, default='', verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='treatment', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='treatment', + name='custom_index', + field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), + ), + migrations.AddField( + model_name='treatment', + name='qrcode', + field=models.ImageField(blank=True, max_length=255, null=True, upload_to=ishtar_common.utils.get_image_path), + ), + migrations.AddField( + model_name='treatmentfile', + name='complete_identifier', + field=models.TextField(blank=True, default='', verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='treatmentfile', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='treatmentfile', + name='custom_index', + field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), + ), + migrations.AddField( + model_name='treatmentfile', + name='qrcode', + field=models.ImageField(blank=True, max_length=255, null=True, upload_to=ishtar_common.utils.get_image_path), + ), + migrations.AlterField( + model_name='basefind', + name='discovery_date', + field=models.DateField(blank=True, null=True, verbose_name='Discovery date (exact or beginning)'), + ), + migrations.AlterField( + model_name='basefind', + name='discovery_date_taq', + field=models.DateField(blank=True, null=True, verbose_name='Discovery date (end)'), + ), + migrations.AlterField( + model_name='basefind', + name='geodata', + field=models.ManyToManyField(blank=True, related_name='related_items_archaeological_finds_basefind', to='ishtar_common.GeoVectorData', verbose_name='Geodata'), + ), + migrations.AlterField( + model_name='basefind', + name='main_geodata', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='main_related_items_archaeological_finds_basefind', to='ishtar_common.GeoVectorData', verbose_name='Main geodata'), + ), + migrations.AlterField( + model_name='find', + name='find_number', + field=models.IntegerField(blank=True, null=True, verbose_name='Number of remains'), + ), + migrations.AlterField( + model_name='find', + name='museum_id', + field=models.TextField(blank=True, default='', verbose_name='Museum inventory number'), + ), + migrations.AlterField( + model_name='historicalbasefind', + name='discovery_date', + field=models.DateField(blank=True, null=True, verbose_name='Discovery date (exact or beginning)'), + ), + migrations.AlterField( + model_name='historicalbasefind', + name='discovery_date_taq', + field=models.DateField(blank=True, null=True, verbose_name='Discovery date (end)'), + ), + migrations.AlterField( + model_name='historicalbasefind', + name='main_geodata', + field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.GeoVectorData', verbose_name='Main geodata'), + ), + migrations.AlterField( + model_name='historicalfind', + name='find_number', + field=models.IntegerField(blank=True, null=True, verbose_name='Number of remains'), + ), + migrations.AlterField( + model_name='historicalfind', + name='museum_id', + field=models.TextField(blank=True, default='', verbose_name='Museum inventory number'), + ), + migrations.AlterField( + model_name='historicaltreatment', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), + ), + migrations.AlterField( + model_name='historicaltreatmentfile', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), + ), + migrations.AlterField( + model_name='treatment', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), + ), + migrations.AlterField( + model_name='treatmentfile', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), + ), + ] diff --git a/archaeological_finds/migrations/0112_migrate_created.py b/archaeological_finds/migrations/0112_migrate_created.py new file mode 100644 index 000000000..b1676c098 --- /dev/null +++ b/archaeological_finds/migrations/0112_migrate_created.py @@ -0,0 +1,27 @@ +# Generated by Django 2.2.24 on 2023-01-30 17:06 + +from django.db import migrations +from ishtar_common.utils_migrations import migrate_created_field + + +def migrate_created(apps, __): + app_name = "archaeological_finds" + model_names = [ + "BaseFind", + "Find", + "Property", + "Treatment", + "TreatmentFile", + ] + migrate_created_field(apps, app_name, model_names) + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_finds', '0111_auto_20230130_1604'), + ] + + operations = [ + migrations.RunPython(migrate_created) + ] diff --git a/archaeological_finds/templates/ishtar/sheet_basefind.html b/archaeological_finds/templates/ishtar/sheet_basefind.html index 85987c320..c3ab1c792 100644 --- a/archaeological_finds/templates/ishtar/sheet_basefind.html +++ b/archaeological_finds/templates/ishtar/sheet_basefind.html @@ -67,17 +67,7 @@ {% if not is_external %}

{% trans "Sheet"%}

- {% with item.history_creation_date|date:"SHORT_DATETIME_FORMAT" as creation_date %} - {% with item.history_creator.ishtaruser.full_label|add:"
"|add:creation_date|add:"" as creator %} - {% field_flex "Created by" creator|safe '' '' first %} - {% endwith %}{% endwith %} - {% if item.history_creation_date != item.last_edition_date %} - {% with item.last_edition_date|date:"SHORT_DATETIME_FORMAT" as edition_date %} - {% with item.history_modifier.ishtaruser.full_label|add:"
"|add:edition_date|add:"" as modifier %} - {% trans "Last modified by" as lastmodifiedby_label %} - {% field_flex lastmodifiedby_label modifier|safe '' '' first %} - {% endwith %}{% endwith %} - {% endif %} + {% include "ishtar/blocks/sheet_creation_section.html" %}
{% endif %} -- cgit v1.2.3