diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-04-06 12:31:38 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-11-04 18:49:51 +0100 |
commit | 59444dab7122bbc853a0d4fa7d0414ee30d75e23 (patch) | |
tree | 0d17edbb79864b5a0343420a2f7c06b77cb8ad5e | |
parent | 885b33ff6de36d223d95294e7f50ca6681c35f00 (diff) | |
download | Ishtar-59444dab7122bbc853a0d4fa7d0414ee30d75e23.tar.bz2 Ishtar-59444dab7122bbc853a0d4fa7d0414ee30d75e23.zip |
New container localisation - adapt sheets, imports
-rw-r--r-- | archaeological_warehouse/migrations/0103_auto_20200403_1638.py | 41 | ||||
-rw-r--r-- | archaeological_warehouse/migrations/0104_auto_container_views.py | 26 | ||||
-rw-r--r-- | archaeological_warehouse/models.py | 22 |
3 files changed, 89 insertions, 0 deletions
diff --git a/archaeological_warehouse/migrations/0103_auto_20200403_1638.py b/archaeological_warehouse/migrations/0103_auto_20200403_1638.py new file mode 100644 index 000000000..d7bd5320b --- /dev/null +++ b/archaeological_warehouse/migrations/0103_auto_20200403_1638.py @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.27 on 2020-04-03 16:38 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_warehouse', '0102_auto_20200324_1142'), + ] + + operations = [ + migrations.AddField( + model_name='containertype', + name='stationary', + field=models.BooleanField(default=False, help_text='Container that usually will not be moved. Ex: building, room.', verbose_name='Stationary'), + ), + migrations.AddField( + model_name='warehousedivisionlink', + name='container_type', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='archaeological_warehouse.ContainerType'), + ), + migrations.AlterField( + model_name='container', + name='parent', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='children', to='archaeological_warehouse.Container', verbose_name='Parent container'), + ), + migrations.AlterField( + model_name='container', + name='responsible', + field=models.ForeignKey(blank=True, help_text='Deprecated - do not use', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='owned_containers', to='archaeological_warehouse.Warehouse', verbose_name='Responsible warehouse'), + ), + migrations.AlterField( + model_name='warehousedivisionlink', + name='division', + field=models.ForeignKey(blank=True, help_text='Deprecated - do not use', null=True, on_delete=django.db.models.deletion.CASCADE, to='archaeological_warehouse.WarehouseDivision'), + ), + ] diff --git a/archaeological_warehouse/migrations/0104_auto_container_views.py b/archaeological_warehouse/migrations/0104_auto_container_views.py new file mode 100644 index 000000000..4f707c8d7 --- /dev/null +++ b/archaeological_warehouse/migrations/0104_auto_container_views.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.27 on 2020-04-03 16:47 +from __future__ import unicode_literals + +from django.db import migrations + +import archaeological_warehouse.models +import archaeological_finds.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_warehouse', '0103_auto_20200403_1638'), + ] + + operations = [ + migrations.RunSQL( + archaeological_warehouse.models.ContainerTree.DELETE_SQL), + migrations.RunSQL( + archaeological_warehouse.models.ContainerTree.CREATE_SQL), + migrations.RunSQL( + archaeological_finds.models.FindInsideContainer.DELETE_SQL), + migrations.RunSQL( + archaeological_finds.models.FindInsideContainer.CREATE_SQL), + ] diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index 66386113b..fdde06a7f 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -663,6 +663,28 @@ post_save.connect(post_save_cache, sender=ContainerType) post_delete.connect(post_save_cache, sender=ContainerType) +class ContainerType(GeneralType): + stationary = models.BooleanField( + _("Stationary"), default=False, + help_text=_("Container that usually will not be moved. Ex: building, " + "room.")) + length = models.IntegerField(_(u"Length (mm)"), blank=True, null=True) + width = models.IntegerField(_(u"Width (mm)"), blank=True, null=True) + height = models.IntegerField(_(u"Height (mm)"), blank=True, null=True) + volume = models.FloatField(_(u"Volume (l)"), blank=True, null=True) + reference = models.CharField(_(u"Ref."), max_length=300, blank=True, + null=True) + + class Meta: + verbose_name = _(u"Container type") + verbose_name_plural = _(u"Container types") + ordering = ('label',) + + +post_save.connect(post_save_cache, sender=ContainerType) +post_delete.connect(post_save_cache, sender=ContainerType) + + class WarehouseDivisionLink(models.Model): RELATED_SET_NAME = "divisions" RELATED_ATTRS = ["order", "container_type"] |