From 8575b7e1ab8814067e81cff180bf1971e3e8ee02 Mon Sep 17 00:00:00 2001 From: Dana Lambert Date: Thu, 2 Dec 2021 14:13:18 +1300 Subject: [PATCH] Modify models for new zone selection method --- .../api/migrations/0010_auto_20211201_2155.py | 27 +++++++++++++++++++ backend/right_tree/api/models.py | 18 +++---------- 2 files changed, 30 insertions(+), 15 deletions(-) create mode 100644 backend/right_tree/api/migrations/0010_auto_20211201_2155.py diff --git a/backend/right_tree/api/migrations/0010_auto_20211201_2155.py b/backend/right_tree/api/migrations/0010_auto_20211201_2155.py new file mode 100644 index 0000000..5713770 --- /dev/null +++ b/backend/right_tree/api/migrations/0010_auto_20211201_2155.py @@ -0,0 +1,27 @@ +# Generated by Django 3.2.8 on 2021-12-01 21:55 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('api', '0009_alter_plant_options'), + ] + + operations = [ + migrations.AddField( + model_name='zone', + name='habitat', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='zones', to='api.habitat'), + ), + migrations.AddField( + model_name='zone', + name='related_svg_segment', + field=models.CharField(blank=True, max_length=20, null=True), + ), + migrations.DeleteModel( + name='ZoneImageSegment', + ), + ] diff --git a/backend/right_tree/api/models.py b/backend/right_tree/api/models.py index ada7597..1c8d713 100644 --- a/backend/right_tree/api/models.py +++ b/backend/right_tree/api/models.py @@ -80,8 +80,11 @@ class Zone(models.Model): name = models.CharField(max_length=50) variant = models.CharField(null=True, blank=True, max_length=50) refined_variant = models.CharField(null=True, blank=True, max_length=100) + habitat = models.ForeignKey( + Habitat, blank=True, null=True, on_delete=models.CASCADE, related_name='zones') redirect_habitat = models.ForeignKey( Habitat, blank=True, null=True, on_delete=models.CASCADE, related_name='zone_redirects') + related_svg_segment = models.CharField(null=True, blank=True, max_length=20) ignore_soil_order_filter = models.BooleanField(default=False) ignore_location_filter = models.BooleanField(default=False) @@ -94,21 +97,6 @@ class Zone(models.Model): ordering = ['name', 'variant', 'refined_variant', 'id'] -class ZoneImageSegment(models.Model): - zone = models.ForeignKey( - Zone, on_delete=models.CASCADE, related_name='image_segments') - habitat_image = models.ForeignKey( - HabitatImage, on_delete=models.CASCADE, related_name='image_segments') - segment_order = models.PositiveIntegerField(default=0) - segment_percentage_width = models.FloatField(default=0) - - def __str__(self): - return f"{self.habitat_image.name}, {self.zone}" - - class Meta: - ordering = ['segment_order', 'id'] - - class Plant(models.Model): name = models.CharField(unique=True, max_length=50) commonname = models.CharField(null=True, blank=True, max_length=200)